summaryrefslogtreecommitdiff
path: root/data/maps/CaveOfOrigin_UnusedRubySapphireMap3
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-07-04 11:11:45 -0400
committerGitHub <noreply@github.com>2018-07-04 11:11:45 -0400
commite06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch)
treee8d37347ae000823943ef57973dc34dd98633b40 /data/maps/CaveOfOrigin_UnusedRubySapphireMap3
parent9acd55ae4f9e455a92765aaee5929240097f9f8f (diff)
parentefebc51972b23ddffa2700b1dd6895d4728646a3 (diff)
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3')
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc7
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc9
5 files changed, 17 insertions, 3 deletions
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
new file mode 100644
index 000000000..a17416bd3
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
+ warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
+ warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC
+ map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
index 623c9c2bc..819afc08f 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
- .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
deleted file mode 100644
index ea574b224..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))))))))))))))")))3333)))333 ""333())))*333()) ""33)))))))))33  ""33")))))))(3  ""3*"3333333( 3  "$"*333333=33  $ "3"""3322233   3 "3"""3$333$3   3 "3"""3 33333"$  3 "3"""3(3333" 3  3 "3"""33(33* 3  3 "*""333 33"$3 ( ""3""333())* 33 3  ""3"$3<33333 2$3  ""3$"333333  333  ""33"$222222$ 333  ""33$22222222$333  "$2233332222222$ "333$2222$3222222$$2222222222$3333333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
new file mode 100644
index 000000000..7f4fb2ff1
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
@@ -0,0 +1,9 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
+ map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
+ .byte 0
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
+ checkflag FLAG_0x071
+ call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
+ end
+