summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_6F
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_6F
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_6F')
-rw-r--r--data/maps/MtPyre_6F/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index 8d5d912c2..943e0f31f 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -6,29 +6,29 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtPyre_6F_EventScript_231D86
- msgbox MtPyre_6F_Text_231DFC, 4
+ msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT
release
end
MtPyre_6F_EventScript_231D67:: @ 8231D67
special sub_80B4808
waitmovement 0
- msgbox MtPyre_6F_Text_231E43, 4
+ msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT
setvar VAR_0x8004, 108
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 108
- callstd 8
+ callstd STD_REGISTER_MATCH_CALL
release
end
MtPyre_6F_EventScript_231D86:: @ 8231D86
trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
- msgbox MtPyre_6F_Text_231EE1, 6
+ msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
end
MtPyre_6F_EventScript_231D9D:: @ 8231D9D
trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
- msgbox MtPyre_6F_Text_231F5C, 6
+ msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
end
MtPyre_6F_Text_231DB4: @ 8231DB4