summaryrefslogtreecommitdiff
path: root/data/maps/Route129
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/Route129
parent10237e8d13b35474ea999b4e9139f9a48a80c53d (diff)
parentd1e6e705ccf05f93933ae4494b1d388550d81d26 (diff)
Merge branch 'master' into fldeff
Diffstat (limited to 'data/maps/Route129')
-rw-r--r--data/maps/Route129/scripts.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 170d87e56..b58e9ddd4 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2
.2byte 0
Route129_EventScript_1F72EC:: @ 81F72EC
- trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D
- msgbox Route129_Text_2A2FB9, 6
+ trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
+ msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7303:: @ 81F7303
- trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034
- msgbox Route129_Text_2A3048, 6
+ trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
+ msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F731A:: @ 81F731A
- trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1
- msgbox Route129_Text_2A3114, 6
+ trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
+ msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7331:: @ 81F7331
- trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D
- msgbox Route129_Text_2A31A6, 6
+ trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
+ msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7348:: @ 81F7348
- trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239
- msgbox Route129_Text_2A3252, 6
+ trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
+ msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
end