diff options
| author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
| commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
| tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /src/start_menu.c | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
| parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) | |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 6f3df5b19..a6e7ae5d8 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -5,7 +5,7 @@ #include "bg.h" #include "event_data.h" #include "event_object_movement.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_scripts.h" #include "fieldmap.h" #include "field_effect.h" @@ -541,7 +541,7 @@ void ShowStartMenu(void) { if (!IsUpdateLinkStateCBActive()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -745,7 +745,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void ShowBattlePyramidStartMenu(void) { ClearDialogWindowAndFrameToTransparent(0, FALSE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); CreateStartMenuTask(Task_ShowStartMenu); ScriptContext2_Enable(); } @@ -787,7 +787,7 @@ static bool8 SaveCallback(void) case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); SoftResetInBattlePyramid(); return TRUE; @@ -824,7 +824,7 @@ static bool8 BattlePyramidRetireCallback(void) return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattlePyramid_Retire); return TRUE; @@ -1377,7 +1377,7 @@ static void HideStartMenuWindow(void) { ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } |