diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-13 18:53:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 18:53:14 -0700 |
| commit | 68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (patch) | |
| tree | 6cbdbe8e87708ffca6a49d6b507ed6341b26f4e2 /data/maps/MtPyre_3F | |
| parent | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff) | |
| parent | 7dffb108b834afdee807998af24e1ddc4c85d4f9 (diff) | |
Merge pull request #654 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/MtPyre_3F')
| -rw-r--r-- | data/maps/MtPyre_3F/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/MtPyre_3F/header.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index fbaf6fa4b..4a5263be5 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,7 +1,7 @@ MtPyre_3F_EventObjects:: @ 838C954 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 MtPyre_3F_MapWarps:: @ 838C99C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 253facf61..c201e9377 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,10 +5,10 @@ MtPyre_3F:: @ 8306F4C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .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 |