sub_8007B7C + nullsub_158

asm/text.s

@@ -5,34 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8007B7C
-sub_8007B7C:
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, [sp, 0x18]
-	ldr r0, _08007BA0
-	str r3, [sp]
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl sub_8007BA8
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08007BA0: .4byte gUnknown_2027370
-	thumb_func_end sub_8007B7C
-
-	thumb_func_start nullsub_158
-nullsub_158:
-	bx lr
-	thumb_func_end nullsub_158
-
 	thumb_func_start sub_8007BA8
 sub_8007BA8:
 	push {r4-r7,lr}

include/text2.h

@@ -35,9 +35,10 @@ void sub_8006518(struct UnkTextStruct2 *);
 void sub_8006554(struct UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const struct UnkTextStruct2 *, u8, u32, struct UnkTextStruct2_sub *, u8);
 void sub_80073B8(s32);
 void sub_80073E0(s32);
-void sub_80078A4(u32, s32, s32, u32, u32);
-void sub_800792C(u32, s32, s32, u32, u32);
-void sub_8007A78(u32, u32, u32, u32, u32);
+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);
 
 // text.s
 extern struct unkChar *GetCharacter(u32);

src/code_801C620.c

@@ -141,7 +141,6 @@ extern char gUnknown_80DBE30[]; // {ARG_POKEMON_0}
 extern u8 gUnknown_80DBDC8[];
 extern u8 *gUnknown_80D4970[];
 
-extern void sub_8007B7C(s32, s32, s32, s32, s32);
 extern u32 sub_801CE58(void);
 extern void sub_801CC38(void);
 extern void sub_80140B4(struct UnkTextStruct2 *);

src/kecleon_bros.c

@@ -54,7 +54,6 @@ extern const u8 gTeamToolboxA[];
 extern const u8 gTeamToolboxB[];
 
 // text.s
-extern void sub_8007B7C(s32, s32, s32, s32, s32);
 extern void sub_8008C54(u32);
 // code_80130A8.s
 extern void sub_80141B4(const u8 *, u32, struct OpenedFile **, u32);

src/text2.c

@@ -12,7 +12,7 @@ extern const struct unkStruct_80B8848 gUnknown_80B8848;
 // text.s
 extern void sub_8008C6C(struct UnkTextStruct1 *, u32);
 
-void nullsub_129(u32, s32, s32, u32, u32);
+void nullsub_129(u32, s32, s32, s32, u32);
 u32 xxx_draw_char(struct UnkTextStruct1 *, s32, s32, u32, u32, u32);
 
 void sub_800677C(struct UnkTextStruct1 *, s32, u16 *, u8);
@@ -23,6 +23,7 @@ void sub_8006C44(struct UnkTextStruct1 *, s32, u16 *, u8);
 void sub_8006E94(struct UnkTextStruct1 *, s32, u32, const u8 *, u16 *);
 void sub_8007958(struct UnkTextStruct1 *, u32, s32, s32, s32, u32);
 void sub_8007AA4(struct UnkTextStruct1 *, u32, s32, s32, s32, u32);
+void sub_8007BA8(struct UnkTextStruct1 *, u32, s32, s32, s32, u32);
 
 void nullsub_152(void)
 {
@@ -1906,25 +1907,25 @@ u32 xxx_draw_char(struct UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u3
 "_080078A0: .4byte gCharacterSpacing");
 }
 
-void sub_80078A4(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+void sub_80078A4(u32 a0, s32 x, s32 y, s32 a3, u32 color)
 {
     sub_800792C(a0, x, y, a3, color);
     sub_800792C(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
 }
 
 // Unused
-void sub_80078E8(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+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);
 }
 
-void sub_800792C(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+void sub_800792C(u32 a0, s32 x, s32 y, s32 a3, u32 color)
 { 
     sub_8007958(gUnknown_2027370, a0, x, y, a3, color);
 }
 
-void nullsub_129(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+void nullsub_129(u32 a0, s32 x, s32 y, s32 a3, u32 color)
 {
 }
 
@@ -2164,13 +2165,13 @@ void sub_8007958(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 co
 }
 #endif // NONMATCHING
 
-void sub_8007A78(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4)
+void sub_8007A78(u32 a0, s32 x, s32 y, s32 a3, u32 color)
 {
-    sub_8007AA4(gUnknown_2027370, a0, a1, a2, a3, a4);
+    sub_8007AA4(gUnknown_2027370, a0, x, y, a3, color);
 }
 
 // Unused
-void nullsub_157()
+void nullsub_157(void)
 {
 }
 
@@ -2290,4 +2291,14 @@ void sub_8007AA4(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 co
     "\tpop {r4-r7}\n"
     "\tpop {r0}\n"
     "\tbx r0");
+}
+
+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)
+{
 }