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/LavaridgeTown_Gym_1F/scripts.inc
+18 -18
View File
@@ -65,7 +65,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864
checkflag FLAG_0x0A8
goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D
msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT
release
end
@@ -73,7 +73,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
message LavaridgeTown_Gym_1F_Text_1FF32F
waitmessage
call LavaridgeTown_Gym_1F_EventScript_27207E
msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
setflag FLAG_0x06C
setflag FLAG_0x4F3
setflag FLAG_BADGE04_GET
@@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
giveitem_std ITEM_TM50
compare VAR_RESULT, 0
goto_eq LavaridgeTown_Gym_1F_EventScript_272054
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
setflag FLAG_0x0A8
release
end
@@ -109,18 +109,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
giveitem_std ITEM_TM50
compare VAR_RESULT, 0
goto_eq LavaridgeTown_Gym_1F_EventScript_27205E
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
setflag FLAG_0x0A8
return
LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E
msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6
msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F
trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6
msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A
@@ -134,37 +134,37 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A
LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF
trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6
msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA
trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6
msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5
trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6
msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900
trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6
msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B
trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6
msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936
trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6
msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A
msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6
msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE
end
LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
@@ -172,12 +172,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
faceplayer
checkflag FLAG_0x4F3
goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981
msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4
msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT
release
end
LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981
msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4
msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT
release
end
@@ -196,12 +196,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B
end
LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB
msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT
releaseall
end
LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5
msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4
msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT
releaseall
end