From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: Move 'map attributes' into 'layouts' --- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin | 1 - data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap2') 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/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 -- cgit v1.2.3 From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: Move events and scripts into map dirs --- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc | 7 +++++++ data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap2') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc new file mode 100644 index 000000000..c8e9bbeeb --- /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_RS_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F + +CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 + map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 + 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 + -- cgit v1.2.3 From 5e00c0bfcf54271b392dd1b83a901c7d623ce704 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:01 -0500 Subject: Fix map constants --- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap2') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index c8e9bbeeb..5af05a471 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F + 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 -- cgit v1.2.3