diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-19 14:24:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 14:24:34 -0500 |
| commit | bf8fa23462990b36ff40ac4a863380a9d979bfdd (patch) | |
| tree | 51f3a9e269bf974880dbae6ba5cbb1fd7949db0b /data/maps/Route134 | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
| parent | 113a8d1efd45ed387a0ede7b7aa8744b622c662f (diff) | |
Merge pull request #365 from garakmon/event-flags
[WIP] Event flags
Diffstat (limited to 'data/maps/Route134')
| -rw-r--r-- | data/maps/Route134/events.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 4201b8068..8caf4da1e 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98 object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 |