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/MossdeepCity_Gym/scripts.inc
+22 -22
View File
@@ -55,7 +55,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898
goto_eq MossdeepCity_Gym_EventScript_22097E
checkflag FLAG_0x0AB
goto_if 0, MossdeepCity_Gym_EventScript_220937
msgbox MossdeepCity_Gym_Text_221B1D, 4
msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT
release
end
@@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
message MossdeepCity_Gym_Text_22196A
waitmessage
call MossdeepCity_Gym_EventScript_27207E
msgbox MossdeepCity_Gym_Text_221999, 4
msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
setflag FLAG_0x4F6
setflag FLAG_BADGE07_GET
setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
@@ -83,7 +83,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox MossdeepCity_Gym_Text_221AEA, 4
msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -95,7 +95,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
goto_eq MossdeepCity_Gym_EventScript_272054
msgbox MossdeepCity_Gym_Text_221A40, 4
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
setflag FLAG_0x0AB
release
end
@@ -104,13 +104,13 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
goto_eq MossdeepCity_Gym_EventScript_27205E
msgbox MossdeepCity_Gym_Text_221A40, 4
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
setflag FLAG_0x0AB
return
MossdeepCity_Gym_EventScript_22097E:: @ 822097E
trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
msgbox MossdeepCity_Gym_Text_221E45, 6
msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220999:: @ 8220999
@@ -212,62 +212,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
msgbox MossdeepCity_Gym_Text_220ED3, 6
msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
msgbox MossdeepCity_Gym_Text_220F3A, 6
msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
msgbox MossdeepCity_Gym_Text_221055, 6
msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
msgbox MossdeepCity_Gym_Text_22116A, 6
msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
msgbox MossdeepCity_Gym_Text_22123D, 6
msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
msgbox MossdeepCity_Gym_Text_22132E, 6
msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
msgbox MossdeepCity_Gym_Text_221412, 6
msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
msgbox MossdeepCity_Gym_Text_2214D3, 6
msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
msgbox MossdeepCity_Gym_Text_221680, 6
msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
msgbox MossdeepCity_Gym_Text_2215E2, 6
msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
msgbox MossdeepCity_Gym_Text_22173A, 6
msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
msgbox MossdeepCity_Gym_Text_221545, 6
msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
@@ -275,12 +275,12 @@ MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
faceplayer
checkflag FLAG_0x4F6
goto_eq MossdeepCity_Gym_EventScript_220C26
msgbox MossdeepCity_Gym_Text_220CD5, 4
msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT
release
end
MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
msgbox MossdeepCity_Gym_Text_220E2A, 4
msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT
release
end
@@ -304,12 +304,12 @@ MossdeepCity_Gym_EventScript_220C43:: @ 8220C43
end
MossdeepCity_Gym_EventScript_220C53:: @ 8220C53
msgbox MossdeepCity_Gym_Text_221CCA, 4
msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT
releaseall
end
MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D
msgbox MossdeepCity_Gym_Text_221CB0, 4
msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT
releaseall
end