ListMenuScroll

8 files changed, 45 insertions, 45 deletions

diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index fcf63fe5..2c8e92bf 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -11665,7 +11665,7 @@ _0223F11A:
 	lsl r5, r5, #4
 	ldr r0, [r0]
 	add r0, #0x20
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, #8
 	lsl r0, r0, #0x10
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 9b2367ba..c6ad3fc0 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -4150,7 +4150,7 @@ _02213F22:
 	bl NewString_ReadMsgData
 	add r6, r0, #0
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x28]
 	mov r0, #0
 	add r1, r6, #0
@@ -4196,7 +4196,7 @@ _02213FA6:
 	bl NewString_ReadMsgData
 	add r6, r0, #0
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	str r0, [sp, #0x2c]
 	mov r0, #0
 	add r1, r6, #0
@@ -4623,7 +4623,7 @@ MOD09_022142FC: ; 0x022142FC
 	cmp r0, #2
 	bne _02214360
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r5, r0, #0
 	add r0, sp, #0x20
 	ldrh r0, [r0, #0x10]
@@ -4766,7 +4766,7 @@ MOD09_0221445C: ; 0x0221445C
 	bl FUN_02002E14
 	add r6, r0, #0
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r3, r0, #0
 	mov r0, #6
 	str r0, [sp]
@@ -4944,7 +4944,7 @@ _022145F4:
 	ldr r0, [r5, r0]
 	lsl r4, r6, #4
 	add r0, r0, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r6, r0, #0
 	mov r0, #0
 	ldr r1, [sp, #0x10]
@@ -5070,7 +5070,7 @@ MOD09_02214694: ; 0x02214694
 	ldr r0, _02214780 ; =0x00002070
 	ldr r0, [r5, r0]
 	add r0, r0, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsl r0, r0, #0x18
@@ -5179,7 +5179,7 @@ MOD09_02214790: ; 0x02214790
 	ldr r0, _0221487C ; =0x00002070
 	ldr r0, [r5, r0]
 	add r0, r0, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsl r0, r0, #0x18
@@ -5289,7 +5289,7 @@ MOD09_0221488C: ; 0x0221488C
 	ldr r0, _0221497C ; =0x00002070
 	ldr r0, [r5, r0]
 	add r0, r0, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsl r0, r0, #0x18
@@ -5401,7 +5401,7 @@ MOD09_0221498C: ; 0x0221498C
 	ldr r0, [r4, r0]
 	lsl r5, r5, #4
 	add r0, r0, r5
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsl r0, r0, #0x18
@@ -5513,7 +5513,7 @@ MOD09_02214A8C: ; 0x02214A8C
 	ldr r0, [r4, r0]
 	lsl r5, r5, #4
 	add r0, r0, r5
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsl r0, r0, #0x18
@@ -5602,7 +5602,7 @@ MOD09_02214B8C: ; 0x02214B8C
 	ldr r0, _02214D14 ; =0x00002070
 	ldr r0, [r5, r0]
 	add r0, #0x40
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r1, r0, #3
 	ldr r0, [sp, #0x14]
 	ldr r2, [sp, #0x10]
@@ -5843,7 +5843,7 @@ MOD09_02214DE8: ; 0x02214DE8
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r5
 	lsl r0, r0, #0x10
@@ -5893,7 +5893,7 @@ _02214E42:
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r5
 	lsl r0, r0, #0x10
@@ -5979,7 +5979,7 @@ MOD09_02214F18: ; 0x02214F18
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r5
 	lsl r0, r0, #0x10
@@ -6029,7 +6029,7 @@ _02214F72:
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r5
 	lsl r0, r0, #0x10
@@ -6166,7 +6166,7 @@ MOD09_022150C8: ; 0x022150C8
 	lsl r0, r0, #0x10
 	lsr r6, r0, #0x10
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r1, r0, r6
 	lsr r0, r1, #0x1f
@@ -6275,7 +6275,7 @@ MOD09_022151A8: ; 0x022151A8
 	bl FUN_02002E14
 	str r0, [sp, #0x1c]
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r1, r0, #3
 	ldr r0, [sp, #0x1c]
 	ldr r2, [sp, #0x18]
@@ -7030,7 +7030,7 @@ _02215830:
 	mov r4, #8
 _02215840:
 	ldr r0, [sp, #0x18]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r6
 	sub r0, r0, r7
@@ -11816,7 +11816,7 @@ _0221803C:
 	lsl r1, r1, #4
 	add r0, r0, r1
 	add r1, r7, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	ldr r1, _022180B0 ; =0x00002070
 	ldr r0, [r5, r1]
 	add r1, r1, #5
@@ -11839,7 +11839,7 @@ _02218072:
 	add r0, r1, r0
 	ldr r2, [sp]
 	add r1, r7, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	ldr r0, _022180B0 ; =0x00002070
 	ldr r1, [r5, r0]
 	ldrb r0, [r6, r4]
@@ -14450,7 +14450,7 @@ MOD09_02219560: ; 0x02219560
 	bl FUN_02002E14
 	add r7, r0, #0
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsr r3, r0, #1
@@ -14626,7 +14626,7 @@ MOD09_02219694: ; 0x02219694
 	bl FUN_02002E14
 	add r7, r0, #0
 	add r0, r4, r6
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsr r3, r0, #1
@@ -14841,7 +14841,7 @@ MOD09_02219884: ; 0x02219884
 	mov r0, #0x19
 	lsl r0, r0, #4
 	add r0, r4, r0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r0, r0, r7
 	lsr r6, r0, #1
@@ -16913,7 +16913,7 @@ _0221A93C:
 	ldr r1, [sp]
 	add r2, r7, #0
 	mov r3, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	ldrb r0, [r4, r5]
 	ldr r1, [r6, #0x2c]
 	lsl r0, r0, #4
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 8f54eb98..e51aee69 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -19965,7 +19965,7 @@ _021E11CE:
 	add r0, #0x30
 	mov r2, #4
 	add r3, r1, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	ldr r0, [r5, #4]
 	add r0, #0x30
 	bl FUN_02019548
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 7810113c..76c91cca 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -23388,7 +23388,7 @@ _02244AF8:
 	ldr r0, [sp, #0xc]
 	mov r2, #2
 	add r3, r1, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	ldr r0, [sp, #0xc]
 	bl CopyWindowToVram
 	ldr r0, [r5]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index dca4005b..e74ab236 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -1792,7 +1792,7 @@ _021D82A2:
 	mov r1, #1
 	mov r2, #2
 	mov r3, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	b _021D8392
 _021D82D2:
 	mov r0, #0x1e
@@ -1812,7 +1812,7 @@ _021D82D2:
 	mov r1, #0
 	mov r2, #4
 	add r3, r1, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	mov r0, #1
 	strh r0, [r4, #0x14]
 	b _021D8392
@@ -1834,7 +1834,7 @@ _021D8302:
 	mov r1, #1
 	mov r2, #2
 	mov r3, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	mov r0, #0
 	strh r0, [r4, #0x14]
 	b _021D8392
@@ -1856,7 +1856,7 @@ _021D8330:
 	mov r1, #0
 	mov r2, #2
 	add r3, r1, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	mov r0, #1
 	strh r0, [r4, #0x14]
 	b _021D8392
@@ -1881,7 +1881,7 @@ _021D835E:
 	mov r1, #0
 	mov r2, #2
 	add r3, r1, #0
-	bl FUN_0201A8C8
+	bl ScrollWindow
 	mov r0, #0
 	strh r0, [r4, #0x14]
 _021D8392:
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index e80e78c9..9f0a99ee 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -527,7 +527,7 @@ MOD68_021D7904: ; 0x021D7904
 	bl FUN_02002E14
 	add r7, r0, #0
 	add r0, r5, r4
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r3, r0, #0
 	mov r1, #0
 	lsl r3, r3, #3
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index ddc3bcd3..86989ca3 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -1021,7 +1021,7 @@ _021D7CE8:
 	add r1, #8
 	lsl r0, r4, #4
 	add r0, r1, r0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #0x1b
 	lsr r0, r0, #0x18
 	sub r0, r0, r6
@@ -1041,7 +1041,7 @@ _021D7D12:
 	add r1, #8
 	lsl r0, r4, #4
 	add r0, r1, r0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #0x1b
 	lsr r0, r0, #0x18
 	sub r1, r0, r6
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 36b862f4..a36fe53c 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -434,10 +434,10 @@ _0222D8B2:
 	bl FUN_0201AB18
 	add r7, r0, #0
 	ldr r0, [sp, #0x1c]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r5, r0, #0
 	ldr r0, [sp, #0x1c]
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r5, [sp]
 	str r0, [sp, #4]
 	mov r0, #0
@@ -908,7 +908,7 @@ MOD83_0222DCA0: ; 0x0222DCA0
 	bl FUN_02002E14
 	add r4, r0, #0
 	add r0, r6, #0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	add r4, #0x20
 	sub r3, r0, r4
@@ -1601,10 +1601,10 @@ _0222E206:
 	bl FUN_0201AB18
 	str r0, [sp, #0x14]
 	add r0, r5, #0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0
 	add r0, r5, #0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r7, [sp]
 	str r0, [sp, #4]
 	mov r0, #0
@@ -1628,10 +1628,10 @@ _0222E256:
 	bl FUN_0201AB18
 	str r0, [sp, #0x1c]
 	add r0, r5, #0
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	add r7, r0, #0
 	add r0, r5, #0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	str r7, [sp]
 	str r0, [sp, #4]
 	mov r0, #1
@@ -1707,7 +1707,7 @@ MOD83_0222E2E4: ; 0x0222E2E4
 	add r1, #0x5c
 	lsl r0, r0, #4
 	add r0, r1, r0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	add r0, r0, #2
 	lsl r3, r0, #3
 	mov r0, #0x42
@@ -1769,7 +1769,7 @@ _0222E362:
 	sub r0, r0, #1
 	lsl r4, r0, #3
 	add r0, r5, #0
-	bl FUN_0201AB10
+	bl GetWindowHeight
 	cmp r7, r4
 	ble _0222E384
 	mov r0, #1
@@ -23140,7 +23140,7 @@ _022389D0:
 	bl FUN_02002E14
 	add r7, r0, #0
 	ldr r0, [r5, #0x10]
-	bl FUN_0201AB0C
+	bl GetWindowWidth
 	lsl r0, r0, #3
 	sub r3, r0, r7
 	ldr r0, [r5, #0x24]