summaryrefslogtreecommitdiff
path: root/data/maps/Route127
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-12-02 12:31:54 -0600
committerGitHub <noreply@github.com>2018-12-02 12:31:54 -0600
commitc123b8d6f1787abce2d1e3920d40192811b5fa39 (patch)
tree37d1541b2e6babc04bd029a8ed4ec32ea03fa75d /data/maps/Route127
parentee05197eba782b9796b042f153890be10c4b492c (diff)
parent862265b73a6eab7d070e628d3cb77663543bc368 (diff)
Merge pull request #417 from melthelesbian/msgbox_documentation
adds constants, cleans up callstd and msgbox code
Diffstat (limited to 'data/maps/Route127')
-rw-r--r--data/maps/Route127/scripts.inc25
1 files changed, 11 insertions, 14 deletions
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 12e5bf127..399e7a428 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -28,37 +28,37 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B
Route127_EventScript_1F6A35:: @ 81F6A35
trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
- msgbox Route127_Text_2A22A1, 6
+ msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A4C:: @ 81F6A4C
trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
- msgbox Route127_Text_2A232C, 6
+ msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A63:: @ 81F6A63
trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
- msgbox Route127_Text_2A240C, 6
+ msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A7A:: @ 81F6A7A
trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
- msgbox Route127_Text_2A2494, 6
+ msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A91:: @ 81F6A91
trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
- msgbox Route127_Text_2A2538, 6
+ msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AA8:: @ 81F6AA8
trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
- msgbox Route127_Text_2A25D2, 6
+ msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6ABF:: @ 81F6ABF
trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
- msgbox Route127_Text_2A2832, 6
+ msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AD6:: @ 81F6AD6
@@ -66,23 +66,20 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route127_EventScript_1F6B21
- msgbox Route127_Text_2A26AC, 4
+ msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
release
end
Route127_EventScript_1F6B02:: @ 81F6B02
special sub_80B4808
waitmovement 0
- msgbox Route127_Text_2A26EE, 4
- setvar VAR_0x8004, 672
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 672
- callstd 8
+ msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
+ register_matchcall TRAINER_KOJI_1
release
end
Route127_EventScript_1F6B21:: @ 81F6B21
trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
- msgbox Route127_Text_2A278E, 6
+ msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
end