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/SlateportCity_PokemonFanClub/scripts.inc
+27 -27
View File
@@ -17,7 +17,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
setvar VAR_0x40B7, 1
msgbox SlateportCity_PokemonFanClub_Text_20A445, 4
msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT
goto SlateportCity_PokemonFanClub_EventScript_209F45
end
@@ -37,17 +37,17 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA
compare VAR_0x40B7, 2
goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B
msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4
msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
goto SlateportCity_PokemonFanClub_EventScript_209F45
end
SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B
msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4
msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4
msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT
setvar VAR_TEMP_1, 0
checkflag FLAG_0x0CC
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B
@@ -79,7 +79,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0
return
SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6
msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4
msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT
release
end
@@ -87,10 +87,10 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0
checkitemspace ITEM_RED_SCARF, 1
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A795, 4
msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
setflag FLAG_0x0C8
giveitem_std ITEM_RED_SCARF
msgbox SlateportCity_PokemonFanClub_Text_20A827, 4
msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT
release
end
@@ -98,10 +98,10 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011
checkitemspace ITEM_BLUE_SCARF, 1
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A795, 4
msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
setflag FLAG_0x0C9
giveitem_std ITEM_BLUE_SCARF
msgbox SlateportCity_PokemonFanClub_Text_20A880, 4
msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT
release
end
@@ -109,10 +109,10 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042
checkitemspace ITEM_PINK_SCARF, 1
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A795, 4
msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
setflag FLAG_0x0CA
giveitem_std ITEM_PINK_SCARF
msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4
msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT
release
end
@@ -120,10 +120,10 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073
checkitemspace ITEM_GREEN_SCARF, 1
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A795, 4
msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
setflag FLAG_0x0CB
giveitem_std ITEM_GREEN_SCARF
msgbox SlateportCity_PokemonFanClub_Text_20A933, 4
msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT
release
end
@@ -131,15 +131,15 @@ SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4
checkitemspace ITEM_YELLOW_SCARF, 1
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A795, 4
msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
setflag FLAG_0x0CC
giveitem_std ITEM_YELLOW_SCARF
msgbox SlateportCity_PokemonFanClub_Text_20A984, 4
msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5
msgbox SlateportCity_PokemonFanClub_Text_20A719, 4
msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT
release
end
@@ -196,18 +196,18 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C
SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152
checkflag FLAG_0x156
goto_eq SlateportCity_PokemonFanClub_EventScript_20A168
msgbox SlateportCity_PokemonFanClub_Text_20A233, 4
msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
setflag FLAG_0x156
release
end
SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168
msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4
msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172
msgbox SlateportCity_PokemonFanClub_Text_20A233, 4
msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
setflag FLAG_0x156
return
@@ -216,7 +216,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
faceplayer
checkflag FLAG_0x116
goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE
msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4
msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetLeadMonFriendshipScore
compare VAR_RESULT, 4
goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3
@@ -229,7 +229,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
waitmovement 0
applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A
waitmovement 0
msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4
msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT
giveitem_std ITEM_SOOTHE_BELL
compare VAR_RESULT, 0
goto_eq SlateportCity_PokemonFanClub_EventScript_272054
@@ -238,16 +238,16 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
end
SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE
msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4
msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT
release
end
SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8
msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2
msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC
end
SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1
msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2
msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC
end
SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA
@@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA
faceplayer
waitse
playmoncry SPECIES_SKITTY, 0
msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4
msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -265,7 +265,7 @@ SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D
faceplayer
waitse
playmoncry SPECIES_ZIGZAGOON, 0
msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4
msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -275,7 +275,7 @@ SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220
faceplayer
waitse
playmoncry SPECIES_AZUMARILL, 0
msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4
msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT
waitmoncry
release
end