summaryrefslogtreecommitdiff
path: root/data/maps/Route116
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route116')
-rw-r--r--data/maps/Route116/events.inc32
-rw-r--r--data/maps/Route116/scripts.inc122
2 files changed, 71 insertions, 83 deletions
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
index f967ebbba..37c54eb7e 100644
--- a/data/maps/Route116/events.inc
+++ b/data/maps/Route116/events.inc
@@ -2,29 +2,29 @@ Route116_EventObjects: @ 852A4B8
object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0
object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0
object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0
- object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 17
- object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18
+ object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11
+ object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12
object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0
- object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, 1019
- object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020
+ object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER
+ object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL
object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0
object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0
- object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
- object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19
+ object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY
+ object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13
object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
- object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20
- object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021
+ object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14
+ object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP
object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0
object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0
object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0
- object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947
- object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001
- object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894
- object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813
+ object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
+ object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL
+ object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER
+ object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN
object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
- object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146
- object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21
+ object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION
+ object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15
object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0
object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0
@@ -48,8 +48,8 @@ Route116_MapBGEvents: @ 852A790
bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B
bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
- bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, 45
- bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96
+ bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION
+ bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES
Route116_MapEvents:: @ 852A814
map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 769d254a5..af9210a36 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -37,17 +37,17 @@ Route116_EventScript_1F2C70:: @ 81F2C70
goto_eq Route116_EventScript_1F2C8E
checkflag FLAG_0x08E
goto_eq Route116_EventScript_1F2C98
- msgbox Route116_Text_1F3140, 4
+ msgbox Route116_Text_1F3140, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F2C8E:: @ 81F2C8E
- msgbox Route116_Text_1F32C1, 4
+ msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F2C98:: @ 81F2C98
- msgbox Route116_Text_1F3166, 4
+ msgbox Route116_Text_1F3166, MSGBOX_DEFAULT
release
end
@@ -56,7 +56,7 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2
faceplayer
checkflag FLAG_0x11F
goto_eq Route116_EventScript_1F2D2B
- msgbox Route116_Text_1F3317, 4
+ msgbox Route116_Text_1F3317, MSGBOX_DEFAULT
goto Route116_EventScript_1F2CBB
end
@@ -65,7 +65,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
giveitem_std ITEM_REPEAT_BALL
compare VAR_RESULT, 0
goto_eq Route116_EventScript_1F2D39
- msgbox Route116_Text_1F3521, 4
+ msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2
call_if 1, Route116_EventScript_1F2D15
@@ -76,7 +76,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
compare VAR_FACING, 4
call_if 1, Route116_EventScript_1F2D20
removeobject VAR_LAST_TALKED
- clearflag FLAG_0x3B5
+ clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
setflag FLAG_0x100
release
end
@@ -92,12 +92,12 @@ Route116_EventScript_1F2D20:: @ 81F2D20
return
Route116_EventScript_1F2D2B:: @ 81F2D2B
- msgbox Route116_Text_1F35CE, 4
+ msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT
goto Route116_EventScript_1F2CBB
end
Route116_EventScript_1F2D39:: @ 81F2D39
- msgbox Route116_Text_1F3593, 4
+ msgbox Route116_Text_1F3593, MSGBOX_DEFAULT
release
end
@@ -126,29 +126,29 @@ Route116_Movement_1F2D4C: @ 81F2D4C
step_end
Route116_EventScript_1F2D57:: @ 81F2D57
- msgbox Route116_Text_1F379D, 3
+ msgbox Route116_Text_1F379D, MSGBOX_SIGN
end
Route116_EventScript_1F2D60:: @ 81F2D60
- msgbox Route116_Text_1F37B7, 3
+ msgbox Route116_Text_1F37B7, MSGBOX_SIGN
end
Route116_EventScript_1F2D69:: @ 81F2D69
- msgbox Route116_Text_1F380F, 3
+ msgbox Route116_Text_1F380F, MSGBOX_SIGN
end
Route116_EventScript_1F2D72:: @ 81F2D72
- msgbox Route116_Text_1F3825, 3
+ msgbox Route116_Text_1F3825, MSGBOX_SIGN
end
Route116_EventScript_1F2D7B:: @ 81F2D7B
- msgbox Route116_Text_1F38D4, 3
+ msgbox Route116_Text_1F38D4, MSGBOX_SIGN
end
Route116_EventScript_1F2D84:: @ 81F2D84
lock
faceplayer
- msgbox Route116_Text_1F309D, 4
+ msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_0x406F, 2
release
end
@@ -158,7 +158,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95
applymovement 11, Route116_Movement_2725A8
applymovement 255, Route116_Movement_2725A4
waitmovement 0
- msgbox Route116_Text_1F309D, 4
+ msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_0x406F, 2
releaseall
end
@@ -172,28 +172,28 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6
specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2DE2
- msgbox Route116_Text_1F3657, 4
+ msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F2DE2:: @ 81F2DE2
- msgbox Route116_Text_1F3718, 4
+ msgbox Route116_Text_1F3718, MSGBOX_DEFAULT
closemessage
goto Route116_EventScript_1F2E2A
end
Route116_EventScript_1F2DF1:: @ 81F2DF1
- msgbox Route116_Text_1F3657, 4
- msgbox Route116_Text_1F3688, 4
+ msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+ msgbox Route116_Text_1F3688, MSGBOX_DEFAULT
specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2E1B
- msgbox Route116_Text_1F375E, 4
+ msgbox Route116_Text_1F375E, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F2E1B:: @ 81F2E1B
- msgbox Route116_Text_1F36B4, 4
+ msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT
closemessage
goto Route116_EventScript_1F2E2A
end
@@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E
step_end
Route116_EventScript_1F2E89:: @ 81F2E89
- trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A
- msgbox Route116_Text_29BBC6, 6
+ trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
+ msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2EA0:: @ 81F2EA0
- trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25
- msgbox Route116_Text_29BC42, 6
+ trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
+ msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2EB7:: @ 81F2EB7
- trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+ trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2F4E
@@ -266,7 +266,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route116_EventScript_1F2F22
- msgbox Route116_Text_29BD92, 4
+ msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
release
end
@@ -279,47 +279,41 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8
Route116_EventScript_1F2F03:: @ 81F2F03
special sub_80B4808
waitmovement 0
- msgbox Route116_Text_29BE71, 4
- setvar VAR_0x8004, 273
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 273
- callstd 8
+ msgbox Route116_Text_29BE71, MSGBOX_DEFAULT
+ register_matchcall TRAINER_JERRY_1
release
end
Route116_EventScript_1F2F22:: @ 81F2F22
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F2F35
- msgbox Route116_Text_29BD92, 4
+ msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F2F35:: @ 81F2F35
- msgbox Route116_Text_29BDEF, 4
- setvar VAR_0x8004, 273
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 273
- callstd 8
+ msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT
+ register_matchcall TRAINER_JERRY_1
release
end
Route116_EventScript_1F2F4E:: @ 81F2F4E
- trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C
- msgbox Route116_Text_29BF68, 6
+ trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
+ msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F65:: @ 81F2F65
- trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F
- msgbox Route116_Text_29BB31, 6
+ trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
+ msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F7C:: @ 81F2F7C
- trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3
- msgbox Route116_Text_29BCCC, 6
+ trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
+ msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F93:: @ 81F2F93
- trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+ trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F302A
@@ -327,7 +321,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93
specialvar VAR_RESULT, sub_813B4E0
compare VAR_RESULT, 0
goto_eq Route116_EventScript_1F2FFE
- msgbox Route116_Text_29C010, 4
+ msgbox Route116_Text_29C010, MSGBOX_DEFAULT
release
end
@@ -340,53 +334,47 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4
Route116_EventScript_1F2FDF:: @ 81F2FDF
special sub_80B4808
waitmovement 0
- msgbox Route116_Text_29C096, 4
- setvar VAR_0x8004, 280
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 280
- callstd 8
+ msgbox Route116_Text_29C096, MSGBOX_DEFAULT
+ register_matchcall TRAINER_KAREN_1
release
end
Route116_EventScript_1F2FFE:: @ 81F2FFE
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route116_EventScript_1F3011
- msgbox Route116_Text_29C010, 4
+ msgbox Route116_Text_29C010, MSGBOX_DEFAULT
release
end
Route116_EventScript_1F3011:: @ 81F3011
- msgbox Route116_Text_29C052, 4
- setvar VAR_0x8004, 280
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 280
- callstd 8
+ msgbox Route116_Text_29C052, MSGBOX_DEFAULT
+ register_matchcall TRAINER_KAREN_1
release
end
Route116_EventScript_1F302A:: @ 81F302A
- trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F
- msgbox Route116_Text_29C13B, 6
+ trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
+ msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3041:: @ 81F3041
- trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8
- msgbox Route116_Text_29C1EA, 6
+ trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
+ msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3058:: @ 81F3058
- trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2
- msgbox Route116_Text_29C2DD, 6
+ trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
+ msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F306F:: @ 81F306F
- trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365
- msgbox Route116_Text_29C380, 6
+ trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
+ msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3086:: @ 81F3086
- trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7
- msgbox Route116_Text_29C418, 6
+ trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
+ msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
end
Route116_Text_1F309D: @ 81F309D