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
@@ -40,9 +40,9 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
applymovement 255, VictoryRoad_1F_Movement_2725AA
waitmovement 0
msgbox VictoryRoad_1F_Text_235EE6, 4
msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC
msgbox VictoryRoad_1F_Text_236020, 4
msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT
clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
moveobjectoffscreen 4
setflag FLAG_0x07E
@@ -78,7 +78,7 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21
step_end
VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
msgbox VictoryRoad_1F_Text_236020, 2
msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC
end
VictoryRoad_1F_EventScript_235E35:: @ 8235E35
@@ -86,37 +86,37 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq VictoryRoad_1F_EventScript_235E5C
msgbox VictoryRoad_1F_Text_2360FE, 6
msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
msgbox VictoryRoad_1F_Text_2360FE, 6
msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235E73:: @ 8235E73
trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
msgbox VictoryRoad_1F_Text_2361E5, 6
msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
msgbox VictoryRoad_1F_Text_2362A4, 6
msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
msgbox VictoryRoad_1F_Text_236356, 6
msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
msgbox VictoryRoad_1F_Text_2363D5, 6
msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
msgbox VictoryRoad_1F_Text_2364BB, 6
msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_Text_235EE6: @ 8235EE6