diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-10 18:04:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-10 18:04:51 -0500 |
| commit | 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (patch) | |
| tree | 91e568adb3166c1adc7185be4947e5109b08cc18 /data/maps/Route124 | |
| parent | d675b7578cff2352796c27d3e6fc882090c9ce21 (diff) | |
Use movement type constants in object_event macros
Diffstat (limited to 'data/maps/Route124')
| -rw-r--r-- | data/maps/Route124/events.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 2dc839783..3e4ab2780 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,16 +1,16 @@ Route124_EventObjects: @ 852C3C4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE |