summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-05-21 21:50:44 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-05-21 21:50:44 -0400
commit4d5947ecb02e28fce1cd1156bd6908571fbf29bd (patch)
tree44a49d8d53db30994487ecb9358d38ce47767e34 /arm9/asm
parent70b098f92d46c134388e02bd8c436649fe31e999 (diff)
Adjust typing in text.c routines
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_02001B80.s2
-rw-r--r--arm9/asm/unk_0200CABC.s2
-rw-r--r--arm9/asm/unk_02016B94.s22
-rw-r--r--arm9/asm/unk_020772F0.s2
4 files changed, 14 insertions, 14 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index 696f470c..18e10da6 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -913,7 +913,7 @@ FUN_02002218: ; 0x02002218
mov r2, #0x0
str r3, [sp, #0x14]
add r3, r2, #0x0
- bl FUN_02019658
+ bl BlitBitmapRectToWindow
add sp, #0x18
pop {r4, pc}
nop
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index 69afdbe7..27b27a76 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -879,7 +879,7 @@ FUN_0200D148: ; 0x0200D148
mov r0, #0x0
str r0, [sp, #0x10]
add r0, sp, #0x1c
- bl FUN_02018A60
+ bl BlitBitmapRect4Bit
add sp, #0x24
pop {r4-r5, pc}
diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index a6817b28..0a68dea2 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -4256,8 +4256,8 @@ _02018A54: .word 0x0400100A
_02018A58: .word 0x0400100C
_02018A5C: .word 0x0400100E
- thumb_func_start FUN_02018A60
-FUN_02018A60: ; 0x02018A60
+ thumb_func_start BlitBitmapRect4Bit
+BlitBitmapRect4Bit: ; 0x02018A60
push {r3-r7, lr}
sub sp, #0x68
str r2, [sp, #0x8]
@@ -4560,8 +4560,8 @@ _02018C92:
_02018C98: .word 0x0000FFFF
_02018C9C: .word 0x00003FE0
- thumb_func_start FUN_02018CA0
-FUN_02018CA0: ; 0x02018CA0
+ thumb_func_start BlitBitmapRect8Bit
+BlitBitmapRect8Bit: ; 0x02018CA0
push {r3-r7, lr}
sub sp, #0x50
str r2, [sp, #0x8]
@@ -5917,8 +5917,8 @@ _0201963C:
bl MIi_CpuClearFast
pop {r3-r5, pc}
- thumb_func_start FUN_02019658
-FUN_02019658: ; 0x02019658
+ thumb_func_start BlitBitmapRectToWindow
+BlitBitmapRectToWindow: ; 0x02019658
push {r4-r5, lr}
sub sp, #0x1c
add r4, sp, #0x18
@@ -5936,13 +5936,13 @@ FUN_02019658: ; 0x02019658
str r4, [sp, #0x14]
mov r4, #0x0
str r4, [sp, #0x18]
- bl FUN_02019684
+ bl BlitBitmapRect
add sp, #0x1c
pop {r4-r5, pc}
.balign 4
- thumb_func_start FUN_02019684
-FUN_02019684: ; 0x02019684
+ thumb_func_start BlitBitmapRect
+BlitBitmapRect: ; 0x02019684
push {r4-r5, lr}
sub sp, #0x24
str r1, [sp, #0x1c]
@@ -5980,7 +5980,7 @@ FUN_02019684: ; 0x02019684
ldrh r0, [r4, #0x28]
str r0, [sp, #0x10]
add r0, sp, #0x1c
- bl FUN_02018A60
+ bl BlitBitmapRect4Bit
add sp, #0x24
pop {r4-r5, pc}
_020196D6:
@@ -5994,7 +5994,7 @@ _020196D6:
ldrh r0, [r4, #0x28]
str r0, [sp, #0x10]
add r0, sp, #0x1c
- bl FUN_02018CA0
+ bl BlitBitmapRect8Bit
add sp, #0x24
pop {r4-r5, pc}
.balign 4
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 80d633bb..16a7190f 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -4119,7 +4119,7 @@ _02078EB4:
mov r2, #0x0
ldr r0, [sp, #0x18]
add r3, r2, #0x0
- bl FUN_02019658
+ bl BlitBitmapRectToWindow
b _02078F56
_02078F00:
ldr r0, _02078F78 ; =0x0000D004