summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_Lounge4
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
commit5c1667b41a7d31df6d405d272833895bf8472cf6 (patch)
treedcee557154cc86398b9815838fc61fbe01837ddc /data/maps/BattleFrontier_Lounge4
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/BattleFrontier_Lounge4')
-rw-r--r--data/maps/BattleFrontier_Lounge4/events.inc6
-rw-r--r--data/maps/BattleFrontier_Lounge4/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc
index 8b86bebc7..c2e2f44a2 100644
--- a/data/maps/BattleFrontier_Lounge4/events.inc
+++ b/data/maps/BattleFrontier_Lounge4/events.inc
@@ -1,11 +1,11 @@
-BattleFrontier_Lounge4_EventObjects: @ 853D24C
+BattleFrontier_Lounge4_EventObjects:
object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0
object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0
-BattleFrontier_Lounge4_MapWarps: @ 853D294
+BattleFrontier_Lounge4_MapWarps:
warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-BattleFrontier_Lounge4_MapEvents:: @ 853D29C
+BattleFrontier_Lounge4_MapEvents::
map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
index 912cc41ff..edb6171e7 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_Lounge4: @ 8485628
+BattleFrontier_Lounge4:
.4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge4_MapEvents
.4byte BattleFrontier_Lounge4_MapScripts
.4byte 0x0
.2byte MUS_B_TOWER
- .2byte 429
+ .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte WEATHER_NONE