Move unused files back to src/ level

5 files changed, 13 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 275df021e..c1f6a6b4f 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
 $(VERSIONS) $(VERSIONS:%=compare_%)
 
 
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs,/unused}}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs}}))
 
 C_SRCS := $(shell find src -iname "*.c")
 ASM_SRCS := $(wildcard asm/*.s)
diff --git a/ld_script.txt b/ld_script.txt
index 894a70d4d..11a430764 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -349,12 +349,12 @@ SECTIONS {
         src/scene/cable_car.o(.text);
         src/roulette_util.o(.text);
         src/engine/cable_car_util.o(.text);
-        src/unused/unused_8124F94.o(.text);
+        src/unused_8124F94.o(.text);
         src/engine/save.o(.text);
         src/engine/mystery_event_script.o(.text);
         src/field/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
-        src/unused/unused_81258BC.o(.text);
+        src/unused_81258BC.o(.text);
         src/battle/anim/sfx.o(.text);
         src/battle/battle_controller_safari.o(.text);
         src/field/fldeff_sweetscent.o(.text);
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 470fea3cc..10ef1681e 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -13,11 +13,10 @@ extern u16 gBattlePartyID[];
 extern u16 gAnimSpeciesByBanks[];
 extern u8 gUnknown_0202F7D2;
 
-void sub_812AF98(u8 taskId);
-void sub_812B004(u8 taskId);
-void sub_812B004(u8 taskId);
-void sub_812B108(u8 taskId);
-void sub_812B404(u8 taskId);
+static void sub_812AF98(u8 taskId);
+static void sub_812B004(u8 taskId);
+static void sub_812B108(u8 taskId);
+static void sub_812B404(u8 taskId);
 
 // used in 1 move:
 //         Move_FIRE_BLAST
@@ -40,7 +39,7 @@ void sub_812AF30(u8 taskId)
     TASK.func = sub_812AF98;
 }
 
-void sub_812AF98(u8 taskId)
+static void sub_812AF98(u8 taskId)
 {
     s16 pan = TASK.data[2];
     s8 dPan = TASK.data[4];
@@ -63,7 +62,7 @@ void sub_812AF98(u8 taskId)
     }
 }
 
-void sub_812B004(u8 taskId)
+static void sub_812B004(u8 taskId)
 {
     s8 pan;
 
@@ -110,10 +109,10 @@ void sub_812B058(u8 taskId)
     TASK.data[12] = r9;
 
     TASK.func = sub_812B108;
-    sub_812B108(taskId);
+    TASK.func(taskId);
 }
 
-void sub_812B108(u8 taskId)
+static void sub_812B108(u8 taskId)
 {
     if (TASK.data[12]++ == TASK.data[6])
     {
@@ -256,10 +255,10 @@ void sub_812B374(u8 taskId)
     TASK.data[11] = sourcePan;
 
     TASK.func = sub_812B404;
-    sub_812B404(taskId);
+    TASK.func(taskId);
 }
 
-void sub_812B404(u8 taskId)
+static void sub_812B404(u8 taskId)
 {
     u16 dPan = TASK.data[3];
 
diff --git a/src/unused/unused_8124F94.c b/src/unused_8124F94.c
index 5f76fa92e..5f76fa92e 100644
--- a/src/unused/unused_8124F94.c
+++ b/src/unused_8124F94.c
diff --git a/src/unused/unused_81258BC.c b/src/unused_81258BC.c
index c509ea4c9..c509ea4c9 100644
--- a/src/unused/unused_81258BC.c
+++ b/src/unused_81258BC.c