adds constants, cleans up callstd and msgbox code
* adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants
This commit is contained in:
@@ -3,7 +3,7 @@ Route107_MapScripts:: @ 81EE594
|
||||
|
||||
Route107_EventScript_1EE595:: @ 81EE595
|
||||
trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F
|
||||
msgbox Route107_Text_29675B, 6
|
||||
msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE5AC:: @ 81EE5AC
|
||||
@@ -11,48 +11,48 @@ Route107_EventScript_1EE5AC:: @ 81EE5AC
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, 1
|
||||
goto_eq Route107_EventScript_1EE5F7
|
||||
msgbox Route107_Text_2967FF, 4
|
||||
msgbox Route107_Text_2967FF, MSGBOX_DEFAULT
|
||||
release
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE5D8:: @ 81EE5D8
|
||||
special sub_80B4808
|
||||
waitmovement 0
|
||||
msgbox Route107_Text_29685A, 4
|
||||
msgbox Route107_Text_29685A, MSGBOX_DEFAULT
|
||||
setvar VAR_0x8004, 155
|
||||
special SetMatchCallRegisteredFlag
|
||||
setorcopyvar VAR_0x8000, 155
|
||||
callstd 8
|
||||
callstd STD_REGISTER_MATCH_CALL
|
||||
release
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE5F7:: @ 81EE5F7
|
||||
trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5
|
||||
msgbox Route107_Text_296923, 6
|
||||
msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE60E:: @ 81EE60E
|
||||
trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E
|
||||
msgbox Route107_Text_2969AB, 6
|
||||
msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE625:: @ 81EE625
|
||||
trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17
|
||||
msgbox Route107_Text_296A35, 6
|
||||
msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE63C:: @ 81EE63C
|
||||
trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
|
||||
msgbox Route107_Text_296ADC, 6
|
||||
msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE657:: @ 81EE657
|
||||
trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
|
||||
msgbox Route107_Text_296BE1, 6
|
||||
msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route107_EventScript_1EE672:: @ 81EE672
|
||||
trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD
|
||||
msgbox Route107_Text_296CC0, 6
|
||||
msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user