summaryrefslogtreecommitdiff
path: root/data/maps/BattlePyramidSquare16
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/BattlePyramidSquare16
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/BattlePyramidSquare16')
-rw-r--r--data/maps/BattlePyramidSquare16/events.inc4
-rw-r--r--data/maps/BattlePyramidSquare16/header.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc
index e08cb110e..973d7c0ef 100644
--- a/data/maps/BattlePyramidSquare16/events.inc
+++ b/data/maps/BattlePyramidSquare16/events.inc
@@ -1,4 +1,4 @@
-BattlePyramidSquare16_EventObjects: @ 853AF64
+BattlePyramidSquare16_EventObjects:
object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
@@ -7,6 +7,6 @@ BattlePyramidSquare16_EventObjects: @ 853AF64
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
-BattlePyramidSquare16_MapEvents:: @ 853B00C
+BattlePyramidSquare16_MapEvents::
map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index 24aa3edcc..b51e9692c 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -1,10 +1,10 @@
-BattlePyramidSquare16: @ 8485104
+BattlePyramidSquare16:
.4byte BattlePyramidSquare16_Layout
.4byte BattlePyramidSquare16_MapEvents
.4byte BattlePyramidSquare16_MapScripts
.4byte 0x0
.2byte 65535
- .2byte 377
+ .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16
.byte MAPSEC_DYNAMIC
.byte 0
.byte WEATHER_NONE