From 21cf77f46f2795cd35a7dc7b82a3ed2f994430d7 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sat, 9 Sep 2023 17:13:43 -0400
Subject: [PATCH] Annotate some more for the text1/text2 puzzle

---
 data/data.s |  4 ++--
 src/text1.c | 22 +++++++++++-----------
 src/text2.c | 27 +++++++++------------------
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/data/data.s b/data/data.s
index 9d1803778..d94856dc6 100644
--- a/data/data.s
+++ b/data/data.s
@@ -1754,10 +1754,10 @@ gUnknown_80B83EA: @ 80B83EA
 
     .align 2, 0
 
-@ ???
+@ text1.c ?
 .string "pksdir0\0"
 
-@ text2.c
+@ text1.c or text2.c (gKanjiA_file_string is used in text1.c but the rest in text2.c, and we get code changes for merging the files...)
 .string "pksdir0\0"
 
 	.global gUnknown_80B853C
diff --git a/src/text1.c b/src/text1.c
index 26a27d072..f497ad570 100644
--- a/src/text1.c
+++ b/src/text1.c
@@ -27,12 +27,12 @@ extern s16 gUnknown_3000E94[];
 
 // data.s
 extern const UnkTextStruct2 gUnknown_80B857C[4];
+extern const u8 gKanjiA_file_string[]; // 80B87B4
+extern const u8 gKanjiB_file_string[]; // 80B87BC
 extern const u32 gUnknown_80B87C4[8];
 extern const u32 gUnknown_80B87E4[8];
 extern const u32 gUnknown_80B8804[4];
 extern const u32 gUnknown_80B8814[];
-extern const char gKanjiA_file_string[];
-extern const char gKanjiB_file_string[];
 // system_sbin.s
 extern const struct FileArchive gSystemFileArchive;
 
@@ -82,7 +82,7 @@ void LoadCharmaps(void)
 u32 xxx_update_some_bg_tiles(u32 a0)
 {
     u32 r5 = gUnknown_20274B0;
-    u32 *r4 = (u32 *)(VRAM + 0x4f40);
+    u32 *r4 = (u32 *)(VRAM + 0x4F40);
     const u32 *r2;
     gUnknown_20274B0 = a0;
 
@@ -132,18 +132,18 @@ void sub_80063D8(int a0)
         retval = 0x88888888;
     }
     else {
-        retval = (a0 & 0xf) | ((a0 & 0xf) << 4);
-        retval |= ((a0 & 0xf) << 8);
-        retval |= ((a0 & 0xf) << 12);
-        retval |= ((a0 & 0xf) << 16);
-        retval |= ((a0 & 0xf) << 20);
-        retval |= ((a0 & 0xf) << 24);
-        retval |= ((a0 & 0xf) << 28);
+        retval = (a0 & 0xF) | ((a0 & 0xF) << 4); // Must be one line for matching
+        retval |= ((a0 & 0xF) << 8);
+        retval |= ((a0 & 0xF) << 12);
+        retval |= ((a0 & 0xF) << 16);
+        retval |= ((a0 & 0xF) << 20);
+        retval |= ((a0 & 0xF) << 24);
+        retval |= ((a0 & 0xF) << 28);
     }
     gUnknown_202B030 = retval;
 }
 
-// TODO: Move sub_800641C and sub_8006438 to text2.c ?
+// TODO: Move sub_800641C and sub_8006438 to text2.c ? data.s shows text1 and text2 are merged somehow but not fully
 void sub_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2)
 {
     UnkTextStruct2_sub r3 = {0, 0};
diff --git a/src/text2.c b/src/text2.c
index 9bcf70fe5..ee1e45c18 100644
--- a/src/text2.c
+++ b/src/text2.c
@@ -1277,8 +1277,7 @@ void sub_8007334(s32 a0)
 }
 #endif // NONMATCHING
 
-// Unused
-void nullsub_154(void)
+UNUSED static void nullsub_154(void)
 {
 }
 
@@ -1293,8 +1292,7 @@ void sub_80073B8(s32 a0)
     r1->unk46 = 1;
 }
 
-// Unused
-void nullsub_155(void)
+UNUSED static void nullsub_155(void)
 {
 }
 
@@ -1319,8 +1317,7 @@ void sub_80073E0(s32 a0)
     r1->unk46 = 0;
 }
 
-// Unused
-void nullsub_156(void)
+UNUSED static void nullsub_156(void)
 {
 }
 
@@ -1915,8 +1912,7 @@ void sub_80078A4(u32 a0, s32 x, s32 y, s32 a3, u32 color)
     sub_800792C(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
 }
 
-// Unused
-void sub_80078E8(u32 a0, s32 x, s32 y, s32 a3, u32 color)
+UNUSED static void sub_80078E8(u32 a0, s32 x, s32 y, s32 a3, u32 color)
 {
     nullsub_129(a0, x, y, a3, color);
     nullsub_129(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
@@ -1997,8 +1993,7 @@ void sub_8007A78(u32 a0, s32 x, s32 y, s32 a3, u32 color)
     sub_8007AA4(gUnknown_2027370, a0, x, y, a3, color);
 }
 
-// Unused
-void nullsub_157(void)
+UNUSED static void nullsub_157(void)
 {
 }
 
@@ -2053,8 +2048,7 @@ void sub_8007B7C(u32 a0, s32 x, s32 y, s32 a3, u32 color)
     sub_8007BA8(gUnknown_2027370, a0, x, y, a3, color);
 }
 
-// Unused
-void nullsub_158(void)
+UNUSED static void nullsub_158(void)
 {
 }
 
@@ -2299,14 +2293,12 @@ void sub_8007BA8(UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, s32 color)
 }
 #endif // NONMATCHING
 
-// Unused
-void sub_8007CD4(u32 a0, s32 a1, s32 a2, s32 a3, s32 a4)
+UNUSED static void sub_8007CD4(u32 a0, s32 a1, s32 a2, s32 a3, s32 a4)
 {
     sub_8007D00(gUnknown_2027370, a0, a1, a2, a3, a4);
 }
 
-// Unused
-void nullsub_159(void)
+UNUSED static void nullsub_159(void)
 {
 }
 
@@ -2477,7 +2469,6 @@ void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u8 *a5, u32 a6)
     sub_8007E64(gUnknown_2027370, &gUnknown_202B038[0][0][0], a0, a1, a2, a3, a4, a5, a6);
 }
 
-// Unused
-void nullsub_160(void)
+UNUSED static void nullsub_160(void)
 {
 }
\ No newline at end of file