ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dodrio berry picking decompiled

Browse Source
This commit is contained in:
DizzyEggg 2019-08-02 00:41:55 +02:00
parent 02cadbee60
commit 4d2d8779bf
9 changed files with 1069 additions and 2657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2099
asm/dodrio_berry_picking.s
View File

File diff suppressed because it is too large Load Diff

41
data/dodrio_berry_picking.s
View File

@ -1,41 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082FB3DC:: @ 82FB3DC
.4byte gText_1Colon
.4byte gText_2Colon
.4byte gText_3Colon
.4byte gText_4Colon
.4byte gText_5Colon
.align 2
gUnknown_082FB3F0:: @ 82FB3F0
.2byte 0x005c, 0x0084, 0x00ac, 0x00d4
gUnknown_082FB3F8:: @ 82FB3F8
.2byte 0x0021, 0x0031, 0x0041, 0x0051, 0x0061
gUnknown_082FB402:: @ 82FB402
.2byte 0x0011, 0x0021, 0x0031, 0x0041, 0x0051
.align 2
gUnknown_082FB40C:: @ 82FB40C
.4byte 0x00000000, sub_8029338
.4byte 0x00000001, sub_8029440
.4byte 0x00000002, sub_802988C
.4byte 0x00000003, sub_802A010
.4byte 0x00000004, sub_802A380
.4byte 0x00000005, sub_802A454
.4byte 0x00000006, sub_802A534
.4byte 0x00000007, sub_802A588
.4byte 0x00000008, unused_0
.4byte 0x00000009, nullsub_16
.align 2
gUnknown_082FB45C:: @ 82FB45C
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00

2
include/berry_crush.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_BERRY_CRUSH_H #ifndef GUARD_BERRY_CRUSH_H
#define GUARD_BERRY_CRUSH_H #define GUARD_BERRY_CRUSH_H
#include "main.h"
void sub_8020C70(MainCallback callback); void sub_8020C70(MainCallback callback);
#endif // GUARD_BERRY_CRUSH_H #endif // GUARD_BERRY_CRUSH_H

8
include/dodrio_berry_picking.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef GUARD_DODRIO_BERRY_PICKING_H
#define GUARD_DODRIO_BERRY_PICKING_H
void sub_802493C(u16 a0, void (*callback)(void));
void sub_8027A5C(void);
void sub_8027AAC(void);
#endif // GUARD_DODRIO_BERRY_PICKING_H

2
include/menu.h
View File

@ -25,7 +25,7 @@ void InitStandardTextBoxWindows(void);
void sub_8197200(void); void sub_8197200(void);
u16 RunTextPrintersAndIsPrinter0Active(void); u16 RunTextPrintersAndIsPrinter0Active(void);
void sub_81973A4(void); void sub_81973A4(void);
void DrawDialogueFrame(u8, u8); void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);

16
include/strings.h
View File

@ -2728,5 +2728,21 @@ extern const u8 gText_BerryPickingRecords[];
extern const u8 gText_BerriesPicked[]; extern const u8 gText_BerriesPicked[];
extern const u8 gText_BerriesInRowFivePlayers[]; extern const u8 gText_BerriesInRowFivePlayers[];
extern const u8 gText_BestScore[]; extern const u8 gText_BestScore[];
extern const u8 gText_1Colon[];
extern const u8 gText_2Colon[];
extern const u8 gText_3Colon[];
extern const u8 gText_4Colon[];
extern const u8 gText_5Colon[];
extern const u8 gText_SpacePoints[];
extern const u8 gText_10P30P50P50P[];
extern const u8 gText_AnnouncingPrizes[];
extern const u8 gText_AnnouncingRankings[];
extern const u8 gText_FirstPlacePrize[];
extern const u8 gText_CantHoldAnyMore[];
extern const u8 gText_FilledStorageSpace[];
extern const u8 gText_BerryPickingResults[];
extern const u8 gText_WantToPlayAgain[];
extern const u8 gText_CommunicationStandby3[];
extern const u8 gText_SomeoneDroppedOut[];
#endif // GUARD_STRINGS_H #endif // GUARD_STRINGS_H

2
ld_script.txt
View File

