summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_3F
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-02 03:37:46 -0500
committerMelody <melody@pallet.town>2018-12-02 03:37:46 -0500
commitc557ac61aef788f1630d3960dd2366bf000db8e0 (patch)
tree305dfa97c9dbceaa197cc3de648d69962a14c26d /data/maps/MtPyre_3F
parent145047d4389c68052ed8a5f4c1760238112004f3 (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/MtPyre_3F')
-rw-r--r--data/maps/MtPyre_3F/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index ec5373509..01a31a6ae 100644
--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -3,12 +3,12 @@ MtPyre_3F_MapScripts:: @ 8231752
MtPyre_3F_EventScript_231753:: @ 8231753
trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
- msgbox MtPyre_3F_Text_231869, 6
+ msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_23176A:: @ 823176A
trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
- msgbox MtPyre_3F_Text_2318F2, 6
+ msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_231781:: @ 8231781
@@ -16,24 +16,24 @@ MtPyre_3F_EventScript_231781:: @ 8231781
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtPyre_3F_EventScript_2317CC
- msgbox MtPyre_3F_Text_23199B, 4
+ msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT
release
end
MtPyre_3F_EventScript_2317AD:: @ 82317AD
special sub_80B4808
waitmovement 0
- msgbox MtPyre_3F_Text_231A49, 4
+ msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT
setvar VAR_0x8004, 9
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 9
- callstd 8
+ callstd STD_REGISTER_MATCH_CALL
release
end
MtPyre_3F_EventScript_2317CC:: @ 82317CC
trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
- msgbox MtPyre_3F_Text_231B0D, 6
+ msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
end
MtPyre_3F_Text_2317E3: @ 82317E3