dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

adds constants, cleans up callstd and msgbox code

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

20
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@@ -51,7 +51,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31
.2byte 0
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT
closemessage
applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
@@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8004, 5
special CallBattlePalaceFunction
lockall
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
setvar VAR_0x8004, 2
@@ -153,13 +153,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
@@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT
closemessage
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
waitmovement 0
@@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
waitfanfare
setvar VAR_0x8004, 13
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
@@ -189,13 +189,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
@@ -206,7 +206,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT
waitmessage
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
waitmovement 0
@@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
waitfanfare
setvar VAR_0x8004, 13
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0