summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePyramidLobby
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_BattlePyramidLobby
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidLobby')
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/events.inc8
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/header.inc4
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
index b70958fec..81a4203b5 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
@@ -1,16 +1,16 @@
-BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
+BattleFrontier_BattlePyramidLobby_EventObjects:
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
-BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
+BattleFrontier_BattlePyramidLobby_MapWarps:
warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
-BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
+BattleFrontier_BattlePyramidLobby_MapBGEvents:
bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95
-BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
+BattleFrontier_BattlePyramidLobby_MapEvents::
map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
index 91d454fbe..f8e7408a0 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidLobby: @ 84853F8
+BattleFrontier_BattlePyramidLobby:
.4byte BattleFrontier_BattlePyramidLobby_Layout
.4byte BattleFrontier_BattlePyramidLobby_MapEvents
.4byte BattleFrontier_BattlePyramidLobby_MapScripts
.4byte 0x0
.2byte MUS_PYRAMID
- .2byte 360
+ .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte WEATHER_NONE