diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-15 16:21:39 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-15 16:21:39 -0400 |
commit | f249e22e6cfd180492054f8ef321fa75495f2daf (patch) | |
tree | b60434a70296a13034d6c92440fff837b4b5bed5 | |
parent | f98bb8e285d3e65299fc58024605983a2563fb28 (diff) |
Name list menu related routines
-rw-r--r-- | arm9/asm/unk_02001B80.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02011744.s | 36 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02072548.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 34 | ||||
-rw-r--r-- | arm9/asm/unk_0207550C.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 6 | ||||
-rw-r--r-- | arm9/global.inc | 12 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 8 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 50 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 126 | ||||
-rw-r--r-- | arm9/modules/55/asm/module_55.s | 10 | ||||
-rw-r--r-- | arm9/modules/56/asm/module_56.s | 42 | ||||
-rw-r--r-- | arm9/modules/59/asm/module_59.s | 6 | ||||
-rw-r--r-- | arm9/modules/62/asm/module_62.s | 6 | ||||
-rw-r--r-- | arm9/modules/65/asm/module_65.s | 14 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 32 | ||||
-rw-r--r-- | arm9/modules/75/asm/module_75.s | 50 | ||||
-rw-r--r-- | arm9/modules/76/asm/module_76.s | 8 | ||||
-rw-r--r-- | arm9/modules/77/asm/module_77.s | 10 | ||||
-rw-r--r-- | arm9/modules/80/asm/module_80.s | 90 | ||||
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 16 |
25 files changed, 306 insertions, 306 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 diff --git a/arm9/global.inc b/arm9/global.inc index 4928b0f3..1fd91f17 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -810,12 +810,12 @@ .extern FUN_02012794 .extern FUN_020127A8 .extern FUN_020127C0 -.extern FUN_02012838 -.extern FUN_02012870 -.extern FUN_02012880 -.extern FUN_020128A0 -.extern FUN_020128C4 -.extern FUN_0201291C +.extern ListMenu_ctor +.extern ListMenu_dtor +.extern ListMenu_ItemFromMsgData +.extern ListMenu_AddItem +.extern ListMenu_CopyItem +.extern ListMenu_DestroyMenuStrings .extern FUN_02012944 .extern FUN_02012974 .extern FUN_02012988 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index a0965880..4bd3be33 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -27091,7 +27091,7 @@ MOD05_021EFEDC: ; 0x021EFEDC add r7, r0, #0 add r0, r7, #1 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5] mov r0, #1 str r0, [sp] @@ -27132,7 +27132,7 @@ _021EFF2E: ldr r0, [r5] ldr r1, [r5, #8] add r2, r4, #0 - bl FUN_020128A0 + bl ListMenu_AddItem _021EFF54: add r4, r4, #1 cmp r4, #0x20 @@ -27142,7 +27142,7 @@ _021EFF54: ldr r0, [r5] ldr r1, [r5, #0x3c] sub r3, #0xd - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r4, _021EFFC0 ; =UNK05_021F8B4C add r3, sp, #0x14 add r2, r3, #0 @@ -27262,7 +27262,7 @@ _021F0056: add r2, r1, #0 bl FUN_02001300 ldr r0, [r5] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index a19163b0..e2f76b59 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8427,7 +8427,7 @@ MOD06_0223D63C: ; 0x0223D63C mov r4, #3 add r0, r4, #0 mov r1, #0xb - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0x84 str r0, [r1] @@ -8439,7 +8439,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r1, [r1] mov r2, #0xf mov r3, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8448,7 +8448,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r1, [r1] mov r2, #0x10 mov r3, #0xe - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8458,7 +8458,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r0, [r0] ldr r1, [r1] sub r3, #0x13 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData mov r3, #1 str r3, [sp] mov r1, #0xd @@ -8478,7 +8478,7 @@ _0223D6B8: mov r4, #2 add r0, r4, #0 mov r1, #0xb - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0x84 str r0, [r1] @@ -8490,7 +8490,7 @@ _0223D6B8: ldr r1, [r1] mov r2, #0xf add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8500,7 +8500,7 @@ _0223D6B8: ldr r0, [r0] ldr r1, [r1] sub r3, #0x13 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData mov r3, #1 str r3, [sp] mov r1, #0xd @@ -8618,7 +8618,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 add r0, r4, #0 add r0, #0x84 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r4, #8 add r0, r4, #0 bl FUN_02019178 @@ -9146,7 +9146,7 @@ _0223DC34: ldrb r0, [r5, r0] mov r1, #0xb add r0, r0, #1 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x7c] mov r0, #0x8b lsl r0, r0, #2 @@ -9172,7 +9172,7 @@ _0223DC52: ldr r0, [r5, #0x7c] ldrh r2, [r2, r4] add r1, r7, #0 - bl FUN_020128A0 + bl ListMenu_AddItem add r0, r7, #0 bl String_dtor mov r0, #0x8b @@ -9190,7 +9190,7 @@ _0223DC8E: ldr r0, [r5, #0x7c] ldr r1, [r1] sub r3, #0xa - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, [sp] bl DestroyMsgData ldr r4, _0223DCEC ; =0x0224F38C @@ -9597,7 +9597,7 @@ _0223E006: add r2, r1, #0 bl FUN_02001300 ldr r0, [r5, #0x7c] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 bl MOD06_0223D9C0 add r0, r5, #0 @@ -11977,7 +11977,7 @@ MOD06_0223F3B8: ; 0x0223F3B8 beq _0223F450 mov r0, #0x10 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor ldr r4, _0223F454 ; =0x02252420 mov r5, #0 ldr r1, [r4] @@ -12006,7 +12006,7 @@ _0223F3E0: mov r2, #0 ldr r0, [r1, #0x64] ldr r1, [r1] - bl FUN_020128A0 + bl ListMenu_AddItem add r5, r5, #1 cmp r5, #0x10 blt _0223F3E0 @@ -12821,7 +12821,7 @@ MOD06_0223FAB8: ; 0x0223FAB8 beq _0223FB4C mov r0, #5 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor ldr r4, _0223FB50 ; =0x02252420 mov r5, #0 ldr r1, [r4] @@ -12834,7 +12834,7 @@ _0223FAE6: ldr r0, [r1, #0x64] ldr r1, [r1, #0x74] add r3, r7, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r5, r5, #1 cmp r5, #5 blt _0223FAE6 @@ -13849,7 +13849,7 @@ MOD06_02240364: ; 0x02240364 mov r1, #0 bl FUN_0200CCF8 ldr r0, [r4, #0x64] - bl FUN_02012870 + bl ListMenu_dtor mov r1, #0 ldr r0, [r4, #0x5c] add r2, r1, #0 @@ -14577,7 +14577,7 @@ _02240940: bne _022409D2 add r0, r6, #2 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #8] mov r3, #1 str r3, [sp] @@ -14605,7 +14605,7 @@ _02240940: ldr r1, [r5, #0x68] mov r2, #0x7b mov r3, #0xc - bl FUN_02012880 + bl ListMenu_ItemFromMsgData mov r4, #0 cmp r6, #0 ble _022409C4 @@ -14625,7 +14625,7 @@ _02240998: ldr r0, [r5, #8] ldr r1, [r5, #0x20] add r2, r4, #0 - bl FUN_020128A0 + bl ListMenu_AddItem add r4, r4, #1 cmp r4, r6 blt _02240998 @@ -14635,7 +14635,7 @@ _022409C4: ldr r0, [r5, #8] ldr r1, [r5, #0x68] sub r3, #0x74 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _022409D2: ldr r4, _02240A24 ; =0x0224F704 add r3, sp, #0x14 @@ -14700,7 +14700,7 @@ MOD06_02240A28: ; 0x02240A28 add r0, #0x34 bl FUN_02019178 ldr r0, [r4, #8] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 str r0, [r4] _02240A62: @@ -14792,7 +14792,7 @@ MOD06_02240B04: ; 0x02240B04 mov r0, #3 mov r1, #4 ldr r4, _02240BA8 ; =MOD6_022522E4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0xc] mov r0, #0xa str r0, [sp] @@ -14823,7 +14823,7 @@ _02240B4A: ldr r1, [r5, #0x68] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #3 @@ -14935,7 +14935,7 @@ _02240C1A: add r0, #0x44 bl FUN_02019178 ldr r0, [r5, #0xc] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 str r0, [r5, #4] _02240C50: diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index b1cef2e5..bc6fe658 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -22044,7 +22044,7 @@ MOD18_02244028: ; 0x02244028 ldr r1, [sp, #0xc] ldrh r0, [r5, #0x10] ldrb r1, [r1, #0x1d] - bl FUN_02012838 + bl ListMenu_ctor add r7, r0, #0 ldrh r0, [r5, #0x10] mov r6, #0 @@ -22055,7 +22055,7 @@ _02244084: ldr r1, [r5] add r0, r7, #0 add r1, r1, r4 - bl FUN_020128C4 + bl ListMenu_CopyItem ldrh r0, [r5, #0x10] add r6, r6, #1 add r4, #8 @@ -22216,7 +22216,7 @@ _022441BA: blx r3 ldrb r1, [r5, #0x1d] add r0, r7, #0 - bl FUN_02012838 + bl ListMenu_ctor mov r4, #0 add r6, r4, #0 str r0, [sp] @@ -22234,7 +22234,7 @@ _022441DE: lsl r1, r4, #3 ldr r0, [sp] add r1, r2, r1 - bl FUN_020128C4 + bl ListMenu_CopyItem _022441EA: add r0, sp, #0xc ldrh r1, [r0, #2] @@ -22250,7 +22250,7 @@ _022441EA: add r1, r2, r1 lsl r1, r1, #3 add r1, r3, r1 - bl FUN_020128C4 + bl ListMenu_CopyItem _0224420A: add r6, r6, #1 cmp r6, r7 @@ -25548,17 +25548,17 @@ MOD18_02245B1C: ; 0x02245B1C add r5, r0, #0 ldr r1, [sp, #0x30] mov r0, #2 - bl FUN_02012838 + bl ListMenu_ctor add r4, r0, #0 add r1, r5, #0 mov r2, #0x26 mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r4, #0 add r1, r5, #0 mov r2, #0x27 mov r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, [sp, #0x30] mov r1, #1 str r4, [sp, #0x10] @@ -29532,7 +29532,7 @@ MOD18_02247AA8: ; 0x02247AA8 add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29569,7 +29569,7 @@ _02247AFA: ldr r2, [r4] ldr r3, [r4, #4] add r1, r7, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -29658,7 +29658,7 @@ MOD18_02247BB8: ; 0x02247BB8 add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29714,7 +29714,7 @@ _02247C2C: ldr r0, [r5, #0x1c] add r1, r6, #0 add r3, r2, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _02247C40 _02247C3E: sub r4, r4, #1 @@ -29831,7 +29831,7 @@ MOD18_02247D1C: ; 0x02247D1C add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29871,7 +29871,7 @@ _02247D6C: lsl r2, r2, #2 add r2, r4, r2 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, #4 blt _02247D6C @@ -30167,7 +30167,7 @@ MOD18_02247FC0: ; 0x02247FC0 add r0, #0xc bl FUN_02019178 ldr r0, [r4, #0x1c] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 str r0, [r4, #0x1c] _02247FF8: @@ -31143,7 +31143,7 @@ MOD18_02248784: ; 0x02248784 add r0, #8 bl FUN_02019178 ldr r0, [r4, #0x18] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 str r0, [r4, #0x18] _022487BC: @@ -31202,7 +31202,7 @@ MOD18_02248820: ; 0x02248820 add r5, r0, #0 mov r0, #5 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x18] mov r3, #1 add r1, r5, #0 @@ -31242,7 +31242,7 @@ _02248870: lsl r2, r2, #2 add r2, r4, r2 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, #4 blt _02248870 @@ -31250,7 +31250,7 @@ _02248870: add r1, r6, #0 mov r2, #0x30 mov r3, #0x33 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #0 bl DestroyMsgData ldr r4, _022488EC ; =0x02250528 @@ -32943,7 +32943,7 @@ MOD18_02249564: ; 0x02249564 bl MOD18_02249544 mov r0, #7 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r0, #1 str r0, [sp] @@ -32985,7 +32985,7 @@ _022495BA: ldr r0, [r5, #0x40] ldr r2, [r4, #4] add r1, r7, #0 - bl FUN_020128A0 + bl ListMenu_AddItem add r0, r7, #0 bl String_dtor b _022495EE @@ -32994,7 +32994,7 @@ _022495E2: ldr r1, [sp, #0x14] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _022495EE: add r6, r6, #1 add r4, #8 @@ -33413,7 +33413,7 @@ _02249936: add r0, #0x10 bl FUN_02019178 ldr r0, [r4, #0x40] - bl FUN_02012870 + bl ListMenu_dtor add r0, r4, #0 bl MOD18_0224CBAC _02249968: @@ -33456,7 +33456,7 @@ _02249998: _022499A2: add r0, r6, #0 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x44] lsl r0, r7, #0x18 lsr r0, r0, #0x18 @@ -33498,7 +33498,7 @@ _022499FA: ldr r1, [sp, #0x14] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r7, r7, #1 add r4, #8 cmp r7, r6 @@ -33559,7 +33559,7 @@ MOD18_02249A64: ; 0x02249A64 ldr r0, [r4, #0x20] bl FUN_0201AC68 ldr r0, [r4, #0x44] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 str r0, [r4, #0x50] _02249A8C: @@ -33730,7 +33730,7 @@ MOD18_02249BA8: ; 0x02249BA8 bl MOD18_0224DB80 add r0, r6, #1 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -33767,7 +33767,7 @@ _02249C18: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, r6 blt _02249C18 @@ -33777,7 +33777,7 @@ _02249C30: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x24 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r3, _02249CBC ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -34197,7 +34197,7 @@ MOD18_02249F8C: ; 0x02249F8C bl MOD18_0224DB80 add r0, r6, #1 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -34259,7 +34259,7 @@ _0224A002: ldr r0, [r5, #0x40] ldr r1, [r5, #0x68] add r2, r4, #0 - bl FUN_020128A0 + bl ListMenu_AddItem add r4, r4, #1 cmp r4, r6 blt _0224A002 @@ -34269,7 +34269,7 @@ _0224A058: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x3e - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r3, _0224A0E0 ; =0x02250598 add r2, sp, #0x20 ldmia r3!, {r0, r1} @@ -34646,7 +34646,7 @@ MOD18_0224A360: ; 0x0224A360 bl MOD18_0224DB80 add r0, r6, #1 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -34683,7 +34683,7 @@ _0224A3D0: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, r6 blt _0224A3D0 @@ -34693,7 +34693,7 @@ _0224A3E8: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x3e - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r3, _0224A470 ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -35584,7 +35584,7 @@ MOD18_0224AB08: ; 0x0224AB08 bl MOD18_0224DB80 add r0, r6, #1 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -35621,7 +35621,7 @@ _0224AB78: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, r6 blt _0224AB78 @@ -35630,7 +35630,7 @@ _0224AB90: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, r2, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r3, _0224AC18 ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -36627,7 +36627,7 @@ _0224B374: bl MOD18_022498EC ldr r0, [sp, #0x18] mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 str r2, [sp] @@ -36675,13 +36675,13 @@ _0224B3D4: add r1, r7, #0 add r2, r6, #5 mvn r3, r3 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _0224B3F4 _0224B3EA: add r1, r7, #0 add r2, r6, r4 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _0224B3F4: ldr r0, [sp, #0x18] add r4, r4, #1 @@ -36750,7 +36750,7 @@ MOD18_0224B464: ; 0x0224B464 bl MOD18_022498EC ldr r0, [sp, #0x1c] mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -36796,13 +36796,13 @@ _0224B4D0: add r1, r7, #0 add r2, r6, r4 mvn r3, r3 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _0224B4F0 _0224B4E6: add r1, r7, #0 add r2, r6, r4 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _0224B4F0: ldr r0, [sp, #0x1c] add r4, r4, #1 @@ -38462,7 +38462,7 @@ _0224C288: bl MOD18_022498EC add r0, r4, #0 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -38502,14 +38502,14 @@ _0224C288: ldr r0, [r5, #0x40] mov r2, #0xd mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 add r1, r0, #0 ldr r0, [r5, #0x40] mov r2, #0xe mov r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0xf @@ -38517,7 +38517,7 @@ _0224C288: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x11 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _0224C396 _0224C31E: cmp r0, #0 @@ -38532,14 +38532,14 @@ _0224C31E: ldr r0, [r5, #0x40] mov r2, #0x10 mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 add r1, r0, #0 ldr r0, [r5, #0x40] mov r2, #0x11 mov r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0x12 @@ -38547,7 +38547,7 @@ _0224C31E: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x14 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _0224C396 _0224C36C: bl MOD18_0223D658 @@ -38556,7 +38556,7 @@ _0224C36C: ldr r0, [r5, #0x40] mov r2, #0x1c mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0x16 @@ -38564,7 +38564,7 @@ _0224C36C: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x18 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _0224C396: bl MOD18_0224DAD8 add r1, sp, #0x14 @@ -39086,7 +39086,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 bl MOD18_022498EC mov r0, #6 mov r1, #4 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -39160,7 +39160,7 @@ _0224C87C: ldr r0, [r5, #0x40] add r1, r6, #0 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, #5 blt _0224C87C @@ -39168,7 +39168,7 @@ _0224C87C: ldr r0, [r5, #0x40] add r1, r6, #0 sub r3, r2, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #0 bl DestroyMsgData bl MOD18_0224DAD8 @@ -42286,7 +42286,7 @@ MOD18_0224E0CC: ; 0x0224E0CC add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x24] mov r2, #3 str r2, [sp] @@ -42369,7 +42369,7 @@ _0224E186: ldr r2, [r4] add r1, r7, #0 add r3, r6, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, r4, #4 cmp r6, #4 @@ -42496,7 +42496,7 @@ MOD18_0224E26C: ; 0x0224E26C add r0, #0x14 bl FUN_02019178 ldr r0, [r4, #0x24] - bl FUN_02012870 + bl ListMenu_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD18_0224E26C @@ -42741,7 +42741,7 @@ _0224E454: ldr r0, [sp, #0x20] mov r1, #4 add r0, r0, #1 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5, #0x28] mov r2, #3 str r2, [sp] @@ -42899,7 +42899,7 @@ _0224E5B4: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] add r3, r6, r3 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, [sp, #0x20] add r4, r4, #1 add r6, r6, #2 @@ -42911,7 +42911,7 @@ _0224E5CE: ldr r1, [sp, #0x18] ldr r2, _0224E694 ; =0x00000115 add r3, r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, [sp, #0x18] bl DestroyMsgData bl MOD18_0223D678 @@ -43025,7 +43025,7 @@ MOD18_0224E6A8: ; 0x0224E6A8 add r0, #0x18 bl FUN_02019178 ldr r0, [r4, #0x28] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, [r4, #4] bl FUN_0205EBEC pop {r4, pc} diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 5ac713b0..e0ada2b4 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -3213,7 +3213,7 @@ MOD55_021D8E6C: ; 0x021D8E6C stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x34 - bl FUN_02012838 + bl ListMenu_ctor ldr r4, _021D8FD0 ; =0x021DA3D8 str r0, [r5, #0x14] mov r6, #0 @@ -3222,7 +3222,7 @@ _021D8EB6: ldr r1, [r5, #0x10] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -3241,7 +3241,7 @@ _021D8ECC: stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x34 - bl FUN_02012838 + bl ListMenu_ctor ldr r4, _021D8FD8 ; =0x021DA438 str r0, [r5, #0x14] mov r6, #0 @@ -3250,7 +3250,7 @@ _021D8EEE: ldr r1, [r5, #0x10] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -3460,7 +3460,7 @@ _021D9098: add r2, r1, #0 bl FUN_02001300 ldr r0, [r5, #0x14] - bl FUN_02012870 + bl ListMenu_dtor add r0, r6, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 614bbffd..197bf84c 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1457,7 +1457,7 @@ _022129EA: ldr r0, [r0] cmp r0, #0 beq _02212A00 - bl FUN_02012870 + bl ListMenu_dtor add r0, r4, #0 mov r1, #0 add r0, #0xb0 @@ -2487,7 +2487,7 @@ MOD56_02213194: ; 0x02213194 add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r6, #0 mov r1, #0 add r0, #0xb0 @@ -3462,7 +3462,7 @@ _02213944: ldr r0, [r0] ldr r1, [r5, r7] sub r2, r2, #1 - bl FUN_020128A0 + bl ListMenu_AddItem add r6, r6, #1 _0221395C: add r4, r4, #1 @@ -3476,7 +3476,7 @@ _0221395C: ldr r1, [r1] mov r2, #0x1b mov r3, #0x20 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r5, #0 add r0, #0xb0 add r5, #0xcc @@ -3485,7 +3485,7 @@ _0221395C: ldr r0, [r0] ldr r1, [r5] sub r3, #0x30 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3498,7 +3498,7 @@ MOD56_02213990: ; 0x02213990 add r5, r0, #0 mov r0, #0x22 mov r1, #0x36 - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xb0 str r0, [r1] @@ -3683,7 +3683,7 @@ _02213AF0: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 mov r1, #0 add r0, #0xb0 @@ -3808,7 +3808,7 @@ _02213C24: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl FUN_0201291C + bl ListMenu_DestroyMenuStrings add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] @@ -4107,7 +4107,7 @@ _02213E5C: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 mov r1, #0 add r0, #0xb0 @@ -5059,7 +5059,7 @@ MOD56_022145D4: ; 0x022145D4 stmia r2!, {r0, r1} mov r0, #4 mov r1, #0x36 - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xb8 ldr r4, _022146C4 ; =0x02216480 @@ -5074,7 +5074,7 @@ _02214602: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -5261,7 +5261,7 @@ _0221476E: add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 add r1, r4, #0 bl MOD56_02214808 @@ -5301,7 +5301,7 @@ _022147CE: bl FUN_02001300 add r5, #0xb8 ldr r0, [r5] - bl FUN_02012870 + bl ListMenu_dtor add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -5338,7 +5338,7 @@ _02214820: stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x36 - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xb8 mov r6, #0 @@ -5354,7 +5354,7 @@ _0221484C: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, r7 @@ -5524,7 +5524,7 @@ _02214994: bl FUN_02001300 add r5, #0xb8 ldr r0, [r5] - bl FUN_02012870 + bl ListMenu_dtor add r0, r6, #0 pop {r4, r5, r6, pc} nop @@ -5585,7 +5585,7 @@ MOD56_022149D8: ; 0x022149D8 lsr r0, r0, #0x10 str r0, [sp, #0x1c] mov r0, #3 - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xb8 str r0, [r1] @@ -5630,7 +5630,7 @@ _02214A7E: ldr r1, [r1] ldr r3, [r4, #4] mov r2, #0x1a - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _02214ADC _02214A9E: ldrh r0, [r7, #0x16] @@ -5652,7 +5652,7 @@ _02214AB2: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _02214ADC _02214AC8: add r0, r5, #0 @@ -5663,7 +5663,7 @@ _02214AC8: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _02214ADC: ldr r0, [sp, #0x24] add r4, #8 @@ -6077,7 +6077,7 @@ _02214DEC: bl FUN_02001300 add r4, #0xb8 ldr r0, [r4] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, [sp] add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index ccfa6163..a06b384c 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -1114,7 +1114,7 @@ _021D7DC4: bl FUN_02019150 ldr r1, [r5] add r0, r6, #0 - bl FUN_02012838 + bl ListMenu_ctor mov r7, #0 str r0, [r5, #0x44] cmp r6, #0 @@ -1124,7 +1124,7 @@ _021D7DDE: ldr r1, [r5, #0x4c] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r7, r7, #1 add r4, #8 cmp r7, r6 @@ -1198,7 +1198,7 @@ _021D7E66: add r2, r1, #0 bl FUN_02001300 ldr r0, [r5, #0x44] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _021D7EC8 ; =0x000005DC bl FUN_020054C8 mov r0, #0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 044f1cb5..b02c4ff1 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1957,7 +1957,7 @@ _0222E442: bl FUN_02019064 add r0, r7, #0 mov r1, #0x35 - bl FUN_02012838 + bl ListMenu_ctor mov r2, #0x67 ldr r1, [sp, #0x1c] lsl r2, r2, #2 @@ -1990,7 +1990,7 @@ _0222E49A: ldr r0, [r1, r0] ldr r2, [r2, #4] add r1, r4, #0 - bl FUN_020128A0 + bl ListMenu_AddItem add r0, r4, #0 bl String_dtor add r6, r6, #1 @@ -4612,7 +4612,7 @@ MOD62_0222F904: ; 0x0222F904 mov r0, #0x67 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor add r4, #0xfc add r0, r4, #0 bl FUN_02019178 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 87f493d0..748c1b41 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -1542,7 +1542,7 @@ MOD65_021D80C8: ; 0x021D80C8 strb r0, [r5, #0x1c] ldrb r0, [r5, #0x1c] ldr r1, [r5] - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xcc str r0, [r1] @@ -1585,7 +1585,7 @@ _021D80EE: ldrb r2, [r6, #5] ldr r0, [r0] ldr r1, [r5, #0x34] - bl FUN_020128A0 + bl ListMenu_AddItem cmp r4, #0xff bne _021D80EE _021D8142: @@ -1594,7 +1594,7 @@ _021D8142: ldr r0, [r0] ldr r1, [r5, #0x38] mov r2, #0xff - bl FUN_020128A0 + bl ListMenu_AddItem add r1, r5, #0 ldr r0, _021D8210 ; =0x021DA2E0 add r1, #0x84 @@ -1729,7 +1729,7 @@ _021D823E: add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 add r0, #0x80 ldrh r1, [r0] @@ -2223,7 +2223,7 @@ MOD65_021D8634: ; 0x021D8634 add r5, r0, #0 ldr r1, [r5] mov r0, #3 - bl FUN_02012838 + bl ListMenu_ctor add r1, r5, #0 add r1, #0xd0 str r0, [r1] @@ -2235,7 +2235,7 @@ _021D8648: ldr r1, [r5, #0x2c] add r2, r4, #1 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -2308,7 +2308,7 @@ MOD65_021D86BC: ; 0x021D86BC add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r4, #0 mov r1, #0 add r0, #0xc8 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 3868e8f9..c5d9cbbc 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -4386,7 +4386,7 @@ _0222F9E4: bl FUN_02001300 ldr r0, _0222FA34 ; =0x0000367C ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -4412,7 +4412,7 @@ MOD71_0222FA38: ; 0x0222FA38 str r0, [sp] add r0, r0, #1 mov r1, #0x1a - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _0222FAD0 ; =0x0000367C str r0, [r5, r1] mov r0, #0x64 @@ -4438,7 +4438,7 @@ _0222FA60: add r1, r6, #0 ldr r0, [r5, r0] add r2, r4, #0 - bl FUN_020128A0 + bl ListMenu_AddItem _0222FA8A: add r4, r4, #1 cmp r4, #0x20 @@ -4450,7 +4450,7 @@ _0222FA8A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0xd - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #0 bl String_dtor ldr r2, _0222FAD0 ; =0x0000367C @@ -4909,7 +4909,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 bl MOD71_02230F40 mov r0, #3 mov r1, #0x1a - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _0222FED8 ; =0x0000065C mov r2, #0x11 str r0, [r4, r1] @@ -4918,7 +4918,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 lsl r1, r1, #2 ldr r1, [r4, r1] mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _0222FED8 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -4926,7 +4926,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 ldr r1, [r4, r1] mov r2, #0x12 mov r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _0222FED8 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -4934,7 +4934,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 ldr r1, [r4, r1] mov r2, #0x13 mov r3, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _0222FED8 ; =0x0000065C ldr r1, [r4, r0] str r1, [sp, #0x10] @@ -5024,7 +5024,7 @@ _0222FF10: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r1, _02230010 ; =MOD71_0222F538 ldr r0, _02230014 ; =0x00002214 add sp, #0x10 @@ -5063,7 +5063,7 @@ _0222FF64: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r1, _0223001C ; =MOD71_02230020 ldr r0, _02230014 ; =0x00002214 str r1, [r4, r0] @@ -5100,7 +5100,7 @@ _0222FFB4: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r1, _02230010 ; =MOD71_0222F538 ldr r0, _02230014 ; =0x00002214 str r1, [r4, r0] @@ -6155,7 +6155,7 @@ MOD71_02230810: ; 0x02230810 bl MOD71_02230F40 mov r0, #2 mov r1, #0x1a - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _02230900 ; =0x0000065C mov r2, #0x11 str r0, [r4, r1] @@ -6164,7 +6164,7 @@ MOD71_02230810: ; 0x02230810 lsl r1, r1, #2 ldr r1, [r4, r1] mov r3, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02230900 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -6172,7 +6172,7 @@ MOD71_02230810: ; 0x02230810 ldr r1, [r4, r1] mov r2, #0x13 mov r3, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02230900 ; =0x0000065C ldr r1, [r4, r0] sub r0, #0x94 @@ -6259,7 +6259,7 @@ _0223092E: bl FUN_02001C5C ldr r0, _022309E4 ; =0x0000065C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor add sp, #0x10 mov r0, #3 pop {r4, pc} @@ -6295,7 +6295,7 @@ _02230982: bl FUN_02001C5C ldr r0, _022309E4 ; =0x0000065C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r1, _022309DC ; =MOD71_0222F538 ldr r0, _022309E0 ; =0x00002214 str r1, [r4, r0] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index e5623487..ec4049ab 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -1040,8 +1040,8 @@ _021E743E: bx lr thumb_func_end MOD75_021E7420 - thumb_func_start MOD75_021E7448 -MOD75_021E7448: ; 0x021E7448 + thumb_func_start MOD75_GetItemName +MOD75_GetItemName: ; 0x021E7448 add r3, r1, #0 add r1, r2, #0 add r2, r3, #0 @@ -1049,10 +1049,10 @@ MOD75_021E7448: ; 0x021E7448 bx r3 nop _021E7454: .word ReadMsgDataIntoString - thumb_func_end MOD75_021E7448 + thumb_func_end MOD75_GetItemName - thumb_func_start MOD75_021E7458 -MOD75_021E7458: ; 0x021E7458 + thumb_func_start MOD75_GetTMHMMoveName +MOD75_GetTMHMMoveName: ; 0x021E7458 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 @@ -1063,7 +1063,7 @@ MOD75_021E7458: ; 0x021E7458 add r2, r4, #0 bl ReadMsgDataIntoString pop {r3, r4, r5, pc} - thumb_func_end MOD75_021E7458 + thumb_func_end MOD75_GetTMHMMoveName thumb_func_start MOD75_021E7470 MOD75_021E7470: ; 0x021E7470 @@ -1233,7 +1233,7 @@ MOD75_021E7580: ; 0x021E7580 ldrb r0, [r0, r1] mov r1, #6 add r0, r0, #3 - bl FUN_02012838 + bl ListMenu_ctor mov r1, #0x16 lsl r1, r1, #4 str r0, [r5, r1] @@ -1243,7 +1243,7 @@ MOD75_021E7580: ; 0x021E7580 add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldrb r3, [r4, #8] cmp r3, #3 bne _021E764A @@ -1272,7 +1272,7 @@ _021E75CE: ldr r0, [r5, r0] ldr r1, [r7, r1] mov r3, #6 - bl MOD75_021E7458 + bl MOD75_GetTMHMMoveName mov r0, #0x16 mov r1, #0x59 lsl r0, r0, #4 @@ -1280,7 +1280,7 @@ _021E75CE: ldr r0, [r5, r0] ldr r1, [r7, r1] add r2, r6, #0 - bl FUN_020128A0 + bl ListMenu_AddItem ldr r0, [sp] ldrb r1, [r4, #8] add r0, r0, #4 @@ -1300,7 +1300,7 @@ _021E761A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x22 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData mov r1, #0x16 lsl r1, r1, #4 ldr r0, [r5, r1] @@ -1309,7 +1309,7 @@ _021E761A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #3 add sp, #8 strb r0, [r4, #9] @@ -1340,7 +1340,7 @@ _021E7658: ldr r0, [r5, r0] ldr r1, [r7, r1] mov r3, #6 - bl MOD75_021E7448 + bl MOD75_GetItemName mov r0, #0x16 mov r1, #0x59 lsl r0, r0, #4 @@ -1348,7 +1348,7 @@ _021E7658: ldr r0, [r5, r0] ldr r1, [r7, r1] add r2, r6, #0 - bl FUN_020128A0 + bl ListMenu_AddItem ldr r0, [sp, #4] ldrb r3, [r4, #8] add r0, r0, #4 @@ -1377,7 +1377,7 @@ _021E76A4: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x22 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _021E76E0 _021E76CC: mov r1, #0x16 @@ -1388,7 +1388,7 @@ _021E76CC: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x2b - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _021E76E0: mov r1, #0x16 lsl r1, r1, #4 @@ -1398,7 +1398,7 @@ _021E76E0: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #3 add sp, #8 strb r0, [r4, #9] @@ -1412,7 +1412,7 @@ _021E76FC: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #2 strb r0, [r4, #9] add sp, #8 @@ -1915,7 +1915,7 @@ MOD75_021E7AA4: ; 0x021E7AA4 mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #0x57 mov r1, #0 lsl r0, r0, #2 @@ -2834,7 +2834,7 @@ _021E81D2: mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor _021E8206: add r0, r5, #0 add r0, #0xc4 @@ -3900,7 +3900,7 @@ MOD75_021E89F0: ; 0x021E89F0 mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r4, #0 bl MOD75_021E7580 _021E8A3C: @@ -5026,7 +5026,7 @@ MOD75_021E92BC: ; 0x021E92BC mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r4, #0 bl MOD75_021E7580 add r0, r4, #0 @@ -8881,7 +8881,7 @@ _021EB180: _021EB1B0: add r0, r7, #0 mov r1, #6 - bl FUN_02012838 + bl ListMenu_ctor mov r1, #0x55 lsl r1, r1, #2 mov r4, #0 @@ -8901,7 +8901,7 @@ _021EB1C4: lsl r1, r1, #2 ldr r0, [r5, r0] ldr r1, [r3, r1] - bl FUN_020128A0 + bl ListMenu_AddItem add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -9112,7 +9112,7 @@ _021EB37A: mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor add r0, r5, #0 add r0, #0xb4 bl FUN_02019178 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 3a079284..028319f9 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -1257,7 +1257,7 @@ MOD76_021D7ECC: ; 0x021D7ECC strb r1, [r5, r0] ldrb r0, [r5, r0] mov r1, #0x43 - bl FUN_02012838 + bl ListMenu_ctor mov r1, #0x42 lsl r1, r1, #2 str r0, [r5, r1] @@ -1287,7 +1287,7 @@ _021D7F0E: ldr r0, [r5, r0] add r1, r7, #0 add r3, r2, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _021D7F42 _021D7F2A: mov r0, #0x42 @@ -1299,7 +1299,7 @@ _021D7F2A: ldr r0, [r5, r0] ldr r1, [r1] sub r3, #0x22 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _021D7F50 _021D7F42: mov r0, #0x61 @@ -1369,7 +1369,7 @@ MOD76_021D7FAC: ; 0x021D7FAC mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD76_021D7FAC diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index a6ce5269..3d646524 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1767,7 +1767,7 @@ MOD77_021D8370: ; 0x021D8370 bl FUN_02019150 ldrh r0, [r6, #0x10] ldr r1, [r5] - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _021D8404 ; =0x0000C058 mov r7, #0 str r0, [r5, r1] @@ -1782,7 +1782,7 @@ _021D8398: ldr r1, [r5, r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldrh r0, [r6, #0x10] add r7, r7, #1 add r4, #8 @@ -1853,7 +1853,7 @@ MOD77_021D8418: ; 0x021D8418 str r0, [sp, #8] ldr r1, [r5] add r0, r6, #0 - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _021D84C8 ; =0x0000C058 mov r4, #0 str r0, [r5, r1] @@ -1865,7 +1865,7 @@ _021D844E: ldr r0, [r5, r0] ldr r1, [sp, #8] add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, r6 blo _021D844E @@ -1940,7 +1940,7 @@ MOD77_021D84D8: ; 0x021D84D8 bl FUN_02001300 ldr r0, _021D850C ; =0x0000C058 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor pop {r4, pc} .align 2, 0 _021D8504: .word 0x0000C024 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index c58bb515..6f1d2bbe 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -4573,7 +4573,7 @@ MOD80_0222F96C: ; 0x0222F96C bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _0222F9FC ; =0x00000FC8 mov r2, #0x36 str r0, [r4, r1] @@ -4581,14 +4581,14 @@ MOD80_0222F96C: ; 0x0222F96C ldr r1, _0222FA00 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _0222F9FC ; =0x00000FC8 ldr r1, _0222FA00 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x37 mov r3, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _0222F9FC ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -4647,7 +4647,7 @@ _0222FA26: bl FUN_02001C5C ldr r0, _0222FADC ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -4702,7 +4702,7 @@ _0222FAA4: bl FUN_02001C5C ldr r0, _0222FADC ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -7629,7 +7629,7 @@ _02231240: bl FUN_02001300 ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _022312BC ; =0x000005DC bl FUN_020054C8 mov r0, #6 @@ -7646,7 +7646,7 @@ _02231266: bl FUN_02001300 ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _022312C0 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7750,7 +7750,7 @@ _02231342: bl FUN_02001300 ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _0223146C ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -7783,7 +7783,7 @@ _0223138C: bl FUN_02001300 ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02231474 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7983,7 +7983,7 @@ _0223154A: bl FUN_02001300 ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8008,7 +8008,7 @@ _0223158E: bl FUN_02001300 ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8156,7 +8156,7 @@ _022316D0: bl FUN_02001300 ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8181,7 +8181,7 @@ _0223170C: bl FUN_02001300 ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -9823,7 +9823,7 @@ MOD80_02232470: ; 0x02232470 bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _02232510 ; =0x00000FC8 mov r2, #0x5e str r0, [r4, r1] @@ -9831,21 +9831,21 @@ MOD80_02232470: ; 0x02232470 ldr r1, _02232514 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232510 ; =0x00000FC8 ldr r1, _02232514 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x5f mov r3, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232510 ; =0x00000FC8 ldr r1, _02232514 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x60 mov r3, #3 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232510 ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -9912,7 +9912,7 @@ _02232546: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -9932,7 +9932,7 @@ _02232574: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10016,7 +10016,7 @@ _0223262E: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10063,7 +10063,7 @@ MOD80_02232670: ; 0x02232670 bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _02232710 ; =0x00000FC8 mov r2, #0x54 str r0, [r4, r1] @@ -10071,21 +10071,21 @@ MOD80_02232670: ; 0x02232670 ldr r1, _02232714 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232710 ; =0x00000FC8 ldr r1, _02232714 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x55 mov r3, #2 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232710 ; =0x00000FC8 ldr r1, _02232714 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x56 mov r3, #3 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData ldr r0, _02232710 ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -10152,7 +10152,7 @@ _02232746: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10172,7 +10172,7 @@ _02232774: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10239,7 +10239,7 @@ _0223280A: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12263,7 +12263,7 @@ _022337FA: bl FUN_02001300 ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor mov r0, #5 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC @@ -12280,7 +12280,7 @@ _02233820: bl FUN_02001300 ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233884 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12418,7 +12418,7 @@ _02233932: bl FUN_02001300 ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233A54 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -12457,7 +12457,7 @@ _0223398C: bl FUN_02001300 ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233A58 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12647,7 +12647,7 @@ _02233B26: bl FUN_02001300 ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12672,7 +12672,7 @@ _02233B6A: bl FUN_02001300 ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12819,7 +12819,7 @@ _02233CA4: bl FUN_02001300 ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12859,7 +12859,7 @@ _02233CFA: bl FUN_02001300 ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] - bl FUN_02012870 + bl ListMenu_dtor ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -13680,7 +13680,7 @@ MOD80_02234370: ; 0x02234370 mov r1, #0x3e str r2, [sp] add r6, r3, #0 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r5] mov r4, #0 _02234388: @@ -13689,7 +13689,7 @@ _02234388: add r1, r6, #0 add r2, #0x68 add r3, r4, #1 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 cmp r4, #9 blt _02234388 @@ -13791,7 +13791,7 @@ _0223444A: _02234456: add r0, r6, #1 mov r1, #0x3e - bl FUN_02012838 + bl ListMenu_ctor ldr r1, [sp] str r0, [r1] mov r0, #0 @@ -13816,7 +13816,7 @@ _02234472: ldr r1, [sp, #4] ldr r0, [r0] add r3, r2, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData b _022344B6 _02234494: ldrh r1, [r5] @@ -13833,7 +13833,7 @@ _02234494: ldr r1, [sp, #4] ldr r0, [r0] add r3, r2, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData _022344B6: ldr r0, [sp, #0x10] add r5, r5, #2 @@ -13848,7 +13848,7 @@ _022344C2: ldr r0, [r0] ldr r1, [sp, #8] sub r3, #0x77 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r0, r6, #1 add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -13929,7 +13929,7 @@ MOD80_02234560: ; 0x02234560 mov r0, #4 mov r1, #0x3e add r7, r2, #0 - bl FUN_02012838 + bl ListMenu_ctor ldr r5, _022345C8 ; =0x02237B64 str r0, [r6] mov r4, #0 @@ -13938,7 +13938,7 @@ _02234578: ldr r2, [r5] ldr r3, [r5, #4] add r1, r7, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 add r5, #8 cmp r4, #4 @@ -13985,7 +13985,7 @@ MOD80_022345D0: ; 0x022345D0 mov r0, #0xd mov r1, #0x3e add r7, r2, #0 - bl FUN_02012838 + bl ListMenu_ctor ldr r5, _02234638 ; =0x02237494 str r0, [r6] mov r4, #0 @@ -13994,7 +13994,7 @@ _022345E8: ldr r2, [r5] add r1, r7, #0 add r3, r4, #0 - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r4, r4, #1 add r5, #8 cmp r4, #0xd diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 027aaecf..4e81fd4b 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -4609,7 +4609,7 @@ MOD83_0222FA4C: ; 0x0222FA4C ldr r0, [r7, #0x7c] cmp r0, #0 beq _0222FA62 - bl FUN_02012870 + bl ListMenu_dtor _0222FA62: ldr r0, [r7, #0x78] cmp r0, #0 @@ -5812,11 +5812,11 @@ MOD83_022303B0: ; 0x022303B0 ldr r0, [r4, #0x7c] cmp r0, #0 beq _022303CC - bl FUN_02012870 + bl ListMenu_dtor _022303CC: add r0, r7, #0 mov r1, #0x56 - bl FUN_02012838 + bl ListMenu_ctor str r0, [r4, #0x7c] ldr r2, _0223045C ; =0x00000172 mov r0, #0 @@ -5832,7 +5832,7 @@ _022303EA: ldr r1, [r4, #0x10] ldr r2, [r5] ldr r3, [r5, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r5, #8 cmp r6, r7 @@ -8142,7 +8142,7 @@ MOD83_022316F0: ; 0x022316F0 str r3, [sp] cmp r0, #0 beq _02231708 - bl FUN_02012870 + bl ListMenu_dtor _02231708: ldr r0, _02231798 ; =0x00002B68 ldr r0, [r5, r0] @@ -8154,7 +8154,7 @@ _02231708: _02231718: add r0, r7, #0 mov r1, #0x57 - bl FUN_02012838 + bl ListMenu_ctor ldr r1, _02231794 ; =0x00002B6C ldr r2, _0223179C ; =0x00000172 str r0, [r5, r1] @@ -8174,7 +8174,7 @@ _0223173A: ldr r1, [r5, r1] ldr r2, [r4] ldr r3, [r4, #4] - bl FUN_02012880 + bl ListMenu_ItemFromMsgData add r6, r6, #1 add r4, #8 cmp r6, r7 @@ -8503,7 +8503,7 @@ MOD83_02231A00: ; 0x02231A00 add r4, r0, #0 ldr r0, _02231A40 ; =0x00002B6C ldr r0, [r4, r0] - bl FUN_02012870 + bl ListMenu_dtor mov r1, #0 ldr r0, _02231A40 ; =0x00002B6C add r2, r1, #0 |