From 55bede6ca279483a0e4b9b51ebe152d4be135b93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Nov 2019 13:59:24 -0500 Subject: Finish decomp of battle_tower --- include/battle_tower.h | 4 ++-- include/party_menu.h | 1 + include/script_pokemon_util_80A0058.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index b7b106107..9bb93f1c2 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -12,7 +12,7 @@ struct BattleTowerTrainer u8 trainerClass; u8 name[3]; u8 teamFlags; - u16 speech[6]; + u16 greeting[6]; }; struct BattleTowerPokemonTemplate @@ -26,7 +26,7 @@ struct BattleTowerPokemonTemplate }; u16 sub_8164FCC(u8, u8); -void sub_80E7524(struct BattleTowerEReaderTrainer *); +void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); void ValidateEReaderTrainer(void); u8 GetBattleTowerTrainerFrontSpriteId(void); u8 GetEreaderTrainerFrontSpriteId(void); diff --git a/include/party_menu.h b/include/party_menu.h index c07371a5d..6c81a248c 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -45,6 +45,7 @@ extern u8 gUnknown_203B0C0; extern u8 gUnknown_203B0C1; extern u8 gUnknown_203B0DC[3]; extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); +extern u8 gSelectedOrderFromParty[3]; bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 MonKnowsMove(struct Pokemon *, u16); diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h index 768e838dd..b63a7b0ef 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util_80A0058.h @@ -5,5 +5,6 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3 bool8 ScriptGiveEgg(u16 species); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); void sp000_heal_pokemon(void); +void ReducePlayerPartyToThree(void); #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H -- cgit v1.2.3 From 807fe60b22bf3cd3deadd2bb40898f3a2727218b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Nov 2019 14:53:30 -0500 Subject: Document battle_tower.c --- include/battle.h | 2 +- include/constants/battle_tower.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 40a2eba04..d0ea787ef 100644 --- a/include/battle.h +++ b/include/battle.h @@ -432,7 +432,7 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 arenaTurnCounter; // not used in FR? + u8 field_DA; // not used in FR? u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; u8 givenExpMons; diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h index b0080caff..6e37d15ec 100644 --- a/include/constants/battle_tower.h +++ b/include/constants/battle_tower.h @@ -72,4 +72,11 @@ #define BATTLE_TOWER_ITEM_LUCKY_PUNCH 61 #define BATTLE_TOWER_ITEM_GANLON_BERRY 62 +#define BTSPECIAL_TEST 0 +#define BTSPECIAL_RESULT_SAVE_SCUM 1 +#define BTSPECIAL_RESULT_WON7 2 +#define BTSPECIAL_RESULT_LOST 3 +#define BTSPECIAL_RESULT_QUICKSAVE 4 +#define BTSPECIAL_RESULT_INACTIVE 5 + #endif //GUARD_CONSTANTS_BATTLE_TOWER_H -- cgit v1.2.3 From aba284d3bed0551b1bc12dbd17e2c63b2d5ce1e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Nov 2019 15:59:49 -0500 Subject: Update comment on BattleStruct.field_DA --- include/battle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index d0ea787ef..122ccc894 100644 --- a/include/battle.h +++ b/include/battle.h @@ -432,7 +432,7 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 field_DA; // not used in FR? + u8 field_DA; // battle tower related u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; u8 givenExpMons; -- cgit v1.2.3 From 89b1087c3795fe5313f3f29ac2a31ed509ebcbd6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Nov 2019 22:06:56 -0500 Subject: Decomp learn_move and start documentation --- include/graphics.h | 6 ++++++ include/strings.h | 11 +++++++++++ 2 files changed, 17 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index bc87e4d53..c057da386 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4226,7 +4226,13 @@ extern const u16 gTradeMenuMonBox_Tilemap[]; extern const u16 gUnknown_8E9CBBC[]; extern const u16 gUnknown_8E9CB9C[]; +// hall_of_fame extern const u32 gFile_graphics_misc_confetti_sheet[]; extern const u32 gFile_graphics_misc_confetti_palette[]; +// learn_move +extern const u16 gUnknown_8E97DDC[]; +extern const u32 gUnknown_8E97DFC[]; +extern const u32 gUnknown_8E97EC4[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index 80ede79ef..078a6b2db 100644 --- a/include/strings.h +++ b/include/strings.h @@ -724,4 +724,15 @@ extern const u8 gText_IDNumber[]; extern const u8 gText_Name[]; extern const u8 gText_MainMenuTime[]; +// learn_move +extern const u8 gUnknown_841E3E3[]; +extern const u8 gUnknown_841E405[]; +extern const u8 gUnknown_841E414[]; +extern const u8 gUnknown_841E481[]; +extern const u8 gUnknown_841E493[]; +extern const u8 gUnknown_841E4C0[]; +extern const u8 gUnknown_841E50C[]; +extern const u8 gUnknown_841E3FB[]; +extern const u8 gUnknown_841E4E2[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From fa91b511b918d4497b3f2156cdc4e007c51c9c51 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2019 19:43:47 -0500 Subject: Finish documentation of learn_move syms --- include/strings.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 078a6b2db..14722f7d3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -725,14 +725,14 @@ extern const u8 gText_Name[]; extern const u8 gText_MainMenuTime[]; // learn_move -extern const u8 gUnknown_841E3E3[]; -extern const u8 gUnknown_841E405[]; -extern const u8 gUnknown_841E414[]; -extern const u8 gUnknown_841E481[]; -extern const u8 gUnknown_841E493[]; -extern const u8 gUnknown_841E4C0[]; -extern const u8 gUnknown_841E50C[]; -extern const u8 gUnknown_841E3FB[]; -extern const u8 gUnknown_841E4E2[]; +extern const u8 gText_TeachWhichMoveToMon[]; +extern const u8 gText_MonLearnedMove[]; +extern const u8 gText_MonIsTryingToLearnMove[]; +extern const u8 gText_StopLearningMove[]; +extern const u8 gText_1_2_and_Poof[]; +extern const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[]; +extern const u8 WhichMoveShouldBeForgotten[]; +extern const u8 gText_TeachMoveQues[]; +extern const u8 gText_GiveUpTryingToTeachNewMove[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 451310c0c8a61b2f81b8573a44e959f95c223afb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2019 20:15:41 -0500 Subject: Address review comments --- include/strings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 14722f7d3..f39f4f553 100644 --- a/include/strings.h +++ b/include/strings.h @@ -731,7 +731,7 @@ extern const u8 gText_MonIsTryingToLearnMove[]; extern const u8 gText_StopLearningMove[]; extern const u8 gText_1_2_and_Poof[]; extern const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[]; -extern const u8 WhichMoveShouldBeForgotten[]; +extern const u8 gText_WhichMoveShouldBeForgotten[]; extern const u8 gText_TeachMoveQues[]; extern const u8 gText_GiveUpTryingToTeachNewMove[]; -- cgit v1.2.3 From e560b55325cb7329bde2c0f757d9698bf0b7a3af Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 11:09:24 -0500 Subject: Port mevent scripts to C --- include/link_rfu.h | 3 +++ include/mevent_server.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index 6e6e5f7a3..671488be0 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -43,4 +43,7 @@ void sub_80FBB20(void); bool8 sub_80FA484(bool32 a0); void var_800D_set_xB(void); +#include "mevent_server.h" +extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[]; + #endif //GUARD_LINK_RFU_H diff --git a/include/mevent_server.h b/include/mevent_server.h index ddc00b978..b691e9e1f 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -37,6 +37,20 @@ struct mevent_client_cmd u32 parameter; }; +// Client commands +#define CLI_RETURN(x) {.instr = 1, .parameter = x} +#define CLI_RECEIVE(x) {.instr = 2, .parameter = x} +#define CLI_WAITSND {.instr = 3, .parameter = 0} +#define CLI_JUMPBUF {.instr = 4, .parameter = 0} +#define CLI_SNDHEAD {.instr = 8, .parameter = 0} +#define CLI_VLDNEWS {.instr = 9, .parameter = 0} +#define CLI_RECVSAV {.instr = 10, .parameter = 0} +#define CLI_RECVBUF {.instr = 12, .parameter = 0} +#define CLI_REQWORD {.instr = 13, .parameter = 0} +#define CLI_SNDWORD {.instr = 14, .parameter = 0} +#define CLI_RECVRAM {.instr = 17, .parameter = 0} +#define CLI_SENDALL {.instr = 20, .parameter = 0} + struct mevent_client { u32 unk_00; @@ -58,6 +72,24 @@ struct mevent_server_cmd void * parameter; }; +// Server commands +#define SRV_RETURN(x) {.instr = 0, .flag = x} +#define SRV_WAITSND {.instr = 1} +#define SRV_RECV(x) {.instr = 2, .flag = x} +#define SRV_BRANCH(y) {.instr = 3, .parameter = (void *)y} +#define SRV_BRANCHIF(x, y) {.instr = 4, .flag = x, .parameter = (void *)y} +#define SRV_READ_1442CC {.instr = 5} +#define SRV_VALID_1442CC {.instr = 6} +#define SRV_CHECK_1442CC_14 {.instr = 7} +#define SRV_READWORD {.instr = 8} +#define SRV_SEND_CARD {.instr = 13} +#define SRV_SEND_NEWS {.instr = 14} +#define SRV_BUFFER_SEND {.instr = 15} +#define SRV_SEND(x, y) {.instr = 18, .flag = x, .parameter = (void *)y} +#define SRV_BUFFER_CARD {.instr = 26} +#define SRV_BUFFER_NEWS {.instr = 27} +#define SRV_RAM_SCRIPT_IF_VALID {.instr = 28} + struct mevent_srv_common { u32 unk_00; -- cgit v1.2.3 From 36c159f7fa166615c445e33cde8e4f756f116179 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 14:20:02 -0500 Subject: SAVE_STAT_ enums --- include/save_menu_util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/save_menu_util.h b/include/save_menu_util.h index f2a18a777..7085520b4 100644 --- a/include/save_menu_util.h +++ b/include/save_menu_util.h @@ -7,7 +7,8 @@ enum SaveStat SAVE_STAT_POKEDEX, SAVE_STAT_TIME, SAVE_STAT_LOCATION, - SAVE_STAT_BADGES + SAVE_STAT_BADGES, + SAVE_STAT_TIME_HR_RT_ALIGN }; void SaveStatToString(u8 a0, u8 *a1, u8 a2); -- cgit v1.2.3 From f316b22f96753c8580d86a8b7957ec69d7bd0c3c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 17:08:21 -0500 Subject: Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata --- include/strings.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index f39f4f553..983caf509 100644 --- a/include/strings.h +++ b/include/strings.h @@ -735,4 +735,7 @@ extern const u8 gText_WhichMoveShouldBeForgotten[]; extern const u8 gText_TeachMoveQues[]; extern const u8 gText_GiveUpTryingToTeachNewMove[]; +// pokemon_size_record +extern const u8 gText_DecimalPoint[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 734cbfdb202f366ed39b5304e030478aaa3ea090 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 21:46:57 -0500 Subject: Decomp map_name_popup --- include/global.fieldmap.h | 2 +- include/map_name_popup.h | 2 +- include/strings.h | 3 +++ include/text_window.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index c0f25fa93..70e806266 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -163,7 +163,7 @@ struct MapHeader /* 0x17 */ u8 mapType; /* 0x18 */ u8 filler_18; /* 0x19 */ u8 escapeRope; - /* 0x1A */ u8 flags; + /* 0x1A */ s8 flags; /* 0x1B */ u8 battleType; }; diff --git a/include/map_name_popup.h b/include/map_name_popup.h index cf9b005d9..6f4a6528c 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -9,6 +9,6 @@ // Exported ROM declarations void HideMapNamePopUpWindow(void); -void sub_8098110(u8); +void CreateMapNamePopupIfNotAlreadyRunning(u8); #endif //GUARD_MAP_NAME_POPUP_H diff --git a/include/strings.h b/include/strings.h index 983caf509..6ad76e2fa 100644 --- a/include/strings.h +++ b/include/strings.h @@ -738,4 +738,7 @@ extern const u8 gText_GiveUpTryingToTeachNewMove[]; // pokemon_size_record extern const u8 gText_DecimalPoint[]; +// map_name_popup +extern const u8 gUnknown_841D18D[]; + #endif //GUARD_STRINGS_H diff --git a/include/text_window.h b/include/text_window.h index c1463a9c7..8e8466145 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -29,5 +29,6 @@ void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette); void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset); void sub_814FE6C(u8 windowId, u16 destOffset, u8 palIdx); void sub_814FEEC(u8 windowId, u16 destOffset, u8 palIdx); +void sub_814FF6C(u8 windowId, u16 destOffset); #endif // GUARD_TEXT_WINDOW_H -- cgit v1.2.3 From 3cbc3121304a0dfb34566a16b828dda96c474700 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 11:21:49 -0500 Subject: Dump field_door data; start field_door decomp --- include/field_camera.h | 1 + include/metatile_behavior.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/field_camera.h b/include/field_camera.h index d2165780a..2ba583a52 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -30,5 +30,6 @@ void sub_805A658(s16 *x, s16 *y); void SetCameraPanningCallback(void (*cb)(void)); void SetCameraPanning(s16 x, s16 y); void InstallCameraPanAheadCallback(void); +void sub_805A91C(int x, int y, const u16 *data); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index df03001bf..d567ab77c 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -151,6 +151,5 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); bool8 MetatileBehavior_IsMBA3(u8 metatileBehavior); -extern u8 gUnknown_8353068[]; #endif // GUARD_METATILE_BEHAVIOR -- cgit v1.2.3 From 4c61bead05968e0404ea074bed4da5edb2645b90 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 13:53:47 -0500 Subject: Document field_door code --- include/field_camera.h | 2 +- include/field_door.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/field_camera.h b/include/field_camera.h index 2ba583a52..fb9861014 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -30,6 +30,6 @@ void sub_805A658(s16 *x, s16 *y); void SetCameraPanningCallback(void (*cb)(void)); void SetCameraPanning(s16 x, s16 y); void InstallCameraPanAheadCallback(void); -void sub_805A91C(int x, int y, const u16 *data); +void DrawDoorMetatileAt(int x, int y, const u16 *data); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_door.h b/include/field_door.h index 0059cbe1a..777afffce 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -3,11 +3,11 @@ #include "global.h" -void FieldSetDoorOpened(u32, u32); -void FieldSetDoorClosed(u32, u32); -s8 FieldAnimateDoorClose(u32, u32); -s8 FieldAnimateDoorOpen(u32, u32); +void FieldSetDoorOpened(int x, int y); +void FieldSetDoorClosed(int x, int y); +s8 FieldAnimateDoorClose(int x, int y); +s8 FieldAnimateDoorOpen(int x, int y); bool8 FieldIsDoorAnimationRunning(void); -u32 GetDoorSoundEffect(u32 x, u32 y); +u16 GetDoorSoundEffect(int x, int y); #endif -- cgit v1.2.3 From f6e88738926162034998a1e510989671a2cab216 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 15:24:36 -0500 Subject: Resolve comments on map_name_popup --- include/map_name_popup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/map_name_popup.h b/include/map_name_popup.h index 6f4a6528c..6fb2f798b 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -9,6 +9,6 @@ // Exported ROM declarations void HideMapNamePopUpWindow(void); -void CreateMapNamePopupIfNotAlreadyRunning(u8); +void CreateMapNamePopupIfNotAlreadyRunning(bool32 palIntoFadedBuffer); #endif //GUARD_MAP_NAME_POPUP_H -- cgit v1.2.3 From f04e6737b2073446efa285cfa74a80ee23649afd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 15:30:48 -0500 Subject: remove declaration of nonexistent map_name_popup routine --- include/map_name_popup.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/map_name_popup.h b/include/map_name_popup.h index 6fb2f798b..c8ce02c30 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -3,12 +3,6 @@ #include "global.h" -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations -void HideMapNamePopUpWindow(void); void CreateMapNamePopupIfNotAlreadyRunning(bool32 palIntoFadedBuffer); #endif //GUARD_MAP_NAME_POPUP_H -- cgit v1.2.3