From 1b0a1a71b3de40a3181e14ae85aefd88565648a2 Mon Sep 17 00:00:00 2001
From: Behemoth <Luisscheurenbrand@gmail.com>
Date: Sat, 29 Aug 2020 18:11:09 +0200
Subject: [PATCH] move animation files

---
 Makefile                                      |  2 +-
 .../beetle.s}                                 |  0
 .../chuchu.s}                                 |  0
 .../darkNut.s}                                |  0
 .../doorMimic.s}                              |  0
 .../greatFairy.s}                             |  0
 .../{keeseAnimations.s => animations/keese.s} |  0
 .../leever.s}                                 |  0
 .../octorok.s}                                |  0
 .../peahat.s}                                 |  0
 .../rollobite.s}                              |  0
 linker.ld                                     | 20 +++++++++----------
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename data/{beetleAnimations.s => animations/beetle.s} (100%)
 rename data/{chuchuAnimations.s => animations/chuchu.s} (100%)
 rename data/{darkNutAnimations.s => animations/darkNut.s} (100%)
 rename data/{doorMimicAnimations.s => animations/doorMimic.s} (100%)
 rename data/{greatFairyAnimations.s => animations/greatFairy.s} (100%)
 rename data/{keeseAnimations.s => animations/keese.s} (100%)
 rename data/{leeverAnimations.s => animations/leever.s} (100%)
 rename data/{octorokAnimations.s => animations/octorok.s} (100%)
 rename data/{peahatAnimations.s => animations/peahat.s} (100%)
 rename data/{rollobiteAnimations.s => animations/rollobite.s} (100%)

diff --git a/Makefile b/Makefile
index ed71b35f..caf5a55e 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
 ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
 
-DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
+DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 
 SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)
diff --git a/data/beetleAnimations.s b/data/animations/beetle.s
similarity index 100%
rename from data/beetleAnimations.s
rename to data/animations/beetle.s
diff --git a/data/chuchuAnimations.s b/data/animations/chuchu.s
similarity index 100%
rename from data/chuchuAnimations.s
rename to data/animations/chuchu.s
diff --git a/data/darkNutAnimations.s b/data/animations/darkNut.s
similarity index 100%
rename from data/darkNutAnimations.s
rename to data/animations/darkNut.s
diff --git a/data/doorMimicAnimations.s b/data/animations/doorMimic.s
similarity index 100%
rename from data/doorMimicAnimations.s
rename to data/animations/doorMimic.s
diff --git a/data/greatFairyAnimations.s b/data/animations/greatFairy.s
similarity index 100%
rename from data/greatFairyAnimations.s
rename to data/animations/greatFairy.s
diff --git a/data/keeseAnimations.s b/data/animations/keese.s
similarity index 100%
rename from data/keeseAnimations.s
rename to data/animations/keese.s
diff --git a/data/leeverAnimations.s b/data/animations/leever.s
similarity index 100%
rename from data/leeverAnimations.s
rename to data/animations/leever.s
diff --git a/data/octorokAnimations.s b/data/animations/octorok.s
similarity index 100%
rename from data/octorokAnimations.s
rename to data/animations/octorok.s
diff --git a/data/peahatAnimations.s b/data/animations/peahat.s
similarity index 100%
rename from data/peahatAnimations.s
rename to data/animations/peahat.s
diff --git a/data/rollobiteAnimations.s b/data/animations/rollobite.s
similarity index 100%
rename from data/rollobiteAnimations.s
rename to data/animations/rollobite.s
diff --git a/linker.ld b/linker.ld
index aaecc595..b4ebf4ba 100644
--- a/linker.ld
+++ b/linker.ld
@@ -906,24 +906,24 @@ SECTIONS {
 		src/trig.o(.rodata);
 		data/data_080C93E0.o(.rodata);
 		src/enemy/octorok.o(.rodata);
-		data/octorokAnimations.o(.rodata);
+		data/animations/octorok.o(.rodata);
 		src/enemy/chuchu.o(.rodata);
-		data/chuchuAnimations.o(.rodata);
+		data/animations/chuchu.o(.rodata);
 		src/enemy/leever.o(.rodata);
-		data/leeverAnimations.o(.rodata);
+		data/animations/leever.o(.rodata);
 		src/enemy/peahat.o(.rodata);
-		data/peahatAnimations.o(.rodata);
+		data/animations/peahat.o(.rodata);
 		src/enemy/rollobite.o(.rodata);
-		data/rollobiteAnimations.o(.rodata);
+		data/animations/rollobite.o(.rodata);
 		src/enemy/darkNut.o(.rodata);
-		data/darkNutAnimations.o(.rodata);
+		data/animations/darkNut.o(.rodata);
 		src/enemy/hangingSeed.o(.rodata);
 		src/enemy/beetle.o(.rodata);
-		data/beetleAnimations.o(.rodata);
+		data/animations/beetle.o(.rodata);
 		src/enemy/keese.o(.rodata);
-		data/keeseAnimations.o(.rodata);
+		data/animations/keese.o(.rodata);
 		src/enemy/doorMimic.o(.rodata);
-		data/doorMimicAnimations.o(.rodata);
+		data/animations/doorMimic.o(.rodata);
 		data/data_080CB948.o(.rodata);
 		src/enemy.o(.rodata);
 		data/data_080D3D94.o(.rodata);
@@ -941,7 +941,7 @@ SECTIONS {
         data/room_headers.o(.rodata);
         data/data_0811E454.o(.rodata);
 		src/object/greatFairy.o(.rodata);
-		data/greatFairyAnimations.o(.rodata);
+		data/animations/greatFairy.o(.rodata);
 		data/data_081208A0.o(.rodata);
 		src/object/heartContainer.o(.rodata);
 		data/data_08121C58.o(.rodata);