From bac57d8d31948ab1262ba1e26185cd8d79e72c7d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:46:31 -0500 Subject: Move 'map attributes' into 'layouts' --- data/maps/SecretBase_Tree2/border.bin | 1 - data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree2/map.bin | 48 ----------------------------------- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 data/maps/SecretBase_Tree2/border.bin delete mode 100644 data/maps/SecretBase_Tree2/map.bin (limited to 'data/maps/SecretBase_Tree2') diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index fefd54e68..c36f1ada0 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree2:: @ 83077F0 - .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin deleted file mode 100644 index c2e5698b0..000000000 --- a/data/maps/SecretBase_Tree2/map.bin +++ /dev/null @@ -1,48 +0,0 @@ -  -2 -22 -2   -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -2 -2 6  -2 -2 -2 -2 6   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2   -2 -2 -2 -2 -2  -2 -2 -2 -2   -2 -2 -2 -2   -2 -2 -26 -26  -2  2   \ No newline at end of file -- cgit v1.2.3 From 931feeb9b720ea5151a781905967fedb170b67b1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:04 -0500 Subject: Move map events into respective data/maps/ directories --- data/maps/SecretBase_Tree2/events.inc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 data/maps/SecretBase_Tree2/events.inc (limited to 'data/maps/SecretBase_Tree2') diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc new file mode 100644 index 000000000..ef2280e01 --- /dev/null +++ b/data/maps/SecretBase_Tree2/events.inc @@ -0,0 +1,22 @@ +SecretBase_Tree2_EventObjects:: @ 838FDAC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Tree2_MapWarps:: @ 838FF14 + warp_def 3, 14, 0, 126, MAP_NONE + +SecretBase_Tree2_MapEvents:: @ 838FF1C + map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 -- cgit v1.2.3 From 6dc3c869391bb56f5d6f872cf51ab717dfca9f31 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:16 -0500 Subject: Move map scripts into 'data/maps//scripts.inc' --- data/maps/SecretBase_Tree2/scripts.inc | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/maps/SecretBase_Tree2/scripts.inc (limited to 'data/maps/SecretBase_Tree2') diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc new file mode 100644 index 000000000..0f2976a8c --- /dev/null +++ b/data/maps/SecretBase_Tree2/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree2_MapScripts:: @ 815F337 -- cgit v1.2.3 From 2c7a4e1406b078cf9bcc2a16e92a58497390aa17 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:51 -0500 Subject: Use MUS_ prefix instead of BGM_ prefix for songs --- data/maps/SecretBase_Tree2/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SecretBase_Tree2') diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index c36f1ada0..7138440cd 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree2:: @ 83077F0 .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 208 .byte 86 .byte 0 -- cgit v1.2.3