summaryrefslogtreecommitdiff
path: root/data/maps/CaveOfOrigin_UnusedRubySapphireMap2
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_UnusedRubySapphireMap2
parent9acd55ae4f9e455a92765aaee5929240097f9f8f (diff)
parentefebc51972b23ddffa2700b1dd6895d4728646a3 (diff)
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap2')
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc7
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc9
5 files changed, 17 insertions, 3 deletions
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
deleted file mode 100644
index 4117717f2..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-#### \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
new file mode 100644
index 000000000..5af05a471
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
+ warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1
+ warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
+ map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
index ef1747de8..6b046b61a 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
- .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
deleted file mode 100644
index 4c1fd5ab8..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"33333333( #  ""#")*333333333  % ""#""333223333   # ""#""33%##%333   %""#""33 ####%33    #""#""<33 #####"33    #""#"%22%#####"33    #"%%2#####)*33    #"#"##"#)))*3333   ("#"##"#"=33333332  # "#"##%"333333%#  # "#"###"%222222%2%( "#"###%22222222%###  "#%222##222222##  %222#%22%######%22% ####%222222222222222% \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
new file mode 100644
index 000000000..d73ff8231
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
@@ -0,0 +1,9 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
+ map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
+ .byte 0
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
+ checkflag FLAG_0x071
+ call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
+ end
+