summaryrefslogtreecommitdiff
path: root/data/maps/Route118
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/Route118
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route118')
-rw-r--r--data/maps/Route118/events.inc22
-rw-r--r--data/maps/Route118/scripts.inc68
2 files changed, 42 insertions, 48 deletions
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
index 19d36d602..fe131549f 100644
--- a/data/maps/Route118/events.inc
+++ b/data/maps/Route118/events.inc
@@ -3,22 +3,22 @@ Route118_EventObjects: @ 852AAB4
object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0
object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0
object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
- object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
- object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
+ object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
+ object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
- object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901
- object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901
- object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904
- object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
- object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
+ object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+ object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+ object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
+ object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
+ object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11
object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
- object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966
- object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
+ object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN
+ object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION
object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
Route118_MapWarps: @ 852ACAC
@@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC
bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
- bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67
- bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66
+ bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON
+ bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE
Route118_MapEvents:: @ 852AD58
map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 09fad07e7..f88e0e9c3 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -30,7 +30,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14
faceplayer
checkflag FLAG_0x0E3
goto_eq Route118_EventScript_1F3E69
- msgbox Route118_Text_1F427B, 5
+ msgbox Route118_Text_1F427B, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route118_EventScript_1F3E3E
compare VAR_RESULT, 0
@@ -38,33 +38,33 @@ Route118_EventScript_1F3E14:: @ 81F3E14
end
Route118_EventScript_1F3E3E:: @ 81F3E3E
- msgbox Route118_Text_1F42AF, 4
+ msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT
giveitem_std ITEM_GOOD_ROD
setflag FLAG_0x0E3
- msgbox Route118_Text_1F42E7, 4
+ msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT
release
end
Route118_EventScript_1F3E5F:: @ 81F3E5F
- msgbox Route118_Text_1F4319, 4
+ msgbox Route118_Text_1F4319, MSGBOX_DEFAULT
release
end
Route118_EventScript_1F3E69:: @ 81F3E69
- msgbox Route118_Text_1F4331, 4
+ msgbox Route118_Text_1F4331, MSGBOX_DEFAULT
release
end
Route118_EventScript_1F3E73:: @ 81F3E73
- msgbox Route118_Text_1F4367, 2
+ msgbox Route118_Text_1F4367, MSGBOX_NPC
end
Route118_EventScript_1F3E7C:: @ 81F3E7C
- msgbox Route118_Text_1F43F4, 3
+ msgbox Route118_Text_1F43F4, MSGBOX_SIGN
end
Route118_EventScript_1F3E85:: @ 81F3E85
- msgbox Route118_Text_1F440E, 3
+ msgbox Route118_Text_1F440E, MSGBOX_SIGN
end
Route118_EventScript_1F3E8E:: @ 81F3E8E
@@ -100,7 +100,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4
applymovement 19, Route118_Movement_1F3F65
waitmovement 0
delay 30
- msgbox Route118_Text_1F40BE, 4
+ msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, Route118_EventScript_1F3F28
@@ -187,78 +187,72 @@ Route118_Movement_1F3F7E: @ 81F3F7E
step_end
Route118_EventScript_1F3F87:: @ 81F3F87
- trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+ trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route118_EventScript_1F3FD2
- msgbox Route118_Text_29D2FA, 4
+ msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT
release
end
Route118_EventScript_1F3FB3:: @ 81F3FB3
special sub_80B4808
waitmovement 0
- msgbox Route118_Text_29D343, 4
- setvar VAR_0x8004, 37
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 37
- callstd 8
+ msgbox Route118_Text_29D343, MSGBOX_DEFAULT
+ register_matchcall TRAINER_ROSE_1
release
end
Route118_EventScript_1F3FD2:: @ 81F3FD2
- trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA
- msgbox Route118_Text_29D3D9, 6
+ trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
+ msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F3FE9:: @ 81F3FE9
- trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C
- msgbox Route118_Text_29D587, 6
+ trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
+ msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4000:: @ 81F4000
- trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C
- msgbox Route118_Text_29D663, 6
+ trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
+ msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4017:: @ 81F4017
- trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+ trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route118_EventScript_1F4062
- msgbox Route118_Text_29D6D8, 4
+ msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT
release
end
Route118_EventScript_1F4043:: @ 81F4043
special sub_80B4808
waitmovement 0
- msgbox Route118_Text_29D74A, 4
- setvar VAR_0x8004, 196
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 196
- callstd 8
+ msgbox Route118_Text_29D74A, MSGBOX_DEFAULT
+ register_matchcall TRAINER_DALTON_1
release
end
Route118_EventScript_1F4062:: @ 81F4062
- trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA
- msgbox Route118_Text_29D7D5, 6
+ trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
+ msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4079:: @ 81F4079
- trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B
- msgbox Route118_Text_29D46C, 6
+ trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
+ msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4090:: @ 81F4090
- trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4
- msgbox Route118_Text_29D4DA, 6
+ trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
+ msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F40A7:: @ 81F40A7
- trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C
- msgbox Route118_Text_29D872, 6
+ trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
+ msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
end
Route118_Text_1F40BE: @ 81F40BE