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

66
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
View File

@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
releaseall
@@ -58,7 +58,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
lockall
delay 16
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT
waitmessage
closemessage
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
@@ -66,7 +66,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
releaseall
@@ -86,11 +86,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
waitmovement 0
lock
faceplayer
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT
closemessage
release
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
@@ -110,7 +110,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT
closemessage
special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
@@ -147,13 +147,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
@@ -164,7 +164,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0
@@ -172,7 +172,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
waitfanfare
setvar VAR_0x8004, 13
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT
closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -182,13 +182,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
@@ -199,7 +199,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePikeRandomRoom1_Text_25E118
@@ -207,7 +207,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
waitfanfare
setvar VAR_0x8004, 13
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT
closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
end
@@ -230,19 +230,19 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB
@@ -258,7 +258,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798
waitmovement 0
@@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special CallBattlePikeFunction
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
delay 16
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
@@ -290,7 +290,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 1
special CallBattlePikeFunction
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
setvar VAR_0x8005, 0
@@ -324,13 +324,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
compare VAR_0x8004, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT
closemessage
releaseall
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT
closemessage
waitse
playmoncry SPECIES_KIRLIA, 0
@@ -355,7 +355,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
waitse
playmoncry SPECIES_KIRLIA, 0
waitmoncry
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT
waitse
playmoncry SPECIES_KIRLIA, 0
waitmoncry
@@ -363,11 +363,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
waitmovement 0
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT
closemessage
waitse
playmoncry SPECIES_DUSCLOPS, 0
@@ -388,7 +388,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
waitse
playmoncry SPECIES_DUSCLOPS, 0
waitmoncry
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT
waitse
playmoncry SPECIES_DUSCLOPS, 0
waitmoncry
@@ -396,7 +396,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4
waitmovement 0
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751
@@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
faceplayer
setvar VAR_0x8004, 14
special CallBattlePikeFunction
msgbox gStringVar4, 4
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
release
@@ -599,7 +599,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
lock
faceplayer
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT
closemessage
release
end
@@ -613,7 +613,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
playfanfare MUS_ME_ASA
waitfanfare
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT
closemessage
release
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E
@@ -623,21 +623,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875
lock
faceplayer
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT
closemessage
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881
lock
faceplayer
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT
closemessage
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
lock
faceplayer
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT
closemessage
release
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4