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/SecretBase_Shrub3/border.bin | 1 - data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub3/map.bin | 65 ---------------------------------- 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 data/maps/SecretBase_Shrub3/border.bin delete mode 100644 data/maps/SecretBase_Shrub3/map.bin (limited to 'data/maps/SecretBase_Shrub3') diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/maps/SecretBase_Shrub3/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 7fb14ec94..cef2a4597 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub3: @ 8484C6C - .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/maps/SecretBase_Shrub3/map.bin deleted file mode 100644 index d51aeea21..000000000 --- a/data/maps/SecretBase_Shrub3/map.bin +++ /dev/null @@ -1,65 +0,0 @@ -  -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 -2 -2 -2 -2 -2 -2 -2  -2  -2  -2   -2 -2 -2 -22 -2 6 -2 -2 -2   -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2   -2 -2 -2 -2 -22 -2 -2 -2 -2 -2   \ 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/SecretBase_Shrub3/events.inc | 23 +++++++++++++++++++++++ data/maps/SecretBase_Shrub3/scripts.inc | 1 + 2 files changed, 24 insertions(+) create mode 100644 data/maps/SecretBase_Shrub3/events.inc create mode 100644 data/maps/SecretBase_Shrub3/scripts.inc (limited to 'data/maps/SecretBase_Shrub3') diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc new file mode 100644 index 000000000..942be3617 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -0,0 +1,23 @@ +SecretBase_Shrub3_EventObjects: @ 85392A8 + object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + +SecretBase_Shrub3_MapWarps: @ 8539410 + warp_def 6, 9, 0, 126, MAP_NONE + +SecretBase_Shrub3_MapEvents:: @ 8539418 + map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc new file mode 100644 index 000000000..22c67c939 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub3_MapScripts:: @ 823B483 -- cgit v1.2.3