diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-09 19:29:05 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-09 19:29:05 -0500 |
| commit | 7309b13cb34400e0256c09fd54664a3f918b4e3d (patch) | |
| tree | db7ec1ed29a98f2a6e7a45a1d550b493f6e08aa6 | |
| parent | 7edcec9a78710e29922e472358f82d546f6ea592 (diff) | |
fix German build
| -rw-r--r-- | data-de/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | include/script_menu.h | 2 | ||||
| -rw-r--r-- | src/hof_pc.c | 2 | ||||
| -rw-r--r-- | src/script_menu.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index a6bb9e015..9f6b77e5a 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1689,7 +1689,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special TryCreatePCMenu + special ScrSpecial_CreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/event_scripts.s b/data/event_scripts.s index 6a95dd4a1..5e2763653 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special ScriptMenu_TryCreatePCMenu + special ScrSpecial_CreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/specials.inc b/data/specials.inc index 051a84bdb..61670a867 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -269,7 +269,7 @@ gSpecials:: def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special ScriptMenu_TryCreatePCMenu + def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC def_special sub_810D6A4 def_special CheckLeadMonCool diff --git a/include/script_menu.h b/include/script_menu.h index e621b32a4..dca8c26a7 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 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4); bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); -bool8 ScriptMenu_TryCreatePCMenu(void); +bool8 ScrSpecial_CreatePCMenu(void); void ScriptMenu_CreatePCMenu(void); void ScriptMenu_DisplayPCStartupPrompt(void); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); diff --git a/src/hof_pc.c b/src/hof_pc.c index 06da38a71..83d39a9b5 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -30,7 +30,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) ScriptContext2_Enable(); sub_8053E90(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); - ScriptMenu_TryCreatePCMenu(); + ScrSpecial_CreatePCMenu(); ScriptMenu_DisplayPCStartupPrompt(); CreateTask(Task_WaitForPaletteFade, 10); } diff --git a/src/script_menu.c b/src/script_menu.c index 253157b47..e25e74d8c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -880,7 +880,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) #undef tIgnoreBPress #undef tDoWrap -bool8 ScriptMenu_TryCreatePCMenu(void) +bool8 ScrSpecial_CreatePCMenu(void) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { |