From 82f0bccff5bf151f8b26c4d098d272bba387011e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Apr 2018 08:42:55 -0400 Subject: Mystery Event Script Macros; start disassembling the raw data in debug_menu_3.s --- include/macros.inc | 1 + include/macros/me_script.inc | 88 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 include/macros/me_script.inc (limited to 'include') diff --git a/include/macros.inc b/include/macros.inc index f34353079..93a029cdd 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -4,6 +4,7 @@ .include "include/macros/pokemon_data.inc" .include "include/macros/ec.inc" .include "include/macros/map.inc" + .include "include/macros/me_script.inc" .macro region_map_location x, y, width, height, name .byte \x diff --git a/include/macros/me_script.inc b/include/macros/me_script.inc new file mode 100644 index 000000000..4d5f59d1b --- /dev/null +++ b/include/macros/me_script.inc @@ -0,0 +1,88 @@ + .macro me_nop + .byte 0 + .endm + + .macro me_checkcompat word, v1, v2, v3, v4 + .byte 1 + .4byte \word + .2byte \v1 + .4byte \v2 + .2byte \v3 + .4byte \v4 + .endm + + .macro me_end + .byte 2 + .endm + + .macro me_setmsg value, str + .byte 3 + .byte \value + .4byte \str + .endm + + .macro me_setstatus value + .byte 4 + .byte \value + .endm + + .macro me_runscript script + .byte 5 + .4byte \script + .endm + + .macro me_initramscript mapId, objId, script, end + .byte 6 + map \mapId + .byte \objId + .4byte \script, \end + .endm + + .macro me_setenigmaberry berry + .byte 7 + .4byte \berry + .endm + + .macro me_giveribbon index, ribbonId + .byte 8 + .byte \index, \ribbonId + .endm + + .macro me_givenationaldex + .byte 9 + .endm + + .macro me_addrareword word + .byte 10 + .byte \word + .endm + + .macro me_setrecordmixinggift unk, quantity, itemId + .byte 11 + .byte \unk, \quantity + .2byte \itemId + .endm + + .macro me_givepokemon data + .byte 12 + .4byte \data + .endm + + .macro me_addtrainer data + .byte 13 + .4byte \data + .endm + + .macro me_enableresetrtc + .byte 14 + .endm + + .macro me_checksum checksum, data, dataEnd + .byte 15 + .4byte \checksum, \data, \dataEnd + .endm + + .macro me_crc crc, data, dataEnd + .byte 16 + .4byte \crc, \data, \dataEnd + .endm -- cgit v1.2.3 From 411687e2b69d4e2e361e1605564b6c0f8a01ef72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Apr 2018 17:04:31 -0400 Subject: Decompile a debug script related to the Eon Ticket --- include/constants/flags.h | 2 +- include/macros/event.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index a8067f6ca..562741b93 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -158,7 +158,7 @@ #define FLAG_RECEIVED_GREEN_SCARF 0xCB #define FLAG_RECEIVED_YELLOW_SCARF 0xCC -#define FLAG_ECOUNTERED_LATIAS_OR_LATIOS 0xCE +#define FLAG_ENCOUNTERED_LATIAS_OR_LATIOS 0xCE #define FLAG_RECEIVED_BASEMENT_KEY 0xD0 #define FLAG_RECEIVED_TM24 0xD1 diff --git a/include/macros/event.inc b/include/macros/event.inc index fcbd3a055..a27e1da76 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -1236,7 +1236,6 @@ .macro setvaddress long, word .byte 0xb8 .4byte \long - .2byte \word .endm .macro vgoto pointer -- cgit v1.2.3 From 4d3098e89b5aebf080547a99e68640138dc74599 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Apr 2018 21:30:05 -0400 Subject: Start decompiling unk_debug_menu_3 code --- include/mystery_event_script.h | 4 ++++ include/util.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index ab23a8d00..a92bb6667 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -4,5 +4,9 @@ u32 RunMysteryEventScript(u8 *); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); +#if DEBUG +bool8 unref_sub_812620C(u8 *a1, const u8 * _a2); +bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2); +#endif // DEBUG #endif // GUARD_MYSTERY_EVENT_SCRIPT_H diff --git a/include/util.h b/include/util.h index 676c3bd9b..02c503f75 100644 --- a/include/util.h +++ b/include/util.h @@ -9,7 +9,7 @@ extern const u32 gBitTable[]; u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); -u16 CalcCRC16(u8 *data, int length); +u16 CalcCRC16(const u8 *data, int length); void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha); void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output); -- cgit v1.2.3 From 9a529d12a955a605810154ea0eb242860db9304e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Apr 2018 22:18:52 -0400 Subject: debug_sub_813C5B4 --- include/berry.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/berry.h b/include/berry.h index a7ac5ba94..7c8f5e5fd 100644 --- a/include/berry.h +++ b/include/berry.h @@ -23,6 +23,8 @@ enum BERRY_STAGE_SPARKLING = 0xFF, }; +void ClearEnigmaBerries(void); +void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); -- cgit v1.2.3 From eaaa093ccaca498e79a0630941cfba0f31fbd9fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 13:39:52 -0400 Subject: finish decompiling unk_debug_menu_3 code --- include/start_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/start_menu.h b/include/start_menu.h index 5e513b9dc..87f6828ab 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -9,5 +9,6 @@ void sub_80712B4(u8 taskId); void sub_8071310(void); void ScrSpecial_DoSaveDialog(void); void sub_8071B28(void); +void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u8 *b, u32 trainerId); #endif // GUARD_STARTER_CHOOSE_H -- cgit v1.2.3 From 030ce70f350ec85e22c067659cd05d521a779ce2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 14:35:13 -0400 Subject: Correct some data misclassification and link relevant objects to mystery_event_menu --- include/debug.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/debug.h b/include/debug.h index 469560b9e..43db92c2b 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,6 +1,11 @@ #ifndef GUARD_DEBUG_H #define GUARD_DEBUG_H +struct UnkDebugMenu3Items { + const u8 * text; + size_t (*func)(u8 * dest); +}; + // start_menu_debug void DebugMenu_8077048(void); @@ -17,4 +22,8 @@ void CB2_StartSoundCheckMenu(void); // nakamura_debug_menu void NakaGenderTest(void); +// unk debug menu 3 +extern const u8 gUnknown_Debug_842E350; +extern const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[]; + #endif // GUARD_DEBUG_H -- cgit v1.2.3 From e145153bd895365652dac6cfffc38e383acd10cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 19:13:12 -0400 Subject: Actually decompile start_menu_debug through DebugMenu_8076EF4 --- include/menu.h | 2 +- include/save.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index 523037839..93394ecb2 100644 --- a/include/menu.h +++ b/include/menu.h @@ -59,7 +59,7 @@ s8 Menu_ProcessInputNoWrap(void); void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32); s8 Menu_ProcessInputGridLayout(void); u8 Menu_GetColumnXCoord(u8); -void Menu_PrintItems(u8, u8, u8, const struct MenuAction[]); +void Menu_PrintItems(u8, u8, u8, const void *); void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order); void InitYesNoMenu(u8, u8, u8); void DisplayYesNoMenu(u8, u8, u32); diff --git a/include/save.h b/include/save.h index 13e07d06a..371bf2c85 100644 --- a/include/save.h +++ b/include/save.h @@ -34,5 +34,6 @@ u8 sub_8125E04(void); u8 sub_8125E2C(void); bool8 sub_8125E6C(void); u8 Save_LoadGameData(u8 a1); +void sub_813B79C(void); #endif // GUARD_SAVE_H -- cgit v1.2.3 From 0db42079be4911ab63aab0396cf1429db089cd55 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 19:36:19 -0400 Subject: start_menu_debug thru DebugMenu_807709C --- include/new_game.h | 1 + include/overworld.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/new_game.h b/include/new_game.h index c90606b5a..e50fc2c80 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -14,5 +14,6 @@ void WarpToTruck(void); void ClearSav2(void); void sub_8052E4C(void); void NewGameInitData(void); +void debug_sub_8057508(bool32 arg0); #endif // GUARD_NEW_GAME_H diff --git a/include/overworld.h b/include/overworld.h index b18027933..f9446c789 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -238,5 +238,6 @@ void SpriteCB_LinkPlayer(struct Sprite *); void sub_805465C(void); void CB2_InitTestMenu(void); +void debug_sub_8058C00(void); #endif // GUARD_ROM4_H -- cgit v1.2.3 From 26d0664302577a882f98fb3fcbd4cf15a99b9591 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 20:32:47 -0400 Subject: through DebugMenu_HoennNationalDex --- include/battle.h | 2 ++ include/debug.h | 14 ++++++++++++++ include/menu.h | 2 +- include/start_menu.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index af0b48013..02e02ca83 100644 --- a/include/battle.h +++ b/include/battle.h @@ -818,4 +818,6 @@ void BattleStopLowHpSound(void); void SetBankFuncToLinkOpponentBufferRunCommand(void); +void GameClear(void); + #endif // GUARD_BATTLE_H diff --git a/include/debug.h b/include/debug.h index 43db92c2b..85bd51bee 100644 --- a/include/debug.h +++ b/include/debug.h @@ -12,6 +12,7 @@ void DebugMenu_8077048(void); // matsuda_debug_menu void sub_80AAF30(void); void Crash(const u8 *text); +bool8 unref_sub_80A9B28(void); // tomomichi_debug_menu void debug_nullsub_66(void); @@ -26,4 +27,17 @@ void NakaGenderTest(void); extern const u8 gUnknown_Debug_842E350; extern const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[]; +// unknown debug menu +int unref_sub_814A414(void); + +// kagaya_debug_menu +bool8 InitKagayaDebugMenu_A(void); + +// nohara_debug_menu +bool8 InitNoharaDebugMenu(void); + +// watanabe_debug_menu +void InitWatanabeDebugMenu(void); +void InitSizeComparison(void); + #endif // GUARD_DEBUG_H diff --git a/include/menu.h b/include/menu.h index 93394ecb2..8f7b91346 100644 --- a/include/menu.h +++ b/include/menu.h @@ -60,7 +60,7 @@ void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32); s8 Menu_ProcessInputGridLayout(void); u8 Menu_GetColumnXCoord(u8); void Menu_PrintItems(u8, u8, u8, const void *); -void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order); +void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const void * menuItems, const u8 *order); void InitYesNoMenu(u8, u8, u8); void DisplayYesNoMenu(u8, u8, u32); s8 Menu_ProcessInputNoWrap_(void); diff --git a/include/start_menu.h b/include/start_menu.h index 87f6828ab..ee76e9863 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -10,5 +10,6 @@ void sub_8071310(void); void ScrSpecial_DoSaveDialog(void); void sub_8071B28(void); void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u8 *b, u32 trainerId); +bool8 debug_sub_8075C30(void); #endif // GUARD_STARTER_CHOOSE_H -- cgit v1.2.3 From 978bdaaa050420289374ddc23aa0017df06e4000 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 22:03:22 -0400 Subject: through DebugMenu_EditPKMN --- include/berry.h | 1 + include/cable_club.h | 1 + include/debug.h | 11 +++++++++++ include/pokedex.h | 2 ++ include/sound.h | 2 ++ 5 files changed, 17 insertions(+) (limited to 'include') diff --git a/include/berry.h b/include/berry.h index 7c8f5e5fd..bb5762e28 100644 --- a/include/berry.h +++ b/include/berry.h @@ -47,5 +47,6 @@ void FieldObjectInteractionPickBerryTree(void); void FieldObjectInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); +void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness); #endif // GUARD_BERRY_H diff --git a/include/cable_club.h b/include/cable_club.h index 2f509c9fc..2fd447691 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -22,6 +22,7 @@ bool32 sub_8083BF4(u8 linkPlayerIndex); void sub_8083C50(u8 taskId); #if DEBUG void debug_sub_808B838(u8); +bool8 debug_sub_8138CC4(void); #endif #endif // GUARD_CABLE_CLUB_H diff --git a/include/debug.h b/include/debug.h index 85bd51bee..d6bd363bf 100644 --- a/include/debug.h +++ b/include/debug.h @@ -16,6 +16,7 @@ bool8 unref_sub_80A9B28(void); // tomomichi_debug_menu void debug_nullsub_66(void); +bool8 InitTomomichiDebugWindow(void); // sound_check_menu void CB2_StartSoundCheckMenu(void); @@ -39,5 +40,15 @@ bool8 InitNoharaDebugMenu(void); // watanabe_debug_menu void InitWatanabeDebugMenu(void); void InitSizeComparison(void); +void InitBattleForDebug(void); +void InitCreatePokemon(void); +void InitSeePokemonGraphics(void); +void InitSeeTrainers(void); + +// taya_debug_menu +bool8 InitTayaDebugWindow(void); + +// nakamura_debug_menu +bool8 InitNakamuraDebugMenu(void); #endif // GUARD_DEBUG_H diff --git a/include/pokedex.h b/include/pokedex.h index 73877bead..9158a97f0 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -25,4 +25,6 @@ u16 GetHoennPokedexCount(u8); bool8 CompletedHoennPokedex(void); bool16 CompletedNationalPokedex(void); +extern bool8 gUnknown_03005CE8; + #endif // GUARD_POKEDEX_H diff --git a/include/sound.h b/include/sound.h index 283b2b1f9..d883fd9c7 100644 --- a/include/sound.h +++ b/include/sound.h @@ -1,6 +1,8 @@ #ifndef GUARD_SOUND_H #define GUARD_SOUND_H +extern bool8 gDisableMusic; + void InitMapMusic(void); void MapMusicMain(void); void ResetMapMusic(void); -- cgit v1.2.3 From 83bb25e7af1837d41177d84f1b03d83b42b9478c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 22:49:37 -0400 Subject: through DebugMenu_807786C; use macro NAKED instead of __attribute__((naked)) --- include/gba/defines.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/gba/defines.h b/include/gba/defines.h index 7fd429d9e..26e0c873f 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -8,6 +8,8 @@ #define IWRAM_DATA __attribute__((section("iwram_data"))) #define EWRAM_DATA __attribute__((section("ewram_data"))) +#define UNUSED __attribute__((unused)) +#define NAKED __attribute__((naked)) #define ALIGNED(n) __attribute__((aligned(n))) -- cgit v1.2.3 From dc729e5d420c63e83b92ca1b984e164ef7559c8b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 09:48:41 -0400 Subject: through DebugMenu_Safari --- include/safari_zone.h | 3 ++- include/wild_encounter.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/safari_zone.h b/include/safari_zone.h index 0bee08a95..08d635794 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -2,6 +2,7 @@ #define GUARD_SAFARI_ZONE_H extern u8 gNumSafariBalls; +extern u16 gSafariZoneStepCounter; bool32 GetSafariZoneFlag(void); void SetSafariZoneFlag(void); @@ -18,6 +19,6 @@ void SafariZoneGetPokeblockNameInFeeder(void); struct Pokeblock *unref_sub_80C8418(void); struct Pokeblock *SafariZoneGetActivePokeblock(void); void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index); -bool8 unref_sub_80C853C(void); +bool32 unref_sub_80C853C(void); #endif // GUARD_SAFARI_ZONE_H diff --git a/include/wild_encounter.h b/include/wild_encounter.h index 41ca31835..1b8b8dfc7 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -39,6 +39,7 @@ bool8 UpdateRepelCounter(void); u16 FeebasDebug_GetTrueNumberOfWaterTilesInMapThird(u8 arg0); void FeebasSeedRng(u16 seed); u16 FeebasRandom(void); +extern u8 gWildEncountersDisabled; #endif // DEBUG #endif // GUARD_WILD_ENCOUNTER_H -- cgit v1.2.3 From 676db333866efd16d17aeedc507f53f3db2206ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 11:37:32 -0400 Subject: through DebugMenu_8077C14 --- include/debug.h | 3 +++ include/fldeff_cut.h | 1 + include/fldeff_flash.h | 1 + include/fldeff_secretpower.h | 6 ++++++ include/fldeff_strength.h | 6 ++++++ include/pokemon_menu.h | 1 + include/rom6.h | 1 + 7 files changed, 19 insertions(+) create mode 100644 include/fldeff_secretpower.h create mode 100644 include/fldeff_strength.h (limited to 'include') diff --git a/include/debug.h b/include/debug.h index d6bd363bf..d725b349f 100644 --- a/include/debug.h +++ b/include/debug.h @@ -33,6 +33,9 @@ int unref_sub_814A414(void); // kagaya_debug_menu bool8 InitKagayaDebugMenu_A(void); +bool8 debug_sub_80B0770(void); +bool8 debug_sub_80B07B0(void); +bool8 debug_sub_80B0800(void); // nohara_debug_menu bool8 InitNoharaDebugMenu(void); diff --git a/include/fldeff_cut.h b/include/fldeff_cut.h index 0a5261468..6230b822a 100644 --- a/include/fldeff_cut.h +++ b/include/fldeff_cut.h @@ -9,5 +9,6 @@ void sub_80A28F4(s16, s16); void objc_8097BBC(struct Sprite *sprite); void sub_80A2AB8(void); void sub_80A2B00(void); // unknown args +void debug_sub_80AFEE4(void); #endif // GUARD_FLDEFF_CUT_H diff --git a/include/fldeff_flash.h b/include/fldeff_flash.h index 546a7f5dc..3b1fbf812 100644 --- a/include/fldeff_flash.h +++ b/include/fldeff_flash.h @@ -4,5 +4,6 @@ void sub_810CC80(void); u8 sub_810CDB8(u8, u8); u8 fade_type_for_given_maplight_pair(u8, u8); +void debug_sub_8122080(void); #endif // GUARD_FLDEFF_FLASH_H diff --git a/include/fldeff_secretpower.h b/include/fldeff_secretpower.h new file mode 100644 index 000000000..be6bebf55 --- /dev/null +++ b/include/fldeff_secretpower.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FLDEFF_SECRETPOWER_H +#define GUARD_FLDEFF_SECRETPOWER_H + +void debug_sub_80D93F4(void); + +#endif //GUARD_FLDEFF_SECRETPOWER_H diff --git a/include/fldeff_strength.h b/include/fldeff_strength.h new file mode 100644 index 000000000..9e324e057 --- /dev/null +++ b/include/fldeff_strength.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FLDEFF_STRENGTH_H +#define GUARD_FLDEFF_STRENGTH_H + +void debug_sub_8130318(void); + +#endif //GUARD_FLDEFF_STRENGTH_H diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h index 57a313d89..313877caa 100644 --- a/include/pokemon_menu.h +++ b/include/pokemon_menu.h @@ -47,5 +47,6 @@ void sub_808B020(void); void sub_808B0C0(u8 taskID); void sub_808B508(u8); void sub_808B564(void); +void debug_sub_80986AC(void); #endif // GUARD_POKEMON_MENU_H diff --git a/include/rom6.h b/include/rom6.h index 8c3691624..67fc7a18a 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -5,5 +5,6 @@ extern struct MapPosition gUnknown_0203923C; bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); +void debug_sub_8120968(void); #endif -- cgit v1.2.3 From bac8127928eb5f19245b49449ad423f853a4d7ed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 15:52:49 -0400 Subject: through DebugMenu_8078254 --- include/global.h | 4 ++-- include/main.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 4437b7feb..b61488545 100644 --- a/include/global.h +++ b/include/global.h @@ -612,8 +612,8 @@ struct ContestWinner /*0x04*/ u32 otId; // otId /*0x08*/ u16 species; // species /*0x0A*/ u8 contestCategory; - /*0x0B*/ u8 nickname[0x16-0xB]; - /*0x16*/ u8 trainerName[0x20-0x16]; + /*0x0B*/ u8 nickname[11]; + /*0x16*/ u8 trainerName[8]; }; // there should be enough flags for all 412 slots diff --git a/include/main.h b/include/main.h index 78403225e..f348e48f8 100644 --- a/include/main.h +++ b/include/main.h @@ -64,4 +64,6 @@ void InitFlashTimer(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); +extern const char BuildDateTime[]; + #endif // GUARD_MAIN_H -- cgit v1.2.3 From b320e08a1245ab0a7971807392d8ed0105c8490a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 17:08:36 -0400 Subject: through DebugMenu_8078550 --- include/reset_rtc_screen.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/reset_rtc_screen.h b/include/reset_rtc_screen.h index 2de95534a..88abd4945 100644 --- a/include/reset_rtc_screen.h +++ b/include/reset_rtc_screen.h @@ -3,5 +3,7 @@ void CB2_InitResetRtcScreen(void); void debug_sub_806F8F8(void); +void debug_sub_806F9E4(u8 taskId); +void debug_sub_806F99C(void); #endif // GUARD_RESET_RTC_SCREEN_H -- cgit v1.2.3 From b3878d6c472d773cd2072849245a9be257089450 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 18:17:17 -0400 Subject: through DebugMenu_BattleTowerStages --- include/berry.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/berry.h b/include/berry.h index bb5762e28..7d8787dea 100644 --- a/include/berry.h +++ b/include/berry.h @@ -48,5 +48,6 @@ void FieldObjectInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness); +u8 * DebugOpenBerryInfo(void); #endif // GUARD_BERRY_H -- cgit v1.2.3 From e651e6a7847bb8f1a55506c8f7729176f84fabf9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 21:41:23 -0400 Subject: Remaining functions and data in start_menu_debug --- include/start_menu.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/start_menu.h b/include/start_menu.h index ee76e9863..df4efda6d 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -12,4 +12,8 @@ void sub_8071B28(void); void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u8 *b, u32 trainerId); bool8 debug_sub_8075C30(void); +#if DEBUG +extern u32 gUnknown_Debug_03004BD0; +#endif // DEBUG + #endif // GUARD_STARTER_CHOOSE_H -- cgit v1.2.3 From 5e9dabd92e84f8e7c5d136e6d408a99120ea1064 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 13:57:20 -0400 Subject: Rename referenced unref_sub_* --- include/berry_blender.h | 6 ++++++ include/debug.h | 4 ++-- include/mystery_event_script.h | 4 ++-- include/safari_zone.h | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 include/berry_blender.h (limited to 'include') diff --git a/include/berry_blender.h b/include/berry_blender.h new file mode 100644 index 000000000..8aaf934e5 --- /dev/null +++ b/include/berry_blender.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BERRY_BLENDER_H +#define GUARD_BERRY_BLENDER_H + +void debug_sub_80524BC(void); + +#endif //GUARD_BERRY_BLENDER_H diff --git a/include/debug.h b/include/debug.h index d725b349f..d090f8bed 100644 --- a/include/debug.h +++ b/include/debug.h @@ -12,7 +12,7 @@ void DebugMenu_8077048(void); // matsuda_debug_menu void sub_80AAF30(void); void Crash(const u8 *text); -bool8 unref_sub_80A9B28(void); +bool8 InitMatsudaDebugMenu(void); // tomomichi_debug_menu void debug_nullsub_66(void); @@ -29,7 +29,7 @@ extern const u8 gUnknown_Debug_842E350; extern const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[]; // unknown debug menu -int unref_sub_814A414(void); +int InitSogabeDebugMenu(void); // kagaya_debug_menu bool8 InitKagayaDebugMenu_A(void); diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index a92bb6667..b86a2eed4 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -5,8 +5,8 @@ u32 RunMysteryEventScript(u8 *); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); #if DEBUG -bool8 unref_sub_812620C(u8 *a1, const u8 * _a2); -bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2); +bool8 debug_sub_812620C(u8 *a1, const u8 * _a2); +bool8 debug_sub_81261B4(u8 *a1, const u8 * _a2); #endif // DEBUG #endif // GUARD_MYSTERY_EVENT_SCRIPT_H diff --git a/include/safari_zone.h b/include/safari_zone.h index 08d635794..dd9ca8088 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -19,6 +19,6 @@ void SafariZoneGetPokeblockNameInFeeder(void); struct Pokeblock *unref_sub_80C8418(void); struct Pokeblock *SafariZoneGetActivePokeblock(void); void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index); -bool32 unref_sub_80C853C(void); +bool32 debug_sub_80C853C(void); #endif // GUARD_SAFARI_ZONE_H -- cgit v1.2.3 From b7d7e5ec71d81ae8fed415080c7042e1f4c3aaa6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 14:00:21 -0400 Subject: Rename me_script.inc to mystery_event_script.inc, debug_menu_3.s to debug_mystery_event_scripts.s --- include/macros.inc | 2 +- include/macros/me_script.inc | 88 --------------------------------- include/macros/mystery_event_script.inc | 88 +++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 include/macros/me_script.inc create mode 100644 include/macros/mystery_event_script.inc (limited to 'include') diff --git a/include/macros.inc b/include/macros.inc index 93a029cdd..8d58f06de 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -4,7 +4,7 @@ .include "include/macros/pokemon_data.inc" .include "include/macros/ec.inc" .include "include/macros/map.inc" - .include "include/macros/me_script.inc" + .include "include/macros/mystery_event_script.inc" .macro region_map_location x, y, width, height, name .byte \x diff --git a/include/macros/me_script.inc b/include/macros/me_script.inc deleted file mode 100644 index 4d5f59d1b..000000000 --- a/include/macros/me_script.inc +++ /dev/null @@ -1,88 +0,0 @@ - .macro me_nop - .byte 0 - .endm - - .macro me_checkcompat word, v1, v2, v3, v4 - .byte 1 - .4byte \word - .2byte \v1 - .4byte \v2 - .2byte \v3 - .4byte \v4 - .endm - - .macro me_end - .byte 2 - .endm - - .macro me_setmsg value, str - .byte 3 - .byte \value - .4byte \str - .endm - - .macro me_setstatus value - .byte 4 - .byte \value - .endm - - .macro me_runscript script - .byte 5 - .4byte \script - .endm - - .macro me_initramscript mapId, objId, script, end - .byte 6 - map \mapId - .byte \objId - .4byte \script, \end - .endm - - .macro me_setenigmaberry berry - .byte 7 - .4byte \berry - .endm - - .macro me_giveribbon index, ribbonId - .byte 8 - .byte \index, \ribbonId - .endm - - .macro me_givenationaldex - .byte 9 - .endm - - .macro me_addrareword word - .byte 10 - .byte \word - .endm - - .macro me_setrecordmixinggift unk, quantity, itemId - .byte 11 - .byte \unk, \quantity - .2byte \itemId - .endm - - .macro me_givepokemon data - .byte 12 - .4byte \data - .endm - - .macro me_addtrainer data - .byte 13 - .4byte \data - .endm - - .macro me_enableresetrtc - .byte 14 - .endm - - .macro me_checksum checksum, data, dataEnd - .byte 15 - .4byte \checksum, \data, \dataEnd - .endm - - .macro me_crc crc, data, dataEnd - .byte 16 - .4byte \crc, \data, \dataEnd - .endm diff --git a/include/macros/mystery_event_script.inc b/include/macros/mystery_event_script.inc new file mode 100644 index 000000000..4d5f59d1b --- /dev/null +++ b/include/macros/mystery_event_script.inc @@ -0,0 +1,88 @@ + .macro me_nop + .byte 0 + .endm + + .macro me_checkcompat word, v1, v2, v3, v4 + .byte 1 + .4byte \word + .2byte \v1 + .4byte \v2 + .2byte \v3 + .4byte \v4 + .endm + + .macro me_end + .byte 2 + .endm + + .macro me_setmsg value, str + .byte 3 + .byte \value + .4byte \str + .endm + + .macro me_setstatus value + .byte 4 + .byte \value + .endm + + .macro me_runscript script + .byte 5 + .4byte \script + .endm + + .macro me_initramscript mapId, objId, script, end + .byte 6 + map \mapId + .byte \objId + .4byte \script, \end + .endm + + .macro me_setenigmaberry berry + .byte 7 + .4byte \berry + .endm + + .macro me_giveribbon index, ribbonId + .byte 8 + .byte \index, \ribbonId + .endm + + .macro me_givenationaldex + .byte 9 + .endm + + .macro me_addrareword word + .byte 10 + .byte \word + .endm + + .macro me_setrecordmixinggift unk, quantity, itemId + .byte 11 + .byte \unk, \quantity + .2byte \itemId + .endm + + .macro me_givepokemon data + .byte 12 + .4byte \data + .endm + + .macro me_addtrainer data + .byte 13 + .4byte \data + .endm + + .macro me_enableresetrtc + .byte 14 + .endm + + .macro me_checksum checksum, data, dataEnd + .byte 15 + .4byte \checksum, \data, \dataEnd + .endm + + .macro me_crc crc, data, dataEnd + .byte 16 + .4byte \crc, \data, \dataEnd + .endm -- cgit v1.2.3