summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route118.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/Route118.inc
parentf5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff)
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/scripts/maps/Route118.inc')
-rw-r--r--data/scripts/maps/Route118.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index a4452d989..569a7103e 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -9,8 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E
Route118_EventScript_150F34:: @ 8150F34
lock
faceplayer
- checkflag FLAG_RECEIVED_GOOD_ROD
- goto_if_eq Route118_EventScript_150F89
+ goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89
msgbox Route118_Text_170F12, MSGBOX_YESNO
compare RESULT, YES
goto_if_eq Route118_EventScript_150F5E
@@ -84,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004
msgbox Route118_Text_170D66, 4
closemessage
compare VAR_SPECIAL_8, 0
- call_if 1, Route118_EventScript_151048
+ call_if_eq Route118_EventScript_151048
compare VAR_SPECIAL_8, 1
- call_if 1, Route118_EventScript_151053
+ call_if_eq Route118_EventScript_151053
compare VAR_SPECIAL_8, 2
- call_if 1, Route118_EventScript_15105E
+ call_if_eq Route118_EventScript_15105E
setvar VAR_ROUTE118_STATE, 1
removeobject 19
releaseall