diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 14:56:39 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 14:56:39 -0400 |
| commit | 788dc307d403794f5e6eda65ebcc5d864827145d (patch) | |
| tree | 7ad7850f083b2c456605ce52a5d5e280ffde23da /src | |
| parent | 9604fa3936bc1144d4f5abd8312ec71abb538bc9 (diff) | |
Sync pc.inc
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_control_avatar.c | 7 | ||||
| -rw-r--r-- | src/hof_pc.c | 2 | ||||
| -rw-r--r-- | src/script_menu.c | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1fe046b0e..e237904fb 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -51,11 +51,10 @@ extern u8 gUnknown_0815281E[]; extern u8 gUnknown_08152C39[]; extern u8 SecretBase_EventScript_PC[]; extern u8 SecretBase_EventScript_RecordMixingPC[]; -extern u8 gUnknown_081A0009[]; +extern u8 EventScript_PC[]; extern u8 gUnknown_081C6C02[]; extern u8 EventScript_HiddenItem[]; extern u8 Event_TV[]; -extern u8 gUnknown_081A0009[]; extern u8 ClosedSootopolisDoorScript[]; extern u8 gUnknown_081A4363[]; extern u8 gUnknown_081C346A[]; @@ -320,7 +319,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil && script != gUnknown_08152C39 && script != SecretBase_EventScript_PC && script != SecretBase_EventScript_RecordMixingPC - && script != gUnknown_081A0009) + && script != EventScript_PC) PlaySE(5); ScriptContext1_SetupScript(script); @@ -456,7 +455,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile if (MetatileBehavior_IsPlayerFacingTVScreen(metatileBehavior, direction) == TRUE) return Event_TV; if (MetatileBehavior_IsPC(metatileBehavior) == TRUE) - return gUnknown_081A0009; + return EventScript_PC; if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE) return ClosedSootopolisDoorScript; if (MetatileBehavior_IsLinkBattleRecords(metatileBehavior) == TRUE) diff --git a/src/hof_pc.c b/src/hof_pc.c index ba64b5f4f..767970da7 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -29,7 +29,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); - ScrSpecial_CreatePCMenu(); + ScriptMenu_CreatePCMultichoice(); ScriptMenu_DisplayPCStartupPrompt(); CreateTask(Task_WaitForPaletteFade, 10); } diff --git a/src/script_menu.c b/src/script_menu.c index 20787878a..03aef9813 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -579,7 +579,7 @@ const u8 *const gStdStrings[] = [STDSTRING_BERRIES] = OtherText_Berries, }; -extern u8 gPCText_WhichPCShouldBeAccessed[]; +extern u8 Text_WhichPCShouldBeAccessed[]; extern u16 gSpecialVar_Result; @@ -881,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) { @@ -1098,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] |