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/Route113/scripts.inc
+23 -23
View File
@@ -25,37 +25,37 @@ Route113_EventScript_1F2189:: @ 81F2189
return
Route113_EventScript_1F218A:: @ 81F218A
msgbox Route113_Text_1F235B, 2
msgbox Route113_Text_1F235B, MSGBOX_NPC
end
Route113_EventScript_1F2193:: @ 81F2193
msgbox Route113_Text_1F23CA, 2
msgbox Route113_Text_1F23CA, MSGBOX_NPC
end
Route113_EventScript_1F219C:: @ 81F219C
msgbox Route113_Text_1F2440, 3
msgbox Route113_Text_1F2440, MSGBOX_SIGN
end
Route113_EventScript_1F21A5:: @ 81F21A5
msgbox Route113_Text_1F2456, 3
msgbox Route113_Text_1F2456, MSGBOX_SIGN
end
Route113_EventScript_1F21AE:: @ 81F21AE
msgbox Route113_Text_1F24F8, 3
msgbox Route113_Text_1F24F8, MSGBOX_SIGN
end
Route113_EventScript_1F21B7:: @ 81F21B7
msgbox Route113_Text_1F2471, 3
msgbox Route113_Text_1F2471, MSGBOX_SIGN
end
Route113_EventScript_1F21C0:: @ 81F21C0
trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68
msgbox Route113_Text_299D7D, 6
msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F21D7:: @ 81F21D7
trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C
msgbox Route113_Text_299E38, 6
msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F21EE:: @ 81F21EE
@@ -63,24 +63,24 @@ Route113_EventScript_1F21EE:: @ 81F21EE
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route113_EventScript_1F2239
msgbox Route113_Text_299F15, 4
msgbox Route113_Text_299F15, MSGBOX_DEFAULT
release
end
Route113_EventScript_1F221A:: @ 81F221A
special sub_80B4808
waitmovement 0
msgbox Route113_Text_299F49, 4
msgbox Route113_Text_299F49, MSGBOX_DEFAULT
setvar VAR_0x8004, 434
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 434
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route113_EventScript_1F2239:: @ 81F2239
trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9
msgbox Route113_Text_299FD8, 6
msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2250:: @ 81F2250
@@ -88,59 +88,59 @@ Route113_EventScript_1F2250:: @ 81F2250
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route113_EventScript_1F229B
msgbox Route113_Text_29A067, 4
msgbox Route113_Text_29A067, MSGBOX_DEFAULT
release
end
Route113_EventScript_1F227C:: @ 81F227C
special sub_80B4808
waitmovement 0
msgbox Route113_Text_29A0A2, 4
msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT
setvar VAR_0x8004, 419
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 419
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route113_EventScript_1F229B:: @ 81F229B
trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F
msgbox Route113_Text_29A13A, 6
msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22B2:: @ 81F22B2
trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6
msgbox Route113_Text_29A219, 6
msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22C9:: @ 81F22C9
trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
msgbox Route113_Text_29A2DE, 6
msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22E4:: @ 81F22E4
trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
msgbox Route113_Text_29A3DA, 6
msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22FF:: @ 81F22FF
trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508
msgbox Route113_Text_29A529, 6
msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2316:: @ 81F2316
trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480
msgbox Route113_Text_29A489, 6
msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F232D:: @ 81F232D
trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0
msgbox Route113_Text_29A5BE, 6
msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2344:: @ 81F2344
trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628
msgbox Route113_Text_29A65D, 6
msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
end
Route113_Text_1F235B: @ 81F235B