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/BattlePyramidSquare14/border.bin | Bin 8 -> 0 bytes data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare14/map.bin | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 data/maps/BattlePyramidSquare14/border.bin delete mode 100644 data/maps/BattlePyramidSquare14/map.bin (limited to 'data/maps/BattlePyramidSquare14') diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/maps/BattlePyramidSquare14/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/maps/BattlePyramidSquare14/border.bin and /dev/null differ diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 8570d95ef..9dcea14fa 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare14: @ 84850CC - .4byte BattlePyramidSquare14_MapAttributes + .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/maps/BattlePyramidSquare14/map.bin deleted file mode 100644 index 21655a872..000000000 --- a/data/maps/BattlePyramidSquare14/map.bin +++ /dev/null @@ -1 +0,0 @@ -¨Be¨Be¨Be¨Be¨B¨B¨B¨B¨B¨B¨B¨Be¨Be¨Be¨Be¨B¨B¨B¨Bˇ¨B¨B¨B¨B¨Be¨Be¨Be¨Be¨B¨B¨B¨B¨B¨B¨B¨Be¨Be¨Be¨Be¨B¨B¨B¨B¨B¨B¨B¨B¨B \ 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/BattlePyramidSquare14/events.inc | 12 ++++++++++++ data/maps/BattlePyramidSquare14/scripts.inc | 1 + 2 files changed, 13 insertions(+) create mode 100644 data/maps/BattlePyramidSquare14/events.inc create mode 100644 data/maps/BattlePyramidSquare14/scripts.inc (limited to 'data/maps/BattlePyramidSquare14') diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc new file mode 100644 index 000000000..c63fabee3 --- /dev/null +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -0,0 +1,12 @@ +BattlePyramidSquare14_EventObjects: @ 853ADEC + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + +BattlePyramidSquare14_MapEvents:: @ 853AE94 + map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare14/scripts.inc b/data/maps/BattlePyramidSquare14/scripts.inc new file mode 100644 index 000000000..5ae39cb8a --- /dev/null +++ b/data/maps/BattlePyramidSquare14/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare14_MapScripts:: @ 823D1A5 -- cgit v1.2.3