summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_020010A8.s371
-rw-r--r--arm9/asm/unk_02001B80.s18
-rw-r--r--arm9/asm/unk_020023C0.s4
-rw-r--r--arm9/asm/unk_02002C14.s4
-rw-r--r--arm9/asm/unk_02012CC8.s4
-rw-r--r--arm9/asm/unk_02016B94.s4
-rw-r--r--arm9/asm/unk_02033F50.s2
-rw-r--r--arm9/asm/unk_02034188.s2
-rw-r--r--arm9/asm/unk_02050E48.s12
-rw-r--r--arm9/asm/unk_020653EC.s2
-rw-r--r--arm9/asm/unk_02072548.s10
-rw-r--r--arm9/asm/unk_020772F0.s10
-rw-r--r--arm9/asm/unk_02089498.s4
-rw-r--r--arm9/asm/unk_02089960.s4
-rw-r--r--arm9/asm/unk_02089D90.s2
-rw-r--r--arm9/asm/unk_02089F24.s4
-rw-r--r--arm9/asm/unk_0208A338.s8
17 files changed, 58 insertions, 407 deletions
diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s
index d7a2c9f0..e814dda2 100644
--- a/arm9/asm/unk_020010A8.s
+++ b/arm9/asm/unk_020010A8.s
@@ -2,363 +2,14 @@
.include "global.inc"
.extern gMain
- .extern FUN_0200165C
+ .extern ListMenuPrint
+ .extern ListMenuPrintEntries
+ .extern ListMenuDrawCursor
+ .extern ListMenuErasePrintedCursor
+ .extern ListMenuUpdateSelectedRowIndexAndScrollOffset
.text
- thumb_func_start ListMenuPrintEntries
-ListMenuPrintEntries: ; 0x02001714
- push {r4-r7, lr}
- sub sp, #0x14
- add r5, r0, #0x0
- str r3, [sp, #0x0]
- ldrh r0, [r5, #0x1a]
- add r4, r1, #0x0
- mov r1, #0x1
- lsl r0, r0, #0x11
- lsr r0, r0, #0x1a
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- add r6, r2, #0x0
- bl FUN_02002E4C
- ldrh r1, [r5, #0x1a]
- lsl r1, r1, #0x19
- lsr r1, r1, #0x1c
- add r0, r1, r0
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- str r0, [sp, #0xc]
- mov r0, #0x0
- str r0, [sp, #0x10]
- ldr r0, [sp, #0x0]
- cmp r0, #0x0
- ble _020017A6
-_02001748:
- ldr r1, [r5, #0x0]
- lsl r0, r4, #0x3
- str r0, [sp, #0x8]
- add r0, r1, r0
- ldr r1, [r0, #0x4]
- mov r0, #0x2
- mvn r0, r0
- cmp r1, r0
- beq _02001760
- ldrb r0, [r5, #0x15]
- str r0, [sp, #0x4]
- b _02001764
-_02001760:
- ldrb r0, [r5, #0x14]
- str r0, [sp, #0x4]
-_02001764:
- ldrb r0, [r5, #0x17]
- lsl r0, r0, #0x1c
- lsr r3, r0, #0x1c
- ldr r0, [sp, #0xc]
- add r2, r0, #0x0
- mul r2, r6
- add r0, r3, r2
- lsl r0, r0, #0x18
- ldr r3, [r5, #0x8]
- lsr r7, r0, #0x18
- cmp r3, #0x0
- beq _02001782
- add r0, r5, #0x0
- add r2, r7, #0x0
- blx r3
-_02001782:
- ldr r2, [r5, #0x0]
- ldr r1, [sp, #0x8]
- add r0, r5, #0x0
- ldr r1, [r2, r1]
- ldr r2, [sp, #0x4]
- add r3, r7, #0x0
- bl FUN_0200165C
- add r0, r4, #0x1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- ldr r0, [sp, #0x10]
- add r6, r6, #0x1
- add r1, r0, #0x1
- ldr r0, [sp, #0x0]
- str r1, [sp, #0x10]
- cmp r1, r0
- blt _02001748
-_020017A6:
- add sp, #0x14
- pop {r4-r7, pc}
- .balign 4
-
- thumb_func_start ListMenuDrawCursor
-ListMenuDrawCursor: ; 0x020017AC
- push {r3-r5, lr}
- add r4, r0, #0x0
- ldrh r0, [r4, #0x1a]
- mov r1, #0x1
- lsl r0, r0, #0x11
- lsr r0, r0, #0x1a
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl FUN_02002E4C
- ldrh r1, [r4, #0x1a]
- ldrh r5, [r4, #0x2e]
- lsl r2, r1, #0x19
- lsr r2, r2, #0x1c
- add r0, r2, r0
- lsl r0, r0, #0x18
- lsr r3, r0, #0x18
- ldrb r0, [r4, #0x17]
- mul r3, r5
- ldrb r2, [r4, #0x16]
- lsl r0, r0, #0x1c
- lsr r0, r0, #0x1c
- add r0, r0, r3
- lsl r0, r0, #0x18
- lsr r3, r0, #0x18
- lsl r0, r1, #0x10
- lsr r0, r0, #0x1f
- cmp r0, #0x3
- bhi _02001802
- add r0, r0, r0
- add r0, pc
- ldrh r0, [r0, #0x6]
- lsl r0, r0, #0x10
- asr r0, r0, #0x10
- add pc, r0
-_020017F2: ; jump table (using 16-bit offset)
- .short _020017FA - _020017F2 - 2; case 0
- .short _02001802 - _020017F2 - 2; case 1
- .short _02001802 - _020017F2 - 2; case 2
- .short _02001802 - _020017F2 - 2; case 3
-_020017FA:
- ldr r0, [r4, #0x28]
- ldr r1, [r4, #0xc]
- bl FUN_020136F8
-_02001802:
- pop {r3-r5, pc}
-
- thumb_func_start FUN_02001804
-FUN_02001804: ; 0x02001804
- push {r3-r5, lr}
- sub sp, #0x8
- add r4, r0, #0x0
- ldrh r0, [r4, #0x1a]
- add r5, r1, #0x0
- lsl r1, r0, #0x10
- lsr r1, r1, #0x1f
- cmp r1, #0x3
- bhi _02001868
- add r1, r1, r1
- add r1, pc
- ldrh r1, [r1, #0x6]
- lsl r1, r1, #0x10
- asr r1, r1, #0x10
- add pc, r1
-_02001822: ; jump table (using 16-bit offset)
- .short _0200182A - _02001822 - 2; case 0
- .short _02001868 - _02001822 - 2; case 1
- .short _02001868 - _02001822 - 2; case 2
- .short _02001868 - _02001822 - 2; case 3
-_0200182A:
- lsl r0, r0, #0x11
- lsr r0, r0, #0x1a
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
- bl FUN_02002E4C
- ldrh r1, [r4, #0x1a]
- lsl r1, r1, #0x19
- lsr r1, r1, #0x1c
- add r0, r1, r0
- lsl r0, r0, #0x18
- lsr r3, r0, #0x18
- mov r0, #0x8
- str r0, [sp, #0x0]
- mov r0, #0x10
- str r0, [sp, #0x4]
- ldrb r1, [r4, #0x18]
- ldr r0, [r4, #0xc]
- ldrb r2, [r4, #0x16]
- ldrb r4, [r4, #0x17]
- lsl r1, r1, #0x1c
- mul r3, r5
- lsl r4, r4, #0x1c
- lsr r4, r4, #0x1c
- add r3, r4, r3
- lsl r3, r3, #0x10
- lsr r1, r1, #0x1c
- lsr r3, r3, #0x10
- bl FUN_020196F4
-_02001868:
- add sp, #0x8
- pop {r3-r5, pc}
-
- thumb_func_start FUN_0200186C
-FUN_0200186C: ; 0x0200186C
- push {r4-r7}
- ldrh r4, [r0, #0x2e]
- ldrh r3, [r0, #0x2c]
- cmp r1, #0x0
- ldrh r2, [r0, #0x12]
- bne _020018FE
- cmp r2, #0x1
- bne _02001880
- mov r1, #0x0
- b _02001898
-_02001880:
- lsr r7, r2, #0x1f
- lsl r6, r2, #0x1f
- sub r6, r6, r7
- mov r5, #0x1f
- ror r6, r5
- lsr r1, r2, #0x1
- add r5, r7, r6
- add r1, r1, r5
- sub r1, r2, r1
- sub r1, r1, #0x1
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
-_02001898:
- cmp r3, #0x0
- bne _020018CC
- cmp r4, #0x0
- beq _020018C6
- ldr r2, [r0, #0x0]
- lsl r1, r3, #0x3
- mov r3, #0x2
- add r1, r2, r1
- mvn r3, r3
-_020018AA:
- sub r2, r4, #0x1
- lsl r2, r2, #0x10
- lsr r4, r2, #0x10
- lsl r2, r4, #0x3
- add r2, r1, r2
- ldr r2, [r2, #0x4]
- cmp r2, r3
- beq _020018C2
- strh r4, [r0, #0x2e]
- mov r0, #0x1
- pop {r4-r7}
- bx lr
-_020018C2:
- cmp r4, #0x0
- bne _020018AA
-_020018C6:
- mov r0, #0x0
- pop {r4-r7}
- bx lr
-_020018CC:
- cmp r4, r1
- bls _020018F6
- ldr r5, [r0, #0x0]
- lsl r2, r3, #0x3
- add r2, r5, r2
- mov r5, #0x2
- mvn r5, r5
-_020018DA:
- sub r4, r4, #0x1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- lsl r6, r4, #0x3
- add r6, r2, r6
- ldr r6, [r6, #0x4]
- cmp r6, r5
- beq _020018F2
- strh r4, [r0, #0x2e]
- mov r0, #0x1
- pop {r4-r7}
- bx lr
-_020018F2:
- cmp r4, r1
- bhi _020018DA
-_020018F6:
- strh r1, [r0, #0x2e]
- sub r1, r3, #0x1
- strh r1, [r0, #0x2c]
- b _02001984
-_020018FE:
- cmp r2, #0x1
- bne _02001906
- mov r5, #0x0
- b _0200191A
-_02001906:
- lsr r7, r2, #0x1f
- lsl r6, r2, #0x1f
- sub r6, r6, r7
- mov r5, #0x1f
- ror r6, r5
- lsr r1, r2, #0x1
- add r5, r7, r6
- add r1, r1, r5
- lsl r1, r1, #0x10
- lsr r5, r1, #0x10
-_0200191A:
- ldrh r1, [r0, #0x10]
- sub r1, r1, r2
- cmp r3, r1
- bne _02001954
- sub r2, r2, #0x1
- cmp r4, r2
- bge _0200194E
- ldr r5, [r0, #0x0]
- lsl r1, r3, #0x3
- add r1, r5, r1
- mov r5, #0x2
- mvn r5, r5
-_02001932:
- add r3, r4, #0x1
- lsl r3, r3, #0x10
- lsr r4, r3, #0x10
- lsl r3, r4, #0x3
- add r3, r1, r3
- ldr r3, [r3, #0x4]
- cmp r3, r5
- beq _0200194A
- strh r4, [r0, #0x2e]
- mov r0, #0x1
- pop {r4-r7}
- bx lr
-_0200194A:
- cmp r4, r2
- blt _02001932
-_0200194E:
- mov r0, #0x0
- pop {r4-r7}
- bx lr
-_02001954:
- cmp r4, r5
- bhs _0200197E
- ldr r2, [r0, #0x0]
- lsl r1, r3, #0x3
- mov r6, #0x2
- add r1, r2, r1
- mvn r6, r6
-_02001962:
- add r2, r4, #0x1
- lsl r2, r2, #0x10
- lsr r4, r2, #0x10
- lsl r2, r4, #0x3
- add r2, r1, r2
- ldr r2, [r2, #0x4]
- cmp r2, r6
- beq _0200197A
- strh r4, [r0, #0x2e]
- mov r0, #0x1
- pop {r4-r7}
- bx lr
-_0200197A:
- cmp r4, r5
- blo _02001962
-_0200197E:
- strh r5, [r0, #0x2e]
- add r1, r3, #0x1
- strh r1, [r0, #0x2c]
-_02001984:
- mov r0, #0x2
- pop {r4-r7}
- bx lr
- .balign 4
-
thumb_func_start FUN_0200198C
FUN_0200198C: ; 0x0200198C
push {r3-r7, lr}
@@ -388,7 +39,7 @@ _020019B8:
lsr r0, r0, #0x1a
lsl r0, r0, #0x18
lsr r0, r0, #0x18
- bl FUN_02002E4C
+ bl GetFontAttribute
ldrh r1, [r5, #0x1a]
lsl r1, r1, #0x19
lsr r1, r1, #0x1c
@@ -444,7 +95,7 @@ _020019B8:
lsl r1, r1, #0x1c
lsr r1, r1, #0x1c
add r3, r4, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add sp, #0x8
pop {r3-r7, pc}
_02001A46:
@@ -487,7 +138,7 @@ _02001A46:
ldr r0, [r5, #0xc]
lsl r1, r1, #0x1c
lsr r1, r1, #0x1c
- bl FUN_020196F4
+ bl FillWindowPixelRect
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@@ -511,7 +162,7 @@ ListMenuChangeSelection: ; 0x02001AA4
_02001AC0:
ldr r1, [sp, #0x8]
add r0, r4, #0x0
- bl FUN_0200186C
+ bl ListMenuUpdateSelectedRowIndexAndScrollOffset
orr r5, r0
cmp r0, #0x2
bne _02001AEA
@@ -560,7 +211,7 @@ _02001B14:
_02001B1A:
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- bl FUN_02001804
+ bl ListMenuErasePrintedCursor
add r0, r4, #0x0
bl ListMenuDrawCursor
add r0, r4, #0x0
@@ -572,7 +223,7 @@ _02001B1A:
_02001B38:
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- bl FUN_02001804
+ bl ListMenuErasePrintedCursor
ldr r2, [sp, #0x8]
add r0, r4, #0x0
add r1, r6, #0x0
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index 65ba52af..c2e1a245 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -57,20 +57,20 @@ FUN_02001B8C: ; 0x02001B8C
strb r6, [r4, #0x17]
strb r7, [r4, #0x18]
ldrb r0, [r5, #0x8]
- bl FUN_02002E4C
+ bl GetFontAttribute
add r6, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x2
- bl FUN_02002E4C
+ bl GetFontAttribute
add r0, r6, r0
strb r0, [r4, #0x19]
ldrb r0, [r5, #0x8]
mov r1, #0x1
- bl FUN_02002E4C
+ bl GetFontAttribute
add r6, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x3
- bl FUN_02002E4C
+ bl GetFontAttribute
add r0, r6, r0
strb r0, [r4, #0x1a]
add r0, r4, #0x0
@@ -108,7 +108,7 @@ FUN_02001C34: ; 0x02001C34
add r6, r1, #0x0
add r4, r2, #0x0
mov r1, #0x0
- bl FUN_02002E4C
+ bl GetFontAttribute
add r1, r0, #0x0
str r4, [sp, #0x0]
mov r0, #0x2
@@ -420,7 +420,7 @@ FUN_02001E64: ; 0x02001E64
_02001E7C:
ldrb r0, [r5, #0x8]
mov r1, #0x6
- bl FUN_02002E4C
+ bl GetFontAttribute
add r1, sp, #0x8
add r7, r0, #0x0
add r0, r5, #0x0
@@ -437,7 +437,7 @@ _02001E7C:
ldrb r2, [r3, #0x1]
ldrb r3, [r3, #0x0]
ldr r0, [r5, #0x4]
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, #0x0
bl FUN_02002080
add r0, r6, #0x0
@@ -631,7 +631,7 @@ FUN_02001FF4: ; 0x02001FF4
add r5, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x6
- bl FUN_02002E4C
+ bl GetFontAttribute
add r1, r0, #0x0
ldr r0, [r5, #0x4]
bl FillWindowPixelBuffer
@@ -718,7 +718,7 @@ FUN_02002080: ; 0x02002080
ldrb r3, [r3, #0x0]
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x4]
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
_020020AA:
add sp, #0x4
pop {r3-r4, pc}
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s
index 54d01d03..5b9bf77a 100644
--- a/arm9/asm/unk_020023C0.s
+++ b/arm9/asm/unk_020023C0.s
@@ -193,7 +193,7 @@ _020024F2:
mov r1, #0x1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0x9]
- bl FUN_02002E4C
+ bl GetFontAttribute
ldrb r1, [r4, #0xf]
ldrb r2, [r4, #0xd]
add sp, #0xc
@@ -520,7 +520,7 @@ _02002786:
bl FUN_02002A00
ldrb r0, [r4, #0x9]
mov r1, #0x1
- bl FUN_02002E4C
+ bl GetFontAttribute
ldrb r1, [r4, #0xf]
add r1, r1, r0
add r0, r4, #0x0
diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s
index c4049d4b..740dca10 100644
--- a/arm9/asm/unk_02002C14.s
+++ b/arm9/asm/unk_02002C14.s
@@ -327,8 +327,8 @@ _02002E2E:
.balign 4
_02002E48: .word UNK_02106FC8
- thumb_func_start FUN_02002E4C
-FUN_02002E4C: ; 0x02002E4C
+ thumb_func_start GetFontAttribute
+GetFontAttribute: ; 0x02002E4C
mov r2, #0x0
cmp r1, #0x7
bhi _02002EAC
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index 92e460b6..c3ed22aa 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -1546,8 +1546,8 @@ _020136F4:
pop {r3-r5, pc}
.balign 4
- thumb_func_start FUN_020136F8
-FUN_020136F8: ; 0x020136F8
+ thumb_func_start ListMenuUpdateCursorObj
+ListMenuUpdateCursorObj: ; 0x020136F8
push {r4-r6, lr}
sub sp, #0x10
add r6, r0, #0x0
diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index a050d569..9a6e152f 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -5999,8 +5999,8 @@ _020196D6:
pop {r4-r5, pc}
.balign 4
- thumb_func_start FUN_020196F4
-FUN_020196F4: ; 0x020196F4
+ thumb_func_start FillWindowPixelRect
+FillWindowPixelRect: ; 0x020196F4
push {r3-r5, lr}
sub sp, #0x10
add r5, r1, #0x0
diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s
index a5439dfe..ed33e084 100644
--- a/arm9/asm/unk_02033F50.s
+++ b/arm9/asm/unk_02033F50.s
@@ -198,7 +198,7 @@ _02033FA4:
add r0, sp, #0x18
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r2, _0203417C ; =0x000001F7
add r0, sp, #0x18
mov r1, #0x0
diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s
index 44144564..08265835 100644
--- a/arm9/asm/unk_02034188.s
+++ b/arm9/asm/unk_02034188.s
@@ -138,7 +138,7 @@ FUN_02034188: ; 0x02034188
add r0, sp, #0x14
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r2, _0203438C ; =0x000001F7
add r0, sp, #0x14
mov r1, #0x0
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index 95b46dc5..70ba73b0 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -1769,14 +1769,14 @@ _02051C34:
lsr r0, r0, #0x10
str r0, [sp, #0x4]
ldr r0, [sp, #0x20]
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r3, [sp, #0x14]
add r1, r5, #0x0
ldr r0, [r5, #0x78]
add r1, #0x54
mov r2, #0x0
lsl r3, r3, #0x4
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
add r0, r5, #0x0
add r0, #0x54
mov r1, #0x0
@@ -1880,13 +1880,13 @@ _02051D0A:
str r0, [sp, #0x4]
add r0, r7, #0x0
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r3, [sp, #0x14]
ldr r0, [r5, #0x78]
ldr r1, [r5, #0x7c]
mov r2, #0x0
lsl r3, r3, #0x4
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
ldr r0, [r5, #0x7c]
mov r1, #0x0
mov r2, #0x1
@@ -1987,14 +1987,14 @@ _02051DE0:
lsr r1, r1, #0x10
str r1, [sp, #0x4]
mov r1, #0xf
- bl FUN_020196F4
+ bl FillWindowPixelRect
mov r3, #0x81
ldrsb r3, [r4, r3]
ldr r0, [r4, #0x78]
ldr r1, [r4, #0x7c]
mov r2, #0x0
lsl r3, r3, #0x4
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
ldr r0, [r4, #0x7c]
bl FUN_02019548
mov r0, #0x0
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index 5e09d0a6..003e1330 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -2066,7 +2066,7 @@ _02066426:
add r0, r5, r1
mov r1, #0xff
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
mov r0, #0x1
bl FUN_02002B60
mov r0, #0x0
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index 901eea03..03f7c540 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -870,7 +870,7 @@ FUN_02072BBC: ; 0x02072BBC
add r0, r5, r4
mov r2, #0x4
add r3, r1, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, r4
bl FUN_02019220
add sp, #0x8
@@ -1000,7 +1000,7 @@ _02072CBE:
mov r1, #0xa
mov r2, #0x0
mov r3, #0x2
- bl FUN_020196F4
+ bl FillWindowPixelRect
str r5, [sp, #0x0]
mov r0, #0x2
str r0, [sp, #0x4]
@@ -1008,7 +1008,7 @@ _02072CBE:
mov r1, #0x9
mov r2, #0x0
mov r3, #0x3
- bl FUN_020196F4
+ bl FillWindowPixelRect
str r5, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@@ -1016,7 +1016,7 @@ _02072CBE:
mov r1, #0xa
mov r2, #0x0
mov r3, #0x5
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r4, #0x0
bl FUN_02019220
add sp, #0xc
@@ -2158,7 +2158,7 @@ FUN_0207363C: ; 0x0207363C
mov r1, #0xf
mov r2, #0x50
mov r3, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r0, _020736E8 ; =0x0000069C
mov r1, #0xc0
ldr r0, [r5, r0]
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 6ed83b14..7a074186 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -5219,7 +5219,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5229,7 +5229,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x26
- bl FUN_020196F4
+ bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5239,7 +5239,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x4c
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r7, r7, #0x1
add r6, #0x20
cmp r7, #0x6
@@ -5256,7 +5256,7 @@ _020797BA:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x13
- bl FUN_020196F4
+ bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5266,7 +5266,7 @@ _020797BA:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x39
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r7, r7, #0x1
add r6, #0x20
cmp r7, #0x7
diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s
index b4c7a133..3facd182 100644
--- a/arm9/asm/unk_02089498.s
+++ b/arm9/asm/unk_02089498.s
@@ -360,7 +360,7 @@ FUN_02089734: ; 0x02089734
add r0, r4, #0x0
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add sp, #0x8
pop {r4, pc}
nop
@@ -539,7 +539,7 @@ _020898B8:
mov r1, #0xf
add r2, r6, #0x0
add r3, r6, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, #0x0
ldr r2, _02089958 ; =0x000001E2
add r0, #0x1c
diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s
index 4502d1f9..9c06a4ab 100644
--- a/arm9/asm/unk_02089960.s
+++ b/arm9/asm/unk_02089960.s
@@ -299,7 +299,7 @@ FUN_02089B80: ; 0x02089B80
add r0, r4, #0x0
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add sp, #0x8
pop {r4, pc}
nop
@@ -466,7 +466,7 @@ _02089CE8:
mov r1, #0xf
add r2, r6, #0x0
add r3, r6, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, #0x0
ldr r2, _02089D88 ; =0x000001E2
add r0, #0x20
diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s
index 92b9e987..e7b88272 100644
--- a/arm9/asm/unk_02089D90.s
+++ b/arm9/asm/unk_02089D90.s
@@ -137,7 +137,7 @@ FUN_02089D90: ; 0x02089D90
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r2, _02089F18 ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s
index b678254c..b5c93a8a 100644
--- a/arm9/asm/unk_02089F24.s
+++ b/arm9/asm/unk_02089F24.s
@@ -141,7 +141,7 @@ FUN_02089F24: ; 0x02089F24
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r2, _0208A0AC ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
@@ -310,7 +310,7 @@ _0208A0C8:
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r2, _0208A24C ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s
index f1e7c357..3b40567c 100644
--- a/arm9/asm/unk_0208A338.s
+++ b/arm9/asm/unk_0208A338.s
@@ -583,7 +583,7 @@ _0208A7D2:
ldr r0, [r5, #0x14]
add r1, r7, #0x0
add r3, r2, #0x0
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
_0208A808:
str r7, [r5, #0x68]
mov r1, #0x0
@@ -671,7 +671,7 @@ _0208A882:
ldr r0, [r5, #0x14]
add r1, r7, #0x0
add r3, r2, #0x0
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
_0208A8B8:
str r7, [r5, #0x68]
mov r1, #0x0
@@ -771,13 +771,13 @@ _0208A954:
lsr r1, r1, #0x10
str r1, [sp, #0x4]
mov r1, #0xf
- bl FUN_020196F4
+ bl FillWindowPixelRect
ldr r3, [r4, #0x5c]
ldr r0, [r4, #0x14]
ldr r1, [r4, #0x68]
mov r2, #0x0
lsl r3, r3, #0x4
- bl FUN_020136F8
+ bl ListMenuUpdateCursorObj
ldr r0, [r4, #0x68]
bl FUN_02019548
ldr r0, _0208A994 ; =0x000005DC