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/Route121/scripts.inc
+24 -24
View File
@@ -2,15 +2,15 @@ Route121_MapScripts:: @ 81F5DFC
.byte 0
Route121_EventScript_1F5DFD:: @ 81F5DFD
msgbox Route121_Text_1F607F, 2
msgbox Route121_Text_1F607F, MSGBOX_NPC
end
Route121_EventScript_1F5E06:: @ 81F5E06
msgbox Route121_Text_1F60D3, 3
msgbox Route121_Text_1F60D3, MSGBOX_SIGN
end
Route121_EventScript_1F5E0F:: @ 81F5E0F
msgbox Route121_Text_1F611E, 3
msgbox Route121_Text_1F611E, MSGBOX_SIGN
end
Route121_EventScript_1F5E18:: @ 81F5E18
@@ -18,7 +18,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18
playbgm MUS_AQA_0, 0
applymovement 13, Route121_Movement_2725B8
waitmovement 0
msgbox Route121_Text_1F605A, 4
msgbox Route121_Text_1F605A, MSGBOX_DEFAULT
closemessage
applymovement 12, Route121_Movement_1F5E59
applymovement 13, Route121_Movement_1F5E62
@@ -67,7 +67,7 @@ Route121_Movement_1F5E6B: @ 81F5E6B
Route121_EventScript_1F5E74:: @ 81F5E74
trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F
msgbox Route121_Text_29F138, 6
msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5E8B:: @ 81F5E8B
@@ -75,39 +75,39 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route121_EventScript_1F5ED6
msgbox Route121_Text_29F21E, 4
msgbox Route121_Text_29F21E, MSGBOX_DEFAULT
release
end
Route121_EventScript_1F5EB7:: @ 81F5EB7
special sub_80B4808
waitmovement 0
msgbox Route121_Text_29F25B, 4
msgbox Route121_Text_29F25B, MSGBOX_DEFAULT
setvar VAR_0x8004, 254
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 254
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route121_EventScript_1F5ED6:: @ 81F5ED6
trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A
msgbox Route121_Text_29F32B, 6
msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5EED:: @ 81F5EED
trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9
msgbox Route121_Text_29F3C6, 6
msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5F04:: @ 81F5F04
trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
msgbox Route121_Text_29F476, 6
msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5F1F:: @ 81F5F1F
trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
msgbox Route121_Text_29F582, 6
msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5F3A:: @ 81F5F3A
@@ -115,44 +115,44 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route121_EventScript_1F5F85
msgbox Route121_Text_29F66F, 4
msgbox Route121_Text_29F66F, MSGBOX_DEFAULT
release
end
Route121_EventScript_1F5F66:: @ 81F5F66
special sub_80B4808
waitmovement 0
msgbox Route121_Text_29F69F, 4
msgbox Route121_Text_29F69F, MSGBOX_DEFAULT
setvar VAR_0x8004, 127
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 127
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route121_EventScript_1F5F85:: @ 81F5F85
trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710
msgbox Route121_Text_29F740, 6
msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5F9C:: @ 81F5F9C
trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B
msgbox Route121_Text_29F9AE, 6
msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5FB3:: @ 81F5FB3
trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64
msgbox Route121_Text_29FA73, 6
msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5FCA:: @ 81F5FCA
trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8
msgbox Route121_Text_29FAEA, 6
msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5FE1:: @ 81F5FE1
trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C
msgbox Route121_Text_29FBA8, 6
msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE
end
Route121_EventScript_1F5FF8:: @ 81F5FF8
@@ -160,24 +160,24 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route121_EventScript_1F6043
msgbox Route121_Text_29F7D4, 4
msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT
release
end
Route121_EventScript_1F6024:: @ 81F6024
special sub_80B4808
waitmovement 0
msgbox Route121_Text_29F80D, 4
msgbox Route121_Text_29F80D, MSGBOX_DEFAULT
setvar VAR_0x8004, 767
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 767
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route121_EventScript_1F6043:: @ 81F6043
trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8
msgbox Route121_Text_29F8D0, 6
msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE
end
Route121_Text_1F605A: @ 81F605A