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
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+32 -34
View File
@@ -34,7 +34,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -63,14 +63,14 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT
BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
setvar VAR_0x8004, 11
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
@@ -100,7 +100,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A5D6
waitmessage
special LoadPlayerParty
@@ -141,7 +141,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
call BattleFrontier_BattleDomeLobby_EventScript_23E8B4
BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
@@ -149,7 +149,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A61A
waitmessage
setvar VAR_0x8004, 13
@@ -215,7 +215,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
fadescreen 1
call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
copyvar VAR_0x8004, VAR_RESULT
@@ -224,7 +224,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5
msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61
case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60
@@ -262,7 +262,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special CallFrontierUtilFunc
setvar VAR_0x8004, 15
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
closemessage
call BattleFrontier_BattleDomeLobby_EventScript_249C6E
special HealPlayerParty
@@ -284,11 +284,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D
BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30
msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
@@ -302,7 +302,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
special LoadPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT
BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
release
@@ -350,11 +350,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5
return
BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD
msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4
msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT
return
BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06
msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT
return
BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F
@@ -366,11 +366,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15
return
BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B
msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4
msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT
return
BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24
msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT
return
BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D
@@ -449,56 +449,54 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
end
BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9
msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3
msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN
return
BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2
msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3
msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN
return
BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB
msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3
msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN
return
BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3
msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN
return
BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
setvar VAR_0x8004, 20
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
end
BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE
msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2
msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC
end
BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07
msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2
msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC
end
BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2
msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC
end
BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19
msgbox BattleFrontier_OutsideWest_Text_24AB06, 2
msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC
end
BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22
loadword 0, BattleFrontier_OutsideWest_Text_24AB44
callstd 2
msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC
end
BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B
loadword 0, BattleFrontier_OutsideWest_Text_24AB75
callstd 2
msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC
end
BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43
end
@@ -515,17 +513,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43
end
BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B
msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43
end
BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99
msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43
end
BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7
msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4
msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43
end