summaryrefslogtreecommitdiff
path: root/data/scripts/maps/IslandCave.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-05 11:36:47 -0800
committerMarcus Huderle <huderlem@gmail.com>2018-01-05 11:36:47 -0800
commitaed64560bc222e4ea5ccec266c0d77859a05eaac (patch)
treeecdbc1f85cf112f24207adb27b63b93d1e503edf /data/scripts/maps/IslandCave.inc
parentf5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff)
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/scripts/maps/IslandCave.inc')
-rw-r--r--data/scripts/maps/IslandCave.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index dbc71b6bb..d8576e883 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6
.byte 0
IslandCave_MapScript1_15EEC6:: @ 815EEC6
- checkflag FLAG_SYS_CTRL_OBJ_DELETE
- call_if 1, IslandCave_EventScript_15EED0
+ call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0
end
IslandCave_EventScript_15EED0:: @ 815EED0
@@ -14,8 +13,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0
return
IslandCave_MapScript1_15EED4:: @ 815EED4
- checkflag FLAG_SYS_BRAILLE_WAIT
- call_if 0, IslandCave_EventScript_15EEDE
+ call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE
end
IslandCave_EventScript_15EEDE:: @ 815EEDE
@@ -45,8 +43,7 @@ S_OpenRegiceChamber:: @ 815EF19
IslandCave_EventScript_15EF59:: @ 815EF59
lockall
- checkflag FLAG_SYS_BRAILLE_WAIT
- goto_if_eq IslandCave_EventScript_15EF72
+ goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72
braillemessage IslandCave_Braille_1C54FC
special DoBrailleWait
waitstate
@@ -61,8 +58,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72
IslandCave_EventScript_15EF7C:: @ 815EF7C
lockall
braillemessage IslandCave_Braille_1C54FC
- checkflag FLAG_SYS_BRAILLE_WAIT
- goto_if_eq IslandCave_EventScript_15EF95
+ goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95
special DoBrailleWait
waitstate
goto IslandCave_EventScript_15EF95