diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/menu.h | 7 | ||||
| -rw-r--r-- | include/constants/seagallop.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 6 | ||||
| -rw-r--r-- | include/quest_log.h | 2 | ||||
| -rw-r--r-- | include/script_menu.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 156 |
6 files changed, 157 insertions, 20 deletions
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 |