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/Route127/scripts.inc
+11 -11
View File
@@ -28,37 +28,37 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B
Route127_EventScript_1F6A35:: @ 81F6A35
trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
msgbox Route127_Text_2A22A1, 6
msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A4C:: @ 81F6A4C
trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
msgbox Route127_Text_2A232C, 6
msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A63:: @ 81F6A63
trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
msgbox Route127_Text_2A240C, 6
msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A7A:: @ 81F6A7A
trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
msgbox Route127_Text_2A2494, 6
msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A91:: @ 81F6A91
trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
msgbox Route127_Text_2A2538, 6
msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AA8:: @ 81F6AA8
trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
msgbox Route127_Text_2A25D2, 6
msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6ABF:: @ 81F6ABF
trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
msgbox Route127_Text_2A2832, 6
msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AD6:: @ 81F6AD6
@@ -66,23 +66,23 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route127_EventScript_1F6B21
msgbox Route127_Text_2A26AC, 4
msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
release
end
Route127_EventScript_1F6B02:: @ 81F6B02
special sub_80B4808
waitmovement 0
msgbox Route127_Text_2A26EE, 4
msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
setvar VAR_0x8004, 672
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 672
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route127_EventScript_1F6B21:: @ 81F6B21
trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
msgbox Route127_Text_2A278E, 6
msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
end