summaryrefslogtreecommitdiff
path: root/data/maps/Route105
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route105')
-rw-r--r--data/maps/Route105/events.inc6
-rw-r--r--data/maps/Route105/scripts.inc39
2 files changed, 21 insertions, 24 deletions
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
index d11bb8cab..e22aa668c 100644
--- a/data/maps/Route105/events.inc
+++ b/data/maps/Route105/events.inc
@@ -3,7 +3,7 @@ Route105_EventObjects: @ 85286F0
object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
- object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
+ object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON
object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
@@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0
warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
Route105_MapBGEvents: @ 85287B8
- bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89
- bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111
+ bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE
+ bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL
Route105_MapEvents:: @ 85287D0
map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 3cb6d9ae6..18fe07cbe 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -32,58 +32,55 @@ Route105_MapScript2_1EE240: @ 81EE240
.2byte 0
Route105_EventScript_1EE24A:: @ 81EE24A
- trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
- msgbox Route105_Text_295DAB, 6
+ trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
+ msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE261:: @ 81EE261
- trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
- msgbox Route105_Text_295E72, 6
+ trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
+ msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE278:: @ 81EE278
- trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
- msgbox Route105_Text_295F08, 6
+ trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
+ msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE28F:: @ 81EE28F
- trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
- msgbox Route105_Text_295FAE, 6
+ trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
+ msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2A6:: @ 81EE2A6
- trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
- msgbox Route105_Text_296076, 6
+ trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
+ msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2BD:: @ 81EE2BD
- trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
- msgbox Route105_Text_2962EC, 6
+ trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
+ msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2D4:: @ 81EE2D4
- trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+ trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route105_EventScript_1EE31F
- msgbox Route105_Text_2960FA, 4
+ msgbox Route105_Text_2960FA, MSGBOX_DEFAULT
release
end
Route105_EventScript_1EE300:: @ 81EE300
special sub_80B4808
waitmovement 0
- msgbox Route105_Text_296159, 4
- setvar VAR_0x8004, 737
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 737
- callstd 8
+ msgbox Route105_Text_296159, MSGBOX_DEFAULT
+ register_matchcall TRAINER_ANDRES_1
release
end
Route105_EventScript_1EE31F:: @ 81EE31F
- trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
- msgbox Route105_Text_2961FE, 6
+ trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
+ msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
end
Route104_Text_1EE336: @ 81EE336