diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
| commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
| tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /src/start_menu.c | |
| parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
| parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 2024ba89a..747f13b3a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -9,7 +9,7 @@ #include "load_save.h" #include "m4a.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "new_game.h" #include "option_menu.h" @@ -405,7 +405,7 @@ void sub_8071310(void) { if (!is_c1_link_related_active()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_80594C0(); sub_80597F4(); } @@ -588,7 +588,7 @@ static u8 SaveCallback2(void) case SAVE_SUCCESS: case SAVE_ERROR: Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); return TRUE; } |