Merge pull request #222 from DizzyEggg/text

Text.s

include/text2.h

@@ -12,12 +12,13 @@ struct unkShiftData
     u32 shift_right;
 };
 
-// size: 0x8
+// size: 0xC
 struct unkChar
 {
     u32 *unk0;
-    s16 unk4;
+    u16 unk4;
     s16 unk6;
+    u32 fill8;
 };
 
 struct unkStruct_80B8824
@@ -39,12 +40,12 @@ void sub_80078A4(u32, s32, s32, s32, u32);
 void sub_800792C(u32, s32, s32, s32, u32);
 void sub_8007A78(u32, s32, s32, s32, u32);
 void sub_8007B7C(u32, s32, s32, s32, u32);
-void sub_8007E20(u32, u32, u32, u32, u32, u8 *, u32);
+void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 *a5, u32 a6);
 
 // text.s
-extern struct unkChar *GetCharacter(u32);
+extern const struct unkChar *GetCharacter(s32);
 extern void InitGraphics(void);
-extern void sub_800836C(u32, u8 *, u32);
+void sub_800836C(s32 a0, const u8 *compressedData, s32 a1);
 extern void sub_800898C(void);
 extern void sub_80089AC(const UnkTextStruct2 *, UnkTextStruct2_sub *);
 extern void CallPrepareTextbox_8008C54(u32);

src/code_8012A18_1.c

@@ -7,7 +7,7 @@
 
 s32 sub_8015FEC(u8 *buffer, s32 size)
 {
-    struct unkChar *iVar2;
+    const struct unkChar *iVar2;
     s32 currLength;
     s32 length;
     u8 *bufferPtr;
@@ -31,4 +31,4 @@ s32 sub_8015FEC(u8 *buffer, s32 size)
 s32 sub_8016028(void)
 {
     return 60;
-}
+}

src/code_801D014.c

@@ -621,6 +621,6 @@ static void LoadTeamRankBadge(u32 a0, u32 a1, u32 a2)
 
     rank = GetRescueTeamRank();
     teamBadgePic = &teamBadgePic[rank * 128];
-    sub_8007E20(a0, a1, a2, 16, 16, teamBadgePic, 14);
+    sub_8007E20(a0, a1, a2, 16, 16, (void *) teamBadgePic, 14);
     CloseFile(teamBadgeFile);
 }

src/code_803D110.c

@@ -59,6 +59,7 @@ struct UnkDataFileStruct
     u16 **unk10;
 };
 
+// Very similar to unkChar struct
 struct UnkStruct_sub_803DC6C
 {
     u8 *unk0;
@@ -759,7 +760,7 @@ struct UnkStruct_sub_803DC6C *sub_803DEC8(s32 chr)
     if (chr > 63487 && chr < 65535)
     {
         s32 r2 = chr & 0xFF;
-        s32 r1 = (chr & 0xFF00) / 256;
+        s32 r1 = (chr & 0xFF00) >> 8;
         r2 -= 32;
         r1 -= 248;
         ret = &strPtr[r1 * 224 + r2];

src/load_screen.c

@@ -388,7 +388,7 @@ void sub_80397B4(void)
   for(index = 0; index < 12; index++)
   {
     if (sub_80023E4(gUnknown_203B3B8[index])) {
-      sub_8007E20(0,x,y,0x10,0x10,(u8 *)(*((s32*)clmkFile->data) + index * 0x80), gUnknown_203B388[index]);
+      sub_8007E20(0,x,y,0x10,0x10,(u32 *)(*((s32*)clmkFile->data) + index * 0x80), gUnknown_203B388[index]);
       x += 16;
     }
   }

src/menu_input.c

@@ -167,7 +167,7 @@ void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 color, u32 a5)
 {
     s32 iVar1;
     u32 uVar2;
-    struct unkChar *iVar3;
+    const struct unkChar *iVar3;
     s32 counter;
     s32 *piVar3;
     s32 *piVar4;
@@ -212,7 +212,7 @@ void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 color, u32 a5)
 void sub_8012C60(u32 x, u32 y, u32 a2, u32 color, u32 a4)
 {
     u32 add_x;
-    struct unkChar *iVar3;
+    const struct unkChar *iVar3;
     u32 uVar2;
 
     uVar2 = ReturnIntFromChar2(a2);