summaryrefslogtreecommitdiff
path: root/data/maps/MagmaHideout_4F
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-10 18:04:51 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-07-10 18:04:51 -0500
commit8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (patch)
tree91e568adb3166c1adc7185be4947e5109b08cc18 /data/maps/MagmaHideout_4F
parentd675b7578cff2352796c27d3e6fc882090c9ce21 (diff)
Use movement type constants in object_event macros
Diffstat (limited to 'data/maps/MagmaHideout_4F')
-rw-r--r--data/maps/MagmaHideout_4F/events.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc
index 1865c3b84..435099c47 100644
--- a/data/maps/MagmaHideout_4F/events.inc
+++ b/data/maps/MagmaHideout_4F/events.inc
@@ -1,12 +1,12 @@
MagmaHideout_4F_EventObjects: @ 8537490
- object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 1, 1, 0, 0, 0x0, 853
- object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857
- object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857
- object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857
- object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857
- object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857
- object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 1, 1, 0, 0, 0x0, 850
- object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168
+ object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853
+ object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857
+ object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857
+ object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857
+ object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857
+ object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857
+ object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850
+ object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168
MagmaHideout_4F_MapWarps: @ 8537550
warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R