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_UnusedRubySapphireMap1/border.bin | 1 - data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap1') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333 \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 081d1bba3..1edd4c6c2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin deleted file mode 100644 index 0ffbdaaa0..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin +++ /dev/null @@ -1 +0,0 @@ -33))))))))))))))))33333"33)))3333))) 33333"33"333())))*333 (33)*33"3))))))))3( 33"33)*3"))))))(3  33"33"333""3333<33( 3  33"3*333""3333333  3  33"3"3333%%333333  3  33"3"333333%23333  3  33"*)))333%333  2 33""3")(333"33   3 33""3""=3( 333""33   3 33""3""33  33*"33   3 33""3""33 ())**33   3 33""3""33())))*333   3 33""3""33333333333  ( 33""3"%333333333% 3  33""3"3%3333333%3 3  33""3%3%2222222%2%3  33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333 \ 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_UnusedRubySapphireMap1/events.inc | 7 +++++++ data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap1') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc new file mode 100644 index 000000000..c9eeaff22 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + +CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 + map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc new file mode 100644 index 000000000..4b4240833 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -0,0 +1,9 @@ +CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 + map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + .byte 0 + +CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E + checkflag FLAG_0x071 + call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_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_UnusedRubySapphireMap1/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap1') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index c9eeaff22..049c263da 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 -- cgit v1.2.3