diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/braille_puzzles.c | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/braille_puzzles.c')
| -rw-r--r-- | src/braille_puzzles.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index f11fb5fb3..7f26f0a9b 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -4,18 +4,19 @@ #include "field_camera.h" #include "field_effect.h" #include "fieldmap.h" -#include "constants/flags.h" #include "main.h" -#include "constants/maps.h" -#include "map_obj_lock.h" +#include "event_obj_lock.h" #include "menu.h" #include "rom6.h" #include "script.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "task.h" #include "text.h" +#include "constants/field_effects.h" +#include "constants/flags.h" +#include "constants/maps.h" +#include "constants/songs.h" +#include "constants/species.h" extern u8 gPlayerPartyCount; extern u8 gLastFieldPokeMenuOpened; @@ -83,7 +84,7 @@ bool8 ShouldDoBrailleStrengthEffect(void) void DoBrailleStrengthEffect(void) { - FieldEffectActiveListRemove(0x28); + FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH); MapGridSetMetatileIdAt(14, 26, 554); MapGridSetMetatileIdAt(15, 26, 555); MapGridSetMetatileIdAt(16, 26, 556); @@ -184,7 +185,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; } - sub_8064E2C(); + ScriptUnfreezeEventObjects(); DestroyTask(taskId); ScriptContext2_Disable(); break; @@ -194,7 +195,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; case 4: - sub_8064E2C(); + ScriptUnfreezeEventObjects(); ScriptContext1_SetupScript(S_OpenRegiceChamber); DestroyTask(taskId); break; |