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/RustboroCity_DevonCorp_2F/scripts.inc
+21 -21
View File
@@ -16,7 +16,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
faceplayer
compare VAR_0x40C4, 1
call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869
msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4
msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
release
end
@@ -27,12 +27,12 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869
checkflag FLAG_0x11F
goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6
msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4
msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
release
end
RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4
msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT
release
end
@@ -43,12 +43,12 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869
checkflag FLAG_0x0BC
goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0
msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4
msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
release
end
RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4
msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT
release
end
@@ -57,7 +57,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
faceplayer
compare VAR_0x40C4, 1
call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869
msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4
msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
release
end
@@ -68,7 +68,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03
compare VAR_0x40C4, 1
goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4
msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
checkitem ITEM_ROOT_FOSSIL, 1
compare VAR_RESULT, 1
goto_eq RustboroCity_DevonCorp_2F_EventScript_211933
@@ -85,7 +85,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933
waitmovement 0
applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A
waitmovement 0
msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5
msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
checkitem ITEM_CLAW_FOSSIL, 1
@@ -96,7 +96,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933
RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
bufferitemname 0, ITEM_ROOT_FOSSIL
msgbox RustboroCity_DevonCorp_2F_Text_212153, 4
msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
takeitem ITEM_ROOT_FOSSIL, 1
setvar VAR_0x40C4, 1
setvar VAR_0x40C5, 1
@@ -110,7 +110,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991
waitmovement 0
applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A
waitmovement 0
msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5
msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
checkitem ITEM_ROOT_FOSSIL, 1
@@ -121,7 +121,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991
RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
bufferitemname 0, ITEM_CLAW_FOSSIL
msgbox RustboroCity_DevonCorp_2F_Text_212153, 4
msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
takeitem ITEM_CLAW_FOSSIL, 1
setvar VAR_0x40C4, 1
setvar VAR_0x40C5, 2
@@ -129,12 +129,12 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
end
RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF
msgbox RustboroCity_DevonCorp_2F_Text_212046, 4
msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT
release
end
RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4
msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT
release
end
@@ -147,13 +147,13 @@ RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A
bufferspeciesname 1, SPECIES_LILEEP
msgbox RustboroCity_DevonCorp_2F_Text_212251, 4
msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
goto RustboroCity_DevonCorp_2F_EventScript_211A3E
end
RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C
bufferspeciesname 1, SPECIES_ANORITH
msgbox RustboroCity_DevonCorp_2F_Text_212251, 4
msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
goto RustboroCity_DevonCorp_2F_EventScript_211AE1
end
@@ -169,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, 5
msgbox gUnknown_08273374, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -179,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, 5
msgbox gUnknown_08273374, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
call RustboroCity_DevonCorp_2F_EventScript_273797
@@ -218,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, 5
msgbox gUnknown_08273374, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -228,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, 5
msgbox gUnknown_08273374, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
call RustboroCity_DevonCorp_2F_EventScript_273797
@@ -285,12 +285,12 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869
compare VAR_0x405A, 6
goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1
msgbox RustboroCity_DevonCorp_2F_Text_212338, 4
msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
release
end
RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1
msgbox RustboroCity_DevonCorp_2F_Text_212386, 4
msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT
release
end