summaryrefslogtreecommitdiff
path: root/data/maps/VictoryRoad_1F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/VictoryRoad_1F')
-rw-r--r--data/maps/VictoryRoad_1F/scripts.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index e07da7e60..4bce6b4c1 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -5,10 +5,8 @@ VictoryRoad_1F_MapScripts::
.byte 0
VictoryRoad_1F_OnTransition:
- compare VAR_VICTORY_ROAD_1F_STATE, 1
- call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1
- compare VAR_VICTORY_ROAD_1F_STATE, 2
- call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2
+ call_if_eq VAR_VICTORY_ROAD_1F_STATE, 1, VictoryRoad_1F_EventScript_SetEntranceWallyPos1
+ call_if_eq VAR_VICTORY_ROAD_1F_STATE, 2, VictoryRoad_1F_EventScript_SetEntranceWallyPos2
end
VictoryRoad_1F_EventScript_SetEntranceWallyPos1::
@@ -88,8 +86,7 @@ VictoryRoad_1F_EventScript_EntranceWally::
VictoryRoad_1F_EventScript_ExitWally::
trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq VictoryRoad_1F_EventScript_RematchWally
+ goto_if_eq VAR_RESULT, TRUE, VictoryRoad_1F_EventScript_RematchWally
msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
end