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
+10 -10
View File
@@ -33,32 +33,32 @@ Route105_MapScript2_1EE240: @ 81EE240
Route105_EventScript_1EE24A:: @ 81EE24A
trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
msgbox Route105_Text_295DAB, 6
msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE261:: @ 81EE261
trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
msgbox Route105_Text_295E72, 6
msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE278:: @ 81EE278
trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
msgbox Route105_Text_295F08, 6
msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE28F:: @ 81EE28F
trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
msgbox Route105_Text_295FAE, 6
msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2A6:: @ 81EE2A6
trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
msgbox Route105_Text_296076, 6
msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2BD:: @ 81EE2BD
trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
msgbox Route105_Text_2962EC, 6
msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2D4:: @ 81EE2D4
@@ -66,24 +66,24 @@ Route105_EventScript_1EE2D4:: @ 81EE2D4
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route105_EventScript_1EE31F
msgbox Route105_Text_2960FA, 4
msgbox Route105_Text_2960FA, MSGBOX_DEFAULT
release
end
Route105_EventScript_1EE300:: @ 81EE300
special sub_80B4808
waitmovement 0
msgbox Route105_Text_296159, 4
msgbox Route105_Text_296159, MSGBOX_DEFAULT
setvar VAR_0x8004, 737
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 737
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route105_EventScript_1EE31F:: @ 81EE31F
trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
msgbox Route105_Text_2961FE, 6
msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
end
Route104_Text_1EE336: @ 81EE336