summaryrefslogtreecommitdiff
path: root/data/maps/Route115
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-04-23 18:08:40 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-04-23 18:08:40 -0400
commit214d9974979ded1b471a383dc2e9477141e90d15 (patch)
tree4b1828166e9785701176a6fb5b47f97235e72c3a /data/maps/Route115
parent71094356313801bf20191f3db1efa0decd3c3dcb (diff)
Use msgbox constants
Diffstat (limited to 'data/maps/Route115')
-rw-r--r--data/maps/Route115/scripts.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 31d4a2860..e24898475 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -2,15 +2,15 @@ Route115_MapScripts:: @ 815092D
.byte 0
Route115_EventScript_15092E:: @ 815092E
- msgbox Route115_Text_170273, 2
+ msgbox Route115_Text_170273, MSGBOX_NPC
end
Route115_EventScript_150937:: @ 8150937
- msgbox Route115_Text_1702E7, 3
+ msgbox Route115_Text_1702E7, MSGBOX_SIGN
end
Route115_EventScript_150940:: @ 8150940
- msgbox Route115_Text_170301, 3
+ msgbox Route115_Text_170301, MSGBOX_SIGN
end
Route115_EventScript_150949:: @ 8150949
@@ -18,17 +18,17 @@ Route115_EventScript_150949:: @ 8150949
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route115_EventScript_150970
- msgbox Route115_Text_1BCA0E, 6
+ msgbox Route115_Text_1BCA0E, MSGBOX_AUTOCLOSE
end
Route115_EventScript_150970:: @ 8150970
trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_1BCA6B, Route115_Text_1BCAB3
- msgbox Route115_Text_1BCAC6, 6
+ msgbox Route115_Text_1BCAC6, MSGBOX_AUTOCLOSE
end
Route115_EventScript_150987:: @ 8150987
trainerbattle_single TRAINER_KOICHI, Route115_Text_1BCB0D, Route115_Text_1BCB2E
- msgbox Route115_Text_1BCB40, 6
+ msgbox Route115_Text_1BCB40, MSGBOX_AUTOCLOSE
end
Route115_EventScript_15099E:: @ 815099E
@@ -36,12 +36,12 @@ Route115_EventScript_15099E:: @ 815099E
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route115_EventScript_1509C5
- msgbox Route115_Text_1BCBDE, 6
+ msgbox Route115_Text_1BCBDE, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1509C5:: @ 81509C5
trainerbattle_rematch TRAINER_NOB_1, Route115_Text_1BCC4C, Route115_Text_1BCCA2
- msgbox Route115_Text_1BCCBA, 6
+ msgbox Route115_Text_1BCCBA, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1509DC:: @ 81509DC
@@ -49,20 +49,20 @@ Route115_EventScript_1509DC:: @ 81509DC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route115_EventScript_150A03
- msgbox Route115_Text_1BCD4C, 6
+ msgbox Route115_Text_1BCD4C, MSGBOX_AUTOCLOSE
end
Route115_EventScript_150A03:: @ 8150A03
trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_1BCDB0, Route115_Text_1BCDD0
- msgbox Route115_Text_1BCDEF, 6
+ msgbox Route115_Text_1BCDEF, MSGBOX_AUTOCLOSE
end
Route115_EventScript_150A1A:: @ 8150A1A
.ifdef SAPPHIRE
trainerbattle_single TRAINER_514, UnknownString_81BCE47, UnknownString_81BCE7D
- msgbox UnknownString_81BCEA4, 6
+ msgbox UnknownString_81BCEA4, MSGBOX_AUTOCLOSE
.else
trainerbattle_single TRAINER_514, Route115_Text_1BCEE0, Route115_Text_1BCF16
- msgbox Route115_Text_1BCF3D, 6
+ msgbox Route115_Text_1BCF3D, MSGBOX_AUTOCLOSE
.endc
end