summaryrefslogtreecommitdiff
path: root/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/AbandonedShip_Rooms2_1F/scripts.inc')
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index 089893aa2..a1bad74b4 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -2,27 +2,27 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67
.byte 0
AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68
- trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
+ trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93
- msgbox AbandonedShip_Rooms2_1F_Text_198835, 6
+ msgbox AbandonedShip_Rooms2_1F_Text_198835, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93
- trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE
- msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6
+ trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE
+ msgbox AbandonedShip_Rooms2_1F_Text_198A70, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE
- trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
+ trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9
- msgbox AbandonedShip_Rooms2_1F_Text_198934, 6
+ msgbox AbandonedShip_Rooms2_1F_Text_198934, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9
- trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40
- msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6
+ trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40
+ msgbox AbandonedShip_Rooms2_1F_Text_198BEA, MSGBOX_AUTOCLOSE
end