From bc7d125c683eeb3299c6ce4983511e6b2ce46c16 Mon Sep 17 00:00:00 2001
From: AreaZeroArven <122058867+AreaZeroArven@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:47:57 -0400
Subject: [PATCH] Move sprite.c and string_util out of GFLib

These two files do not contain hardware-interfacing code, and thus make more sense in src than GFLib.

Plus, they were never part of the actual GFLib if the first place.
---
 {gflib => include}/sprite.h      | 0
 {gflib => include}/string_util.h | 0
 ld_script.txt                    | 8 ++++----
 {gflib => src}/sprite.c          | 0
 {gflib => src}/string_util.c     | 0
 sym_bss.txt                      | 2 +-
 sym_common.txt                   | 2 +-
 sym_ewram.txt                    | 4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename {gflib => include}/sprite.h (100%)
 rename {gflib => include}/string_util.h (100%)
 rename {gflib => src}/sprite.c (100%)
 rename {gflib => src}/string_util.c (100%)

diff --git a/gflib/sprite.h b/include/sprite.h
similarity index 100%
rename from gflib/sprite.h
rename to include/sprite.h
diff --git a/gflib/string_util.h b/include/string_util.h
similarity index 100%
rename from gflib/string_util.h
rename to include/string_util.h
diff --git a/ld_script.txt b/ld_script.txt
index 4be596524004..1e925d1e664f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -66,8 +66,8 @@ SECTIONS {
         gflib/blit.o(.text);
         gflib/window.o(.text);
         gflib/text.o(.text);
-        gflib/sprite.o(.text);
-        gflib/string_util.o(.text);
+        src/sprite.o(.text);
+        src/string_util.o(.text);
         src/link.o(.text);
         src/AgbRfu_LinkManager.o(.text);
         src/link_rfu_3.o(.text);
@@ -451,9 +451,9 @@ SECTIONS {
         gflib/bg.o(.rodata);
         gflib/window.o(.rodata);
         gflib/text.o(.rodata);
-        gflib/sprite.o(.rodata);
+        src/sprite.o(.rodata);
         gflib/io_reg.o(.rodata);
-        gflib/string_util.o(.rodata);
+        src/string_util.o(.rodata);
         src/link.o(.rodata);
         src/link.o(.rodata.str1.4);
         src/AgbRfu_LinkManager.o(.rodata);
diff --git a/gflib/sprite.c b/src/sprite.c
similarity index 100%
rename from gflib/sprite.c
rename to src/sprite.c
diff --git a/gflib/string_util.c b/src/string_util.c
similarity index 100%
rename from gflib/string_util.c
rename to src/string_util.c
diff --git a/sym_bss.txt b/sym_bss.txt
index 3a23e747890e..20e6f5a8e69a 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -4,7 +4,7 @@
 	.include "gflib/gpu_regs.o"
 	.include "gflib/bg.o"
 	.include "gflib/text.o"
-	.include "gflib/sprite.o"
+	.include "src/sprite.o"
 	.include "src/link.o"
 	.include "src/AgbRfu_LinkManager.o"
 	.include "src/link_rfu_3.o"
diff --git a/sym_common.txt b/sym_common.txt
index 7eebcac74e62..d51c01c29491 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -24,7 +24,7 @@ gCurGlyph:
 	.align 2
 gTextFlags:
 	.space 4
-    @ ../gflib/sprite.o
+    @ ../src/sprite.o
 	.align 2
 gOamMatrixAllocBitmap:
 	.space 4
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 414b7a3b235c..71a62812870b 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -2,8 +2,8 @@
 	.include "src/main.o"
 	.include "gflib/window.o"
 	.include "gflib/text.o"
-	.include "gflib/sprite.o"
-	.include "gflib/string_util.o"
+	.include "src/sprite.o"
+	.include "src/string_util.o"
 	.include "src/link.o"
 	.include "src/AgbRfu_LinkManager.o"
 	.include "src/link_rfu_3.o"