summaryrefslogtreecommitdiff
path: root/data/maps/Route132/scripts.inc
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-12-16 20:05:31 -0500
committerGitHub <noreply@github.com>2018-12-16 20:05:31 -0500
commite292d0ca8375a8c54907d6bcf404e2e084344156 (patch)
treeb9c59449d47bf73d98d3e38fa26804a163d871ab /data/maps/Route132/scripts.inc
parent10237e8d13b35474ea999b4e9139f9a48a80c53d (diff)
parentd1e6e705ccf05f93933ae4494b1d388550d81d26 (diff)
Merge branch 'master' into fldeff
Diffstat (limited to 'data/maps/Route132/scripts.inc')
-rw-r--r--data/maps/Route132/scripts.inc32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index a4ae6f716..aed4d0673 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9
.byte 0
Route132_EventScript_1F74EA:: @ 81F74EA
- trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC
- msgbox Route132_Text_2A3BC0, 6
+ trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
+ msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7501:: @ 81F7501
- trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39
- msgbox Route132_Text_2A3C49, 6
+ trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
+ msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7518:: @ 81F7518
- trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD
- msgbox Route132_Text_2A3CC5, 6
+ trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
+ msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F752F:: @ 81F752F
- trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C
- msgbox Route132_Text_2A3D8B, 6
+ trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
+ msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7546:: @ 81F7546
- trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8
- msgbox Route132_Text_2A3FE5, 6
+ trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
+ msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F755D:: @ 81F755D
- trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E
- msgbox Route132_Text_2A40A4, 6
+ trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
+ msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7574:: @ 81F7574
- trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD
- msgbox Route132_Text_2A3F03, 6
+ trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
+ msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F758B:: @ 81F758B
- trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C
- msgbox Route132_Text_2A3E4E, 6
+ trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
+ msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
end