@ -75,7 +75,6 @@ SECTIONS {
asm/berry_crush.o(.text*); asm/berry_crush.o(.text*);
src/berry_powder.o(.text*); src/berry_powder.o(.text*);
src/dodrio_berry_picking.o(.text*); src/dodrio_berry_picking.o(.text*);
asm/dodrio_berry_picking.o(.text*);
src/pokemon_jump.o(.text*); src/pokemon_jump.o(.text*);
asm/pokemon_jump.o(.text*); asm/pokemon_jump.o(.text*);
src/rtc.o(.text*); src/rtc.o(.text*);
@ -447,7 +446,6 @@ SECTIONS {
data/berry_crush.o(.rodata); data/berry_crush.o(.rodata);
data/berry_powder.o(.rodata); data/berry_powder.o(.rodata);
src/dodrio_berry_picking.o(.rodata); src/dodrio_berry_picking.o(.rodata);
data/dodrio_berry_picking.o(.rodata);
src/pokemon_jump.o(.rodata); src/pokemon_jump.o(.rodata);
data/pokemon_jump.o(.rodata); data/pokemon_jump.o(.rodata);
src/rtc.o(.rodata); src/rtc.o(.rodata);

1482
src/dodrio_berry_picking.c
View File

File diff suppressed because it is too large Load Diff

74
src/union_room.c
View File

@ -1,53 +1,54 @@
#include "global.h" #include "global.h"
#include "window.h" #include "alloc.h"
#include "battle.h"
#include "berry_crush.h"
#include "bg.h" #include "bg.h"
#include "random.h" #include "cable_club.h"
#include "string_util.h" #include "data.h"
#include "task.h" #include "decompress.h"
#include "dodrio_berry_picking.h"
#include "dynamic_placeholder_text_util.h"
#include "easy_chat.h"
#include "event_data.h" #include "event_data.h"
#include "event_obj_lock.h"
#include "field_control_avatar.h"
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_weather.h"
#include "international_string_util.h"
#include "librfu.h"
#include "link.h" #include "link.h"
#include "link_rfu.h" #include "link_rfu.h"
#include "librfu.h"
#include "alloc.h"
#include "menu.h"
#include "list_menu.h" #include "list_menu.h"
#include "load_save.h"
#include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "mevent.h"
#include "mystery_gift.h"
#include "overworld.h"
#include "palette.h"
#include "party_menu.h"
#include "pokemon_jump.h"
#include "random.h"
#include "script.h" #include "script.h"
#include "script_pokemon_util_80F87D8.h"
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "start_menu.h"
#include "constants/game_stat.h" #include "string_util.h"
#include "constants/maps.h" #include "strings.h"
#include "constants/species.h" #include "task.h"
#include "constants/rgb.h"
#include "constants/battle_frontier.h"
#include "trade.h" #include "trade.h"
#include "trainer_card.h" #include "trainer_card.h"
#include "overworld.h"
#include "battle.h"
#include "load_save.h"
#include "cable_club.h"
#include "field_control_avatar.h"
#include "party_menu.h"
#include "field_weather.h"
#include "palette.h"
#include "decompress.h"
#include "start_menu.h"
#include "data.h"
#include "field_screen_effect.h"
#include "script_pokemon_util_80F87D8.h"
#include "international_string_util.h"
#include "field_player_avatar.h"
#include "strings.h"
#include "mevent.h"
#include "dynamic_placeholder_text_util.h"
#include "union_room.h" #include "union_room.h"
#include "easy_chat.h"
#include "event_obj_lock.h"
#include "union_room_chat.h" #include "union_room_chat.h"
#include "berry_crush.h"
#include "mystery_gift.h"
#include "union_room_player_avatar.h" #include "union_room_player_avatar.h"
#include "pokemon_jump.h" #include "window.h"
#include "constants/battle_frontier.h"
#include "constants/game_stat.h"
#include "constants/maps.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
EWRAM_DATA u8 gUnknown_02022C20[12] = {}; EWRAM_DATA u8 gUnknown_02022C20[12] = {};
EWRAM_DATA u8 gUnknown_02022C2C = 0; EWRAM_DATA u8 gUnknown_02022C2C = 0;
@ -98,7 +99,6 @@ bool32 sub_8017678(struct UnkStruct_Shared *arg0, struct UnkStruct_Shared *arg1)
u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId); u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId);
void sub_801807C(struct TradeUnkStruct *arg0); void sub_801807C(struct TradeUnkStruct *arg0);
void sub_801AC54(void); void sub_801AC54(void);
void sub_802493C(u8 monId, MainCallback callback);
void sub_80149D8(void); void sub_80149D8(void);
void MG_DrawTextBorder(u8 windowId); void MG_DrawTextBorder(u8 windowId);
s8 mevent_message_print_and_prompt_yes_no(u8 *textState, u8 *arg1, u8 arg2, const u8 *str); s8 mevent_message_print_and_prompt_yes_no(u8 *textState, u8 *arg1, u8 arg2, const u8 *str);