move GBA library files to libs.

15 files changed, 27 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index e779fbcb2..0ba9cdee9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,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,/field,/debug,/misc,/scene,/pokemon,/engine}}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle,/field,/debug,/misc,/scene,/pokemon,/engine,/libs}}))
 
 C_SRCS := $(wildcard src/*/*.c) $(wildcard src/*.c)
 ASM_SRCS := $(wildcard asm/*.s)
@@ -90,17 +90,17 @@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(A
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID) $(<F)
 
-%src/engine/libc.o: CC1 := tools/agbcc/bin/old_agbcc
-%src/engine/libc.o: CFLAGS := -O2
+%src/libs/libc.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/libc.o: CFLAGS := -O2
 
-%src/engine/siirtc.o: CFLAGS := -mthumb-interwork
+%src/libs/siirtc.o: CFLAGS := -mthumb-interwork
 
-%src/engine/agb_flash.o: CFLAGS := -O -mthumb-interwork
-%src/engine/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
-%src/engine/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
 
-%src/engine/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
-%src/engine/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 
 $(SONG_OBJS): %.o: %.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
diff --git a/common_syms/engine/agb_flash.txt b/common_syms/libs/agb_flash.txt
index cb421ec80..cb421ec80 100644
--- a/common_syms/engine/agb_flash.txt
+++ b/common_syms/libs/agb_flash.txt
diff --git a/common_syms/engine/m4a_2.txt b/common_syms/libs/m4a_2.txt
index a80d8a79d..a80d8a79d 100644
--- a/common_syms/engine/m4a_2.txt
+++ b/common_syms/libs/m4a_2.txt
diff --git a/ld_script.txt b/ld_script.txt
index 31d50e4b3..198a549da 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -25,7 +25,7 @@ SECTIONS {
 <BSS>
 
         /* .bss.code starts at 0x3000F60 */
-        src/engine/m4a_2.o(.bss.code);
+        src/libs/m4a_2.o(.bss.code);
 
         /* COMMON starts at 0x3001760 */
 <COMMON>
@@ -293,13 +293,13 @@ SECTIONS {
     {
         asm/libgcnmultiboot.o(.text);
         asm/m4a_1.o(.text);
-        src/engine/m4a_2.o(.text);
+        src/libs/m4a_2.o(.text);
         asm/m4a_3.o(.text);
-        src/engine/m4a_4.o(.text);
-        src/engine/agb_flash.o(.text);
-        src/engine/agb_flash_1m.o(.text);
-        src/engine/agb_flash_mx.o(.text);
-        src/engine/siirtc.o(.text);
+        src/libs/m4a_4.o(.text);
+        src/libs/agb_flash.o(.text);
+        src/libs/agb_flash_1m.o(.text);
+        src/libs/agb_flash_mx.o(.text);
+        src/libs/siirtc.o(.text);
         asm/libagbsyscall.o(.text);
         tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text);
         tools/agbcc/lib/libgcc.a:_divsi3.o(.text);
@@ -315,7 +315,7 @@ SECTIONS {
         tools/agbcc/lib/libgcc.a:fp-bit.o(.text);
         tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text);
         tools/agbcc/lib/libgcc.a:_negdi2.o(.text);
-        src/engine/libc.o(.text);
+        src/libs/libc.o(.text);
     } =0
 
     .rodata :
@@ -479,7 +479,7 @@ SECTIONS {
         data/strings2.o(.rodata);
         data/menu_cursor.o(.rodata);
         data/mystery_event_msg.o(.rodata);
-        src/engine/m4a_tables.o(.rodata);
+        src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
 
@@ -908,11 +908,11 @@ SECTIONS {
     lib_rodata :
     ALIGN(4)
     {
-        src/engine/agb_flash.o(.rodata);
-        src/engine/agb_flash_1m.o(.rodata);
-        src/engine/agb_flash_mx.o(.rodata);
-        src/engine/agb_flash_le.o(.rodata);
-        src/engine/siirtc.o(.rodata);
+        src/libs/agb_flash.o(.rodata);
+        src/libs/agb_flash_1m.o(.rodata);
+        src/libs/agb_flash_mx.o(.rodata);
+        src/libs/agb_flash_le.o(.rodata);
+        src/libs/siirtc.o(.rodata);
         tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);
     } =0
 
diff --git a/src/engine/agb_flash.c b/src/libs/agb_flash.c
index 340d469a7..340d469a7 100644
--- a/src/engine/agb_flash.c
+++ b/src/libs/agb_flash.c
diff --git a/src/engine/agb_flash_1m.c b/src/libs/agb_flash_1m.c
index e249fab9a..e249fab9a 100644
--- a/src/engine/agb_flash_1m.c
+++ b/src/libs/agb_flash_1m.c
diff --git a/src/engine/agb_flash_le.c b/src/libs/agb_flash_le.c
index 39d956e27..39d956e27 100644
--- a/src/engine/agb_flash_le.c
+++ b/src/libs/agb_flash_le.c
diff --git a/src/engine/agb_flash_mx.c b/src/libs/agb_flash_mx.c
index 67348901f..67348901f 100644
--- a/src/engine/agb_flash_mx.c
+++ b/src/libs/agb_flash_mx.c
diff --git a/src/engine/libc.c b/src/libs/libc.c
index 920673e3e..920673e3e 100644
--- a/src/engine/libc.c
+++ b/src/libs/libc.c
diff --git a/src/engine/m4a_2.c b/src/libs/m4a_2.c
index 2d3c65848..2d3c65848 100644
--- a/src/engine/m4a_2.c
+++ b/src/libs/m4a_2.c
diff --git a/src/engine/m4a_4.c b/src/libs/m4a_4.c
index 99195ec00..99195ec00 100644
--- a/src/engine/m4a_4.c
+++ b/src/libs/m4a_4.c
diff --git a/src/engine/m4a_tables.c b/src/libs/m4a_tables.c
index 91f00a31d..91f00a31d 100644
--- a/src/engine/m4a_tables.c
+++ b/src/libs/m4a_tables.c
diff --git a/src/engine/siirtc.c b/src/libs/siirtc.c
index 965a068f1..965a068f1 100644
--- a/src/engine/siirtc.c
+++ b/src/libs/siirtc.c
diff --git a/sym_bss.txt b/sym_bss.txt
index 95c5bc3cc..0e583c4e1 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -132,7 +132,7 @@ gUnknown_030007B0: @ 30007B0
 
 	.include "src/field/player_pc.o"
 	.include "asm/m4a_1.o"
-	.include "src/engine/agb_flash.o"
-	.include "src/engine/siirtc.o"
+	.include "src/libs/agb_flash.o"
+	.include "src/libs/siirtc.o"
 	.include "tools/agbcc/lib/libgcc.a:dp-bit.o"
 	.include "tools/agbcc/lib/libgcc.a:fp-bit.o"
diff --git a/sym_common.txt b/sym_common.txt
index e141f6899..8a2f53869 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -328,5 +328,5 @@ gUnknown_03005F94: @ 3005F94
 gUnknown_03005FA0: @ 3005FA0
 	.space 0x30
 
-	.include "engine/m4a_2.o"
-	.include "engine/agb_flash.o"
+	.include "libs/m4a_2.o"
+	.include "libs/agb_flash.o"