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:
Melody
2018-12-02 03:37:46 -05:00
parent 145047d438
commit c557ac61ae
354 changed files with 4538 additions and 4531 deletions
+8 -8
View File
@@ -2,17 +2,17 @@ Route106_MapScripts:: @ 81EE489
.byte 0
Route106_EventScript_1EE48A:: @ 81EE48A
msgbox Route106_Text_1EE53A, 3
msgbox Route106_Text_1EE53A, MSGBOX_SIGN
end
Route106_EventScript_1EE493:: @ 81EE493
trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD
msgbox Route106_Text_296608, 6
msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE
end
Route106_EventScript_1EE4AA:: @ 81EE4AA
trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674
msgbox Route106_Text_29669E, 6
msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE
end
Route106_EventScript_1EE4C1:: @ 81EE4C1
@@ -20,29 +20,29 @@ Route106_EventScript_1EE4C1:: @ 81EE4C1
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route106_EventScript_1EE50C
msgbox Route106_Text_29638C, 4
msgbox Route106_Text_29638C, MSGBOX_DEFAULT
release
end
Route106_EventScript_1EE4ED:: @ 81EE4ED
special sub_80B4808
waitmovement 0
msgbox Route106_Text_2963E3, 4
msgbox Route106_Text_2963E3, MSGBOX_DEFAULT
setvar VAR_0x8004, 339
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 339
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route106_EventScript_1EE50C:: @ 81EE50C
trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477
msgbox Route106_Text_296493, 6
msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE
end
Route106_EventScript_1EE523:: @ 81EE523
trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553
msgbox Route106_Text_296588, 6
msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE
end
Route106_Text_1EE53A: @ 81EE53A