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/TradeCenter/border.bin | 1 - data/maps/TradeCenter/header.inc | 2 +- data/maps/TradeCenter/map.bin | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 data/maps/TradeCenter/border.bin delete mode 100644 data/maps/TradeCenter/map.bin (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/border.bin b/data/maps/TradeCenter/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/TradeCenter/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 757b3f0a4..55afa79f3 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,5 +1,5 @@ TradeCenter: @ 8484D4C - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 diff --git a/data/maps/TradeCenter/map.bin b/data/maps/TradeCenter/map.bin deleted file mode 100644 index 7e592dbe6..000000000 --- a/data/maps/TradeCenter/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -017456742389?<=  >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22 -2 2 2 22222SPQ2+22222+2R2SP2222222222SXY222#2$2%2&222Z2[,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/TradeCenter/events.inc | 14 ++++++++++++++ data/maps/TradeCenter/scripts.inc | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 data/maps/TradeCenter/events.inc create mode 100644 data/maps/TradeCenter/scripts.inc (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc new file mode 100644 index 000000000..89e5eac90 --- /dev/null +++ b/data/maps/TradeCenter/events.inc @@ -0,0 +1,14 @@ +TradeCenter_EventObjects: @ 8539DA0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + +TradeCenter_MapWarps: @ 8539DB8 + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + +TradeCenter_MapCoordEvents: @ 8539DC8 + coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 + coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF + +TradeCenter_MapEvents:: @ 8539DE8 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..e0e0e7d1e --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,3 @@ +TradeCenter_MapScripts:: @ 823B77E + .byte 0 + -- cgit v1.2.3