Merge pull request #200 from DizzyEggg/code_big

Decompilation of code_805D8C8.s Part 1
pret · Jul 28, 2024 · 3d73fd4 · 3d73fd4
2 parents f28d769 + c85a3e9
commit 3d73fd4
Show file tree

Hide file tree

Showing 111 changed files with 5,851 additions and 9,341 deletions.
diff --git a/asm/code_800F990.s b/asm/code_800F990.s
@@ -2299,7 +2299,7 @@ _08010BD0:
 	movs r0, 0xC
 	movs r1, 0x2
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r0, 0
 	bl sub_80073E0
 	add sp, 0x64
@@ -2397,7 +2397,7 @@ _08010C86:
 	movs r1, 0
 	adds r2, r5, 0
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r0, 0
 	bl sub_80073E0
 	movs r0, 0x1
@@ -2407,13 +2407,13 @@ _08010C86:
 	movs r0, 0xA
 	movs r1, 0
 	movs r3, 0x1
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	ldr r2, _08010D78
 	str r4, [sp]
 	movs r0, 0xA
 	movs r1, 0xC
 	movs r3, 0x1
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r0, 0x1
 	bl sub_80073E0
 	add r0, sp, 0x4

diff --git a/asm/code_8010F28.s b/asm/code_8010F28.s
@@ -649,7 +649,7 @@ _08011406:
 	movs r1, 0x2
 	add r2, sp, 0x4
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r0, 0
 	bl sub_80073E0
 	ldr r0, _08011480
@@ -846,7 +846,7 @@ _0801152A:
 	movs r0, 0x10
 	movs r1, 0
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r6, 0
 	cmp r6, r9
 	bge _08011678
@@ -875,7 +875,7 @@ _080115DC:
 	adds r1, r4, 0
 	ldr r2, _0801163C
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	b _08011672
 	.align 2, 0
 _08011610: .4byte gUnknown_203B0E4
@@ -913,7 +913,7 @@ _08011640:
 	adds r1, r4, 0
 	ldr r2, _08011698
 	movs r3, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 _08011672:
 	adds r6, 0x1
 	cmp r6, r9

diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
@@ -1132,7 +1132,7 @@ _08014B1E:
 	movs r0, 0x4
 	movs r1, 0x2
 	movs r3, 0x3
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	movs r0, 0x3
 	bl sub_80073E0
 _08014B6A:
@@ -1667,8 +1667,8 @@ _08014FE8:
 	bx r1
 	thumb_func_end sub_8014FA8
 
-	thumb_func_start xxx_format_and_draw
-xxx_format_and_draw:
+	thumb_func_start PrintFormatStringOnWindow
+PrintFormatStringOnWindow:
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -1691,7 +1691,7 @@ xxx_format_and_draw:
 	adds r1, r6, 0
 	add r2, sp, 0x4
 	mov r3, r8
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	add sp, 0x1F8
 	pop {r3}
 	mov r8, r3
@@ -1700,7 +1700,7 @@ xxx_format_and_draw:
 	bx r0
 	.align 2, 0
 _08015030: .4byte 0x000001f7
-	thumb_func_end xxx_format_and_draw
+	thumb_func_end PrintFormatStringOnWindow
 
 	thumb_func_start sub_8015034
 sub_8015034:
@@ -1819,7 +1819,7 @@ _080150AC:
 	movs r0, 0x4
 	movs r1, 0x4
 	movs r3, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	movs r0, 0
 	bl sub_80073E0
 	ldr r0, [r5]
@@ -3136,7 +3136,7 @@ _08015B34:
 	mov r2, r10
 _08015B6A:
 	movs r3, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	b _08015B9E
 	.align 2, 0
 _08015B74: .4byte gUnknown_80DB4F4
@@ -3351,7 +3351,7 @@ _08015D28:
 	movs r1, 0x2
 _08015D32:
 	movs r3, 0x1
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	b _08015D50
 	.align 2, 0
 _08015D3C: .4byte gUnknown_80DB638
@@ -3362,7 +3362,7 @@ _08015D40:
 	movs r0, 0x30
 	movs r1, 0x4
 	movs r3, 0x1
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 _08015D50:
 	ldr r5, _08015D68
 	ldr r0, [r5]
@@ -3445,7 +3445,7 @@ _08015DEE:
 	movs r1, 0x16
 	add r2, sp, 0x4
 	movs r3, 0x1
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 _08015DFE:
 	movs r0, 0x1
 	bl sub_80073E0

diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s
@@ -39,7 +39,7 @@ sub_801F280:
 	str r0, [sp]
 	movs r0, 0xC
 	movs r1, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	movs r7, 0
 	ldr r0, [r4]
 	movs r1, 0x36
@@ -131,7 +131,7 @@ _0801F372:
 	adds r0, r4, 0
 	adds r1, r6, 0
 	ldr r2, _0801F3F4
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 _0801F386:
 	adds r7, 0x1
 	mov r1, r8
@@ -168,7 +168,7 @@ _0801F394:
 	str r0, [sp]
 	movs r0, 0x8
 	movs r1, 0
-	bl xxx_format_and_draw
+	bl PrintFormatStringOnWindow
 	ldr r0, [r4]
 	ldr r0, [r0, 0x54]
 	bl sub_80073E0

diff --git a/asm/code_8023868.s b/asm/code_8023868.s
@@ -712,7 +712,7 @@ _08023DE0:
 	movs r0, 0xA
 	movs r1, 0
 	add r2, sp, 0x8
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	b _08023E3C
 _08023E00:
 	ldr r2, _08023EBC
@@ -723,7 +723,7 @@ _08023E02:
 	str r0, [sp]
 	movs r0, 0xA
 	movs r1, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	ldr r1, [r4]
 	ldr r2, _08023EC0
 	adds r0, r1, r2
@@ -878,7 +878,7 @@ _08023F02:
 	str r0, [sp]
 	movs r0, 0x8
 	add r2, sp, 0x8
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	adds r7, 0x1
 	mov r1, r8
 	ldr r0, [r4]

diff --git a/asm/code_803B050.s b/asm/code_803B050.s
@@ -310,7 +310,7 @@ sub_803B284:
 	str r0, [sp]
 	movs r0, 0xA
 	movs r1, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	ldr r1, [r6]
 	adds r0, r1, 0
 	adds r0, 0x9E
@@ -362,7 +362,7 @@ _0803B2DC:
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x8
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	adds r5, 0x1
 	ldr r0, [r6]
 	movs r3, 0x1A

diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
@@ -2043,7 +2043,7 @@ _080533F0:
 	str r0, [sp]
 	movs r0, 0x8
 	movs r3, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 	adds r6, 0xE
 _08053402:
 	adds r4, 0x1
@@ -2169,7 +2169,7 @@ _080534EA:
 	str r0, [sp]
 	movs r0, 0x8
 	movs r3, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 _080534FA:
 	movs r0, 0
 	bl sub_80073E0
@@ -2291,7 +2291,7 @@ _080535E4:
 	str r0, [sp]
 	movs r0, 0x8
 	movs r3, 0
-	bl xxx_call_draw_string
+	bl PrintStringOnWindow
 _080535F4:
 	movs r0, 0
 	bl sub_80073E0