summaryrefslogtreecommitdiff
path: root/src/braille_puzzles.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-13 15:13:30 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-13 15:13:30 -0500
commit3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch)
treee9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /src/braille_puzzles.c
parentcafbffd5b82836d779ec446e2362a9885fd18c4a (diff)
parentb4f4d2c0f03462dcdf3492aad27890294600eb2e (diff)
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/braille_puzzles.c')
-rw-r--r--src/braille_puzzles.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index e217de503..428d114c7 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -5,7 +5,7 @@
#include "field_effect.h"
#include "fieldmap.h"
#include "main.h"
-#include "event_obj_lock.h"
+#include "event_object_lock.h"
#include "menu.h"
#include "rom6.h"
#include "script.h"
@@ -186,7 +186,7 @@ void Task_BrailleWait(u8 taskId)
data[0] = 4;
break;
}
- ScriptUnfreezeEventObjects();
+ ScriptUnfreezeObjectEvents();
DestroyTask(taskId);
ScriptContext2_Disable();
break;
@@ -196,7 +196,7 @@ void Task_BrailleWait(u8 taskId)
data[0] = 4;
break;
case 4:
- ScriptUnfreezeEventObjects();
+ ScriptUnfreezeObjectEvents();
ScriptContext1_SetupScript(S_OpenRegiceChamber);
DestroyTask(taskId);
break;