diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 16:55:25 -0600 |
| commit | 5c1667b41a7d31df6d405d272833895bf8472cf6 (patch) | |
| tree | dcee557154cc86398b9815838fc61fbe01837ddc /data/maps/MtPyre_1F | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_1F')
| -rw-r--r-- | data/maps/MtPyre_1F/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/MtPyre_1F/header.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 5fd821541..7b1d79e16 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,9 +1,9 @@ -MtPyre_1F_EventObjects: @ 8534D64 +MtPyre_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 -MtPyre_1F_MapWarps: @ 8534DAC +MtPyre_1F_MapWarps: warp_def 17, 18, 3, 0, MAP_ROUTE122 warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR warp_def 18, 18, 3, 0, MAP_ROUTE122 @@ -11,6 +11,6 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F -MtPyre_1F_MapEvents:: @ 8534DDC +MtPyre_1F_MapEvents:: map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index f60532fa2..b4d6603df 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,10 +1,10 @@ -MtPyre_1F: @ 8484064 +MtPyre_1F: .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 137 + .2byte LAYOUT_MT_PYRE_1F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE |