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/UnionRoom | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/UnionRoom')
| -rw-r--r-- | data/maps/UnionRoom/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/UnionRoom/header.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 3ab614468..c78b86eec 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,4 +1,4 @@ -UnionRoom_EventObjects: @ 853B020 +UnionRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 @@ -9,10 +9,10 @@ UnionRoom_EventObjects: @ 853B020 object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 -UnionRoom_MapWarps: @ 853B0F8 +UnionRoom_MapWarps: warp_def 7, 11, 3, 127, MAP_NONE warp_def 8, 11, 3, 127, MAP_NONE -UnionRoom_MapEvents:: @ 853B108 +UnionRoom_MapEvents:: map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 29fd3cc3f..cc7e1c3d1 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,10 +1,10 @@ -UnionRoom: @ 8485120 +UnionRoom: .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 393 + .2byte LAYOUT_UNION_ROOM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE |