Move kaleido scope and map mark data to a misc folder (#1033)

15 files changed, 13 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 4b097cc1a..1954b43e2 100644
--- a/Makefile
+++ b/Makefile
@@ -154,9 +154,7 @@ build/src/code/jpegdecoder.o: CC := $(CC_OLD)
 
 build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/actors/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/effects/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/gamestates/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
+build/src/overlays/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 
 build/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 
diff --git a/spec b/spec
index 55c3ed515..4b4521d2a 100644
--- a/spec
+++ b/spec
@@ -556,16 +556,16 @@ endseg
 
 beginseg
     name "ovl_kaleido_scope"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
 endseg
 
 beginseg
@@ -576,8 +576,8 @@ endseg
 
 beginseg
     name "ovl_map_mark_data"
-    include "build/src/overlays/ovl_map_mark_data/z_map_mark_data.o"
-    include "build/src/overlays/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
+    include "build/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
+    include "build/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_kaleido_scope/overlay.cfg b/src/overlays/misc/ovl_kaleido_scope/overlay.cfg
index d9bc0eb65..d9bc0eb65 100644
--- a/src/overlays/actors/ovl_kaleido_scope/overlay.cfg
+++ b/src/overlays/misc/ovl_kaleido_scope/overlay.cfg
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index c3954bb45..c3954bb45 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
index 8156fc073..8156fc073 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
index 992e33bcf..992e33bcf 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index 50ff579c0..50ff579c0 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
index 78491e12c..78491e12c 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
index c16404fb2..c16404fb2 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
index 2e1559191..2e1559191 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 8b7f529a7..8b7f529a7 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
index 3da61f1df..3da61f1df 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
index df96fc876..df96fc876 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
diff --git a/src/overlays/ovl_map_mark_data/overlay.cfg b/src/overlays/misc/ovl_map_mark_data/overlay.cfg
index b29d893c0..b29d893c0 100644
--- a/src/overlays/ovl_map_mark_data/overlay.cfg
+++ b/src/overlays/misc/ovl_map_mark_data/overlay.cfg
diff --git a/src/overlays/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
index 1fa95837a..1fa95837a 100644
--- a/src/overlays/ovl_map_mark_data/z_map_mark_data.c
+++ b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c