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/MeteorFalls_1F_2R/scripts.inc
+12 -12
View File
@@ -6,24 +6,24 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MeteorFalls_1F_2R_EventScript_22C529
msgbox MeteorFalls_1F_2R_Text_22C6A3, 4
msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT
release
end
MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A
special sub_80B4808
waitmovement 0
msgbox MeteorFalls_1F_2R_Text_22C6F6, 4
msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT
setvar VAR_0x8004, 392
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 392
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529
trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD
msgbox MeteorFalls_1F_2R_Text_22C7D8, 6
msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE
end
MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
@@ -31,22 +31,22 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MeteorFalls_1F_2R_EventScript_22C589
msgbox MeteorFalls_1F_2R_Text_22C8C1, 4
msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT
release
end
MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570
msgbox MeteorFalls_1F_2R_Text_22C99C, 4
msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
setvar VAR_0x8004, 681
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 681
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589
trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27
msgbox MeteorFalls_1F_2R_Text_22CBC5, 6
msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE
end
MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
@@ -54,22 +54,22 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MeteorFalls_1F_2R_EventScript_22C5ED
msgbox MeteorFalls_1F_2R_Text_22CA70, 4
msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT
release
end
MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4
msgbox MeteorFalls_1F_2R_Text_22C99C, 4
msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
setvar VAR_0x8004, 681
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 681
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED
trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB
msgbox MeteorFalls_1F_2R_Text_22CD34, 6
msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE
end
MeteorFalls_1F_2R_Text_22C608: @ 822C608