From 0a440d658b2d4a311381b1d297872e7eece7486f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 11:10:08 -0400 Subject: Finish script_menu code decomp --- include/event_scripts.h | 3 +++ include/field_effect.h | 2 ++ include/quest_log.h | 2 +- include/script_menu.h | 2 +- include/strings.h | 10 ++++++++++ 5 files changed, 17 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index 99b453c85..28058af81 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1168,4 +1168,7 @@ extern const u8 gText_SavingDontTurnOffThePower[]; extern const u8 gText_PlayerSavedTheGame[]; extern const u8 gText_DifferentGameFile[]; +// script_menu +extern const u8 EventScript_1A7AE0[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_effect.h b/include/field_effect.h index 70398313b..4afc5cace 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -21,5 +21,7 @@ void sub_8084784(u8 a0, u8 a1); void sub_8084F2C(u8 a0); void sub_80853CC(u8 a0); void sub_8083598(u8 a0); +void sub_8083A5C(struct Sprite * sprite, u8 spriteId); +u8 sub_8083970(u16 species, s16 x, s16 y, bool8 unused); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/quest_log.h b/include/quest_log.h index f5fd820b0..b7dcec871 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -25,7 +25,7 @@ void sub_8113550(u16, const u16 *); void sub_811539C(void); void sub_8115748(u16); u8 sub_8112CAC(void); -bool8 sub_81119D4(void (*func)(void)); +bool8 QuestLog_ScheduleRoutineIfNotInPlaybackMode(void (*func)(void)); void sub_8111F38(u16, u16); void sub_8111134(void); void DestroyHelpMessageWindow(u8 a0); diff --git a/include/script_menu.h b/include/script_menu.h index d3d04c65d..95eb30d74 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -10,7 +10,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 va bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); -bool32 ScrSpecial_CreatePCMenu(void); +bool8 ScrSpecial_CreatePCMenu(void); void ScriptMenu_DisplayPCStartupPrompt(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); diff --git a/include/strings.h b/include/strings.h index ee7536d9b..121a577a2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -521,4 +521,14 @@ extern const u8 gUnknown_8418142[]; extern const u8 gUnknown_8418152[]; extern const u8 gUnknown_8418163[]; +// script_menu +extern const u8 gUnknown_8417B9F[]; +extern const u8 gUnknown_8417BAC[]; +extern const u8 gUnknown_8417BB6[]; +extern const u8 gUnknown_8417BBE[]; +extern const u8 gUnknown_8417BCB[]; +extern const u8 gUnknown_8417BD3[]; +extern const u8 gUnknown_8417DED[]; +extern const u8 gUnknown_81A508A[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 00675eaafba7605bdbf5c16984975e4ed6ad6bde Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:23:46 -0400 Subject: script_menu data --- include/constants/menu.h | 7 ++ include/constants/seagallop.h | 2 + include/event_scripts.h | 6 ++ include/quest_log.h | 2 +- include/script_menu.h | 4 +- include/strings.h | 156 +++++++++++++++++++++++++++++++++++++----- 6 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 include/constants/menu.h (limited to 'include') diff --git a/include/constants/menu.h b/include/constants/menu.h new file mode 100644 index 000000000..b981cca9e --- /dev/null +++ b/include/constants/menu.h @@ -0,0 +1,7 @@ +#ifndef GUARD_CONSTANTS_MENU_H +#define GUARD_CONSTANTS_MENU_H + +#define SCR_MENU_CANCEL 127 +#define SCR_MENU_UNSET 255 + +#endif //GUARD_CONSTANTS_MENU_H diff --git a/include/constants/seagallop.h b/include/constants/seagallop.h index eff4eb7a5..68e847445 100644 --- a/include/constants/seagallop.h +++ b/include/constants/seagallop.h @@ -13,4 +13,6 @@ #define SEAGALLOP_NAVEL_ROCK 9 #define SEAGALLOP_BIRTH_ISLAND 10 +#define SEAGALLOP_MORE 254 + #endif //GUARD_CONSTANTS_SEAGALLOP_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 28058af81..c61e51f04 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1170,5 +1170,11 @@ extern const u8 gText_DifferentGameFile[]; // script_menu extern const u8 EventScript_1A7AE0[]; +extern const u8 Text_1BC388[]; +extern const u8 Text_1BC3C7[]; +extern const u8 Text_1BCB42[]; +extern const u8 Text_1BCA95[]; +extern const u8 Text_1BCACB[]; +extern const u8 Text_1BCAF2[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/quest_log.h b/include/quest_log.h index b7dcec871..adfe27e1b 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -25,7 +25,7 @@ void sub_8113550(u16, const u16 *); void sub_811539C(void); void sub_8115748(u16); u8 sub_8112CAC(void); -bool8 QuestLog_ScheduleRoutineIfNotInPlaybackMode(void (*func)(void)); +bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); void sub_8111F38(u16, u16); void sub_8111134(void); void DestroyHelpMessageWindow(u8 a0); diff --git a/include/script_menu.h b/include/script_menu.h index 95eb30d74..d19e6d14d 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -3,7 +3,7 @@ #include "global.h" -extern const u8 *const gStdStringPtrs[9]; +extern const u8 *const gStdStringPtrs[]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); @@ -14,7 +14,7 @@ bool8 ScrSpecial_CreatePCMenu(void); void ScriptMenu_DisplayPCStartupPrompt(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); -void sub_809D6D4(void); +void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void); void sub_809D424(void); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index 121a577a2..d4507b41f 100644 --- a/include/strings.h +++ b/include/strings.h @@ -91,7 +91,6 @@ extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; extern const u8 gText_EggNickname[]; extern const u8 gStartMenuText_Pokemon[]; -extern const u8 gText_PkmnFainted3[]; extern const u8 gOtherText_Use[]; extern const u8 gOtherText_Toss[]; @@ -99,7 +98,6 @@ extern const u8 gOtherText_Give[]; extern const u8 gOtherText_Exit[]; extern const u8 gText_ThreeHyphens[]; extern const u8 gOtherText_UnkF9_08_Clear_01[]; -extern const u8 gFameCheckerText_ListMenuCursor[]; extern const u8 gText_TimesStrVar1[]; extern const u8 gText_IsSelected[]; extern const u8 gText_ThereIsNoPokemon[]; @@ -116,6 +114,16 @@ extern const u8 gText_TurnedOverItemsWorthYen[]; extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_ReadTMDescription[]; extern const u8 gFameCheckerText_Cancel[]; +extern const u8 gFameCheckerText_ListMenuCursor[]; +extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; +extern const u8 gFameCheckerText_ClearTextbox[]; +extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" +extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gFameCheckerOakName[]; // "OAK$" +extern const u8 gFameCheckerDaisyName[]; // "DAISY$" +extern const u8 gFameCheckerBillName[]; // "BILL$" +extern const u8 gFameCheckerMrFujiName[]; // "FUJI$" // teachy_tv extern const u8 gTeachyTvString_TeachBattle[]; @@ -151,8 +159,6 @@ extern const u8 gString_Someone[]; extern const u8 gString_Help[]; extern const u8 gString_HelpSystem_ClearTo8[]; -extern const u8 gOtherText_Give[]; -extern const u8 gFameCheckerText_Cancel[]; extern const u8 gOtherText_StrVar1[]; extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[]; extern const u8 gOtherText_Powder[]; @@ -185,7 +191,6 @@ extern const u8 BattleText_Rose[]; extern const u8 BattleText_UnknownString3[]; extern const u8 BattleText_GetPumped[]; extern const u8 BattleText_MistShroud[]; -extern const u8 gText_EggNickname[]; extern const u8 gText_BadEgg[]; extern const u8 gText_PkmnsXPreventsSwitching[]; extern u8 *gUnknown_83FD5D0[]; @@ -218,7 +223,6 @@ extern const u8 gUnknown_83FE6E6[]; extern const u8 gText_BattleSwitchWhich[]; extern const u8 gUnknown_83FE770[]; extern const u8 gText_MoveInterfacePP[]; -extern const u8 gUnknown_83FE770[]; extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_LinkStandby[]; extern const u8 gUnknown_83FE725[]; @@ -344,14 +348,6 @@ extern const u8 gText_NewGame[]; extern const u8 gText_Continue[]; extern const u8 gText_MysteryGift[]; extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; -extern const u8 gText_WirelessAdapterIsNotConnected[]; extern const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[]; extern const u8 gText_Player[]; extern const u8 gText_Time[]; @@ -381,7 +377,6 @@ extern const u8 gText_WonderNews[]; extern const u8 gText_Exit3[]; extern const u8 gText_WirelessCommunication[]; extern const u8 gText_Friend2[]; -extern const u8 gFameCheckerText_Cancel[]; extern const u8 gText_Receive[]; extern const u8 gText_Send[]; extern const u8 gText_Toss[]; @@ -448,7 +443,6 @@ extern const u8 gText_MailReturnedToBagMessageErased[]; // start_menu extern const u8 gStartMenuText_Pokedex[]; -extern const u8 gStartMenuText_Pokemon[]; extern const u8 gStartMenuText_Bag[]; extern const u8 gStartMenuText_Player[]; extern const u8 gStartMenuText_Save[]; @@ -459,7 +453,6 @@ extern const u8 gUnknown_84162A9[]; extern const u8 gStartMenuDesc_Pokedex[]; extern const u8 gStartMenuDesc_Pokemon[]; extern const u8 gStartMenuDesc_Bag[]; -extern const u8 gStartMenuDesc_Player[]; extern const u8 gStartMenuDesc_Save[]; extern const u8 gStartMenuDesc_Option[]; extern const u8 gStartMenuDesc_Exit[]; @@ -530,5 +523,134 @@ extern const u8 gUnknown_8417BCB[]; extern const u8 gUnknown_8417BD3[]; extern const u8 gUnknown_8417DED[]; extern const u8 gUnknown_81A508A[]; +extern const u8 gOtherText_Double[]; +extern const u8 gOtherText_Knockout[]; +extern const u8 gOtherText_Mixed[]; +extern const u8 gOtherText_Single[]; +extern const u8 gUnknown_84178E6[]; +extern const u8 gUnknown_84178EB[]; +extern const u8 gUnknown_84178F0[]; +extern const u8 gUnknown_84178FD[]; +extern const u8 gUnknown_8417907[]; +extern const u8 gUnknown_841790C[]; +extern const u8 gUnknown_8417910[]; +extern const u8 gUnknown_8417914[]; +extern const u8 gUnknown_8417918[]; +extern const u8 gUnknown_841791C[]; +extern const u8 gUnknown_8417938[]; +extern const u8 gUnknown_841793C[]; +extern const u8 gUnknown_8417944[]; +extern const u8 gUnknown_8417952[]; +extern const u8 gUnknown_8417960[]; +extern const u8 gUnknown_841796D[]; +extern const u8 gUnknown_841797F[]; +extern const u8 gUnknown_8417984[]; +extern const u8 gUnknown_841799A[]; +extern const u8 gUnknown_84179AD[]; +extern const u8 gUnknown_84179C0[]; +extern const u8 gUnknown_84179D6[]; +extern const u8 gUnknown_84179ED[]; +extern const u8 gUnknown_84179F7[]; +extern const u8 gUnknown_8417A02[]; +extern const u8 gUnknown_8417A0C[]; +extern const u8 gUnknown_8417A19[]; +extern const u8 gUnknown_8417A24[]; +extern const u8 gUnknown_8417A37[]; +extern const u8 gUnknown_8417A3D[]; +extern const u8 gUnknown_8417A42[]; +extern const u8 gUnknown_8417A58[]; +extern const u8 gUnknown_8417A6E[]; +extern const u8 gUnknown_8417A84[]; +extern const u8 gUnknown_8417A9A[]; +extern const u8 gUnknown_8417AB0[]; +extern const u8 gUnknown_8417AB3[]; +extern const u8 gUnknown_8417AB6[]; +extern const u8 gUnknown_8417AB9[]; +extern const u8 gUnknown_8417ABC[]; +extern const u8 gUnknown_8417ADC[]; +extern const u8 gUnknown_8417AE3[]; +extern const u8 gUnknown_8417AE9[]; +extern const u8 gUnknown_8417AEE[]; +extern const u8 gUnknown_8417BE2[]; +extern const u8 gUnknown_8417BE8[]; +extern const u8 gUnknown_8417BF0[]; +extern const u8 gUnknown_8417BF8[]; +extern const u8 gUnknown_8417C01[]; +extern const u8 gUnknown_8417C0F[]; +extern const u8 gUnknown_8417C1B[]; +extern const u8 gUnknown_8417C24[]; +extern const u8 gUnknown_8417C33[]; +extern const u8 gUnknown_8417C4B[]; +extern const u8 gUnknown_8417C55[]; +extern const u8 gUnknown_8417C6A[]; +extern const u8 gUnknown_8417C83[]; +extern const u8 gUnknown_8417C9D[]; +extern const u8 gUnknown_8417CB7[]; +extern const u8 gUnknown_8417D4C[]; +extern const u8 gUnknown_8417D56[]; +extern const u8 gUnknown_8417D63[]; +extern const u8 gUnknown_8417D6F[]; +extern const u8 gUnknown_8417D79[]; +extern const u8 gUnknown_8417D86[]; +extern const u8 gUnknown_8417D90[]; +extern const u8 gUnknown_8417DA0[]; +extern const u8 gUnknown_8417DF3[]; +extern const u8 gUnknown_8417DFE[]; +extern const u8 gUnknown_8417E09[]; +extern const u8 gUnknown_8417E46[]; +extern const u8 gUnknown_8417E50[]; +extern const u8 gUnknown_8417E5A[]; +extern const u8 gUnknown_8417E66[]; +extern const u8 gUnknown_8417E67[]; +extern const u8 gUnknown_8417E71[]; +extern const u8 gUnknown_8417E72[]; +extern const u8 gUnknown_8417E7F[]; +extern const u8 gUnknown_8417E94[]; +extern const u8 gUnknown_8417EA4[]; +extern const u8 gUnknown_8417EB3[]; +extern const u8 gUnknown_8417EC1[]; +extern const u8 gUnknown_8417ECC[]; +extern const u8 gUnknown_8417ED9[]; +extern const u8 gUnknown_8417EF7[]; +extern const u8 gUnknown_8417F11[]; +extern const u8 gUnknown_8417F2F[]; +extern const u8 gUnknown_8417F4D[]; +extern const u8 gUnknown_8417F67[]; +extern const u8 gUnknown_8417F68[]; +extern const u8 gUnknown_8417F69[]; +extern const u8 gUnknown_8417F77[]; +extern const u8 gUnknown_8417ABF[]; +extern const u8 gUnknown_8417AC4[]; +extern const u8 gUnknown_8417ACB[]; +extern const u8 gUnknown_8417AD0[]; +extern const u8 gUnknown_8417AD6[]; +extern const u8 gUnknown_8417AF4[]; +extern const u8 gUnknown_8417AF9[]; +extern const u8 gUnknown_8417B00[]; +extern const u8 gUnknown_8417B05[]; +extern const u8 gUnknown_8417B0B[]; +extern const u8 gUnknown_8417B11[]; +extern const u8 gUnknown_8417B17[]; +extern const u8 gUnknown_8417B21[]; +extern const u8 gUnknown_8417B2C[]; +extern const u8 gUnknown_8417B36[]; +extern const u8 gUnknown_8417B3E[]; +extern const u8 gUnknown_8417B4B[]; +extern const u8 gUnknown_8417B58[]; +extern const u8 gUnknown_8417B65[]; +extern const u8 gUnknown_8417B72[]; +extern const u8 gUnknown_8417B7C[]; +extern const u8 gUnknown_8417B87[]; +extern const u8 gUnknown_8417B94[]; +extern const u8 gUnknown_8417C2D[]; +extern const u8 gUnknown_8417DA9[]; +extern const u8 gUnknown_8417DB6[]; +extern const u8 gUnknown_8417DC7[]; +extern const u8 gUnknown_8417DD9[]; +extern const u8 gUnknown_8417DE1[]; +extern const u8 gUnknown_8417E16[]; +extern const u8 gUnknown_8417E22[]; +extern const u8 gUnknown_8417E2E[]; +extern const u8 gUnknown_8417E39[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From d33509ec93a5c6fc5b49b9efc2c92225a01846aa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:56:01 -0400 Subject: script_menu name strings --- include/strings.h | 273 +++++++++++++++++++++++++++--------------------------- 1 file changed, 134 insertions(+), 139 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index d4507b41f..32b485ce4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -474,10 +474,10 @@ extern const u8 gUnknown_8417FC3[]; extern const u8 gUnknown_8417FD0[]; extern const u8 gUnknown_8417FCC[]; extern const u8 gUnknown_8418075[]; -extern const u8 gUnknown_8418069[]; +extern const u8 gText_B4F[]; extern const u8 gUnknown_8418065[]; -extern const u8 gUnknown_8418061[]; -extern const u8 gUnknown_841805D[]; +extern const u8 gText_B2F[]; +extern const u8 gText_B1F[]; extern const u8 gUnknown_841803A[]; extern const u8 gUnknown_841803D[]; extern const u8 gUnknown_8418040[]; @@ -489,7 +489,7 @@ extern const u8 gUnknown_841804F[]; extern const u8 gUnknown_8418052[]; extern const u8 gUnknown_8418055[]; extern const u8 gUnknown_8418059[]; -extern const u8 gUnknown_841806D[]; +extern const u8 gText_Rooftop[]; extern const u8 gUnknown_8417FD9[]; extern const u8 gUnknown_8417FE6[]; extern const u8 gUnknown_8417FF3[]; @@ -498,9 +498,9 @@ extern const u8 gUnknown_841800D[]; extern const u8 gUnknown_8418017[]; extern const u8 gUnknown_8418022[]; extern const u8 gUnknown_841802F[]; -extern const u8 gUnknown_841807D[]; -extern const u8 gUnknown_841808E[]; -extern const u8 gUnknown_841809C[]; +extern const u8 gText_LinkedGamePlay[]; +extern const u8 gText_DirectCorner[]; +extern const u8 gText_UnionRoom[]; extern const u8 gOtherText_Quit[]; extern const u8 gUnknown_84180A7[]; extern const u8 gUnknown_84180BC[]; @@ -515,142 +515,137 @@ extern const u8 gUnknown_8418152[]; extern const u8 gUnknown_8418163[]; // script_menu -extern const u8 gUnknown_8417B9F[]; -extern const u8 gUnknown_8417BAC[]; -extern const u8 gUnknown_8417BB6[]; -extern const u8 gUnknown_8417BBE[]; -extern const u8 gUnknown_8417BCB[]; -extern const u8 gUnknown_8417BD3[]; -extern const u8 gUnknown_8417DED[]; +extern const u8 gText_SomeoneSPc[]; +extern const u8 gText_BillSPc[]; +extern const u8 gText_SPc[]; +extern const u8 gText_HallOfFame_2[]; +extern const u8 gText_LogOff[]; +extern const u8 gText_ProfOakSPc[]; +extern const u8 gText_Other[]; extern const u8 gUnknown_81A508A[]; extern const u8 gOtherText_Double[]; extern const u8 gOtherText_Knockout[]; extern const u8 gOtherText_Mixed[]; extern const u8 gOtherText_Single[]; -extern const u8 gUnknown_84178E6[]; -extern const u8 gUnknown_84178EB[]; -extern const u8 gUnknown_84178F0[]; -extern const u8 gUnknown_84178FD[]; -extern const u8 gUnknown_8417907[]; -extern const u8 gUnknown_841790C[]; -extern const u8 gUnknown_8417910[]; -extern const u8 gUnknown_8417914[]; -extern const u8 gUnknown_8417918[]; -extern const u8 gUnknown_841791C[]; -extern const u8 gUnknown_8417938[]; -extern const u8 gUnknown_841793C[]; -extern const u8 gUnknown_8417944[]; -extern const u8 gUnknown_8417952[]; -extern const u8 gUnknown_8417960[]; -extern const u8 gUnknown_841796D[]; -extern const u8 gUnknown_841797F[]; -extern const u8 gUnknown_8417984[]; -extern const u8 gUnknown_841799A[]; -extern const u8 gUnknown_84179AD[]; -extern const u8 gUnknown_84179C0[]; -extern const u8 gUnknown_84179D6[]; -extern const u8 gUnknown_84179ED[]; -extern const u8 gUnknown_84179F7[]; -extern const u8 gUnknown_8417A02[]; -extern const u8 gUnknown_8417A0C[]; -extern const u8 gUnknown_8417A19[]; -extern const u8 gUnknown_8417A24[]; -extern const u8 gUnknown_8417A37[]; -extern const u8 gUnknown_8417A3D[]; -extern const u8 gUnknown_8417A42[]; -extern const u8 gUnknown_8417A58[]; -extern const u8 gUnknown_8417A6E[]; -extern const u8 gUnknown_8417A84[]; -extern const u8 gUnknown_8417A9A[]; -extern const u8 gUnknown_8417AB0[]; -extern const u8 gUnknown_8417AB3[]; -extern const u8 gUnknown_8417AB6[]; -extern const u8 gUnknown_8417AB9[]; -extern const u8 gUnknown_8417ABC[]; -extern const u8 gUnknown_8417ADC[]; -extern const u8 gUnknown_8417AE3[]; -extern const u8 gUnknown_8417AE9[]; -extern const u8 gUnknown_8417AEE[]; -extern const u8 gUnknown_8417BE2[]; -extern const u8 gUnknown_8417BE8[]; -extern const u8 gUnknown_8417BF0[]; -extern const u8 gUnknown_8417BF8[]; -extern const u8 gUnknown_8417C01[]; -extern const u8 gUnknown_8417C0F[]; -extern const u8 gUnknown_8417C1B[]; -extern const u8 gUnknown_8417C24[]; -extern const u8 gUnknown_8417C33[]; -extern const u8 gUnknown_8417C4B[]; -extern const u8 gUnknown_8417C55[]; -extern const u8 gUnknown_8417C6A[]; -extern const u8 gUnknown_8417C83[]; -extern const u8 gUnknown_8417C9D[]; -extern const u8 gUnknown_8417CB7[]; -extern const u8 gUnknown_8417D4C[]; -extern const u8 gUnknown_8417D56[]; -extern const u8 gUnknown_8417D63[]; -extern const u8 gUnknown_8417D6F[]; -extern const u8 gUnknown_8417D79[]; -extern const u8 gUnknown_8417D86[]; -extern const u8 gUnknown_8417D90[]; -extern const u8 gUnknown_8417DA0[]; -extern const u8 gUnknown_8417DF3[]; -extern const u8 gUnknown_8417DFE[]; -extern const u8 gUnknown_8417E09[]; -extern const u8 gUnknown_8417E46[]; -extern const u8 gUnknown_8417E50[]; -extern const u8 gUnknown_8417E5A[]; -extern const u8 gUnknown_8417E66[]; -extern const u8 gUnknown_8417E67[]; -extern const u8 gUnknown_8417E71[]; -extern const u8 gUnknown_8417E72[]; -extern const u8 gUnknown_8417E7F[]; -extern const u8 gUnknown_8417E94[]; -extern const u8 gUnknown_8417EA4[]; -extern const u8 gUnknown_8417EB3[]; -extern const u8 gUnknown_8417EC1[]; -extern const u8 gUnknown_8417ECC[]; -extern const u8 gUnknown_8417ED9[]; -extern const u8 gUnknown_8417EF7[]; -extern const u8 gUnknown_8417F11[]; -extern const u8 gUnknown_8417F2F[]; -extern const u8 gUnknown_8417F4D[]; -extern const u8 gUnknown_8417F67[]; -extern const u8 gUnknown_8417F68[]; -extern const u8 gUnknown_8417F69[]; -extern const u8 gUnknown_8417F77[]; -extern const u8 gUnknown_8417ABF[]; -extern const u8 gUnknown_8417AC4[]; -extern const u8 gUnknown_8417ACB[]; -extern const u8 gUnknown_8417AD0[]; -extern const u8 gUnknown_8417AD6[]; -extern const u8 gUnknown_8417AF4[]; -extern const u8 gUnknown_8417AF9[]; -extern const u8 gUnknown_8417B00[]; -extern const u8 gUnknown_8417B05[]; -extern const u8 gUnknown_8417B0B[]; -extern const u8 gUnknown_8417B11[]; -extern const u8 gUnknown_8417B17[]; -extern const u8 gUnknown_8417B21[]; -extern const u8 gUnknown_8417B2C[]; -extern const u8 gUnknown_8417B36[]; -extern const u8 gUnknown_8417B3E[]; -extern const u8 gUnknown_8417B4B[]; -extern const u8 gUnknown_8417B58[]; -extern const u8 gUnknown_8417B65[]; -extern const u8 gUnknown_8417B72[]; -extern const u8 gUnknown_8417B7C[]; -extern const u8 gUnknown_8417B87[]; -extern const u8 gUnknown_8417B94[]; -extern const u8 gUnknown_8417C2D[]; -extern const u8 gUnknown_8417DA9[]; -extern const u8 gUnknown_8417DB6[]; -extern const u8 gUnknown_8417DC7[]; -extern const u8 gUnknown_8417DD9[]; -extern const u8 gUnknown_8417DE1[]; -extern const u8 gUnknown_8417E16[]; -extern const u8 gUnknown_8417E22[]; -extern const u8 gUnknown_8417E2E[]; -extern const u8 gUnknown_8417E39[]; +extern const u8 gText_Info[]; +extern const u8 gText_Eggs[]; +extern const u8 gText_HallOfFame[]; +extern const u8 gText_Victories[]; +extern const u8 gText_Quit[]; +extern const u8 gText_Psn[]; +extern const u8 gText_Par[]; +extern const u8 gText_Slp[]; +extern const u8 gText_Brn[]; +extern const u8 gText_Frz[]; +extern const u8 gText_Yes[]; +extern const u8 gText_No[]; +extern const u8 gText_SingleBattle[]; +extern const u8 gText_DoubleBattle[]; +extern const u8 gText_MultiBattle[]; +extern const u8 gText_MakeAChallenge[]; +extern const u8 gText_Info_2[]; +extern const u8 gText_FreshWater200[]; +extern const u8 gText_SodaPop300[]; +extern const u8 gText_Lemonade350[]; +extern const u8 gText_50Coins1000[]; +extern const u8 gText_500Coins10000[]; +extern const u8 gText_Excellent[]; +extern const u8 gText_NotSoBad[]; +extern const u8 gText_RedShard[]; +extern const u8 gText_YellowShard[]; +extern const u8 gText_BlueShard[]; +extern const u8 gText_GreenShard[]; +extern const u8 gText_Right[]; +extern const u8 gText_Left[]; +extern const u8 gText_Tm134000Coins[]; +extern const u8 gText_Tm233500Coins[]; +extern const u8 gText_Tm244000Coins[]; +extern const u8 gText_Tm304500Coins[]; +extern const u8 gText_Tm354000Coins[]; +extern const u8 gText_1F[]; +extern const u8 gText_2F[]; +extern const u8 gText_3F[]; +extern const u8 gText_4F[]; +extern const u8 gText_5F[]; +extern const u8 gText_Normal[]; +extern const u8 gText_Black[]; +extern const u8 gText_Pink[]; +extern const u8 gText_Sepia[]; +extern const u8 gText_Eevee[]; +extern const u8 gText_Flareon[]; +extern const u8 gText_Jolteon[]; +extern const u8 gText_Vaporeon[]; +extern const u8 gText_QuitLooking[]; +extern const u8 gText_FreshWater[]; +extern const u8 gText_SodaPop[]; +extern const u8 gText_Lemonade[]; +extern const u8 gText_Bicycle1000000[]; +extern const u8 gText_NoThanks[]; +extern const u8 gText_Abra180Coins[]; +extern const u8 gText_Clefairy500Coins[]; +extern const u8 gText_Dratini2800Coins[]; +extern const u8 gText_Scyther5500Coins[]; +extern const u8 gText_Porygon9999Coins[]; +extern const u8 gText_NoThanks_2[]; +extern const u8 gText_HelixFossil[]; +extern const u8 gText_DomeFossil[]; +extern const u8 gText_OldAmber[]; +extern const u8 gText_TradeCenter[]; +extern const u8 gText_Colosseum[]; +extern const u8 gText_GameLinkCable[]; +extern const u8 gText_Wireless[]; +extern const u8 gText_OneIsland[]; +extern const u8 gText_TwoIsland[]; +extern const u8 gText_ThreeIsland[]; +extern const u8 gText_Vermilion[]; +extern const u8 gText_Colosseum_2[]; +extern const u8 gText_BerryCrush[]; +extern const u8 gText_Dummy_8417E66[]; +extern const u8 gText_Dummy_8417E67[]; +extern const u8 gText_Dummy_8417E71[]; +extern const u8 gText_PokemonJump[]; +extern const u8 gText_DodrioBerryPicking[]; +extern const u8 gText_2Tinymushrooms[]; +extern const u8 gText_1BigMushroom[]; +extern const u8 gText_SeviiIslands[]; +extern const u8 gText_NavelRock[]; +extern const u8 gText_BirthIsland[]; +extern const u8 gText_MiracleSeed1000Coins[]; +extern const u8 gText_Charcoal1000Coins[]; +extern const u8 gText_MysticWater1000Coins[]; +extern const u8 gText_YellowFlute1600Coins[]; +extern const u8 gText_SmokeBall800Coins[]; +extern const u8 gText_Dummy_8417F67[]; +extern const u8 gText_Dummy_8417F68[]; +extern const u8 gText_BecomeLeader[]; +extern const u8 gText_JoinGroup[]; +extern const u8 gText_Cool_2[]; +extern const u8 gText_Beauty_2[]; +extern const u8 gText_Cute_2[]; +extern const u8 gText_Smart_2[]; +extern const u8 gText_Tough_2[]; +extern const u8 gText_Items[]; +extern const u8 gText_KeyItems[]; +extern const u8 gText_PokeBalls[]; +extern const u8 gText_TmsgUnknown_8417B2CHms[]; +extern const u8 gText_Berries[]; +extern const u8 gText_Boulderbadge[]; +extern const u8 gText_Cascadebadge[]; +extern const u8 gText_Thunderbadge[]; +extern const u8 gText_Rainbowbadge[]; +extern const u8 gText_Soulbadge[]; +extern const u8 gText_Marshbadge[]; +extern const u8 gText_Volcanobadge[]; +extern const u8 gText_Earthbadge[]; +extern const u8 gText_Coins_2[]; +extern const u8 gText_ItemsPocket[]; +extern const u8 gText_KeyItemsPocket[]; +extern const u8 gText_PokeBallsPocket[]; +extern const u8 gText_TmCase[]; +extern const u8 gText_BerryPouch_2[]; +extern const u8 gText_FourIsland[]; +extern const u8 gText_FiveIsland[]; +extern const u8 gText_SixIsland[]; +extern const u8 gText_SevenIsland[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 15298c6cd152ebbe8dcf30fd9dcc384b7da02d19 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 14:01:40 -0400 Subject: Fix some string names --- include/strings.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 32b485ce4..7613225d4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -544,11 +544,11 @@ extern const u8 gText_DoubleBattle[]; extern const u8 gText_MultiBattle[]; extern const u8 gText_MakeAChallenge[]; extern const u8 gText_Info_2[]; -extern const u8 gText_FreshWater200[]; -extern const u8 gText_SodaPop300[]; -extern const u8 gText_Lemonade350[]; -extern const u8 gText_50Coins1000[]; -extern const u8 gText_500Coins10000[]; +extern const u8 gText_FreshWater_200[]; +extern const u8 gText_SodaPop_300[]; +extern const u8 gText_Lemonade_350[]; +extern const u8 gText_50Coins_1000[]; +extern const u8 gText_500Coins_10000[]; extern const u8 gText_Excellent[]; extern const u8 gText_NotSoBad[]; extern const u8 gText_RedShard[]; @@ -557,11 +557,11 @@ extern const u8 gText_BlueShard[]; extern const u8 gText_GreenShard[]; extern const u8 gText_Right[]; extern const u8 gText_Left[]; -extern const u8 gText_Tm134000Coins[]; -extern const u8 gText_Tm233500Coins[]; -extern const u8 gText_Tm244000Coins[]; -extern const u8 gText_Tm304500Coins[]; -extern const u8 gText_Tm354000Coins[]; +extern const u8 gText_Tm13_4000Coins[]; +extern const u8 gText_Tm23_3500Coins[]; +extern const u8 gText_Tm24_4000Coins[]; +extern const u8 gText_Tm30_4500Coins[]; +extern const u8 gText_Tm35_4000Coins[]; extern const u8 gText_1F[]; extern const u8 gText_2F[]; extern const u8 gText_3F[]; @@ -579,13 +579,13 @@ extern const u8 gText_QuitLooking[]; extern const u8 gText_FreshWater[]; extern const u8 gText_SodaPop[]; extern const u8 gText_Lemonade[]; -extern const u8 gText_Bicycle1000000[]; +extern const u8 gText_Bicycle_1000000[]; extern const u8 gText_NoThanks[]; -extern const u8 gText_Abra180Coins[]; -extern const u8 gText_Clefairy500Coins[]; -extern const u8 gText_Dratini2800Coins[]; -extern const u8 gText_Scyther5500Coins[]; -extern const u8 gText_Porygon9999Coins[]; +extern const u8 gText_Abra_180Coins[]; +extern const u8 gText_Clefairy_500Coins[]; +extern const u8 gText_Dratini_2800Coins[]; +extern const u8 gText_Scyther_5500Coins[]; +extern const u8 gText_Porygon_9999Coins[]; extern const u8 gText_NoThanks_2[]; extern const u8 gText_HelixFossil[]; extern const u8 gText_DomeFossil[]; @@ -610,11 +610,11 @@ extern const u8 gText_1BigMushroom[]; extern const u8 gText_SeviiIslands[]; extern const u8 gText_NavelRock[]; extern const u8 gText_BirthIsland[]; -extern const u8 gText_MiracleSeed1000Coins[]; -extern const u8 gText_Charcoal1000Coins[]; -extern const u8 gText_MysticWater1000Coins[]; -extern const u8 gText_YellowFlute1600Coins[]; -extern const u8 gText_SmokeBall800Coins[]; +extern const u8 gText_MiracleSeed_1000Coins[]; +extern const u8 gText_Charcoal_1000Coins[]; +extern const u8 gText_MysticWater_1000Coins[]; +extern const u8 gText_YellowFlute_1600Coins[]; +extern const u8 gText_SmokeBall_800Coins[]; extern const u8 gText_Dummy_8417F67[]; extern const u8 gText_Dummy_8417F68[]; extern const u8 gText_BecomeLeader[]; -- cgit v1.2.3 From 359ec8dde1d069b8b335e863f332f65c262c9145 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 14:52:54 -0400 Subject: Name multichoice menus --- include/constants/menu.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ include/strings.h | 34 ++++++++++++------------- 2 files changed, 83 insertions(+), 17 deletions(-) (limited to 'include') diff --git a/include/constants/menu.h b/include/constants/menu.h index b981cca9e..b873bc296 100644 --- a/include/constants/menu.h +++ b/include/constants/menu.h @@ -4,4 +4,70 @@ #define SCR_MENU_CANCEL 127 #define SCR_MENU_UNSET 255 +#define MULTICHOICE_YES_NO 0 +#define MULTICHOICE_EEVEELUTIONS 1 +#define MULTICHOICE_TRAINER_CARD_ICON_TINT 2 +#define MULTICHOICE_HOF_QUIT 3 +#define MULTICHOICE_EGGS_QUIT 4 +#define MULTICHOICE_VICTORIES_QUIT 5 +#define MULTICHOICE_HOF_EGGS_QUIT 6 +#define MULTICHOICE_HOF_VICTORIES_QUIT 7 +#define MULTICHOICE_EGGS_VICTORIES_QUIT 8 +#define MULTICHOICE_HOF_EGGS_VICTORIES_QUIT 9 +#define MULTICHOICE_EXIT 10 +#define MULTICHOICE_EXIT_2 11 +#define MULTICHOICE_EXIT_3 12 +#define MULTICHOICE_BIKE_SHOP 13 +#define MULTICHOICE_GAME_CORNER_POKEMON_PRIZES 14 +#define MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD 15 +#define MULTICHOICE_YES_NO_INFO 16 +#define MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT 17 +#define MULTICHOICE_YES_NO_INFO_2 18 +#define MULTICHOICE_CHALLENGE_INFO_EXIT 19 +#define MULTICHOICE_ROOFTOP_B1F 20 +#define MULTICHOICE_HELIX 21 +#define MULTICHOICE_DOME 22 +#define MULTICHOICE_AMBER 23 +#define MULTICHOICE_HELIX_AMBER 24 +#define MULTICHOICE_DOME_AMBER 25 +#define MULTICHOICE_CELADON_VENDING_MACHINE 26 +#define MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER 27 +#define MULTICHOICE_EXCELLENT_NOT_SO_BAD 28 +#define MULTICHOICE_RIGHT_LEFT 29 +#define MULTICHOICE_GAME_CORNER_TMPRIZES 30 +#define MULTICHOICE_DEPT_STORE_ELEVATOR 31 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER 32 +#define MULTICHOICE_THIRSTY_GIRL_SODA_POP 33 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP 34 +#define MULTICHOICE_THIRSTY_GIRL_LEMONADE 35 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE 36 +#define MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE 37 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE 38 +#define MULTICHOICE_TRADE_CENTER_COLOSSEUM 39 +#define MULTICHOICE_LINK_WIRELESS 40 +#define MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES 41 +#define MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR 42 +#define MULTICHOICE_LINKED_DIRECT_UNION 43 +#define MULTICHOICE_ISLAND_23 44 +#define MULTICHOICE_ISLAND_13 45 +#define MULTICHOICE_ISLAND_12 46 +#define MULTICHOICE_TRADE_COLOSSEUM_CRUSH 47 +#define MULTICHOICE_48 48 +#define MULTICHOICE_POKEJUMP_DODRIO 49 +#define MULTICHOICE_TRADE_COLOSSEUM_2 50 +#define MULTICHOICE_MUSHROOMS 51 +#define MULTICHOICE_TRADE_COLOSSEUM_BLANK_CRUSH 52 +#define MULTICHOICE_TRADE_COLOSSEUM_BLANK 53 +#define MULTICHOICE_SEVII_NAVEL 54 +#define MULTICHOICE_SEVII_BIRTH 55 +#define MULTICHOICE_SEVII_NAVEL_BIRTH 56 +#define MULTICHOICE_SEA_GALLOP_123 57 +#define MULTICHOICE_SEA_GALLOP_V23 58 +#define MULTICHOICE_SEA_GALLOP_V13 59 +#define MULTICHOICE_SEA_GALLOP_V12 60 +#define MULTICHOICE_SEA_GALLOP_VERMILION 61 +#define MULTICHOICE_62 62 +#define MULTICHOICE_JOIN_OR_LEAD 63 +#define MULTICHOICE_TRAINER_TOWER_MODE 64 + #endif //GUARD_CONSTANTS_MENU_H diff --git a/include/strings.h b/include/strings.h index 7613225d4..d60e841ef 100644 --- a/include/strings.h +++ b/include/strings.h @@ -475,20 +475,20 @@ extern const u8 gUnknown_8417FD0[]; extern const u8 gUnknown_8417FCC[]; extern const u8 gUnknown_8418075[]; extern const u8 gText_B4F[]; -extern const u8 gUnknown_8418065[]; +extern const u8 gText_B3F[]; extern const u8 gText_B2F[]; extern const u8 gText_B1F[]; -extern const u8 gUnknown_841803A[]; -extern const u8 gUnknown_841803D[]; -extern const u8 gUnknown_8418040[]; -extern const u8 gUnknown_8418043[]; -extern const u8 gUnknown_8418046[]; -extern const u8 gUnknown_8418049[]; -extern const u8 gUnknown_841804C[]; -extern const u8 gUnknown_841804F[]; -extern const u8 gUnknown_8418052[]; -extern const u8 gUnknown_8418055[]; -extern const u8 gUnknown_8418059[]; +extern const u8 gText_1F[]; +extern const u8 gText_2F[]; +extern const u8 gText_3F[]; +extern const u8 gText_4F[]; +extern const u8 gText_5F[]; +extern const u8 gText_6F[]; +extern const u8 gText_7F[]; +extern const u8 gText_8F[]; +extern const u8 gText_9F[]; +extern const u8 gText_10F[]; +extern const u8 gText_11F[]; extern const u8 gText_Rooftop[]; extern const u8 gUnknown_8417FD9[]; extern const u8 gUnknown_8417FE6[]; @@ -562,11 +562,11 @@ extern const u8 gText_Tm23_3500Coins[]; extern const u8 gText_Tm24_4000Coins[]; extern const u8 gText_Tm30_4500Coins[]; extern const u8 gText_Tm35_4000Coins[]; -extern const u8 gText_1F[]; -extern const u8 gText_2F[]; -extern const u8 gText_3F[]; -extern const u8 gText_4F[]; -extern const u8 gText_5F[]; +extern const u8 gText_1F_2[]; +extern const u8 gText_2F_2[]; +extern const u8 gText_3F_2[]; +extern const u8 gText_4F_2[]; +extern const u8 gText_5F_2[]; extern const u8 gText_Normal[]; extern const u8 gText_Black[]; extern const u8 gText_Pink[]; -- cgit v1.2.3 From 2fce74000549a66bc5508b0c9cfbb42bf76009f4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 14:59:46 -0400 Subject: Name strings used in field_specials --- include/strings.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index d60e841ef..51396954c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -469,11 +469,11 @@ extern const u8 gSaveStatName_Time[]; extern const u8 gText_From[]; // field_specials -extern const u8 gUnknown_8417FBB[]; -extern const u8 gUnknown_8417FC3[]; -extern const u8 gUnknown_8417FD0[]; -extern const u8 gUnknown_8417FCC[]; -extern const u8 gUnknown_8418075[]; +extern const u8 gText_BigGuy[]; +extern const u8 gText_BigGirl[]; +extern const u8 gText_Son[]; +extern const u8 gText_Daughter[]; +extern const u8 gText_NowOn[]; extern const u8 gText_B4F[]; extern const u8 gText_B3F[]; extern const u8 gText_B2F[]; @@ -490,29 +490,29 @@ extern const u8 gText_9F[]; extern const u8 gText_10F[]; extern const u8 gText_11F[]; extern const u8 gText_Rooftop[]; -extern const u8 gUnknown_8417FD9[]; -extern const u8 gUnknown_8417FE6[]; -extern const u8 gUnknown_8417FF3[]; -extern const u8 gUnknown_8418000[]; -extern const u8 gUnknown_841800D[]; -extern const u8 gUnknown_8418017[]; -extern const u8 gUnknown_8418022[]; -extern const u8 gUnknown_841802F[]; +extern const u8 gText_BoulderBadge[]; +extern const u8 gText_CascadeBadge[]; +extern const u8 gText_ThunderBadge[]; +extern const u8 gText_RainbowBadge[]; +extern const u8 gText_SoulBadge[]; +extern const u8 gText_MarshBadge[]; +extern const u8 gText_VolcanoBadge[]; +extern const u8 gText_EarthBadge[]; extern const u8 gText_LinkedGamePlay[]; extern const u8 gText_DirectCorner[]; extern const u8 gText_UnionRoom[]; extern const u8 gOtherText_Quit[]; -extern const u8 gUnknown_84180A7[]; -extern const u8 gUnknown_84180BC[]; -extern const u8 gUnknown_84180D0[]; -extern const u8 gUnknown_84180E4[]; -extern const u8 gUnknown_84180FA[]; -extern const u8 gUnknown_841810D[]; -extern const u8 gUnknown_841811D[]; -extern const u8 gUnknown_841812F[]; -extern const u8 gUnknown_8418142[]; -extern const u8 gUnknown_8418152[]; -extern const u8 gUnknown_8418163[]; +extern const u8 gText_Energypowder_50[]; +extern const u8 gText_EnergyRoot_80[]; +extern const u8 gText_HealPowder_50[]; +extern const u8 gText_RevivalHerb_300[]; +extern const u8 gText_Protein_1000[]; +extern const u8 gText_Iron_1000[]; +extern const u8 gText_Carbos_1000[]; +extern const u8 gText_Calcium_1000[]; +extern const u8 gText_Zinc_1000[]; +extern const u8 gText_HpUp_1000[]; +extern const u8 gText_PpUp_3000[]; // script_menu extern const u8 gText_SomeoneSPc[]; -- cgit v1.2.3 From 4b052a204084119ad9302ccdf43b76733447a2df Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 17:01:05 -0400 Subject: Resolve review comments --- include/constants/menu.h | 10 +++++----- include/seagallop.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/constants/menu.h b/include/constants/menu.h index b873bc296..44df246d9 100644 --- a/include/constants/menu.h +++ b/include/constants/menu.h @@ -61,11 +61,11 @@ #define MULTICHOICE_SEVII_NAVEL 54 #define MULTICHOICE_SEVII_BIRTH 55 #define MULTICHOICE_SEVII_NAVEL_BIRTH 56 -#define MULTICHOICE_SEA_GALLOP_123 57 -#define MULTICHOICE_SEA_GALLOP_V23 58 -#define MULTICHOICE_SEA_GALLOP_V13 59 -#define MULTICHOICE_SEA_GALLOP_V12 60 -#define MULTICHOICE_SEA_GALLOP_VERMILION 61 +#define MULTICHOICE_SEAGALLOP_123 57 +#define MULTICHOICE_SEAGALLOP_V23 58 +#define MULTICHOICE_SEAGALLOP_V13 59 +#define MULTICHOICE_SEAGALLOP_V12 60 +#define MULTICHOICE_SEAGALLOP_VERMILION 61 #define MULTICHOICE_62 62 #define MULTICHOICE_JOIN_OR_LEAD 63 #define MULTICHOICE_TRAINER_TOWER_MODE 64 diff --git a/include/seagallop.h b/include/seagallop.h index a8eaa6c88..50b128185 100644 --- a/include/seagallop.h +++ b/include/seagallop.h @@ -3,6 +3,6 @@ #include "constants/seagallop.h" -void ScrSpecial_SeaGallopFerry(void); +void ScrSpecial_SeagallopFerry(void); #endif //GUARD_SEAGALLOP_H -- cgit v1.2.3