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/Route102/scripts.inc
+14 -14
View File
@@ -2,19 +2,19 @@ Route102_MapScripts:: @ 81EC0E0
.byte 0
Route102_EventScript_1EC0E1:: @ 81EC0E1
msgbox Route102_Text_1EC2C0, 2
msgbox Route102_Text_1EC2C0, MSGBOX_NPC
end
Route102_EventScript_1EC0EA:: @ 81EC0EA
msgbox Route102_Text_1EC35B, 3
msgbox Route102_Text_1EC35B, MSGBOX_SIGN
end
Route102_EventScript_1EC0F3:: @ 81EC0F3
msgbox Route102_Text_1EC373, 3
msgbox Route102_Text_1EC373, MSGBOX_SIGN
end
Route102_EventScript_1EC0FC:: @ 81EC0FC
msgbox Route102_Text_1EC32E, 2
msgbox Route102_Text_1EC32E, MSGBOX_NPC
end
Route102_EventScript_1EC105:: @ 81EC105
@@ -26,7 +26,7 @@ Route102_EventScript_1EC105:: @ 81EC105
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route102_EventScript_1EC170
msgbox Route102_Text_2945AC, 4
msgbox Route102_Text_2945AC, MSGBOX_DEFAULT
release
end
@@ -39,48 +39,48 @@ Route102_EventScript_1EC146:: @ 81EC146
end
Route102_EventScript_1EC157:: @ 81EC157
msgbox Route102_Text_294668, 4
msgbox Route102_Text_294668, MSGBOX_DEFAULT
setvar VAR_0x8004, 318
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 318
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route102_EventScript_1EC170:: @ 81EC170
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route102_EventScript_1EC183
msgbox Route102_Text_2945AC, 4
msgbox Route102_Text_2945AC, MSGBOX_DEFAULT
release
end
Route102_EventScript_1EC183:: @ 81EC183
msgbox Route102_Text_2945EB, 4
msgbox Route102_Text_2945EB, MSGBOX_DEFAULT
setvar VAR_0x8004, 318
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 318
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route102_EventScript_1EC19C:: @ 81EC19C
trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C
msgbox Route102_Text_29473C, 6
msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE
end
Route102_EventScript_1EC1B3:: @ 81EC1B3
trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847
msgbox Route102_Text_294859, 6
msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE
end
Route102_EventScript_1EC1CA:: @ 81EC1CA
trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3
msgbox Route102_Text_294916, 6
msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE
end
Route102_EventScript_1EC1E1:: @ 81EC1E1
trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA
msgbox Route102_Text_2947DB, 6
msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE
end
PetalburgCity_Text_1EC1F8: @ 81EC1F8