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_Summit | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/MtPyre_Summit')
| -rw-r--r-- | data/maps/MtPyre_Summit/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/MtPyre_Summit/header.inc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b112fbcfe..abe957f28 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,4 +1,4 @@ -MtPyre_Summit_EventObjects: @ 85351A0 +MtPyre_Summit_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 @@ -8,12 +8,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE -MtPyre_Summit_MapWarps: @ 8535260 +MtPyre_Summit_MapWarps: warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR -MtPyre_Summit_MapCoordEvents: @ 8535278 +MtPyre_Summit_MapCoordEvents: coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 @@ -21,10 +21,10 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 -MtPyre_Summit_MapBGEvents: @ 85352D8 +MtPyre_Summit_MapBGEvents: bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY -MtPyre_Summit_MapEvents:: @ 85352F0 +MtPyre_Summit_MapEvents:: map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29a28e99b..483afb989 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,10 +1,10 @@ -MtPyre_Summit: @ 8484128 +MtPyre_Summit: .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 303 + .2byte LAYOUT_MT_PYRE_SUMMIT .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 |