summaryrefslogtreecommitdiff
path: root/data/maps/Route109
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route109')
-rw-r--r--data/maps/Route109/events.inc20
-rw-r--r--data/maps/Route109/scripts.inc112
2 files changed, 63 insertions, 69 deletions
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
index e74aa5dfa..322055874 100644
--- a/data/maps/Route109/events.inc
+++ b/data/maps/Route109/events.inc
@@ -1,6 +1,6 @@
Route109_EventObjects: @ 8528A34
- object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744
- object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
+ object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+ object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY
object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
@@ -8,7 +8,7 @@ Route109_EventObjects: @ 8528A34
object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
- object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005
+ object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP
object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
@@ -21,7 +21,7 @@ Route109_EventObjects: @ 8528A34
object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
- object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140
+ object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_0x474
object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0
Route109_MapWarps: @ 8528C74
@@ -30,12 +30,12 @@ Route109_MapWarps: @ 8528C74
Route109_MapBGEvents: @ 8528C7C
bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B
bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34
- bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, 50
- bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52
- bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51
- bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64
- bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90
- bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91
+ bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE
+ bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1
+ bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL
+ bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER
+ bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2
+ bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3
Route109_MapEvents:: @ 8528CDC
map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index 84f7b7c34..050dad358 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -44,16 +44,16 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
applymovement 255, Route109_Movement_1EE900
waitmovement 0
addobject 4
- clearflag FLAG_0x2E7
+ clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setobjectxyperm 2, 12, 8
addobject 2
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
applymovement 2, Route109_Movement_1EE90D
waitmovement 0
- clearflag FLAG_0x2E4
- setflag FLAG_0x2E8
+ clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+ setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
hideobjectat 1, MAP_ROUTE109
- msgbox Route109_Text_1E9C1D, 4
+ msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
closemessage
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_ROUTE109
@@ -279,7 +279,7 @@ Route109_EventScript_1EE910:: @ 81EE910
Route109_EventScript_1EE921:: @ 81EE921
message Route109_Text_1EEC96
- msgbox Route109_Text_1EEC96, 5
+ msgbox Route109_Text_1EEC96, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route109_EventScript_1EE981
goto Route109_EventScript_1EE972
@@ -296,29 +296,29 @@ Route109_EventScript_1EE93F:: @ 81EE93F
end
Route109_EventScript_1EE972:: @ 81EE972
- msgbox Route109_Text_1EED06, 4
+ msgbox Route109_Text_1EED06, MSGBOX_DEFAULT
closemessage
goto Route109_EventScript_1EE760
end
Route109_EventScript_1EE981:: @ 81EE981
- msgbox Route109_Text_1EED5E, 4
+ msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT
release
end
Route109_EventScript_1EE98B:: @ 81EE98B
- msgbox Route109_Text_1EEE72, 4
+ msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT
release
end
Route109_EventScript_1EE995:: @ 81EE995
- msgbox Route109_Text_1EEEB4, 2
+ msgbox Route109_Text_1EEEB4, MSGBOX_NPC
end
Route109_EventScript_1EE99E:: @ 81EE99E
lock
faceplayer
- msgbox Route109_Text_1EEFB0, 4
+ msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
waitmovement 0
@@ -331,7 +331,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
special GetPlayerBigGuyGirlString
checkflag FLAG_0x118
goto_eq Route109_EventScript_1EE9F2
- msgbox Route109_Text_1EEFDE, 4
+ msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT
giveitem_std ITEM_SOFT_SAND
compare VAR_RESULT, 0
goto_eq Route109_EventScript_272054
@@ -343,18 +343,18 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
end
Route109_EventScript_1EE9F2:: @ 81EE9F2
- msgbox Route109_Text_1EEFF1, 4
+ msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
waitmovement 0
release
end
Route109_EventScript_1EEA06:: @ 81EEA06
- msgbox Route109_Text_1EEF08, 2
+ msgbox Route109_Text_1EEF08, MSGBOX_NPC
end
Route109_EventScript_1EEA0F:: @ 81EEA0F
- msgbox Route109_Text_1EF080, 2
+ msgbox Route109_Text_1EF080, MSGBOX_NPC
end
Route109_EventScript_1EEA18:: @ 81EEA18
@@ -362,127 +362,121 @@ Route109_EventScript_1EEA18:: @ 81EEA18
faceplayer
waitse
playmoncry SPECIES_ZIGZAGOON, 0
- msgbox Route109_Text_1EF173, 4
+ msgbox Route109_Text_1EF173, MSGBOX_DEFAULT
waitmoncry
release
end
Route109_EventScript_1EEA2B:: @ 81EEA2B
- msgbox Route109_Text_1EF185, 3
+ msgbox Route109_Text_1EF185, MSGBOX_SIGN
end
Route109_EventScript_1EEA34:: @ 81EEA34
- msgbox Route109_Text_1EF1D5, 3
+ msgbox Route109_Text_1EF1D5, MSGBOX_SIGN
end
Route109_EventScript_1EEA3D:: @ 81EEA3D
- trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D
- msgbox Route109_Text_297191, 6
+ trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
+ msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA54:: @ 81EEA54
- trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD
- msgbox Route109_Text_29720F, 6
+ trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
+ msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA6B:: @ 81EEA6B
- trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B
- msgbox Route109_Text_29728C, 6
+ trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
+ msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA82:: @ 81EEA82
- trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE
- msgbox Route109_Text_2972ED, 6
+ trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
+ msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA99:: @ 81EEA99
- trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
+ trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route109_EventScript_1EEAE4
- msgbox Route109_Text_297380, 4
+ msgbox Route109_Text_297380, MSGBOX_DEFAULT
release
end
Route109_EventScript_1EEAC5:: @ 81EEAC5
special sub_80B4808
waitmovement 0
- msgbox Route109_Text_2973C1, 4
- setvar VAR_0x8004, 64
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 64
- callstd 8
+ msgbox Route109_Text_2973C1, MSGBOX_DEFAULT
+ register_matchcall TRAINER_RICKY_1
release
end
Route109_EventScript_1EEAE4:: @ 81EEAE4
- trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437
- msgbox Route109_Text_297458, 6
+ trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437
+ msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEAFB:: @ 81EEAFB
- trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
+ trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route109_EventScript_1EEB46
- msgbox Route109_Text_2974D6, 4
+ msgbox Route109_Text_2974D6, MSGBOX_DEFAULT
release
end
Route109_EventScript_1EEB27:: @ 81EEB27
special sub_80B4808
waitmovement 0
- msgbox Route109_Text_297520, 4
- setvar VAR_0x8004, 57
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 57
- callstd 8
+ msgbox Route109_Text_297520, MSGBOX_DEFAULT
+ register_matchcall TRAINER_LOLA_1
release
end
Route109_EventScript_1EEB46:: @ 81EEB46
- trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576
- msgbox Route109_Text_29757D, 6
+ trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576
+ msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEB5D:: @ 81EEB5D
- trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601
- msgbox Route109_Text_29762A, 6
+ trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
+ msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEB74:: @ 81EEB74
- trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691
- msgbox Route109_Text_2976A4, 6
+ trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
+ msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEB8B:: @ 81EEB8B
- trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC
- msgbox Route109_Text_297715, 6
+ trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
+ msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEBA2:: @ 81EEBA2
- trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
- msgbox Route109_Text_2977C7, 6
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
+ msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEBBD:: @ 81EEBBD
- trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
- msgbox Route109_Text_2978F1, 6
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
+ msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEBD8:: @ 81EEBD8
- trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE
- msgbox Route109_Text_2979BF, 6
+ trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
+ msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEBEF:: @ 81EEBEF
- trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15
- msgbox Route109_Text_297A40, 6
+ trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
+ msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEC06:: @ 81EEC06
- trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7
- msgbox Route109_Text_297AE5, 6
+ trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
+ msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE
end
DewfordTown_Text_1EEC1D: @ 81EEC1D