From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 20 Jun 2018 17:41:17 -0500
Subject: Move 'map attributes' into 'layouts'

---
 data/maps/AlteringCave/border.bin | 1 -
 data/maps/AlteringCave/header.inc | 2 +-
 data/maps/AlteringCave/map.bin    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 data/maps/AlteringCave/border.bin
 delete mode 100644 data/maps/AlteringCave/map.bin

(limited to 'data/maps/AlteringCave')

diff --git a/data/maps/AlteringCave/border.bin b/data/maps/AlteringCave/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/AlteringCave/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
index 98a23f76a..2361bf769 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -1,5 +1,5 @@
 AlteringCave: @ 8484A58
-	.4byte AlteringCave_MapAttributes
+	.4byte AlteringCave_Layout
 	.4byte AlteringCave_MapEvents
 	.4byte AlteringCave_MapScripts
 	.4byte 0x0
diff --git a/data/maps/AlteringCave/map.bin b/data/maps/AlteringCave/map.bin
deleted file mode 100644
index 38bec91fa..000000000
--- a/data/maps/AlteringCave/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-f222f222ff6
66222222
6
6
6222222
6
662f2222222222222######"f22222222#######"222
2222 !B!B!B!B!B!B"P222
2
2
222B
B
B
B
B
BP22˜2™2™2š222
2
222fP222
B
B
B
B
BB22˜2¡2¡2¡2¢22222ffPf2
B
B
B
B
BB22 2¡2¡2¡2¡2š2222
222222
BBBB
B22 2¡2¡2¡2¡2¢222
2
2
2222
2222¨2¡2¡2¡2¡2¢222f2
2
2222
2
2
22222222f22¨2©2©2©2ª22222Pf
222222
2
2222222222P2222222222f22222
222222222222####"2222222222222
2
2
22 ##################"2222
2
2226
666
66222
22222
6
6
6
6
6
62222222 #
6
66
6
66###"2<22#XYZ##
\ No newline at end of file
-- 
cgit v1.2.3


From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 20 Jun 2018 17:41:41 -0500
Subject: Move events and scripts into map dirs

---
 data/maps/AlteringCave/events.inc  | 6 ++++++
 data/maps/AlteringCave/scripts.inc | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 data/maps/AlteringCave/events.inc
 create mode 100644 data/maps/AlteringCave/scripts.inc

(limited to 'data/maps/AlteringCave')

diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc
new file mode 100644
index 000000000..898038715
--- /dev/null
+++ b/data/maps/AlteringCave/events.inc
@@ -0,0 +1,6 @@
+AlteringCave_MapWarps: @ 8537894
+	warp_def 18, 22, 0, 0, MAP_ROUTE103
+
+AlteringCave_MapEvents:: @ 853789C
+	map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc
new file mode 100644
index 000000000..a9faddc36
--- /dev/null
+++ b/data/maps/AlteringCave/scripts.inc
@@ -0,0 +1,8 @@
+AlteringCave_MapScripts:: @ 823B177
+	map_script 3, AlteringCave_MapScript1_23B17D
+	.byte 0
+
+AlteringCave_MapScript1_23B17D: @ 823B17D
+	setflag FLAG_LANDMARK_ALTERING_CAVE
+	end
+
-- 
cgit v1.2.3