summaryrefslogtreecommitdiff
path: root/data/maps/Route127/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route127/scripts.inc')
-rw-r--r--data/maps/Route127/scripts.inc15
1 files changed, 7 insertions, 8 deletions
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index f9c3290b9..28f20bfb3 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -5,21 +5,20 @@ Route127_MapScripts:: @ 81F69D9
.byte 0
Route127_MapScript1_1F69E9: @ 81F69E9
- checkflag FLAG_SYS_WEATHER_CTRL
- call_if 1, Route127_EventScript_27207A
+ call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A
compare VAR_0x4039, 1
- call_if 1, Route127_EventScript_273D13
+ call_if_eq Route127_EventScript_273D13
compare VAR_0x4037, 13
- call_if 1, Route127_EventScript_273D17
+ call_if_eq Route127_EventScript_273D17
compare VAR_0x4037, 14
- call_if 1, Route127_EventScript_273D17
+ call_if_eq Route127_EventScript_273D17
end
Route127_MapScript1_1F6A14: @ 81F6A14
compare VAR_0x4037, 13
- call_if 1, Route127_EventScript_273B5F
+ call_if_eq Route127_EventScript_273B5F
compare VAR_0x4037, 14
- call_if 1, Route127_EventScript_273BCC
+ call_if_eq Route127_EventScript_273BCC
end
Route127_MapScript2_1F6A2B: @ 81F6A2B
@@ -65,7 +64,7 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6
trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
- goto_eq Route127_EventScript_1F6B21
+ goto_if_eq Route127_EventScript_1F6B21
msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
release
end