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/LinkContestRoom1/border.bin | 1 - data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom1/map.bin | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 data/maps/LinkContestRoom1/border.bin delete mode 100644 data/maps/LinkContestRoom1/map.bin (limited to 'data/maps/LinkContestRoom1') diff --git a/data/maps/LinkContestRoom1/border.bin b/data/maps/LinkContestRoom1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index f5d7b9b78..dcd7be859 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,5 +1,5 @@ LinkContestRoom1: @ 8484DA0 - .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom1/map.bin b/data/maps/LinkContestRoom1/map.bin deleted file mode 100644 index a8853f6ae..000000000 --- a/data/maps/LinkContestRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ 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/LinkContestRoom1/events.inc | 18 ++++++++++++++++++ data/maps/LinkContestRoom1/scripts.inc | 1 + 2 files changed, 19 insertions(+) create mode 100644 data/maps/LinkContestRoom1/events.inc create mode 100644 data/maps/LinkContestRoom1/scripts.inc (limited to 'data/maps/LinkContestRoom1') diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc new file mode 100644 index 000000000..c1bdfe3fb --- /dev/null +++ b/data/maps/LinkContestRoom1/events.inc @@ -0,0 +1,18 @@ +LinkContestRoom1_EventObjects: @ 8539EFC + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + +LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc new file mode 100644 index 000000000..5276adcd8 --- /dev/null +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom1_MapScripts:: @ 823B781 -- cgit v1.2.3