summaryrefslogtreecommitdiff
path: root/data/maps/Route107/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route107/scripts.inc')
-rw-r--r--data/maps/Route107/scripts.inc28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
index 5ad30f9f4..43fc45825 100644
--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -2,39 +2,39 @@ Route107_MapScripts:: @ 814F3BB
.byte 0
Route107_EventScript_14F3BC:: @ 814F3BC
- trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7
- msgbox Route107_Text_1B92E7, 6
+ trainerbattle_single TRAINER_DARRIN, Route107_Text_1B926B, Route107_Text_1B92B7
+ msgbox Route107_Text_1B92E7, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F3D3:: @ 814F3D3
- trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365
+ trainerbattle_single TRAINER_TONY_1, Route107_Text_1B933A, Route107_Text_1B9365
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route107_EventScript_14F3FA
- msgbox Route107_Text_1B938E, 6
+ msgbox Route107_Text_1B938E, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F3FA:: @ 814F3FA
- trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429
- msgbox Route107_Text_1B9477, 6
+ trainerbattle_rematch TRAINER_TONY_1, Route107_Text_1B93EB, Route107_Text_1B9429
+ msgbox Route107_Text_1B9477, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F411:: @ 814F411
- trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2
- msgbox Route107_Text_1B94FF, 6
+ trainerbattle_single TRAINER_DENISE, Route107_Text_1B94C8, Route107_Text_1B94F2
+ msgbox Route107_Text_1B94FF, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F428:: @ 814F428
- trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B
- msgbox Route107_Text_1B9589, 6
+ trainerbattle_single TRAINER_BETH, Route107_Text_1B9538, Route107_Text_1B956B
+ msgbox Route107_Text_1B9589, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F43F:: @ 814F43F
- trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672
- msgbox Route107_Text_1B9630, 6
+ trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672
+ msgbox Route107_Text_1B9630, MSGBOX_AUTOCLOSE
end
Route107_EventScript_14F45A:: @ 814F45A
- trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788
- msgbox Route107_Text_1B9735, 6
+ trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788
+ msgbox Route107_Text_1B9735, MSGBOX_AUTOCLOSE
end