summaryrefslogtreecommitdiff
path: root/data/maps/BattlePyramidSquare16
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BattlePyramidSquare16')
-rw-r--r--data/maps/BattlePyramidSquare16/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare16/events.inc12
-rw-r--r--data/maps/BattlePyramidSquare16/header.inc10
-rw-r--r--data/maps/BattlePyramidSquare16/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare16/scripts.inc3
5 files changed, 20 insertions, 6 deletions
diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/maps/BattlePyramidSquare16/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare16/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc
new file mode 100644
index 000000000..84bb566c2
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/events.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare16_EventObjects: @ 853AF64
+ object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+ object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+ object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+ 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
+ map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index 4df56bbc7..f8f97b671 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -1,15 +1,15 @@
BattlePyramidSquare16: @ 8485104
- .4byte BattlePyramidSquare16_MapAttributes
+ .4byte BattlePyramidSquare16_Layout
.4byte BattlePyramidSquare16_MapEvents
.4byte BattlePyramidSquare16_MapScripts
.4byte 0x0
.2byte 65535
.2byte 377
- .byte 87
+ .byte MAPSEC_DYNAMIC
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
- .byte 1
+ .byte MAP_BATTLE_SCENE_GYM
diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/maps/BattlePyramidSquare16/map.bin
deleted file mode 100644
index 601eb526e..000000000
--- a/data/maps/BattlePyramidSquare16/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare16/scripts.inc b/data/maps/BattlePyramidSquare16/scripts.inc
new file mode 100644
index 000000000..9308930d1
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/scripts.inc
@@ -0,0 +1,3 @@
+BattlePyramidSquare16_MapScripts:: @ 823D1A5
+ .byte 0
+