summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_2F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MtPyre_2F')
-rw-r--r--data/maps/MtPyre_2F/events.inc12
-rw-r--r--data/maps/MtPyre_2F/header.inc8
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
index 9f8041366..d6f401581 100644
--- a/data/maps/MtPyre_2F/events.inc
+++ b/data/maps/MtPyre_2F/events.inc
@@ -1,10 +1,10 @@
MtPyre_2F_EventObjects:: @ 838C888
- object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0
- object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1
- object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0
- object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0
- object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0
- object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0
+ object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0
+ object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1
+ object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0
+ object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0
+ object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0
+ object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0
MtPyre_2F_MapWarps:: @ 838C918
warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 081adb3e9..c123d076a 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -5,10 +5,10 @@ MtPyre_2F:: @ 8306F30
.4byte 0x0
.2byte MUS_M_DUNGON
.2byte 139
- .byte 65
+ .byte MAPSEC_MT_PYRE
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 1
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL