summaryrefslogtreecommitdiff
path: root/data/maps/Route108
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-10-19 14:24:34 -0500
committerGitHub <noreply@github.com>2018-10-19 14:24:34 -0500
commitbf8fa23462990b36ff40ac4a863380a9d979bfdd (patch)
tree51f3a9e269bf974880dbae6ba5cbb1fd7949db0b /data/maps/Route108
parent95d8815721321f08714b97c59a97de3a59f1e0c7 (diff)
parent113a8d1efd45ed387a0ede7b7aa8744b622c662f (diff)
Merge pull request #365 from garakmon/event-flags
[WIP] Event flags
Diffstat (limited to 'data/maps/Route108')
-rw-r--r--data/maps/Route108/events.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
index a92fe680d..094eb0bc7 100644
--- a/data/maps/Route108/events.inc
+++ b/data/maps/Route108/events.inc
@@ -5,13 +5,13 @@ Route108_EventObjects: @ 8528964
object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
- object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139
+ object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE
Route108_MapWarps: @ 8528A0C
warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
Route108_MapBGEvents: @ 8528A14
- bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86
+ bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY
Route108_MapEvents:: @ 8528A20
map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents