From 86bdadf4da2e9006541c8cddb3b5067da1ca1bb9 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Thu, 13 May 2021 21:00:38 -0400 Subject: Extract assets in `make setup`, don't extract them to `assets/src/` and build them in `make` (#132) * extract assets in setup and build them in make * Add assetclean --- linker_scripts/code_script.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linker_scripts/code_script.txt') diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 0a2425985..e08eed699 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -7,8 +7,8 @@ RomLocation += . - _##_Name##SegmentStart; \ _##_Name##SegmentEnd = .; -#define DECL_SEG_SCENE(_SceneName) DECL_SEG(_SceneName, build/assets/src/scenes/_SceneName, 0x02000000) -#define DECL_SEG_ROOM(_SceneName, _RoomNum) DECL_SEG(_SceneName##_room_##_RoomNum, build/assets/src/scenes/_SceneName, 0x03000000) +#define DECL_SEG_SCENE(_SceneName) DECL_SEG(_SceneName, build/assets/scenes/_SceneName, 0x02000000) +#define DECL_SEG_ROOM(_SceneName, _RoomNum) DECL_SEG(_SceneName##_room_##_RoomNum, build/assets/scenes/_SceneName, 0x03000000) #define DECL_ACTOR(_ActorName, _File) \ _ovl_##_ActorName##SegmentStart = .; \ -- cgit v1.2.3