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/menu.c | |
| parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
| parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c index d50fb4f22..5bb5f96d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "menu.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu_cursor.h" #include "script.h" #include "constants/songs.h" @@ -54,7 +54,7 @@ void CloseMenu(void) { PlaySE(SE_SELECT); Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); Menu_DestroyCursor(); } |