summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_02001B80.s8
-rw-r--r--arm9/asm/unk_02011744.s36
-rw-r--r--arm9/asm/unk_02035068.s8
-rw-r--r--arm9/asm/unk_020625EC.s8
-rw-r--r--arm9/asm/unk_020653EC.s14
-rw-r--r--arm9/asm/unk_0206F3FC.s2
-rw-r--r--arm9/asm/unk_02072548.s6
-rw-r--r--arm9/asm/unk_02073DA8.s34
-rw-r--r--arm9/asm/unk_0207550C.s10
-rw-r--r--arm9/asm/unk_02086414.s6
10 files changed, 66 insertions, 66 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index 52c55775..ff804a2f 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -772,18 +772,18 @@ FUN_020020EC: ; 0x020020EC
add r4, r0, #0x0
mov r0, #0x2
add r1, r5, #0x0
- bl FUN_02012838
+ bl ListMenu_ctor
add r1, r4, #0x0
mov r2, #0x29
mov r3, #0x0
add r6, r0, #0x0
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
mov r3, #0x2a
add r2, r3, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
sub r3, #0x2c
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r0, r4, #0x0
bl DestroyMsgData
add r0, r5, #0x0
@@ -896,7 +896,7 @@ FUN_020021EC: ; 0x020021EC
add r0, r4, #0x0
bl FUN_02016A8C
ldr r0, [r5, #0x0]
- bl FUN_02012870
+ bl ListMenu_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 5d836ed4..d8202d2d 100644
--- a/arm9/asm/unk_02011744.s
+++ b/arm9/asm/unk_02011744.s
@@ -2388,8 +2388,8 @@ _0201282C: .word UNK_020ED4A4
_02012830: .word UNK_020ED498
_02012834: .word 0xBC19137F
- thumb_func_start FUN_02012838
-FUN_02012838: ; 0x02012838
+ thumb_func_start ListMenu_ctor
+ListMenu_ctor: ; 0x02012838
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
@@ -2421,23 +2421,23 @@ _02012862:
_0201286E:
pop {r3-r5, pc}
- thumb_func_start FUN_02012870
-FUN_02012870: ; 0x02012870
+ thumb_func_start ListMenu_dtor
+ListMenu_dtor: ; 0x02012870
push {r4, lr}
add r4, r0, #0x0
- bl FUN_0201291C
+ bl ListMenu_DestroyMenuStrings
add r0, r4, #0x0
bl FreeToHeap
pop {r4, pc}
- thumb_func_start FUN_02012880
-FUN_02012880: ; 0x02012880
+ thumb_func_start ListMenu_ItemFromMsgData
+ListMenu_ItemFromMsgData: ; 0x02012880
push {r3-r7, lr}
add r6, r1, #0x0
add r1, sp, #0x0
add r7, r2, #0x0
add r5, r3, #0x0
- bl FUN_020128E0
+ bl ListMenu_NewItem
add r4, r0, #0x0
beq _0201289E
add r0, r6, #0x0
@@ -2448,14 +2448,14 @@ FUN_02012880: ; 0x02012880
_0201289E:
pop {r3-r7, pc}
- thumb_func_start FUN_020128A0
-FUN_020128A0: ; 0x020128A0
+ thumb_func_start ListMenu_AddItem
+ListMenu_AddItem: ; 0x020128A0
push {r3-r6, lr}
sub sp, #0x4
add r6, r1, #0x0
add r1, sp, #0x0
add r5, r2, #0x0
- bl FUN_020128E0
+ bl ListMenu_NewItem
add r4, r0, #0x0
beq _020128BE
ldr r1, [sp, #0x0]
@@ -2468,13 +2468,13 @@ _020128BE:
pop {r3-r6, pc}
.balign 4
- thumb_func_start FUN_020128C4
-FUN_020128C4: ; 0x020128C4
+ thumb_func_start ListMenu_CopyItem
+ListMenu_CopyItem: ; 0x020128C4
push {r3-r4, lr}
sub sp, #0x4
add r4, r1, #0x0
add r1, sp, #0x0
- bl FUN_020128E0
+ bl ListMenu_NewItem
cmp r0, #0x0
beq _020128DC
ldr r1, [r4, #0x0]
@@ -2485,8 +2485,8 @@ _020128DC:
add sp, #0x4
pop {r3-r4, pc}
- thumb_func_start FUN_020128E0
-FUN_020128E0: ; 0x020128E0
+ thumb_func_start ListMenu_NewItem
+ListMenu_NewItem: ; 0x020128E0
push {r4, lr}
ldr r3, [r0, #0x0]
cmp r3, #0x0
@@ -2522,8 +2522,8 @@ _02012912:
pop {r4, pc}
.balign 4
- thumb_func_start FUN_0201291C
-FUN_0201291C: ; 0x0201291C
+ thumb_func_start ListMenu_DestroyMenuStrings
+ListMenu_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 55c9432f..3b3dccfc 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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012880
+ bl ListMenu_ItemFromMsgData
_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 FUN_02012870
+ bl ListMenu_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 5179b667..92829a69 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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 98bddf15..edeab8fa 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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012838
+ bl ListMenu_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 FUN_02012880
+ bl ListMenu_ItemFromMsgData
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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 c0ecfeec..5c8bbf31 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -778,7 +778,7 @@ _0206F914:
bl FUN_02001C5C
ldr r0, _0206F978 ; =0x000006F8
ldr r0, [r4, r0]
- bl FUN_02012870
+ bl ListMenu_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 3479c659..99ab8a55 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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 fe7c931f..8eed46de 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 FUN_02012870
+ bl ListMenu_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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 1ae52fa7..4750d078 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 FUN_020128A0
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_AddItem
mov r0, #0x1
pop {r3-r7, pc}
.balign 4
@@ -3209,7 +3209,7 @@ _02077050:
_02077058:
mov r0, #0x4
mov r1, #0xc
- bl FUN_02012838
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_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 598bb827..05e25ce3 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 FUN_02012838
+ bl ListMenu_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 FUN_020128A0
+ bl ListMenu_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 FUN_02012870
+ bl ListMenu_dtor
pop {r4, pc}
thumb_func_start FUN_0208698C