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

View File

@@ -3,12 +3,12 @@ MtPyre_3F_MapScripts:: @ 8231752
MtPyre_3F_EventScript_231753:: @ 8231753
trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
msgbox MtPyre_3F_Text_231869, 6
msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_23176A:: @ 823176A
trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
msgbox MtPyre_3F_Text_2318F2, 6
msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_231781:: @ 8231781
@@ -16,24 +16,24 @@ MtPyre_3F_EventScript_231781:: @ 8231781
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtPyre_3F_EventScript_2317CC
msgbox MtPyre_3F_Text_23199B, 4
msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT
release
end
MtPyre_3F_EventScript_2317AD:: @ 82317AD
special sub_80B4808
waitmovement 0
msgbox MtPyre_3F_Text_231A49, 4
msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT
setvar VAR_0x8004, 9
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 9
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
MtPyre_3F_EventScript_2317CC:: @ 82317CC
trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
msgbox MtPyre_3F_Text_231B0D, 6
msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
end
MtPyre_3F_Text_2317E3: @ 82317E3