diff options
| author | Melody <melody@pallet.town> | 2018-12-02 03:37:46 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-02 03:37:46 -0500 |
| commit | c557ac61aef788f1630d3960dd2366bf000db8e0 (patch) | |
| tree | 305dfa97c9dbceaa197cc3de648d69962a14c26d /data/maps/Route125/scripts.inc | |
| parent | 145047d4389c68052ed8a5f4c1760238112004f3 (diff) | |
adds constants, cleans up callstd and msgbox code
* 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
Diffstat (limited to 'data/maps/Route125/scripts.inc')
| -rw-r--r-- | data/maps/Route125/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2dda3fb2d..c1771a83b 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -28,22 +28,22 @@ Route125_MapScript2_1F679A: @ 81F679A Route125_EventScript_1F67A4:: @ 81F67A4 trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, 6 + msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, 6 + msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, 6 + msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, 6 + msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 @@ -51,43 +51,43 @@ Route125_EventScript_1F6800:: @ 81F6800 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, 4 + msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 - msgbox Route125_Text_2A17CF, 4 + msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT setvar VAR_0x8004, 492 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 492 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route125_EventScript_1F684B:: @ 81F684B trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, 6 + msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6862:: @ 81F6862 trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, 6 + msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE end Route125_EventScript_1F687D:: @ 81F687D trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, 6 + msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6898:: @ 81F6898 trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, 6 + msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, 6 + msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end |