sa1: move data into sa1 sub directory

graphics.mk

@@ -16,3 +16,9 @@ graphics/obj_tiles/4bpp/%.4bpp: graphics/obj_tiles/4bpp/%.png
 
 graphics/obj_tiles/8bpp/%.8bpp: graphics/obj_tiles/8bpp/%.png
 	$(GFX) $< $@ $(GFX_CVT_FLAGS)
+
+graphics/sa1/obj_tiles/4bpp/%.4bpp: graphics/sa1/obj_tiles/4bpp/%.png
+	$(GFX) $< $@ $(GFX_CVT_FLAGS)
+
+graphics/sa1/obj_tiles/8bpp/%.8bpp: graphics/sa1/obj_tiles/8bpp/%.png
+	$(GFX) $< $@ $(GFX_CVT_FLAGS)

sa1/.gitignore

@@ -68,7 +68,7 @@ Temporary Items
 *.dump
 build
 tools/agbcc
-**/sound/songs/midi/*.s
+**/sound/*/songs/midi/*.s
 /ctx.c
 reports
 .vscode/*.log
@@ -81,7 +81,7 @@ reports
 *.8bpp
 libagbsyscall/*.s
 
-!data/maps/*/*/tilemaps/*/*.bin
+!data/*/maps/*/*/tilemaps/*/*.bin
 *.exe
 *.dll
 *.lib

sa1/Makefile

@@ -139,22 +139,22 @@ ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
 C_SUBDIR = src
 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
 
-DATA_ASM_SUBDIR = data
+DATA_ASM_SUBDIR = data/sa1
 DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
 
-SONG_SUBDIR = sound/songs
+SONG_SUBDIR = sound/sa1/songs
 SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
 
 SOUND_ASM_SUBDIR = sound
 SOUND_ASM_BUILDDIR = $(OBJ_DIR)/$(SOUND_ASM_SUBDIR)
 
-MID_SUBDIR = sound/songs/midi
+MID_SUBDIR = sound/sa1/songs/midi
 MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
 
-SAMPLE_SUBDIR = sound/direct_sound_samples
+SAMPLE_SUBDIR = sound/sa1/direct_sound_samples
 
-OBJ_TILES_4BPP_SUBDIR = graphics/obj_tiles/4bpp
-TILESETS_SUBDIR = graphics/tilesets/
+OBJ_TILES_4BPP_SUBDIR = graphics/sa1/obj_tiles/4bpp
+TILESETS_SUBDIR = graphics/sa1/tilesets/
 
 ifeq ($(PLATFORM),gba)
 C_SRCS := $(shell find $(C_SUBDIR) -name "*.c" -not -path "*/platform/*")
@@ -466,7 +466,7 @@ include ../graphics.mk
 chao_garden/mb_chao_garden.gba.lz: chao_garden/mb_chao_garden.gba 
 	$(GFX) $< $@ -search 1
     
-data/mb_chao_garden_japan.gba.lz: data/mb_chao_garden_japan.gba
+data/sa1/mb_chao_garden_japan.gba.lz: data/sa1/mb_chao_garden_japan.gba
 	$(GFX) $< $@ -search 1
 
 %interactables.bin: %interactables.csv

sa1/data/sa1/data1.s

@@ -29,23 +29,23 @@ C_DECL(gUnknown_087BF8DC):
 @@@
 @@@ Compressed Input-recordings for Demo playback
 @@@
-    @ src/data/recordings.c:static const u8 demo1[]
+    @ src/data/sa1/recordings.c:static const u8 demo1[]
     .global demo1
 demo1:
     .incbin "baserom_sa1.gba", 0x007BF918, 0x1F8
 
-    @ src/data/recordings.c:static const u8 demo2[]
+    @ src/data/sa1/recordings.c:static const u8 demo2[]
     .global demo2
 demo2:
     .incbin "baserom_sa1.gba", 0x007BFB10, 0x200
 
-    @ src/data/recordings.c:static const u8 demo4[]
+    @ src/data/sa1/recordings.c:static const u8 demo4[]
     @ NOTE: Ice Mountain data comes before Casino Paradise!
     .global demo4
 demo4:
     .incbin "baserom_sa1.gba", 0x007BFD10, 0x208
 
-    @ src/data/recordings.c:static const u8 demo3[]
+    @ src/data/sa1/recordings.c:static const u8 demo3[]
     .global demo3
 demo3:
     .incbin "baserom_sa1.gba", 0x007BFF18, 0x200

sa1/data/sa1/data_0_3_2.s

@@ -3,7 +3,7 @@
 
     mSectionRodata
 
-    @ "graphics/tilemaps/mp_multipak_player_overview/header.c"
+    @ "graphics/sa1/tilemaps/mp_multipak_player_overview/header.c"
 
     .global C_DECL(gUnknown_084ADA08)
 C_DECL(gUnknown_084ADA08):