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/BattleFrontier_Lounge2 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
Define layout constants
Diffstat (limited to 'data/maps/BattleFrontier_Lounge2')
| -rw-r--r-- | data/maps/BattleFrontier_Lounge2/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_Lounge2/header.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index cc32ddf42..faa0a5608 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_EventObjects: @ 853D11C +BattleFrontier_Lounge2_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 -BattleFrontier_Lounge2_MapWarps: @ 853D194 +BattleFrontier_Lounge2_MapWarps: warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 +BattleFrontier_Lounge2_MapEvents:: map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index effcc53bd..a74f85ca4 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge2: @ 84855F0 +BattleFrontier_Lounge2: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE |