diff options
Diffstat (limited to 'data/maps/JaggedPass/scripts.inc')
| -rw-r--r-- | data/maps/JaggedPass/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 151da14d1..f938caa05 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,6 +1,6 @@ JaggedPass_MapScripts:: @ 815D266 - map_script 5, JaggedPass_MapScript1_15D271 - map_script 3, JaggedPass_MapScript1_15D274 + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_15D271 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_15D274 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 @@ -18,32 +18,32 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 - msgbox JaggedPass_Text_195E3E, 6 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + msgbox JaggedPass_Text_195E3E, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 - msgbox JaggedPass_Text_195F04, 6 + msgbox JaggedPass_Text_195F04, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C - msgbox JaggedPass_Text_195FB9, 6 + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + msgbox JaggedPass_Text_195FB9, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 - msgbox JaggedPass_Text_196077, 6 + msgbox JaggedPass_Text_196077, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 - msgbox JaggedPass_Text_196118, 6 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + msgbox JaggedPass_Text_196118, MSGBOX_AUTOCLOSE end |