diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:03:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:03:49 -0400 |
| commit | 4dc2ba23f617f0b53a8f4d95e82a71580a808c91 (patch) | |
| tree | 9522877c5990fcc3877e985f0d1c228a1c42593d /src/script_menu.c | |
| parent | c6b4319b682807d714f88857f16287770b483db8 (diff) | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
Merge branch 'master' into constants-mapdatasize
Diffstat (limited to 'src/script_menu.c')
| -rw-r--r-- | src/script_menu.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/script_menu.c b/src/script_menu.c index 1a7489c82..03aef9813 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -11,6 +11,7 @@ #include "sprite.h" #include "strings.h" #include "task.h" +#include "constants/script_menu.h" // multichoice lists const struct MenuAction MultichoiceList_00[] = @@ -555,30 +556,30 @@ const struct MultichoiceListStruct gMultichoiceLists[] = {MultichoiceList_72, ARRAY_COUNT(MultichoiceList_72)}, }; -const u8 *const gUnknown_083CE048[] = +const u8 *const gStdStrings[] = { - OtherText_Cool2, - OtherText_Beauty3, - OtherText_Cute2, - OtherText_Smart2, - OtherText_Tough2, - OtherText_Normal, - OtherText_Super, - OtherText_Hyper, - OtherText_Master, - OtherText_Cool3, - OtherText_Beauty4, - OtherText_Cute3, - OtherText_Smart3, - OtherText_Tough3, - OtherText_Items, - OtherText_KeyItems, - OtherText_Balls, - OtherText_TMsHMs, - OtherText_Berries, + [STDSTRING_COOL] = OtherText_Cool2, + [STDSTRING_BEAUTY] = OtherText_Beauty3, + [STDSTRING_CUTE] = OtherText_Cute2, + [STDSTRING_SMART] = OtherText_Smart2, + [STDSTRING_TOUGH] = OtherText_Tough2, + [STDSTRING_NORMAL] = OtherText_Normal, + [STDSTRING_SUPER] = OtherText_Super, + [STDSTRING_HYPER] = OtherText_Hyper, + [STDSTRING_MASTER] = OtherText_Master, + [STDSTRING_COOL2] = OtherText_Cool3, + [STDSTRING_BEAUTY2] = OtherText_Beauty4, + [STDSTRING_CUTE2] = OtherText_Cute3, + [STDSTRING_SMART2] = OtherText_Smart3, + [STDSTRING_TOUGH2] = OtherText_Tough3, + [STDSTRING_ITEMS] = OtherText_Items, + [STDSTRING_KEYITEMS] = OtherText_KeyItems, + [STDSTRING_POKEBALLS] = OtherText_Balls, + [STDSTRING_TMHMS] = OtherText_TMsHMs, + [STDSTRING_BERRIES] = OtherText_Berries, }; -extern u8 gPCText_WhichPCShouldBeAccessed[]; +extern u8 Text_WhichPCShouldBeAccessed[]; extern u16 gSpecialVar_Result; @@ -880,7 +881,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) #undef tIgnoreBPress #undef tDoWrap -bool8 ScrSpecial_CreatePCMenu(void) +bool8 ScriptMenu_CreatePCMultichoice(void) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { @@ -1097,7 +1098,7 @@ _080B588C: .4byte gPCText_PlayersPC\n\ void ScriptMenu_DisplayPCStartupPrompt(void) { Menu_DisplayDialogueFrame(); - Menu_PrintText(gPCText_WhichPCShouldBeAccessed, 2, 15); + Menu_PrintText(Text_WhichPCShouldBeAccessed, 2, 15); } #define tState data[0] |