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_UnusedRubySapphireMap3/border.bin | 1 - data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') 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/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 -- 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_UnusedRubySapphireMap3/events.inc | 7 +++++++ data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc new file mode 100644 index 000000000..953eef558 --- /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_RS_B2F + 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/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 + -- 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_UnusedRubySapphireMap3/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index 953eef558..a17416bd3 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + 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 -- cgit v1.2.3