ListMenuScroll

5 files changed, 32 insertions, 164 deletions

diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s
index e814dda2..37faa5e7 100644
--- a/arm9/asm/unk_020010A8.s
+++ b/arm9/asm/unk_020010A8.s
@@ -7,142 +7,10 @@
 	.extern ListMenuDrawCursor
 	.extern ListMenuErasePrintedCursor
 	.extern ListMenuUpdateSelectedRowIndexAndScrollOffset
+	.extern ListMenuScroll
 
 	.text
 
-	thumb_func_start FUN_0200198C
-FUN_0200198C: ; 0x0200198C
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	ldrh r0, [r5, #0x12]
-	add r4, r1, #0x0
-	add r7, r2, #0x0
-	cmp r4, r0
-	blt _020019B8
-	ldrb r1, [r5, #0x18]
-	ldr r0, [r5, #0xc]
-	lsl r1, r1, #0x1c
-	lsr r1, r1, #0x1c
-	bl FillWindowPixelBuffer
-	ldrh r1, [r5, #0x2c]
-	ldrh r3, [r5, #0x12]
-	add r0, r5, #0x0
-	mov r2, #0x0
-	bl ListMenuPrintEntries
-	add sp, #0x8
-	pop {r3-r7, pc}
-_020019B8:
-	ldrh r0, [r5, #0x1a]
-	mov r1, #0x1
-	lsl r0, r0, #0x11
-	lsr r0, r0, #0x1a
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	bl GetFontAttribute
-	ldrh r1, [r5, #0x1a]
-	lsl r1, r1, #0x19
-	lsr r1, r1, #0x1c
-	add r0, r1, r0
-	lsl r0, r0, #0x18
-	lsr r6, r0, #0x18
-	cmp r7, #0x0
-	ldrb r0, [r5, #0x18]
-	bne _02001A46
-	lsl r0, r0, #0x1c
-	lsr r7, r0, #0x1c
-	add r2, r4, #0x0
-	lsl r3, r7, #0x4
-	mul r2, r6
-	orr r3, r7
-	lsl r2, r2, #0x18
-	lsl r3, r3, #0x18
-	ldr r0, [r5, #0xc]
-	mov r1, #0x1
-	lsr r2, r2, #0x18
-	lsr r3, r3, #0x18
-	bl FUN_0201A8C8
-	ldrh r1, [r5, #0x2c]
-	add r0, r5, #0x0
-	mov r2, #0x0
-	add r3, r4, #0x0
-	bl ListMenuPrintEntries
-	ldrb r0, [r5, #0x17]
-	lsl r0, r0, #0x1c
-	lsr r2, r0, #0x1c
-	ldrh r0, [r5, #0x12]
-	add r1, r0, #0x0
-	mul r1, r6
-	add r0, r2, r1
-	lsl r0, r0, #0x10
-	lsr r4, r0, #0x10
-	ldr r0, [r5, #0xc]
-	bl FUN_0201AB0C
-	add r6, r0, #0x0
-	ldr r0, [r5, #0xc]
-	bl FUN_0201AB10
-	lsl r0, r0, #0x3
-	lsl r1, r6, #0x13
-	sub r0, r0, r4
-	lsr r1, r1, #0x10
-	lsl r0, r0, #0x10
-	str r1, [sp, #0x0]
-	lsr r0, r0, #0x10
-	str r0, [sp, #0x4]
-	ldrb r1, [r5, #0x18]
-	ldr r0, [r5, #0xc]
-	mov r2, #0x0
-	lsl r1, r1, #0x1c
-	lsr r1, r1, #0x1c
-	add r3, r4, #0x0
-	bl FillWindowPixelRect
-	add sp, #0x8
-	pop {r3-r7, pc}
-_02001A46:
-	lsl r0, r0, #0x1c
-	lsr r3, r0, #0x1c
-	add r2, r4, #0x0
-	mul r2, r6
-	lsl r6, r3, #0x4
-	orr r3, r6
-	lsl r2, r2, #0x18
-	lsl r3, r3, #0x18
-	ldr r0, [r5, #0xc]
-	mov r1, #0x0
-	lsr r2, r2, #0x18
-	lsr r3, r3, #0x18
-	bl FUN_0201A8C8
-	ldrh r0, [r5, #0x12]
-	ldrh r1, [r5, #0x2c]
-	add r3, r4, #0x0
-	sub r2, r0, r4
-	add r1, r1, r2
-	lsl r1, r1, #0x10
-	lsl r2, r2, #0x10
-	add r0, r5, #0x0
-	lsr r1, r1, #0x10
-	lsr r2, r2, #0x10
-	bl ListMenuPrintEntries
-	ldr r0, [r5, #0xc]
-	bl FUN_0201AB0C
-	lsl r0, r0, #0x13
-	lsr r0, r0, #0x10
-	str r0, [sp, #0x0]
-	ldrb r0, [r5, #0x17]
-	mov r2, #0x0
-	add r3, r2, #0x0
-	lsl r0, r0, #0x1c
-	lsr r0, r0, #0x1c
-	str r0, [sp, #0x4]
-	ldrb r1, [r5, #0x18]
-	ldr r0, [r5, #0xc]
-	lsl r1, r1, #0x1c
-	lsr r1, r1, #0x1c
-	bl FillWindowPixelRect
-	add sp, #0x8
-	pop {r3-r7, pc}
-	.balign 4
-
 	thumb_func_start ListMenuChangeSelection
 ListMenuChangeSelection: ; 0x02001AA4
 	push {r3-r7, lr}
@@ -227,7 +95,7 @@ _02001B38:
 	ldr r2, [sp, #0x8]
 	add r0, r4, #0x0
 	add r1, r6, #0x0
-	bl FUN_0200198C
+	bl ListMenuScroll
 	add r0, r4, #0x0
 	bl ListMenuDrawCursor
 	add r0, r4, #0x0
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s
index 5b9bf77a..a4223e53 100644
--- a/arm9/asm/unk_020023C0.s
+++ b/arm9/asm/unk_020023C0.s
@@ -549,7 +549,7 @@ _020027B6:
 	ldr r0, [r4, #0x4]
 	mov r1, #0x0
 	lsr r3, r3, #0x18
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	mov r1, #0x0
 	b _020027F2
 _020027D8:
@@ -560,7 +560,7 @@ _020027D8:
 	mov r1, #0x0
 	mov r2, #0x4
 	lsr r3, r3, #0x18
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	add r0, r4, #0x0
 	add r0, #0x27
 	ldrb r0, [r0, #0x0]
@@ -686,7 +686,7 @@ _020028AC:
 	bl FUN_0201AB18
 	str r0, [sp, #0x28]
 	ldr r0, [r5, #0x4]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	ldr r1, _020029F8 ; =gTextFlags
 	ldrh r6, [r1, #0x2]
 	ldr r1, [sp, #0x28]
@@ -853,7 +853,7 @@ FUN_02002A00: ; 0x02002A00
 	bl FUN_0201AB18
 	add r6, r0, #0x0
 	ldr r0, [r5, #0x4]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	ldr r1, _02002A90 ; =gTextFlags
 	add r7, r6, #0x2
 	ldrh r4, [r1, #0x2]
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index 6d593845..57462727 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -291,10 +291,10 @@ FUN_0200CCA4: ; 0x0200CCA4
 	bl FUN_0201AB18
 	str r0, [sp, #0x18]
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x1c]
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	ldr r1, [sp, #0x1c]
 	ldr r2, [sp, #0x14]
 	str r1, [sp, #0x0]
@@ -328,10 +328,10 @@ FUN_0200CCF8: ; 0x0200CCF8
 	bl FUN_0201AB18
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x14]
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	sub r1, r7, #0x1
 	lsl r1, r1, #0x18
 	lsr r1, r1, #0x18
@@ -758,10 +758,10 @@ FUN_0200D06C: ; 0x0200D06C
 	bl FUN_0201AB18
 	str r0, [sp, #0x18]
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r7, [sp, #0x0]
 	str r0, [sp, #0x4]
 	lsl r0, r6, #0x18
@@ -813,10 +813,10 @@ FUN_0200D0E0: ; 0x0200D0E0
 	bl FUN_0201AB18
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x14]
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	sub r1, r7, #0x1
 	lsl r1, r1, #0x18
 	lsr r1, r1, #0x18
@@ -1575,10 +1575,10 @@ FUN_0200D6F8: ; 0x0200D6F8
 	bl FUN_0201AB18
 	str r0, [sp, #0x1c]
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r7, [sp, #0x0]
 	str r0, [sp, #0x4]
 	str r6, [sp, #0x8]
@@ -1604,10 +1604,10 @@ _0200D756:
 	bl FUN_0201AB18
 	str r0, [sp, #0x24]
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r7, [sp, #0x0]
 	str r0, [sp, #0x4]
 	str r6, [sp, #0x8]
@@ -1648,10 +1648,10 @@ FUN_0200D7A0: ; 0x0200D7A0
 	bl FUN_0201AB18
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r6, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	sub r1, r7, #0x1
 	lsl r1, r1, #0x18
 	lsr r1, r1, #0x18
@@ -1681,10 +1681,10 @@ _0200D7FE:
 	bl FUN_0201AB18
 	add r6, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	sub r1, r6, #0x1
 	lsl r1, r1, #0x18
 	lsr r1, r1, #0x18
@@ -1863,7 +1863,7 @@ FUN_0200D980: ; 0x0200D980
 	bl FUN_0201AB18
 	str r0, [sp, #0x1c]
 	ldr r0, [r5, #0x0]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x20]
 	cmp r6, #0x2
 	bne _0200DA8A
diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index 9a6e152f..6f46943c 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -8422,8 +8422,8 @@ FUN_0201A8BC: ; 0x0201A8BC
 	nop
 _0201A8C4: .word 0x00007FC0
 
-	thumb_func_start FUN_0201A8C8
-FUN_0201A8C8: ; 0x0201A8C8
+	thumb_func_start ScrollWindow
+ScrollWindow: ; 0x0201A8C8
 	push {r4-r6, lr}
 	ldrb r6, [r0, #0x4]
 	mov r5, #0x2c
@@ -8752,13 +8752,13 @@ FUN_0201AB08: ; 0x0201AB08
 	ldrb r0, [r0, #0x4]
 	bx lr
 
-	thumb_func_start FUN_0201AB0C
-FUN_0201AB0C: ; 0x0201AB0C
+	thumb_func_start GetWindowWidth
+GetWindowWidth: ; 0x0201AB0C
 	ldrb r0, [r0, #0x7]
 	bx lr
 
-	thumb_func_start FUN_0201AB10
-FUN_0201AB10: ; 0x0201AB10
+	thumb_func_start GetWindowHeight
+GetWindowHeight: ; 0x0201AB10
 	ldrb r0, [r0, #0x8]
 	bx lr
 
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 0fab5e2c..0aa84bfc 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -581,7 +581,7 @@ _0207D9B4:
 	lsl r0, r0, #0x18
 	lsr r5, r0, #0x18
 	add r0, r6, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #0x1b
 	lsr r0, r0, #0x18
 	sub r0, r0, r5
@@ -598,7 +598,7 @@ _0207D9D8:
 	lsl r0, r0, #0x18
 	lsr r5, r0, #0x18
 	add r0, r6, #0x0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #0x1b
 	lsr r0, r0, #0x18
 	sub r1, r0, r5
@@ -1647,7 +1647,7 @@ FUN_0207E200: ; 0x0207E200
 	mov r0, #0x91
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	mov r1, #0x76
 	str r1, [sp, #0x0]
 	mov r1, #0x9d