summaryrefslogtreecommitdiff
path: root/data/maps/Route126
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-12-02 19:38:05 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-12-02 19:38:05 +0100
commit9828e0e97b8403a7614f4bec127af9233ae923cb (patch)
tree7a2b5d14e654e6f8171548692dc5f241de8cb748 /data/maps/Route126
parenta42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf (diff)
parentc123b8d6f1787abce2d1e3920d40192811b5fa39 (diff)
Merge with master
Diffstat (limited to 'data/maps/Route126')
-rw-r--r--data/maps/Route126/scripts.inc25
1 files changed, 11 insertions, 14 deletions
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 3ea9ba786..a773feb2b 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -9,37 +9,37 @@ Route126_MapScript1_1F68CC: @ 81F68CC
Route126_EventScript_1F68D6:: @ 81F68D6
trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8
- msgbox Route126_Text_2A1CDD, 6
+ msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F68ED:: @ 81F68ED
trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63
- msgbox Route126_Text_2A1D72, 6
+ msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6904:: @ 81F6904
trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8
- msgbox Route126_Text_2A1E03, 6
+ msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F691B:: @ 81F691B
trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63
- msgbox Route126_Text_2A1E70, 6
+ msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6932:: @ 81F6932
trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6
- msgbox Route126_Text_2A20F7, 6
+ msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6949:: @ 81F6949
trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3
- msgbox Route126_Text_2A21B8, 6
+ msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6960:: @ 81F6960
trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216
- msgbox Route126_Text_2A222A, 6
+ msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6977:: @ 81F6977
@@ -47,23 +47,20 @@ Route126_EventScript_1F6977:: @ 81F6977
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route126_EventScript_1F69C2
- msgbox Route126_Text_2A1F10, 4
+ msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT
release
end
Route126_EventScript_1F69A3:: @ 81F69A3
special sub_80B4808
waitmovement 0
- msgbox Route126_Text_2A1F5A, 4
- setvar VAR_0x8004, 377
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 377
- callstd 8
+ msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT
+ register_matchcall TRAINER_PABLO_1
release
end
Route126_EventScript_1F69C2:: @ 81F69C2
trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8
- msgbox Route126_Text_2A200C, 6
+ msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
end