Rename funcs in unk_02011744.s to disambiguate from list_menu

10 files changed, 66 insertions, 66 deletions

diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index 1b7f2aac..f76e1b80 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -764,18 +764,18 @@ CreateYesNoMenu: ; 0x020020EC
 	add r4, r0, #0x0
 	mov r0, #0x2
 	add r1, r5, #0x0
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	add r1, r4, #0x0
 	mov r2, #0x29
 	mov r3, #0x0
 	add r6, r0, #0x0
-	bl ListMenu_ItemFromMsgData ; YES
+	bl ListMenuItems_AppendFromMsgData ; YES
 	mov r3, #0x2a
 	add r2, r3, #0x0
 	add r0, r6, #0x0
 	add r1, r4, #0x0
 	sub r3, #0x2c
-	bl ListMenu_ItemFromMsgData ; NO
+	bl ListMenuItems_AppendFromMsgData ; NO
 	add r0, r4, #0x0
 	bl DestroyMsgData
 	add r0, r5, #0x0
@@ -888,7 +888,7 @@ FUN_020021EC: ; 0x020021EC
 	add r0, r4, #0x0
 	bl FreeToHeapExplicit
 	ldr r0, [r5, #0x0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	add r0, r5, #0x0
 	mov r1, #0x0
 	bl FUN_02001C5C
diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s
index 0f9f871b..98fd8b7e 100644
--- a/arm9/asm/unk_02011744.s
+++ b/arm9/asm/unk_02011744.s
@@ -2407,8 +2407,8 @@ _0201282C: .word sMaxDate
 _02012830: .word sMaxTime
 _02012834: .word 0xBC19137F
 
-	thumb_func_start ListMenu_ctor
-ListMenu_ctor: ; 0x02012838
+	thumb_func_start ListMenuItems_ctor
+ListMenuItems_ctor: ; 0x02012838
 	push {r3-r5, lr}
 	add r5, r0, #0x0
 	add r4, r1, #0x0
@@ -2440,23 +2440,23 @@ _02012862:
 _0201286E:
 	pop {r3-r5, pc}
 
-	thumb_func_start ListMenu_dtor
-ListMenu_dtor: ; 0x02012870
+	thumb_func_start ListMenuItems_dtor
+ListMenuItems_dtor: ; 0x02012870
 	push {r4, lr}
 	add r4, r0, #0x0
-	bl ListMenu_DestroyMenuStrings
+	bl ListMenuItems_DestroyMenuStrings
 	add r0, r4, #0x0
 	bl FreeToHeap
 	pop {r4, pc}
 
-	thumb_func_start ListMenu_ItemFromMsgData
-ListMenu_ItemFromMsgData: ; 0x02012880
+	thumb_func_start ListMenuItems_AppendFromMsgData
+ListMenuItems_AppendFromMsgData: ; 0x02012880
 	push {r3-r7, lr}
 	add r6, r1, #0x0
 	add r1, sp, #0x0
 	add r7, r2, #0x0
 	add r5, r3, #0x0
-	bl ListMenu_NewItem
+	bl ListMenuItems_NewItem
 	add r4, r0, #0x0
 	beq _0201289E
 	add r0, r6, #0x0
@@ -2467,14 +2467,14 @@ ListMenu_ItemFromMsgData: ; 0x02012880
 _0201289E:
 	pop {r3-r7, pc}
 
-	thumb_func_start ListMenu_AddItem
-ListMenu_AddItem: ; 0x020128A0
+	thumb_func_start ListMenuItems_AddItem
+ListMenuItems_AddItem: ; 0x020128A0
 	push {r3-r6, lr}
 	sub sp, #0x4
 	add r6, r1, #0x0
 	add r1, sp, #0x0
 	add r5, r2, #0x0
-	bl ListMenu_NewItem
+	bl ListMenuItems_NewItem
 	add r4, r0, #0x0
 	beq _020128BE
 	ldr r1, [sp, #0x0]
@@ -2487,13 +2487,13 @@ _020128BE:
 	pop {r3-r6, pc}
 	.balign 4
 
-	thumb_func_start ListMenu_CopyItem
-ListMenu_CopyItem: ; 0x020128C4
+	thumb_func_start ListMenuItems_CopyItem
+ListMenuItems_CopyItem: ; 0x020128C4
 	push {r3-r4, lr}
 	sub sp, #0x4
 	add r4, r1, #0x0
 	add r1, sp, #0x0
-	bl ListMenu_NewItem
+	bl ListMenuItems_NewItem
 	cmp r0, #0x0
 	beq _020128DC
 	ldr r1, [r4, #0x0]
@@ -2504,8 +2504,8 @@ _020128DC:
 	add sp, #0x4
 	pop {r3-r4, pc}
 
-	thumb_func_start ListMenu_NewItem
-ListMenu_NewItem: ; 0x020128E0
+	thumb_func_start ListMenuItems_NewItem
+ListMenuItems_NewItem: ; 0x020128E0
 	push {r4, lr}
 	ldr r3, [r0, #0x0]
 	cmp r3, #0x0
@@ -2541,8 +2541,8 @@ _02012912:
 	pop {r4, pc}
 	.balign 4
 
-	thumb_func_start ListMenu_DestroyMenuStrings
-ListMenu_DestroyMenuStrings: ; 0x0201291C
+	thumb_func_start ListMenuItems_DestroyMenuStrings
+ListMenuItems_DestroyMenuStrings: ; 0x0201291C
 	push {r4-r6, lr}
 	add r5, r0, #0x0
 	mov r0, #0x0
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 1123d9f5..c9df4ca4 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -639,7 +639,7 @@ FUN_0203549C: ; 0x0203549C
 	str r0, [sp, #0x18]
 	ldr r0, [sp, #0x14]
 	mov r1, #0xb
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	str r0, [r4, #0x24]
 	mov r5, #0x0
 	ldr r0, [sp, #0x14]
@@ -684,7 +684,7 @@ _02035526:
 	ldrb r2, [r2, #0x0]
 	ldr r0, [r4, #0x24]
 	add r1, r7, #0x0
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	ldr r0, [sp, #0x20]
 	bl String_dtor
 	add r0, r7, #0x0
@@ -698,7 +698,7 @@ _02035594:
 	ldr r0, [r4, #0x24]
 	ldr r1, [sp, #0x18]
 	ldr r2, [r2, r6]
-	bl ListMenu_ItemFromMsgData
+	bl ListMenuItems_AppendFromMsgData
 _020355A2:
 	ldr r0, [sp, #0x1c]
 	add r0, #0x8c
@@ -902,7 +902,7 @@ FUN_02035718: ; 0x02035718
 	mov r1, #0x0
 	bl FUN_02001C5C
 	ldr r0, [r4, #0x24]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x0
 	str r0, [r4, #0x20]
 	pop {r4, pc}
diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s
index 48f512e9..fc235004 100644
--- a/arm9/asm/unk_020625EC.s
+++ b/arm9/asm/unk_020625EC.s
@@ -1361,7 +1361,7 @@ FUN_02063028: ; 0x02063028
 	ldr r1, [r5, #0x0]
 	add r7, r0, #0x1
 	add r0, r7, #0x0
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	add r1, r5, #0x0
 	add r1, #0xc4
 	str r0, [r1, #0x0]
@@ -1397,7 +1397,7 @@ _0206307C:
 	ldr r0, [r0, #0x0]
 	ldr r1, [r4, #0x64]
 	add r2, r6, #0x0
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	ldrb r0, [r5, #0x18]
 	add r6, r6, #0x1
 	add r4, r4, #0x4
@@ -1409,7 +1409,7 @@ _02063094:
 	ldr r0, [r0, #0x0]
 	ldr r1, [r5, #0x38]
 	ldr r2, _02063160 ; =0x0000FFFF
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	add r1, r5, #0x0
 	ldr r0, _02063164 ; =UNK_020F7C2C
 	add r1, #0xa0
@@ -1519,7 +1519,7 @@ FUN_02063178: ; 0x02063178
 	add r0, r4, #0x0
 	add r0, #0xc4
 	ldr r0, [r0, #0x0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	add r0, r4, #0x0
 	add r0, #0xd4
 	bl FUN_02019570
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index 69cc0dbd..df203337 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -976,7 +976,7 @@ FUN_02065AF4: ; 0x02065AF4
 	ldrb r0, [r5, #0x1b]
 	ldr r1, [r5, #0x0]
 	add r0, r0, #0x1
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	mov r1, #0x59
 	lsl r1, r1, #0x2
 	add r7, r5, #0x0
@@ -995,7 +995,7 @@ _02065B7E:
 	ldr r1, [r2, #0x8]
 	ldrb r2, [r2, #0x0]
 	ldr r0, [r5, r0]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	add r0, r6, #0x1
 	lsl r0, r0, #0x18
 	lsr r6, r0, #0x18
@@ -1011,7 +1011,7 @@ _02065B9E:
 	sub r1, #0x4c
 	ldr r1, [r5, r1]
 	ldr r2, _02065CE0 ; =0x0000FFFF
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	add r0, r6, #0x1
 	lsl r0, r0, #0x18
 	mov r1, #0x5
@@ -1280,7 +1280,7 @@ FUN_02065DD8: ; 0x02065DD8
 	str r2, [sp, #0x4]
 	ldr r1, [r5, #0x0]
 	mov r0, #0x4
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	mov r1, #0x59
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
@@ -1309,7 +1309,7 @@ _02065E14:
 	ldr r1, [r5, r7]
 	ldr r2, [r6, r2]
 	ldr r3, [r3, #0x4]
-	bl ListMenu_ItemFromMsgData
+	bl ListMenuItems_AppendFromMsgData
 	add r0, r4, #0x1
 	lsl r0, r0, #0x18
 	lsr r4, r0, #0x18
@@ -1422,7 +1422,7 @@ FUN_02065EF8: ; 0x02065EF8
 	mov r0, #0x59
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x65
 	lsl r0, r0, #0x2
 	add r0, r4, r0
@@ -1499,7 +1499,7 @@ FUN_02065F8C: ; 0x02065F8C
 	mov r0, #0x59
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x5d
 	lsl r0, r0, #0x2
 	add r0, r4, r0
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 772480ed..1a62b92b 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -781,7 +781,7 @@ _0206F914:
 	bl FUN_02001C5C
 	ldr r0, _0206F978 ; =0x000006F8
 	ldr r0, [r4, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	add r0, r4, #0x0
 	mov r1, #0x1d
 	mov r2, #0x1
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index 03f7c540..7cbbce8f 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -453,7 +453,7 @@ FUN_02072844: ; 0x02072844
 	bl FUN_02019064
 	ldr r0, [sp, #0x14]
 	mov r1, #0xc
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	ldr r1, _0207294C ; =0x000006F8
 	mov r6, #0x0
 	str r0, [r5, r1]
@@ -473,7 +473,7 @@ _02072890:
 	ldr r1, _02072950 ; =0x000006E8
 	ldr r0, [r5, r0]
 	ldr r1, [r3, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	add r0, r6, #0x1
 	lsl r0, r0, #0x10
 	lsr r6, r0, #0x10
@@ -488,7 +488,7 @@ _020728B4:
 	ldr r1, _02072954 ; =0x000006AC
 	ldr r0, [r5, r0]
 	ldr r1, [r3, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 _020728CC:
 	add r0, r4, #0x1
 	lsl r0, r0, #0x10
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 6dd1bf64..9cac1662 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -46,7 +46,7 @@ FUN_02073DB4: ; 0x02073DB4
 	bl FUN_02001C5C
 	ldr r0, _02073DF0 ; =0x000006F8
 	ldr r0, [r4, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x95
 	lsl r0, r0, #0x2
 	add r0, r4, r0
@@ -69,7 +69,7 @@ FUN_02073DF4: ; 0x02073DF4
 	bl FUN_020731D4
 	mov r0, #0x3
 	mov r1, #0xc
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	ldr r1, _02073EB0 ; =0x000006F8
 	str r0, [r5, r1]
 	mov r0, #0x3
@@ -79,7 +79,7 @@ FUN_02073DF4: ; 0x02073DF4
 	ldr r0, [r5, r1]
 	sub r1, #0x40
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x4
 	bl FUN_02073DA8
 	ldr r1, _02073EB0 ; =0x000006F8
@@ -87,7 +87,7 @@ FUN_02073DF4: ; 0x02073DF4
 	ldr r0, [r5, r1]
 	sub r1, #0x3c
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x9
 	bl FUN_02073DA8
 	ldr r1, _02073EB0 ; =0x000006F8
@@ -95,7 +95,7 @@ FUN_02073DF4: ; 0x02073DF4
 	ldr r0, [r5, r1]
 	sub r1, #0x28
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	ldr r0, _02073EB0 ; =0x000006F8
 	mov r1, #0x0
 	ldr r0, [r5, r0]
@@ -155,7 +155,7 @@ FUN_02073EB8: ; 0x02073EB8
 	bl FUN_02001C5C
 	ldr r0, _02073EE4 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	ldr r0, _02073EE8 ; =0x000005A4
 	mov r1, #0x3
 	ldr r0, [r5, r0]
@@ -186,7 +186,7 @@ FUN_02073EEC: ; 0x02073EEC
 	bl FUN_02001C5C
 	ldr r0, _02074048 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	ldr r0, _0207404C ; =0x00000B25
 	ldrb r1, [r5, r0]
 	mov r0, #0x2c
@@ -381,7 +381,7 @@ FUN_020740AC: ; 0x020740AC
 	bl FUN_020731D4
 	mov r0, #0x3
 	mov r1, #0xc
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	ldr r1, _02074168 ; =0x000006F8
 	str r0, [r5, r1]
 	mov r0, #0x6
@@ -391,7 +391,7 @@ FUN_020740AC: ; 0x020740AC
 	ldr r0, [r5, r1]
 	sub r1, #0x34
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x7
 	bl FUN_02073DA8
 	ldr r1, _02074168 ; =0x000006F8
@@ -399,7 +399,7 @@ FUN_020740AC: ; 0x020740AC
 	ldr r0, [r5, r1]
 	sub r1, #0x30
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x9
 	bl FUN_02073DA8
 	ldr r1, _02074168 ; =0x000006F8
@@ -407,7 +407,7 @@ FUN_020740AC: ; 0x020740AC
 	ldr r0, [r5, r1]
 	sub r1, #0x28
 	ldr r1, [r5, r1]
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	ldr r0, _02074168 ; =0x000006F8
 	mov r1, #0x0
 	ldr r0, [r5, r0]
@@ -467,7 +467,7 @@ FUN_02074170: ; 0x02074170
 	bl FUN_02001C5C
 	ldr r0, _0207419C ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	ldr r0, _020741A0 ; =0x000005A4
 	mov r1, #0x7
 	ldr r0, [r5, r0]
@@ -497,7 +497,7 @@ FUN_020741A4: ; 0x020741A4
 	bl FUN_02001C5C
 	ldr r0, _020741F0 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	add r0, r5, #0x0
 	mov r1, #0x2b
 	mov r2, #0x1
@@ -744,7 +744,7 @@ FUN_020743AC: ; 0x020743AC
 	bl FUN_02001C5C
 	ldr r0, _02074414 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	ldr r0, _02074418 ; =0x000005A4
 	mov r1, #0x0
 	ldr r0, [r5, r0]
@@ -2324,7 +2324,7 @@ FUN_02075090: ; 0x02075090
 	bl FUN_02001C5C
 	ldr r0, _020750C0 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x1b
 	str r0, [r4, #0x0]
 	pop {r3-r5, pc}
@@ -2349,7 +2349,7 @@ FUN_020750C4: ; 0x020750C4
 	bl FUN_02001C5C
 	ldr r0, _020750F4 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x1b
 	str r0, [r4, #0x0]
 	pop {r3-r5, pc}
@@ -2482,7 +2482,7 @@ _020751E4:
 	bl FUN_02001C5C
 	ldr r0, _0207523C ; =0x000006F8
 	ldr r0, [r4, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	mov r0, #0x1b
 	str r0, [r6, #0x0]
 	pop {r4-r6, pc}
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index 743c2845..9e2ab9b0 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -3174,7 +3174,7 @@ FUN_02076FB0: ; 0x02076FB0
 	mov r2, #0x2
 	ldr r1, [r5, r1]
 	mvn r2, r2
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x0
 	pop {r3-r7, pc}
 _0207701C:
@@ -3182,7 +3182,7 @@ _0207701C:
 	sub r1, #0x50
 	ldr r1, [r5, r1]
 	add r2, r6, #0x0
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	mov r0, #0x1
 	pop {r3-r7, pc}
 	.balign 4
@@ -3209,7 +3209,7 @@ _02077050:
 _02077058:
 	mov r0, #0x4
 	mov r1, #0xc
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	ldr r1, _02077108 ; =0x000006F8
 	str r0, [r4, r1]
 	add r0, r4, #0x0
@@ -3328,7 +3328,7 @@ _02077130:
 	bl FUN_02001C5C
 	ldr r0, _02077230 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	add r0, r5, #0x0
 	mov r1, #0x20
 	mov r2, #0x1
@@ -3353,7 +3353,7 @@ _0207716A:
 	bl FUN_02001C5C
 	ldr r0, _02077230 ; =0x000006F8
 	ldr r0, [r5, r0]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	ldr r0, _02077234 ; =0x000005A4
 	ldr r6, [r5, r0]
 	add r0, r5, #0x0
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index b3f2444c..3cbdf2a8 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -658,7 +658,7 @@ FUN_02086878: ; 0x02086878
 	bl FUN_02019064
 	mov r0, #0x2
 	mov r1, #0x47
-	bl ListMenu_ctor
+	bl ListMenuItems_ctor
 	str r0, [r5, #0x44]
 	ldr r2, _0208695C ; =0x0000013F
 	mov r0, #0x0
@@ -675,7 +675,7 @@ _020868DE:
 	ldr r0, [r5, #0x44]
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl ListMenu_AddItem
+	bl ListMenuItems_AddItem
 	add r0, r6, #0x0
 	bl String_dtor
 	add r4, r4, #0x1
@@ -744,7 +744,7 @@ FUN_02086960: ; 0x02086960
 	mov r1, #0x0
 	bl FUN_02001C5C
 	ldr r0, [r4, #0x44]
-	bl ListMenu_dtor
+	bl ListMenuItems_dtor
 	pop {r4, pc}
 
 	thumb_func_start FUN_0208698C