summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePikeRandomRoom1
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_BattlePikeRandomRoom1
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom1')
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc6
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
index 81dee29d1..34f802c91 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
@@ -1,8 +1,8 @@
-BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
+BattleFrontier_BattlePikeRandomRoom1_EventObjects:
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
-BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
+BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents:
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
@@ -11,6 +11,6 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
-BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
+BattleFrontier_BattlePikeRandomRoom1_MapEvents::
map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
index d49bb07d5..ff61d1238 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePikeRandomRoom1: @ 8485548
+BattleFrontier_BattlePikeRandomRoom1:
.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
.4byte 0x0
.2byte MUS_B_TUBE
- .2byte 352
+ .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte WEATHER_NONE