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
@@ -4,7 +4,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F
MagmaHideout_4F_EventScript_23A560:: @ 823A560
lockall
playbgm MUS_MGM0, 0
msgbox MagmaHideout_4F_Text_23A9F4, 4
msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT
closemessage
delay 20
setvar VAR_RESULT, 1
@@ -48,17 +48,17 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
delay 30
applymovement 6, MagmaHideout_4F_Movement_23A680
waitmovement 0
msgbox MagmaHideout_4F_Text_23AADA, 4
msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
closemessage
applymovement 255, MagmaHideout_4F_Movement_2725A8
waitmovement 0
delay 30
applymovement 6, MagmaHideout_4F_Movement_27259E
waitmovement 0
msgbox MagmaHideout_4F_Text_23AB33, 4
msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
closemessage
trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5
msgbox MagmaHideout_4F_Text_23ABE2, 4
msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT
closemessage
clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
@@ -110,22 +110,22 @@ MagmaHideout_4F_Movement_23A680: @ 823A680
MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
msgbox MagmaHideout_4F_Text_23A7B5, 6
msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3
trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
msgbox MagmaHideout_4F_Text_23A841, 6
msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA
trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
msgbox MagmaHideout_4F_Text_23A8C6, 6
msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1
trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
msgbox MagmaHideout_4F_Text_23A9AC, 6
msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE
end
MagmaHideout_4F_Text_23A6E8: @ 823A6E8