summaryrefslogtreecommitdiff
path: root/data/maps/Route119/scripts.inc
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-21 20:28:24 -0500
committerMelody <melody@pallet.town>2018-12-21 20:28:24 -0500
commitac2e4adf2da2f30a741556e20e5bc9a494997581 (patch)
tree1a05a202cfece044d546094581d8463a9b6e452c /data/maps/Route119/scripts.inc
parent87fd6b8dc21b37b656f16e3f11832c6951328750 (diff)
improve goto_if macros
Diffstat (limited to 'data/maps/Route119/scripts.inc')
-rw-r--r--data/maps/Route119/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index 544330f9a..dc63f64df 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -11,7 +11,7 @@ Route119_MapScript1_1F442F: @ 81F442F
Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
- goto_if 5, Route119_EventScript_27374E
+ goto_if_ne Route119_EventScript_27374E
removeobject VAR_LAST_TALKED
return
@@ -64,9 +64,9 @@ Route119_EventScript_1F4488:: @ 81F4488
delay 30
checkplayergender
compare VAR_RESULT, 0
- goto_eq Route119_EventScript_1F450B
+ goto_if_eq Route119_EventScript_1F450B
compare VAR_RESULT, 1
- goto_eq Route119_EventScript_1F4585
+ goto_if_eq Route119_EventScript_1F4585
releaseall
end
@@ -370,7 +370,7 @@ Route119_EventScript_1F4810:: @ 81F4810
trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
- goto_eq Route119_EventScript_1F485B
+ goto_if_eq Route119_EventScript_1F485B
msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT
release
end
@@ -392,7 +392,7 @@ Route119_EventScript_1F4872:: @ 81F4872
trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
- goto_eq Route119_EventScript_1F48BD
+ goto_if_eq Route119_EventScript_1F48BD
msgbox Route119_Text_29DE88, MSGBOX_DEFAULT
release
end