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/Route104/scripts.inc
+64 -64
View File
@@ -104,27 +104,27 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B
checkflag FLAG_0x07C
goto_eq Route104_EventScript_1ECDD0
setflag FLAG_0x07C
msgbox Route104_Text_1EDBFF, 4
msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox Route104_Text_1EDC8F, 4
msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
setflag FLAG_0x0FD
applymovement 255, Route104_Movement_1ECDCD
applymovement 34, Route104_Movement_1ECDC8
msgbox Route104_Text_1EDCB1, 4
msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT
closemessage
waitmovement 0
applymovement 34, Route104_Movement_1ECDCA
waitmovement 0
moveobjectoffscreen 34
msgbox Route104_Text_1EDCED, 5
msgbox Route104_Text_1EDCED, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route104_EventScript_1ECDED
msgbox Route104_Text_1EDD2A, 4
msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
call Route104_EventScript_1ECE31
releaseall
end
@@ -144,15 +144,15 @@ Route104_Movement_1ECDCD: @ 81ECDCD
step_end
Route104_EventScript_1ECDD0:: @ 81ECDD0
msgbox Route104_Text_1EDD9F, 5
msgbox Route104_Text_1EDD9F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route104_EventScript_1ECDED
msgbox Route104_Text_1EDD2A, 4
msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
releaseall
end
Route104_EventScript_1ECDED:: @ 81ECDED
msgbox Route104_Text_1EDDDB, 4
msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECE36
case 1, Route104_EventScript_1ECE49
@@ -160,7 +160,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED
end
Route104_EventScript_1ECE1C:: @ 81ECE1C
msgbox Route104_Text_1EDE3E, 4
msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT
compare VAR_0x8008, 0
call_if 1, Route104_EventScript_1ECE31
releaseall
@@ -195,41 +195,41 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F
checkflag FLAG_0x07C
goto_eq Route104_EventScript_1ECEEC
setflag FLAG_0x07C
msgbox Route104_Text_1EDF04, 4
msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox Route104_Text_1EDFA0, 4
msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
setflag FLAG_0x0FD
applymovement 255, Route104_Movement_1ECDCD
applymovement 34, Route104_Movement_1ECDC8
msgbox Route104_Text_1EDFC6, 4
msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT
closemessage
waitmovement 0
applymovement 34, Route104_Movement_1ECDCA
waitmovement 0
moveobjectoffscreen 34
msgbox Route104_Text_1EE009, 5
msgbox Route104_Text_1EE009, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route104_EventScript_1ECF09
msgbox Route104_Text_1EE04D, 4
msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
call Route104_EventScript_1ECE31
releaseall
end
Route104_EventScript_1ECEEC:: @ 81ECEEC
msgbox Route104_Text_1EE094, 5
msgbox Route104_Text_1EE094, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route104_EventScript_1ECF09
msgbox Route104_Text_1EE04D, 4
msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
releaseall
end
Route104_EventScript_1ECF09:: @ 81ECF09
msgbox Route104_Text_1EE0C7, 4
msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECF4D
case 1, Route104_EventScript_1ECF60
@@ -237,7 +237,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09
end
Route104_EventScript_1ECF38:: @ 81ECF38
msgbox Route104_Text_1EE120, 4
msgbox Route104_Text_1EE120, MSGBOX_DEFAULT
compare VAR_0x8008, 0
call_if 1, Route104_EventScript_1ECE31
releaseall
@@ -276,17 +276,17 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C
faceplayer
checkflag FLAG_0x0F6
goto_eq Route104_EventScript_1ECFC3
msgbox Route104_Text_2A6D86, 4
msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT
giveitem_std ITEM_CHESTO_BERRY
compare VAR_RESULT, 0
goto_eq Route104_EventScript_272054
setflag FLAG_0x0F6
msgbox Route104_Text_2A6E32, 4
msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ECFC3:: @ 81ECFC3
msgbox Route104_Text_2A6E32, 4
msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
release
end
@@ -295,7 +295,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD
faceplayer
checkflag FLAG_0x117
goto_eq Route104_EventScript_1ECFFC
msgbox Route104_Text_1ED96A, 4
msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT
giveitem_std ITEM_WHITE_HERB
compare VAR_RESULT, 0
goto_eq Route104_EventScript_272054
@@ -304,44 +304,44 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD
end
Route104_EventScript_1ECFFC:: @ 81ECFFC
msgbox Route104_Text_1EDA0F, 4
msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED006:: @ 81ED006
msgbox Route104_Text_1ED5EC, 2
msgbox Route104_Text_1ED5EC, MSGBOX_NPC
end
Route104_EventScript_1ED00F:: @ 81ED00F
msgbox Route104_Text_1ED662, 3
msgbox Route104_Text_1ED662, MSGBOX_SIGN
end
Route104_EventScript_1ED018:: @ 81ED018
msgbox Route104_Text_1EDA8C, 3
msgbox Route104_Text_1EDA8C, MSGBOX_SIGN
end
Route104_EventScript_1ED021:: @ 81ED021
msgbox Route104_Text_1EDAA1, 3
msgbox Route104_Text_1EDAA1, MSGBOX_SIGN
end
Route104_EventScript_1ED02A:: @ 81ED02A
msgbox Route104_Text_1EDABC, 3
msgbox Route104_Text_1EDABC, MSGBOX_SIGN
end
Route104_EventScript_1ED033:: @ 81ED033
msgbox Route104_Text_1EDAD6, 3
msgbox Route104_Text_1EDAD6, MSGBOX_SIGN
end
Route104_EventScript_1ED03C:: @ 81ED03C
msgbox Route104_Text_1EDAEF, 3
msgbox Route104_Text_1EDAEF, MSGBOX_SIGN
end
Route104_EventScript_1ED045:: @ 81ED045
msgbox Route104_Text_1ED6A2, 2
msgbox Route104_Text_1ED6A2, MSGBOX_NPC
end
Route104_EventScript_1ED04E:: @ 81ED04E
msgbox Route104_Text_1ED735, 2
msgbox Route104_Text_1ED735, MSGBOX_NPC
end
Route104_EventScript_1ED057:: @ 81ED057
@@ -349,7 +349,7 @@ Route104_EventScript_1ED057:: @ 81ED057
faceplayer
checkflag FLAG_0x106
goto_eq Route104_EventScript_1ED086
msgbox Route104_Text_1ED838, 4
msgbox Route104_Text_1ED838, MSGBOX_DEFAULT
giveitem_std ITEM_TM09
compare VAR_RESULT, 0
goto_eq Route104_EventScript_272054
@@ -358,12 +358,12 @@ Route104_EventScript_1ED057:: @ 81ED057
end
Route104_EventScript_1ED086:: @ 81ED086
msgbox Route104_Text_1ED8E7, 4
msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED090:: @ 81ED090
msgbox Route104_Text_1ED7A2, 2
msgbox Route104_Text_1ED7A2, MSGBOX_NPC
end
Route104_EventScript_1ED099:: @ 81ED099
@@ -396,7 +396,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF
waitmessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox Route104_Text_1EE463, 4
msgbox Route104_Text_1EE463, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -438,12 +438,12 @@ Route104_EventScript_1ED139:: @ 81ED139
end
Route104_EventScript_1ED1B4:: @ 81ED1B4
msgbox Route104_Text_1E9AAF, 4
msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT
releaseall
end
Route104_EventScript_1ED1BE:: @ 81ED1BE
msgbox Route104_Text_1E9C1D, 4
msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT
releaseall
end
@@ -872,12 +872,12 @@ Route104_Movement_1ED35C: @ 81ED35C
Route104_EventScript_1ED35F:: @ 81ED35F
trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509
msgbox Route104_Text_29554E, 6
msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE
end
Route104_EventScript_1ED376:: @ 81ED376
trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4
msgbox Route104_Text_2955E8, 6
msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE
end
Route104_EventScript_1ED38D:: @ 81ED38D
@@ -889,7 +889,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route104_EventScript_1ED3F8
msgbox Route104_Text_295689, 4
msgbox Route104_Text_295689, MSGBOX_DEFAULT
release
end
@@ -902,33 +902,33 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE
end
Route104_EventScript_1ED3DF:: @ 81ED3DF
msgbox Route104_Text_29576B, 4
msgbox Route104_Text_29576B, MSGBOX_DEFAULT
setvar VAR_0x8004, 604
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 604
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED3F8:: @ 81ED3F8
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED40B
msgbox Route104_Text_295689, 4
msgbox Route104_Text_295689, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED40B:: @ 81ED40B
msgbox Route104_Text_2956FF, 4
msgbox Route104_Text_2956FF, MSGBOX_DEFAULT
setvar VAR_0x8004, 604
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 604
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED424:: @ 81ED424
trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0
msgbox Route104_Text_29580C, 6
msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE
end
Route104_EventScript_1ED43B:: @ 81ED43B
@@ -940,7 +940,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route104_EventScript_1ED4A6
msgbox Route104_Text_2958C1, 4
msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
release
end
@@ -953,33 +953,33 @@ Route104_EventScript_1ED47C:: @ 81ED47C
end
Route104_EventScript_1ED48D:: @ 81ED48D
msgbox Route104_Text_29595A, 4
msgbox Route104_Text_29595A, MSGBOX_DEFAULT
setvar VAR_0x8004, 136
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 136
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED4A6:: @ 81ED4A6
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED4B9
msgbox Route104_Text_2958C1, 4
msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED4B9:: @ 81ED4B9
msgbox Route104_Text_2958F8, 4
msgbox Route104_Text_2958F8, MSGBOX_DEFAULT
setvar VAR_0x8004, 136
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 136
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED4D2:: @ 81ED4D2
trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC
msgbox Route104_Text_295A1E, 6
msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE
end
Route104_EventScript_1ED4E9:: @ 81ED4E9
@@ -991,7 +991,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route104_EventScript_1ED554
msgbox Route104_Text_295AC3, 4
msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
release
end
@@ -1004,52 +1004,52 @@ Route104_EventScript_1ED52A:: @ 81ED52A
end
Route104_EventScript_1ED53B:: @ 81ED53B
msgbox Route104_Text_295B60, 4
msgbox Route104_Text_295B60, MSGBOX_DEFAULT
setvar VAR_0x8004, 114
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 114
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED554:: @ 81ED554
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route104_EventScript_1ED567
msgbox Route104_Text_295AC3, 4
msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED567:: @ 81ED567
msgbox Route104_Text_295B01, 4
msgbox Route104_Text_295B01, MSGBOX_DEFAULT
setvar VAR_0x8004, 114
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 114
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route104_EventScript_1ED580:: @ 81ED580
trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA
msgbox Route104_Text_295C1F, 6
msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE
end
Route104_EventScript_1ED597:: @ 81ED597
trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
special GetPlayerBigGuyGirlString
msgbox Route104_Text_2952FE, 4
msgbox Route104_Text_2952FE, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED5B6:: @ 81ED5B6
trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
special GetPlayerBigGuyGirlString
msgbox Route104_Text_29540D, 4
msgbox Route104_Text_29540D, MSGBOX_DEFAULT
release
end
Route104_EventScript_1ED5D5:: @ 81ED5D5
trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9
msgbox Route104_Text_295CD3, 6
msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE
end
Route104_Text_1ED5EC: @ 81ED5EC