diff options
Diffstat (limited to 'arm9/modules')
47 files changed, 749 insertions, 749 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 7a16d48c..72d4bbbd 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -3290,7 +3290,7 @@ _021D8FF6: bl FUN_0206B9B0 mov r1, #5 add r2, r5, #0 - bl FUN_020688E8 + bl MonApplyFriendshipModEncrypted add r4, r4, #1 cmp r4, r7 blt _021D8FF6 @@ -21420,7 +21420,7 @@ MOD05_021E1AD8: ; 0x021E1AD8 mov r0, #1 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r6, #0 add r1, #0x8c str r0, [r1] @@ -21968,7 +21968,7 @@ _021E1EFC: add r0, r6, #0 add r0, #0x8c ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData _021E1F22: ldr r0, [r6, #4] bl FUN_0200CAB4 @@ -22565,7 +22565,7 @@ _021E2398: add r0, r6, #0 add r0, #0x8c ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData _021E23BE: ldr r0, [r6, #4] bl FUN_0200CAB4 @@ -22834,7 +22834,7 @@ _021E25D0: add r0, r6, #0 add r0, #0x8c ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData _021E25F6: ldr r0, [r6, #4] bl FUN_0200CAB4 @@ -23159,7 +23159,7 @@ MOD05_021E27E8: ; 0x021E27E8 mov r1, #0x1a lsl r2, r2, #2 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x12 add r7, r0, #0 bl FUN_0200A914 @@ -23174,7 +23174,7 @@ MOD05_021E27E8: ; 0x021E27E8 str r1, [sp, #8] bl FUN_0201BD84 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_02021A20 add r0, r5, #0 @@ -23216,7 +23216,7 @@ MOD05_021E28A0: ; 0x021E28A0 mov r1, #0x1a lsl r2, r2, #2 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #4 bl FUN_0200AA80 @@ -23266,7 +23266,7 @@ MOD05_021E28A0: ; 0x021E28A0 add r0, r6, #0 bl FUN_0200AB18 ldr r0, [sp, #0xc] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0 bl FUN_02019220 add sp, #0x14 @@ -23344,7 +23344,7 @@ MOD05_021E29C8: ; 0x021E29C8 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #4 bl FUN_0200AA80 @@ -23393,7 +23393,7 @@ MOD05_021E29C8: ; 0x021E29C8 add r0, r5, #0 bl FUN_0200AB18 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0xc] bl FUN_02019220 add sp, #0x14 @@ -23462,7 +23462,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #4 bl FUN_0200AA80 @@ -23513,7 +23513,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 add r0, r5, #0 bl FUN_0200AB18 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0xc] bl FUN_02019220 add sp, #0x14 @@ -24389,7 +24389,7 @@ MOD05_021E320C: ; 0x021E320C mov r0, #1 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x3c] add r0, r4, #0 pop {r3, r4, r5, pc} @@ -24401,7 +24401,7 @@ MOD05_021E3248: ; 0x021E3248 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x3c] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add r0, #0x20 bl FUN_02019178 @@ -35346,7 +35346,7 @@ MOD05_021E8588: ; 0x021E8588 mov r0, #1 mov r1, #0x1a add r3, r5, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x18] add r0, r4, #0 ldr r1, [r4] @@ -35372,7 +35372,7 @@ MOD05_021E85E4: ; 0x021E85E4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x14] bl FUN_0200AB18 add r0, r4, #0 @@ -43049,7 +43049,7 @@ _021EC46E: bl FUN_02023C7C add r1, r7, #0 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021EC48C add r0, r4, #1 @@ -43081,7 +43081,7 @@ _021EC4AA: bl FUN_02023C7C add r1, r6, #0 add r2, r7, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _021EC4C6 add r0, r4, #0 @@ -43103,7 +43103,7 @@ MOD05_021EC4DC: ; 0x021EC4DC push {r3, lr} mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FUN_0206EA98 @@ -43211,13 +43211,13 @@ MOD05_021EC5B0: ; 0x021EC5B0 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _021EC600 add r0, r7, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021EC600 add r0, r5, #0 @@ -43275,7 +43275,7 @@ _021EC64E: blt _021EC616 _021EC658: add r0, r5, #0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -43289,7 +43289,7 @@ MOD05_021EC668: ; 0x021EC668 add r6, r1, #0 mov r0, #4 add r7, r2, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 add r0, r6, #0 bl FUN_02023C7C @@ -43304,7 +43304,7 @@ MOD05_021EC668: ; 0x021EC668 add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r7, r0, #0x10 add r0, r5, #0 @@ -43329,7 +43329,7 @@ MOD05_021EC668: ; 0x021EC668 str r0, [sp, #8] add r0, r4, #0 mov r1, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 bl MOD05_021EC604 _021EC6E0: @@ -43342,13 +43342,13 @@ _021EC6E0: add r2, r0, #0 add r0, r4, #0 mov r1, #0xa9 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _021EC6FA: ldr r0, [sp] add r1, r4, #0 bl FUN_0206B900 add r0, r5, #0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r6, #0 mov r1, #0 bl FUN_02023CA0 @@ -43384,7 +43384,7 @@ MOD05_021EC744: ; 0x021EC744 add r6, r0, #0 mov r0, #4 add r5, r1, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r7, r0, #0 bl FUN_020690E4 add r4, r0, #0 @@ -43394,16 +43394,16 @@ MOD05_021EC744: ; 0x021EC744 add r0, r4, #0 mov r1, #8 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp] add r0, r0, r5 str r0, [sp] add r0, r4, #0 mov r1, #8 add r2, sp, #0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted add r4, r0, #0 add r0, r7, #0 bl FreeToHeap @@ -43416,7 +43416,7 @@ MOD05_021EC78C: ; 0x021EC78C add r5, r0, #0 bl FUN_02023C7C add r6, r0, #0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r0, r5, #0 @@ -43525,7 +43525,7 @@ MOD05_021EC864: ; 0x021EC864 bl FUN_02023C7C mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021EC888 add r0, r4, #0 @@ -43564,7 +43564,7 @@ MOD05_021EC8A8: ; 0x021EC8A8 add r5, sp, #4 _021EC8BC: ldr r0, [r5] - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted cmp r0, #1 bne _021EC8C8 str r4, [sp] @@ -43581,7 +43581,7 @@ _021EC8D8: ldr r0, [r4] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [r5] cmp r0, #0x84 bne _021EC8EC @@ -43612,7 +43612,7 @@ _021EC90E: add r0, sp, #4 ldr r0, [r0, r1] mov r1, #6 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0xe5 bne _021EC938 bl rand_LC @@ -43652,7 +43652,7 @@ _021EC960: bl MOD05_021EC458 add r1, r5, #0 add r2, r1, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted bl GetNatureFromPersonality mov r7, #0x96 add r6, r0, #0 @@ -43791,62 +43791,62 @@ _021ECA60: ; jump table _021ECA6C: mov r1, #0x46 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x46 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ECAEE _021ECA82: mov r1, #0x47 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x47 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ECAEE _021ECA98: mov r1, #0x48 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x48 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ECAEE _021ECAAE: mov r1, #0x49 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x49 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ECAEE _021ECAC4: mov r1, #0x4a mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x4a add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ECAEE _021ECADA: mov r1, #0x4b mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6] add r0, r4, #0 mov r1, #0x4b add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _021ECAEE: add r0, r5, #1 lsl r0, r0, #0x18 @@ -43965,13 +43965,13 @@ _021ECBC0: ldr r0, [sp] add r1, r6, #0 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, [sp, #0x20] mov r2, #0 str r0, [r4, r1] ldr r0, [sp, #4] add r1, r6, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, [sp, #0x10] str r0, [r1, #0x20] add r0, r5, #1 @@ -44218,13 +44218,13 @@ _021ECDAE: ldr r0, [sp] mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r4, r0, #0x10 ldr r0, [sp, #4] mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r2, r0, #0x10 mov r0, #6 @@ -44258,12 +44258,12 @@ MOD05_021ECDF4: ; 0x021ECDF4 ldr r0, [sp] mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r5, r0, #0 ldr r0, [sp, #4] mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r5, #0xec beq _021ECE20 cmp r0, #0xec @@ -44301,7 +44301,7 @@ _021ECE56: ldr r0, [r7, r6] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r1, r4, #1 add r2, sp, #0xc strh r0, [r2, r1] @@ -44316,7 +44316,7 @@ _021ECE56: b _021ECE8C _021ECE7A: ldr r0, [r7, r6] - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted cmp r0, #1 bne _021ECE8C mov r0, #1 @@ -44377,7 +44377,7 @@ _021ECEDE: lsl r1, r0, #2 add r0, sp, #4 ldr r0, [r0, r1] - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted cmp r0, #1 beq _021ECF02 ldrb r1, [r5, #1] @@ -44424,16 +44424,16 @@ MOD05_021ECF14: ; 0x021ECF14 add r0, r5, #0 mov r1, #0x9a add r2, sp, #0x14 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 mov r1, #9 add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x10 add r0, r5, #0 mov r1, #0x9b add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, sp, #0x30 ldrb r0, [r0, #8] cmp r0, #0 @@ -44441,7 +44441,7 @@ MOD05_021ECF14: ; 0x021ECF14 add r0, r5, #0 mov r1, #0x97 add r2, sp, #0x38 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _021ECF7E: add r2, sp, #0x10 mov r1, #1 @@ -44450,7 +44450,7 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x4c add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, _021ED008 ; =0x000001EE mov r1, #4 bl FUN_0200AA50 @@ -44458,7 +44458,7 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x76 add r2, r6, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 bl FUN_02021A20 ldr r0, [sp, #0x40] @@ -44477,15 +44477,15 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x90 add r2, r6, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 mov r1, #7 add r2, sp, #0x1c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 mov r1, #0x9c add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 bl FUN_02021A20 _021ECFEE: @@ -44562,20 +44562,20 @@ _021ED05E: add r0, r7, #0 mov r1, #0x9a add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0 mov r1, #9 add r2, sp, #0x14 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x14 add r0, r7, #0 mov r1, #0x9b add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0 mov r1, #0x70 add r2, sp, #0x30 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, _021ED0C8 ; =0x000001EE mov r1, #4 bl FUN_0200AA50 @@ -44583,7 +44583,7 @@ _021ED05E: add r0, r7, #0 mov r1, #0x76 add r2, r4, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 bl FUN_02021A20 add sp, #0x18 @@ -44599,7 +44599,7 @@ MOD05_021ED0CC: ; 0x021ED0CC mov r0, #4 str r1, [sp, #4] add r7, r2, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r1, sp, #0x10 add r4, r0, #0 add r0, r5, #0 @@ -44617,7 +44617,7 @@ MOD05_021ED0CC: ; 0x021ED0CC bl MOD05_021EC458 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -44664,7 +44664,7 @@ _021ED168: add r0, r4, #0 mov r1, #0x4c add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #4] add r1, r4, #0 bl FUN_0206B900 @@ -44765,21 +44765,21 @@ _021ED228: ldr r0, [r5] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4] ldr r0, [r5] mov r1, #7 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, [sp] str r0, [r1] mov r1, #0 ldr r0, [r5] add r2, r1, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #0 ldrh r0, [r4] - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality stmia r7!, {r0} ldrh r0, [r4] mov r1, #0x16 @@ -44956,7 +44956,7 @@ _021ED38E: ldr r0, [r5] mov r1, #0xab mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021ED3AC ldr r0, [sp] @@ -45055,7 +45055,7 @@ _021ED472: add r0, r4, #0 mov r1, #9 add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted b _021ED484 _021ED47E: add sp, #0x14 @@ -45120,7 +45120,7 @@ MOD05_021ED4E0: ; 0x021ED4E0 ldr r0, [sp] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021ED50E ldr r2, [sp] @@ -45135,7 +45135,7 @@ _021ED50E: ldr r0, [sp, #4] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021ED526 ldr r2, [sp, #4] @@ -45186,7 +45186,7 @@ MOD05_021ED52C: ; 0x021ED52C add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #2 @@ -45194,7 +45194,7 @@ MOD05_021ED52C: ; 0x021ED52C add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r0, #0x1d @@ -45205,7 +45205,7 @@ _021ED5A4: add r0, r5, #0 mov r1, #0x4d mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _021ED5B4 mov r4, #2 @@ -45311,7 +45311,7 @@ MOD05_021ED650: ; 0x021ED650 bl FUN_020219F4 str r0, [sp, #0x10] add r0, r5, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r6, r0, #0 add r0, r4, #0 mov r1, #5 @@ -45460,13 +45460,13 @@ _021ED7A2: add r0, r6, #0 add r1, #0x36 add r2, r7, r2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r1, r5, #0 add r2, sp, #0x30 add r0, r6, #0 add r1, #0x3a add r2, r2, r5 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -45480,7 +45480,7 @@ _021ED7CE: add r0, r6, #0 add r1, #0x46 add r2, r7, r5 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -45490,16 +45490,16 @@ _021ED7CE: add r0, r6, #0 mov r1, #0xc add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 mov r1, #0x79 add r2, sp, #0x20 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x1c add r0, r6, #0 mov r1, #0xb add r2, #3 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x1c mov r1, #0x78 add r0, sp, #0x18 @@ -45507,34 +45507,34 @@ _021ED7CE: add r0, r6, #0 mov r1, #9 add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x20 add r0, r6, #0 mov r1, #0x99 add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x1c add r0, r6, #0 mov r1, #0x6e add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r2, [sp, #0x10] add r0, r6, #0 mov r1, #0x90 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x9c add r2, #3 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 mov r1, #7 add r2, sp, #0x2c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 mov r1, #0x70 add r2, sp, #0x1c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #0x97 mov r2, #0 @@ -45562,21 +45562,21 @@ _021ED7CE: add r0, r6, #0 mov r1, #0x97 add r2, sp, #0x24 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x91 add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x92 add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 mov r1, #0x93 add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #0x98 mov r2, #0 @@ -45604,21 +45604,21 @@ _021ED7CE: add r0, r6, #0 mov r1, #0x98 add r2, sp, #0x24 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x94 add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x95 add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 mov r1, #0x96 add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 add r1, r4, #0 bl FUN_02069B88 @@ -45649,7 +45649,7 @@ MOD05_021ED940: ; 0x021ED940 add r0, r4, #0 mov r1, #0x4c add r2, #3 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #5 add r2, r5, #0 @@ -45658,27 +45658,27 @@ MOD05_021ED940: ; 0x021ED940 lsr r0, r0, #0x10 add r1, r5, #0 add r2, sp, #4 - bl FUN_0200A99C + bl GetSpeciesName add r0, r4, #0 mov r1, #0x74 add r2, sp, #4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0 add r0, r4, #0 mov r1, #0x4d add r2, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0 add r0, r4, #0 mov r1, #0x9a add r2, #1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #0x9b add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0x1c pop {r4, r5, pc} .balign 4, 0 @@ -51032,7 +51032,7 @@ MOD05_021F0254: ; 0x021F0254 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x3c] mov r0, #0x6e mov r1, #4 @@ -51051,7 +51051,7 @@ MOD05_021F0290: ; 0x021F0290 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x3c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x38] bl FUN_0200AB18 ldr r0, [r4, #0xc] @@ -63495,7 +63495,7 @@ MOD05_021F60C4: ; 0x021F60C4 mov r1, #0x1a mov r2, #0xc7 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x48] mov r0, #1 lsl r0, r0, #0xa @@ -63525,7 +63525,7 @@ MOD05_021F60FC: ; 0x021F60FC ldr r0, [r4, #0x30] bl FUN_02021A20 ldr r0, [r4, #0x48] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 529aeb97..2f478ef3 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -6555,7 +6555,7 @@ MOD06_0223C854: ; 0x0223C854 mov r0, #0xb str r2, [sp, #0x18] add r5, r3, #0 - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x1c] bl ZeroMonData ldrb r0, [r6, #0xd] @@ -6607,7 +6607,7 @@ _0223C8D2: cmp r4, #0 bne _0223C8E0 ldr r0, [sp, #0x44] - bl FUN_02068854 + bl GetMonNatureEncrypted str r0, [sp, #0x20] mov r7, #1 _0223C8E0: @@ -6622,7 +6622,7 @@ _0223C8EC: bne _0223C914 ldr r0, [sp, #0x10] add r1, r4, #0 - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality add r7, r0, #0 cmp r7, #2 bne _0223C904 @@ -6684,7 +6684,7 @@ MOD06_0223C968: ; 0x0223C968 str r1, [sp, #0xc] str r2, [sp, #0x10] add r5, r3, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 bl ZeroMonData add r0, r7, #0 @@ -6748,11 +6748,11 @@ _0223C9E4: add r0, r4, #0 add r1, r7, #0 mov r3, #0x20 - bl FUN_02066DD4 + bl CreateMonWithNatureGenderLetter add r0, r4, #0 mov r1, #7 add r2, r5, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x10] ldr r3, [sp, #0x2c] add r1, r5, #0 @@ -6779,7 +6779,7 @@ _0223CA28: add r0, r4, #0 mov r1, #7 add r2, r5, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x10] ldr r3, [sp, #0x2c] add r1, r5, #0 @@ -7586,7 +7586,7 @@ MOD06_0223D044: ; 0x0223D044 add r5, r1, #0 mov r0, #4 add r6, r2, #0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 add r0, r5, #0 mov r1, #4 @@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044 add r0, r4, #0 mov r1, #7 add r2, sp, #0x30 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #0x9f add r2, sp, #0x14 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 mov r1, #0xa2 add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r6, #8] add r1, r4, #0 bl FUN_0206B900 @@ -7839,7 +7839,7 @@ _0223D24E: add r0, r6, #0 mov r1, #0x70 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0223D25C: ldr r0, [sp] add r1, r6, #0 @@ -8340,7 +8340,7 @@ MOD06_0223D618: ; 0x0223D618 mov r1, #0x1a lsl r2, r2, #2 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0x88 str r0, [r1] @@ -8588,7 +8588,7 @@ _0223D804: add r0, r4, #0 add r0, #0x88 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add r0, #0x8c ldr r0, [r0] @@ -9055,7 +9055,7 @@ MOD06_0223DBF4: ; 0x0223DBF4 mov r1, #0x1a sub r2, #0xe9 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp] b _0223DC34 _0223DC12: @@ -9065,7 +9065,7 @@ _0223DC12: mov r1, #0x1a sub r2, #0xa mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp] b _0223DC34 _0223DC26: @@ -9073,7 +9073,7 @@ _0223DC26: mov r1, #0x1a mov r2, #0xa mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp] _0223DC34: mov r0, #0x8b @@ -9127,7 +9127,7 @@ _0223DC8E: sub r3, #0xa bl FUN_02012880 ldr r0, [sp] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _0223DCEC ; =0x0224F38C add r3, sp, #4 add r2, r3, #0 @@ -9206,21 +9206,21 @@ _0223DD3C: mov r1, #0x1a sub r2, #0xa mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, #0 add r7, r0, #0 add r1, #0x8a bl FUN_0200A914 add r6, r0, #0 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData b _0223DD86 _0223DD60: mov r0, #0 mov r1, #0x1a sub r2, #0x5a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 lsl r0, r5, #0x18 lsr r0, r0, #0x18 @@ -9230,7 +9230,7 @@ _0223DD60: bl FUN_0200A914 add r6, r0, #0 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData _0223DD86: mov r1, #0 str r1, [sp] @@ -11371,7 +11371,7 @@ _0223EF28: strb r2, [r0] ldr r2, _0223EFF8 ; =0x0000013A mov r0, #1 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0223EFF4 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x74] @@ -11498,7 +11498,7 @@ _0223F060: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x74] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r1, [r0, #0x4c] @@ -14889,7 +14889,7 @@ MOD06_02240C58: ; 0x02240C58 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x30] mov r0, #0xb4 mov r1, #4 @@ -15195,7 +15195,7 @@ _02240EE0: ldr r0, [sp, #0x28] bl FUN_02021A20 ldr r0, [sp, #0x30] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x24] bl FUN_020191D0 add sp, #0x34 @@ -15488,7 +15488,7 @@ _0224113A: ldr r0, [r4, #0x64] bl FUN_0200AB18 ldr r0, [r4, #0x68] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x14] bl FUN_02021A20 ldr r0, [r4, #0x18] @@ -15535,7 +15535,7 @@ MOD06_02241188: ; 0x02241188 mov r1, #0x1a mov r2, #0xcf mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x68] mov r0, #0xb4 mov r1, #4 @@ -18878,7 +18878,7 @@ MOD06_02242C78: ; 0x02242C78 mov r0, #1 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x54] mov r0, #4 bl FUN_0200AA80 @@ -19392,7 +19392,7 @@ _02243060: ldr r0, [r6, #0x58] bl FUN_0200AB18 ldr r0, [r6, #0x54] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, r5, r6, pc} .align 2, 0 _0224307C: .word 0x000005DC @@ -21463,7 +21463,7 @@ _02243FFA: ldr r0, [sp, #4] add r1, r6, #0 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #1 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -21734,7 +21734,7 @@ MOD06_02244210: ; 0x02244210 mov r0, #1 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] mov r0, #0x13 mov r1, #0xe @@ -21781,7 +21781,7 @@ _0224429E: cmp r4, #0x12 blo _02244264 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x1c] bl FUN_02021A20 add r0, r6, #0 @@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388 strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x70 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 mov r1, #6 add r2, r6, #2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r4, #0 str r6, [sp, #4] add r7, r4, #0 @@ -21937,7 +21937,7 @@ _022443D4: add r1, r4, #0 add r0, r5, #0 add r1, #0x36 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldrb r0, [r6, #0x1e] add r2, sp, #8 add r2, #1 @@ -21950,7 +21950,7 @@ _022443D4: add r1, r4, #0 add r0, r5, #0 add r1, #0x3e - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r1, r4, #0 add r0, r5, #0 add r1, #0x42 @@ -21962,7 +21962,7 @@ _022443D4: add r0, r5, #0 add r1, #0x3a add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #4] add r4, r4, #1 add r0, r0, #2 @@ -21975,7 +21975,7 @@ _022443D4: str r0, [sp, #0xc] add r0, r5, #0 add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x18] add r0, sp, #8 @@ -21983,7 +21983,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xd - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x19] add r0, sp, #8 @@ -21991,7 +21991,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xe - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x1a] add r0, sp, #8 @@ -21999,7 +21999,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xf - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x1b] add r0, sp, #8 @@ -22007,7 +22007,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x1c] add r0, sp, #8 @@ -22015,7 +22015,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x11 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #8 ldrb r1, [r6, #0x1d] add r0, sp, #8 @@ -22023,17 +22023,17 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x12 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r6, #0 add r0, r5, #0 mov r1, #0xa add r2, #0x20 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r6, #0 add r0, r5, #0 mov r1, #9 add r2, #0x21 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r6, #0x14] lsl r0, r0, #1 lsr r0, r0, #0x1f @@ -22042,7 +22042,7 @@ _022443D4: mov r0, #1 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldrh r1, [r6] add r4, r0, #0 lsl r1, r1, #0x15 @@ -22052,26 +22052,26 @@ _022443D4: add r0, r5, #0 mov r1, #0x76 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData b _02244508 _022444FC: add r2, r6, #0 add r0, r5, #0 mov r1, #0x74 add r2, #0x22 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02244508: add r6, #0x1f add r0, r5, #0 mov r1, #0xc add r2, r6, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -22137,7 +22137,7 @@ MOD06_02244558: ; 0x02244558 add r0, r0, #4 str r1, [r7, r0] ldr r0, [r5, #4] - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 ldrb r1, [r5, #0xe] ldr r0, [r7, #4] @@ -22170,9 +22170,9 @@ _022445A6: add r0, r4, #0 mov r1, #8 add r2, sp, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats _022445E8: add r0, r7, #0 add r1, r4, #0 @@ -22477,7 +22477,7 @@ MOD06_02244820: ; 0x02244820 mov r1, #0x1a mov r2, #0x10 add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 add r0, r4, #0 add r1, r6, #0 @@ -22502,7 +22502,7 @@ MOD06_02244820: ; 0x02244820 add r0, r4, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22713,7 +22713,7 @@ _022449F2: lsl r0, r0, #0x15 lsr r0, r0, #0x15 add r2, r5, #0 - bl FUN_0200A99C + bl GetSpeciesName add r0, r7, #0 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -23177,7 +23177,7 @@ MOD06_02244D04: ; 0x02244D04 add r0, #0x5a strh r1, [r0] ldr r0, [sp, #0x20] - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 ldr r0, [sp] mov r6, #0 @@ -30932,7 +30932,7 @@ _0224886C: str r5, [r4, #0x10] str r6, [r4, #0xc] add r0, r5, #0 - bl FUN_020669C0 + bl AllocMonZeroed str r0, [r4, #4] add r0, r5, #0 bl FUN_02023928 @@ -31078,13 +31078,13 @@ MOD06_022489AC: ; 0x022489AC add r4, r1, #0 mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 add r1, r4, #0 bl FUN_0200A914 add r4, r0, #0 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x76 add r2, r7, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0 bl FUN_02021A20 mov r1, #1 @@ -31123,66 +31123,66 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x4d add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0 mov r1, #0x46 add r2, r4, #4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x47 add r2, #8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x48 add r2, #0xc - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x49 add r2, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x4a add r2, #0x14 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x4b add r2, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x13 add r2, #0x24 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x14 add r2, #0x28 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x15 add r2, #0x2c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x16 add r2, #0x30 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #0x17 add r2, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, r4, #0 add r0, r5, #0 mov r1, #6 add r2, #0x3c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x28] add r1, r6, #4 bl MOD06_022489AC @@ -31190,19 +31190,19 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x90 add r2, r6, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0 bl FUN_02021A20 add r2, r4, #0 add r0, r5, #0 mov r1, #0x9c add r2, #0x40 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r4, #0x48 add r0, r5, #0 mov r1, #0xc add r2, r4, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x2c] bl FUN_02034824 add r3, r0, #0 @@ -31213,7 +31213,7 @@ MOD06_022489D4: ; 0x022489D4 mov r2, #1 bl FUN_0208089C add r0, r5, #0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add r0, r5, #0 bl FUN_02068A80 cmp r0, #0 @@ -40792,7 +40792,7 @@ MOD06_0224D46C: ; 0x0224D46C mov r1, #0x1a mov r2, #0xc3 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0xb bl FUN_0200AA80 @@ -41031,7 +41031,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 add r0, r4, #0 bl FUN_02019178 ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x14] bl FUN_0200AB18 add r0, r4, #0 @@ -41103,7 +41103,7 @@ MOD06_0224D70C: ; 0x0224D70C mov r0, #0 mov r1, #0x1a lsl r2, r2, #2 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x52 lsl r1, r1, #2 str r0, [r4, r1] @@ -41123,7 +41123,7 @@ MOD06_0224D76C: ; 0x0224D76C mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl MOD06_0224DC28 add r0, r4, #0 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 7fbc2c22..cb716405 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -3758,7 +3758,7 @@ _02213CEA: ldr r0, _02213D28 ; =0x00000222 strb r1, [r7, r0] add r0, r4, #0 - bl FUN_020689E0 + bl GetMonGenderEncrypted ldr r1, _02213D2C ; =0x00000221 strb r0, [r5, r1] add r0, r4, #0 @@ -4965,7 +4965,7 @@ MOD07_0221469C: ; 0x0221469C ldr r3, [r3, #0x24] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r3, [r6] str r0, [sp, #0x10] ldr r3, [r3, #0x24] @@ -5006,7 +5006,7 @@ _022146F6: add r0, r7, #0 bl FUN_02021A20 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0xc] bl FUN_0200B990 ldr r0, [sp, #8] diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index a5b5560b..9ac54172 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2360,7 +2360,7 @@ MOD09_02213138: ; 0x02213138 ldr r3, [r3, #0xc]
mov r1, #0x1a
mov r2, #3
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _02213180 ; =0x00001FA8
mov r2, #0
str r0, [r4, r1]
@@ -2396,7 +2396,7 @@ MOD09_02213190: ; 0x02213190 add r4, r0, #0
ldr r0, _022131B8 ; =0x00001FA8
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _022131BC ; =0x00001FA4
ldr r0, [r4, r0]
bl FUN_0200B990
@@ -2535,7 +2535,7 @@ _022132C2: add r6, r0, #0
ldr r0, [r4, #4]
add r6, #0x1b
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldrb r1, [r6, r5]
mov r2, #7
bic r1, r2
@@ -5747,7 +5747,7 @@ MOD09_02214D24: ; 0x02214D24 ldr r3, [r3, #0xc]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x50
mul r1, r6
add r1, r5, r1
@@ -5773,7 +5773,7 @@ MOD09_02214D24: ; 0x02214D24 add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _02214D9C ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
@@ -6072,7 +6072,7 @@ MOD09_02215000: ; 0x02215000 ldr r3, [r3, #0xc]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r6, #0
add r7, r0, #0
bl FUN_0200A914
@@ -6091,7 +6091,7 @@ MOD09_02215000: ; 0x02215000 add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, r4
bl FUN_02019220
add sp, #0x10
@@ -6119,7 +6119,7 @@ MOD09_02215060: ; 0x02215060 mov r0, #0
mov r1, #0x1a
mov r2, #0xc5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r7, #0
str r0, [sp, #0x10]
bl FUN_0200A914
@@ -6138,7 +6138,7 @@ MOD09_02215060: ; 0x02215060 add r0, r6, #0
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, r4
bl FUN_02019220
add sp, #0x14
@@ -13408,7 +13408,7 @@ _02218D22: add r0, r1, #0
mov r1, #0x1a
mov r2, #0xc7
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x24
add r7, r0, #0
bl FUN_0200A914
@@ -13424,7 +13424,7 @@ _02218D22: add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
bl MOD09_02219BE0
ldr r0, _02218E40 ; =0x0000114B
@@ -14088,7 +14088,7 @@ MOD09_022192A4: ; 0x022192A4 ldr r3, [r3, #0xc]
mov r1, #0x1a
mov r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
ldr r3, [r4]
mov r0, #0xf
@@ -14115,7 +14115,7 @@ MOD09_022192E4: ; 0x022192E4 push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0xc]
bl FUN_0200B990
ldr r0, [r4, #0x14]
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 55c064d7..dd2316a4 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -893,13 +893,13 @@ _0222DC42: mov r1, #0x1a
lsl r2, r2, #2
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0xc]
mov r0, #1
mov r1, #0x1a
mov r2, #0
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #5
bl FUN_0200AA80
@@ -1303,9 +1303,9 @@ _0222E10A: ldr r0, [r4, #0x28]
bl FUN_02002FEC
ldr r0, [r4, #0xc]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_0200AB18
mov r0, #0x71
@@ -2898,7 +2898,7 @@ _0222EE8C: add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x68]
add r5, r5, #1
bl FUN_0206B9AC
@@ -2920,7 +2920,7 @@ _0222EEBC: add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x70]
add r5, r5, #1
bl FUN_0206B9AC
@@ -3586,7 +3586,7 @@ _0222F30E: mov r1, #0x1a
lsl r2, r2, #2
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
mov r0, #1
lsl r0, r0, #8
@@ -3608,7 +3608,7 @@ _0222F30E: add r0, r6, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222F4D8 ; =MOD11_0222F0D4
add r1, r5, #0
bl FUN_02015F10
@@ -5714,7 +5714,7 @@ _022303E4: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@@ -5776,7 +5776,7 @@ _02230478: str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@@ -5824,7 +5824,7 @@ _022304DC: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@@ -5872,7 +5872,7 @@ _02230540: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@@ -5920,7 +5920,7 @@ _022305A4: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@@ -6313,7 +6313,7 @@ _022308C4: ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223091C
@@ -6384,7 +6384,7 @@ _0223097E: ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022309B4
@@ -6524,7 +6524,7 @@ _02230AC2: ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
mov r1, #0xa2
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x38]
mov r1, #0x17
lsl r0, r0, #0x10
@@ -6692,7 +6692,7 @@ _02230C28: ldr r0, [sp, #0x18]
ldr r2, [sp, #8]
mov r1, #9
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230C3E
@@ -7152,7 +7152,7 @@ _02230F4E: add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230F58:
add r0, r5, #0
mov r1, #0
@@ -8274,7 +8274,7 @@ _02231708: mov r0, #0
mov r1, #0x1a
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r7, r0, #0
bl FUN_0200A914
@@ -8296,7 +8296,7 @@ _02231708: add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _02231778
_0223174C:
ldr r2, [r5, #0x18]
@@ -23939,7 +23939,7 @@ _022392AA: add r0, r4, #0
mov r1, #6
add r2, r5, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392C4:
cmp r5, #0x62
@@ -23954,7 +23954,7 @@ _022392C4: add r0, r4, #0
mov r1, #6
add r2, r2, r3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392E2:
add r1, r1, #1
@@ -24010,7 +24010,7 @@ _0223932E: add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02239350:
ldr r0, [sp]
mov r1, #0
@@ -26914,7 +26914,7 @@ _0223AA0C: add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@@ -27099,9 +27099,9 @@ _0223AB58: add r0, r6, #0
mov r1, #0
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
add r0, r6, #0
- bl FUN_02066F04
+ bl CalcMonStatsMaybeEncrypted
ldr r1, [r4, #4]
ldr r0, _0223ABB0 ; =0x0000219C
b _0223ABBC
@@ -27897,7 +27897,7 @@ _0223B1F6: add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@@ -28183,7 +28183,7 @@ _0223B45A: str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@@ -29102,7 +29102,7 @@ _0223BC38: bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223BC62:
add r0, r5, #0
bl FUN_02077AC4
@@ -29210,7 +29210,7 @@ _0223BD3E: add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@@ -31697,7 +31697,7 @@ _0223D148: add r0, r7, #0
mov r1, #8
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D18E:
add r0, r5, #0
@@ -31707,7 +31707,7 @@ _0223D18E: add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D1A4:
add r0, r5, #0
@@ -31717,7 +31717,7 @@ _0223D1A4: add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0223D1B8:
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -43613,7 +43613,7 @@ _02242D2E: add r0, r7, r1
str r0, [sp, #0x1c]
add r0, r4, #0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldr r1, [sp, #0x1c]
mov r2, #0xf
ldrb r1, [r1, r5]
@@ -64908,13 +64908,13 @@ _0224CEE2: add r0, r7, #0
add r1, #0x36
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF0C:
add r4, r4, #1
add r5, r5, #2
@@ -64932,16 +64932,16 @@ _0224CF14: add r0, r7, #0
mov r1, #6
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@@ -65066,7 +65066,7 @@ _0224D038: add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@@ -75135,7 +75135,7 @@ _02252196: str r0, [sp, #0x14]
_022521A4:
mov r0, #5
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
mov r5, #0
_022521AE:
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index d77621d5..acf2d363 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -162,25 +162,25 @@ MOD12_0222D5C0: ; 0x0222D5C0 mov r1, #0x1a mov r2, #0xbf mov r3, #0x15 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x44] mov r0, #0 mov r1, #0x1a mov r2, #0xc0 mov r3, #0x15 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x48] mov r0, #0 mov r1, #0x1a mov r2, #0xc5 mov r3, #0x15 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x4c] mov r0, #0 mov r1, #0x1a mov r2, #0xc6 mov r3, #0x15 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x50] mov r0, #8 mov r1, #0x15 @@ -500,13 +500,13 @@ MOD12_0222D9B0: ; 0x0222D9B0 ldr r0, [r4, #0x54] bl FUN_0200AB18 ldr r0, [r4, #0x44] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x48] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x4c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x50] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x30] bl FreeToHeap ldr r0, [r4, #4] @@ -3283,7 +3283,7 @@ MOD12_0222EF04: ; 0x0222EF04 mov r1, #0x1a mov r2, #0xc4 mov r3, #0x16 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x44] mov r0, #0x16 bl FUN_0200AA80 @@ -3671,7 +3671,7 @@ _0222F3AE: ldr r0, [r4, #0x4c] bl FUN_02021A20 ldr r0, [r4, #0x44] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x30] bl FreeToHeap ldr r0, [r4, #4] @@ -5151,7 +5151,7 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r1, #0x1a mov r2, #0xc1 mov r3, #0x17 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, #0 add r1, #0x98 str r0, [r1] @@ -5515,7 +5515,7 @@ _02230296: add r0, r4, #0 add r0, #0x98 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x74] bl FreeToHeap ldr r0, [r4, #4] @@ -7695,13 +7695,13 @@ MOD12_022314A8: ; 0x022314A8 mov r0, #1 mov r1, #0x1a mov r2, #0xc2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 add r1, r4, #0 bl FUN_0200A914 add r4, r0, #0 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 pop {r3, r4, r5, pc} @@ -29420,7 +29420,7 @@ MOD12_0223B940: ; 0x0223B940 mov r1, #0x1a mov r2, #0xbf mov r3, #0x17 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 ldr r0, [r5, #4] mov r2, #0x12 @@ -29489,7 +29489,7 @@ MOD12_0223B940: ; 0x0223B940 add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -41222,7 +41222,7 @@ MOD12_02241210: ; 0x02241210 mov r1, #0x1a mov r2, #0xcc mov r3, #0x18 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, #0 add r1, #0xc4 str r0, [r1] @@ -41550,7 +41550,7 @@ _022415D4: add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x30] bl FreeToHeap ldr r0, [r4, #4] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index c0d531a8..00b933b8 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -3868,7 +3868,7 @@ _021D9488: bl FUN_0206B5E4 mov r1, #0xab mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021D94AE mov r0, #0 @@ -4713,7 +4713,7 @@ _021D9B9E: add r1, r6, #0 bl FUN_0206B9B0 add r4, r0, #0 - bl FUN_020669D4 + bl TryDecryptMon add r7, r0, #0 add r0, r4, #0 mov r1, #0xac @@ -4731,7 +4731,7 @@ _021D9B9E: _021D9BD2: add r0, r4, #0 add r1, r7, #0 - bl FUN_02066A20 + bl TryEncryptMon cmp r5, #2 blt _021D9BE4 add sp, #8 @@ -5301,7 +5301,7 @@ _021DA042: mov r1, #0xab mov r2, #0 add r7, r0, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DA080 ldr r4, _021DA164 ; =0x021E6224 @@ -5455,12 +5455,12 @@ MOD14_021DA168: ; 0x021DA168 mov r1, #0 add r5, r0, #0 str r1, [sp, #4] - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp] add r0, r5, #0 mov r1, #0xac mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _021DA1A8 mov r4, #0 @@ -5470,7 +5470,7 @@ _021DA18C: add r0, r5, #0 add r1, #0x36 add r2, r7, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r6, r0 bne _021DA1A2 mov r0, #1 @@ -5483,7 +5483,7 @@ _021DA1A2: _021DA1A8: ldr r1, [sp] add r0, r5, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r0, [sp, #4] add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -7543,7 +7543,7 @@ MOD14_021DB220: ; 0x021DB220 mov r2, #0xf mov r3, #9 str r0, [r4, #8] - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x63 lsl r2, r2, #2 str r0, [r5, r2] @@ -7551,7 +7551,7 @@ MOD14_021DB220: ; 0x021DB220 mov r1, #0x1a sub r2, #0x22 mov r3, #9 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x19 lsl r1, r1, #4 str r0, [r5, r1] @@ -7559,7 +7559,7 @@ MOD14_021DB220: ; 0x021DB220 mov r1, #0x1a mov r2, #0xbe mov r3, #9 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x65 lsl r2, r2, #2 str r0, [r5, r2] @@ -7567,7 +7567,7 @@ MOD14_021DB220: ; 0x021DB220 mov r1, #0x1a add r2, #0x94 mov r3, #9 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x66 lsl r1, r1, #2 str r0, [r5, r1] @@ -7576,7 +7576,7 @@ MOD14_021DB220: ; 0x021DB220 mov r1, #0x67 lsl r1, r1, #2 str r0, [r5, r1] - bl FUN_020669BC + bl SizeOfStructPokemon add r1, r0, #0 mov r0, #9 bl AllocFromHeap @@ -7706,19 +7706,19 @@ _021DB3BE: mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x65 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x66 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x4a lsl r0, r0, #2 ldr r0, [r4, r0] @@ -8518,7 +8518,7 @@ _021DB998: beq _021DB9C4 mov r1, #0xab mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DB9C4 mov r0, #1 @@ -8739,7 +8739,7 @@ _021DBB36: mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DBB86 ldr r0, [sp, #0x20] @@ -9122,7 +9122,7 @@ MOD14_021DBE34: ; 0x021DBE34 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x14] - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt mov r0, #1 strb r0, [r4, #0x13] add r0, r4, #0 @@ -9189,18 +9189,18 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 add r6, r2, #0 add r4, #0x4c - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp] str r5, [r7, #0x4c] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #4] add r0, r5, #0 mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #6] mov r0, #0x47 lsl r0, r0, #2 @@ -9212,7 +9212,7 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #0xac mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r4, #0xf] ldrh r0, [r4, #4] mov r1, #9 @@ -9221,26 +9221,26 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #8 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r2, r0, #0 ldrh r1, [r4, #4] add r0, r7, #0 - bl CalcMonLevelInternal + bl CalcLevelBySpeciesAndExp_PreloadedPersonal strb r0, [r4, #0xa] add r0, r5, #0 mov r1, #0xb mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r4, #0xb] add r0, r5, #0 mov r1, #0xb0 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r4, #0xc] add r0, r5, #0 mov r1, #0xb1 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r4, #0xd] ldrb r0, [r4, #0xf] cmp r0, #0 @@ -9248,17 +9248,17 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #0xaf mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DBF68 mov r1, #0 add r0, r5, #0 add r2, r1, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r2, r0, #0 ldrh r1, [r4, #4] add r0, r7, #0 - bl FUN_02068A44 + bl GetGenderBySpeciesAndPersonality_PreloadedPersonal strb r0, [r4, #0xe] b _021DBF6C _021DBF68: @@ -9268,7 +9268,7 @@ _021DBF6C: ldr r2, [r4, #0x14] add r0, r5, #0 mov r1, #0x76 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldrb r0, [r4, #0xf] cmp r0, #0 bne _021DBF8C @@ -9302,7 +9302,7 @@ _021DBFAA: bl FUN_0200A8E0 _021DBFB8: add r0, r5, #0 - bl FUN_0206885C + bl GetBoxMonNatureEncrypted add r1, r0, #0 mov r0, #0x65 lsl r0, r0, #2 @@ -9312,7 +9312,7 @@ _021DBFB8: add r0, r5, #0 mov r1, #0xa mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #0 mov r0, #0x66 lsl r0, r0, #2 @@ -9323,7 +9323,7 @@ _021DBFB8: bl FreeMonPersonal ldr r1, [sp] add r0, r5, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD14_021DBFF4 @@ -9371,7 +9371,7 @@ _021DC034: mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_020669D4 + bl TryDecryptMon add r6, r0, #0 mov r0, #0x1a lsl r0, r0, #4 @@ -9489,7 +9489,7 @@ _021DC034: lsl r0, r0, #4 ldr r0, [r5, r0] add r1, r6, #0 - bl FUN_02066A20 + bl TryEncryptMon add r0, r7, #0 add r0, #0xa4 ldrb r0, [r0] @@ -9557,7 +9557,7 @@ MOD14_021DC1AC: ; 0x021DC1AC ldr r0, [r4, #0x4c] mov r1, #0xb add r2, sp, #0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 bl MOD14_021DC3CC cmp r0, #0 @@ -9623,12 +9623,12 @@ _021DC24A: ldr r0, [r4] mov r1, #6 add r2, sp, #0x1c - bl FUN_02067960 + bl SetBoxMonDataEncrypted _021DC254: ldr r0, [r4] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _021DC274 ; =0x000001ED cmp r0, r1 bne _021DC26A @@ -10215,7 +10215,7 @@ MOD14_021DC58C: ; 0x021DC58C ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted pop {r4, r5, r6, pc} _021DC5B2: ldrb r0, [r5, #0x1f] @@ -10224,7 +10224,7 @@ _021DC5B2: ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted pop {r4, r5, r6, pc} _021DC5C4: ldr r0, [r5, #0x4c] @@ -10245,7 +10245,7 @@ MOD14_021DC5D0: ; 0x021DC5D0 ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted pop {r4, r5, r6, pc} _021DC5EC: ldr r0, [r5, #8] @@ -14333,7 +14333,7 @@ _021DE5FE: mov r1, #0xab mov r2, #0 str r0, [sp, #0x34] - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DE64E add r0, r4, #0 @@ -14434,7 +14434,7 @@ _021DE6D0: mov r1, #5 mov r2, #0 add r7, r0, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DE70A ldr r1, _021DE724 ; =0x00005814 @@ -14908,7 +14908,7 @@ _021DEA70: mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DEB02 ldrb r1, [r5, #2] @@ -15025,7 +15025,7 @@ _021DEB5C: mov r1, #5 mov r2, #0 str r0, [sp, #0x2c] - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _021DEBA0 add r0, r4, #0 @@ -18859,7 +18859,7 @@ MOD14_021E0940: ; 0x021E0940 str r2, [sp, #8] str r3, [sp, #0xc] ldr r4, [sp, #0x64] - bl FUN_02066A6C + bl TryDecryptBoxMon lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x10] @@ -18877,21 +18877,21 @@ MOD14_021E0940: ; 0x021E0940 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x18] add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x14] add r0, r6, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r7, r0, #0x18 add r0, r6, #0 @@ -18905,12 +18905,12 @@ MOD14_021E0940: ; 0x021E0940 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #0x30] add r0, r6, #0 mov r1, #0xb mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #0x2e] add r0, r4, #4 bl FUN_020B1A24 @@ -18971,7 +18971,7 @@ _021E0A36: bl MOD14_021E0B54 ldr r1, [sp, #0x10] add r0, r6, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x44 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -18987,19 +18987,19 @@ MOD14_021E0A60: ; 0x021E0A60 str r2, [sp, #8] add r7, r3, #0 ldr r4, [sp, #0x70] - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x14] add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x10] add r0, r6, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0xc] @@ -19023,12 +19023,12 @@ MOD14_021E0A60: ; 0x021E0A60 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #0x30] add r0, r6, #0 mov r1, #0xb mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r4, #0x2e] add r0, r4, #4 bl FUN_020B1A24 @@ -19079,7 +19079,7 @@ _021E0B28: bl MOD14_021E0B54 ldr r1, [sp, #0x14] add r0, r6, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop @@ -20658,7 +20658,7 @@ MOD14_021E1750: ; 0x021E1750 mov r3, #0xa str r0, [r4, #0x10] mov r0, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x14] mov r0, #0x40 mov r1, #0xa @@ -20724,7 +20724,7 @@ _021E17EC: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E17F6 - bl FUN_0200A8B8 + bl DestroyMsgData _021E17F6: ldr r0, [r5, #0x30] cmp r0, #0 @@ -21579,7 +21579,7 @@ _021E1DBC: strh r1, [r0] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _021E1EE8 ; =0x00004BF8 add r2, r5, #0 str r0, [r5, r1] @@ -21662,7 +21662,7 @@ MOD14_021E1F20: ; 0x021E1F20 ldr r0, [r5, r0] cmp r0, #0 beq _021E1F30 - bl FUN_0200A8B8 + bl DestroyMsgData _021E1F30: ldr r0, [r5, #0x14] cmp r0, #0 @@ -21819,26 +21819,26 @@ _021E204A: bl FUN_0206B5E4 add r4, r4, #1 add r5, r0, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x1c] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r7, r0, #0 beq _021E20C8 add r0, r5, #0 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _021E209A add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r1, r0, #0x10 add r0, r7, #0 @@ -21876,7 +21876,7 @@ _021E20AA: _021E20C8: ldr r1, [sp, #0x1c] add r0, r5, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r0, [sp, #0x24] add r6, r6, #2 add r0, r0, #1 @@ -28213,7 +28213,7 @@ _021E5064: mov r1, #0x1a lsl r2, r2, #2 mov r3, #0xa - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x70] mov r0, #0x20 mov r1, #0xa @@ -28246,7 +28246,7 @@ MOD14_021E50EC: ; 0x021E50EC ldr r0, [r4, r0] bl FreeToHeap ldr r0, [r4, #0x70] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl MOD14_021E5C04 add r0, r4, #0 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 800f1e57..f63c7b7a 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -4342,7 +4342,7 @@ MOD15_021D95E8: ; 0x021D95E8 mov r0, #0
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x48]
mov r0, #0x23
bl FUN_02013690
@@ -4379,7 +4379,7 @@ _021D9660: ldr r0, [r4, #0x48]
cmp r0, #0
beq _021D966A
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021D966A:
ldr r0, [r4, #0x4c]
cmp r0, #0
@@ -5955,7 +5955,7 @@ MOD15_021DA2AC: ; 0x021DA2AC mov r0, #1
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x20]
mov r0, #9
mov r7, #1
@@ -6055,7 +6055,7 @@ _021DA31A: cmp r4, #0xc
blt _021DA2CC
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
add sp, #0x38
pop {r3, r4, r5, r6, r7, pc}
@@ -6170,7 +6170,7 @@ MOD15_021DA480: ; 0x021DA480 mov r0, #1
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0xd
str r0, [sp, #0x20]
bl FUN_0200A914
@@ -6243,7 +6243,7 @@ _021DA4C2: ldr r0, [sp, #0x1c]
bl FUN_02021A20
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
add sp, #0x34
pop {r4, r5, r6, r7, pc}
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 22511fc3..3191e90c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -1796,13 +1796,13 @@ MOD16_021D8270: ; 0x021D8270 add r3, r1, #0 mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 add r1, r4, #0 bl FUN_0200A914 add r4, r0, #0 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -2392,7 +2392,7 @@ _021D873A: lsl r0, r5, #0x10 lsr r0, r0, #0x10 mov r1, #0 - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality add r4, r0, #0 _021D874E: ldr r0, [sp, #0x40] @@ -8470,7 +8470,7 @@ MOD16_021DB3C8: ; 0x021DB3C8 ldr r3, [r5, #0x14] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 bne _021DB3E4 bl ErrorHandling @@ -8500,7 +8500,7 @@ _021DB3E4: add r0, r4, #0 bl FUN_02021A20 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 add sp, #0x10 pop {r4, r5, r6, pc} @@ -9807,7 +9807,7 @@ MOD16_021DBCA0: ; 0x021DBCA0 mov r0, #1 mov r1, #0x1a add r3, r5, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 beq _021DBCDA mov r0, #1 @@ -9822,7 +9822,7 @@ MOD16_021DBCA0: ; 0x021DBCA0 bl FUN_0200A8E0 _021DBCD0: add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0 pop {r4, r5, r6, pc} _021DBCDA: @@ -11514,7 +11514,7 @@ MOD16_021DC958: ; 0x021DC958 mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0 add r2, r4, #0 add r6, r0, #0 @@ -11584,7 +11584,7 @@ MOD16_021DC958: ; 0x021DC958 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5] mov r1, #1 bl FUN_0201AC68 @@ -11609,7 +11609,7 @@ MOD16_021DCA2C: ; 0x021DCA2C mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x6c add r2, r4, #0 add r6, r0, #0 @@ -11646,7 +11646,7 @@ MOD16_021DCA2C: ; 0x021DCA2C add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5] mov r1, #1 bl FUN_0201AC68 @@ -12790,7 +12790,7 @@ MOD16_021DD370: ; 0x021DD370 mov r0, #0 mov r1, #0x1a add r3, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x15 lsl r1, r1, #4 str r0, [sp, #0x14] @@ -12868,7 +12868,7 @@ _021DD420: add r0, r7, #0 bl FUN_02021A20 ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -29763,7 +29763,7 @@ MOD16_021E5064: ; 0x021E5064 mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #9 add r2, r7, #0 str r0, [sp, #0x18] @@ -29795,7 +29795,7 @@ MOD16_021E5064: ; 0x021E5064 add r0, r7, #0 bl FUN_02021A20 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r6, #0 @@ -29834,7 +29834,7 @@ MOD16_021E5104: ; 0x021E5104 mov r1, #0x1a lsl r2, r2, #2 add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, [sp, #0x10] add r2, r4, #0 add r6, r0, #0 @@ -29852,7 +29852,7 @@ MOD16_021E5104: ; 0x021E5104 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -29873,7 +29873,7 @@ MOD16_021E5158: ; 0x021E5158 mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, [sp, #0x10] add r2, r4, #0 add r6, r0, #0 @@ -29891,7 +29891,7 @@ MOD16_021E5158: ; 0x021E5158 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -34441,7 +34441,7 @@ MOD16_021E72E4: ; 0x021E72E4 ldr r3, [sp, #0x10] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x14] ldr r0, [r4, #4] bl MOD16_021D9DE8 @@ -34483,7 +34483,7 @@ _021E731E: ldr r0, [sp, #0x18] bl FUN_02021A20 ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x1c] ldr r1, [sp, #0x10] str r0, [sp] @@ -45799,7 +45799,7 @@ MOD16_021EC7E8: ; 0x021EC7E8 mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x2b add r2, r4, #0 add r6, r0, #0 @@ -45857,7 +45857,7 @@ MOD16_021EC7E8: ; 0x021EC7E8 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -45881,7 +45881,7 @@ MOD16_021EC898: ; 0x021EC898 mov r1, #0x1a lsl r2, r2, #2 add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] ldr r0, [r6, #4] bl MOD16_021D9DE8 @@ -45925,12 +45925,12 @@ MOD16_021EC898: ; 0x021EC898 ldr r0, [sp, #0x18] bl FUN_02021A20 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r2, _021EC9AC ; =0x00000266 mov r0, #0 mov r1, #0x1a add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [r6, #4] bl MOD16_021D9F40 @@ -45981,7 +45981,7 @@ _021EC970: add r0, r4, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -48779,7 +48779,7 @@ MOD16_021EDEC8: ; 0x021EDEC8 mov r0, #0 mov r1, #0x1a add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x2c add r2, r4, #0 add r6, r0, #0 @@ -48837,7 +48837,7 @@ MOD16_021EDEC8: ; 0x021EDEC8 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -48860,7 +48860,7 @@ MOD16_021EDF78: ; 0x021EDF78 mov r0, #0 mov r1, #0x1a add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] ldr r0, [r6] bl MOD16_021D9DE8 @@ -48904,12 +48904,12 @@ MOD16_021EDF78: ; 0x021EDF78 ldr r0, [sp, #0x18] bl FUN_02021A20 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r2, _021EE08C ; =0x00000266 mov r0, #0 mov r1, #0x1a add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [r6] bl MOD16_021D9F40 @@ -48960,7 +48960,7 @@ _021EE04E: add r0, r4, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -52406,7 +52406,7 @@ MOD16_021EFA6C: ; 0x021EFA6C mov r0, #0 mov r1, #0x1a add r3, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x6d add r2, r5, #0 add r4, r0, #0 @@ -52425,7 +52425,7 @@ MOD16_021EFA6C: ; 0x021EFA6C add r0, r5, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x10 pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index ab858387..4f74dada 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4712,7 +4712,7 @@ MOD17_021D9918: ; 0x021D9918 mov r0, #0 mov r1, #0x1a mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, [sp, #0x14] add r6, r0, #0 bl FUN_0200A914 @@ -4731,7 +4731,7 @@ MOD17_021D9918: ; 0x021D9918 add r0, r4, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _021D99D4 ; =0x000006A8 ldr r0, [r5, r0] bl FUN_020191D0 @@ -4758,7 +4758,7 @@ MOD17_021D99E0: ; 0x021D99E0 mov r0, #0 mov r1, #0x1a mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r7, r0, #0 bl FUN_0200A914 @@ -4789,7 +4789,7 @@ MOD17_021D99E0: ; 0x021D99E0 add r0, r6, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _021D9A58 ; =0x000006A8 ldr r0, [r5, r0] bl FUN_020191D0 @@ -4823,7 +4823,7 @@ _021D9A7E: mov r0, #0 mov r1, #0x1a mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r7, r0, #0 bl FUN_0200A914 @@ -4868,7 +4868,7 @@ _021D9AD0: add r0, r4, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _021D9B08 ; =0x000006A8 ldr r0, [r5, r0] bl FUN_020191D0 @@ -11254,7 +11254,7 @@ MOD17_021DC880: ; 0x021DC880 add r4, r3, #0 mov r0, #0 mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 bne _021DC898 bl ErrorHandling @@ -11294,7 +11294,7 @@ _021DC898: add r0, r7, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -11933,7 +11933,7 @@ MOD17_021DCD80: ; 0x021DCD80 add r4, r3, #0 mov r0, #0 mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCD98 bl ErrorHandling @@ -11959,7 +11959,7 @@ _021DCD98: add r0, r4, #0 bl FUN_02021A20 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 add sp, #0x10 pop {r4, r5, r6, pc} @@ -11984,7 +11984,7 @@ _021DCDEC: add r1, r5, #0 add r2, r6, #0 mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCE00 bl ErrorHandling @@ -12008,7 +12008,7 @@ _021DCE00: bl FUN_0201BDE0 add r4, r0, #0 add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -13208,7 +13208,7 @@ MOD17_021DD6DC: ; 0x021DD6DC lsl r0, r0, #2 str r1, [r4, r0] ldr r0, [r5, #0x68] - bl FUN_020669C0 + bl AllocMonZeroed mov r1, #0x8a lsl r1, r1, #2 str r0, [r4, r1] @@ -13278,7 +13278,7 @@ MOD17_021DD778: ; 0x021DD778 lsl r0, r0, #2 str r1, [r4, r0] ldr r0, [r5, #0x68] - bl FUN_020669C0 + bl AllocMonZeroed mov r1, #0x8a lsl r1, r1, #2 str r0, [r4, r1] @@ -14340,7 +14340,7 @@ MOD17_021DDFDC: ; 0x021DDFDC mov r0, #0 mov r1, #0x1a mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] cmp r0, #0 bne _021DDFF8 @@ -14443,7 +14443,7 @@ _021DDFF8: add r0, r7, #0 bl FUN_02021A20 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_0200AB18 add sp, #0x20 @@ -14501,7 +14501,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 add r3, r6, #0 bl FUN_0200ABB4 mov r0, #0xd - bl FUN_020669C0 + bl AllocMonZeroed add r6, r0, #0 ldr r0, [r5, #4] add r1, r6, #0 @@ -14518,7 +14518,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 mov r0, #0 mov r1, #0x1a mov r3, #0xd - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] cmp r0, #0 bne _021DE1A0 @@ -14591,7 +14591,7 @@ _021DE1A0: add r0, r4, #0 bl FUN_02021A20 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r7, #0 bl FUN_0200AB18 add sp, #0x14 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 879113e6..36ef4cf5 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -29544,7 +29544,7 @@ MOD18_02247AA8: ; 0x02247AA8 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r4, _02247B5C ; =0x02250548 add r7, r0, #0 mov r6, #0 @@ -29559,7 +29559,7 @@ _02247AFA: cmp r6, #4 blo _02247AFA add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData bl MOD18_0224DAD8 add r1, sp, #0x14 mov r2, #0x20 @@ -29670,7 +29670,7 @@ MOD18_02247BB8: ; 0x02247BB8 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 mov r4, #0 add r7, sp, #0x14 @@ -29707,7 +29707,7 @@ _02247C40: cmp r4, #4 blt _02247C0A add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _02247C94 ; =0x02250528 add r3, sp, #0x18 add r2, r3, #0 @@ -29843,7 +29843,7 @@ MOD18_02247D1C: ; 0x02247D1C mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 mov r4, #0 _02247D6C: @@ -29860,7 +29860,7 @@ _02247D6C: cmp r4, #4 blt _02247D6C add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _02247DD4 ; =0x02250528 add r3, sp, #0x14 add r2, r3, #0 @@ -31214,7 +31214,7 @@ MOD18_02248820: ; 0x02248820 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 mov r4, #0 _02248870: @@ -31236,7 +31236,7 @@ _02248870: mov r3, #0x33 bl FUN_02012880 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _022488EC ; =0x02250528 add r3, sp, #0x14 add r2, r3, #0 @@ -36642,7 +36642,7 @@ _0224B374: mov r1, #0x1a lsl r2, r2, #2 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [sp, #0x18] mov r4, #0 @@ -36673,7 +36673,7 @@ _0224B3F4: blt _0224B3D4 _0224B3FC: add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData bl MOD18_0224DAD8 add r1, sp, #0x20 mov r2, #0x20 @@ -36765,7 +36765,7 @@ MOD18_0224B464: ; 0x0224B464 mov r1, #0x1a lsl r2, r2, #2 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 ldr r0, [sp, #0x1c] mov r4, #0 @@ -36794,7 +36794,7 @@ _0224B4F0: blt _0224B4D0 _0224B4F8: add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData bl MOD18_0224DAD8 add r1, sp, #0x20 mov r2, #0x20 @@ -39102,7 +39102,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 mov r1, #0x1a sub r2, #0xd mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 bl MOD18_0223D678 ldr r1, _0224C938 ; =0x0000023B @@ -39116,7 +39116,7 @@ _0224C83C: mov r1, #0x1a sub r2, #0x11 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 bl MOD18_0223D678 ldr r1, _0224C93C ; =0x00000237 @@ -39128,7 +39128,7 @@ _0224C85C: mov r1, #0x1a sub r2, #0xf mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 bl MOD18_0223D678 ldr r1, _0224C940 ; =0x00000239 @@ -39154,7 +39154,7 @@ _0224C87C: sub r3, r2, #2 bl FUN_02012880 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData bl MOD18_0224DAD8 add r1, sp, #0x14 mov r2, #0x20 @@ -40806,7 +40806,7 @@ MOD18_0224D5CC: ; 0x0224D5CC mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0 add r0, r4, #0 add r0, #8 @@ -40844,7 +40844,7 @@ _0224D64A: ldr r0, [r1] str r4, [r0] add r0, r5, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -41311,7 +41311,7 @@ MOD18_0224DA00: ; 0x0224DA00 mov r1, #0x1a lsl r2, r2, #2 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 add r0, r5, #0 add r0, #8 @@ -41332,7 +41332,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r0, #8 bl FUN_02019220 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -41413,7 +41413,7 @@ _0224DB08: mov r0, #1 mov r1, #0x1a add r3, r5, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x24] str r5, [r4, #0x34] add r0, r4, #0 @@ -41446,7 +41446,7 @@ MOD18_0224DB5C: ; 0x0224DB5C ldr r0, [r4, #0x28] bl FUN_0200AB18 ldr r0, [r4, #0x24] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -41463,12 +41463,12 @@ MOD18_0224DB80: ; 0x0224DB80 beq _0224DBAC str r4, [r5, #0x2c] ldr r0, [r5, #0x24] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r3, [r5, #0x34] add r0, r6, #0 mov r1, #0x1a add r2, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x24] cmp r0, #0 bne _0224DBAC @@ -42324,7 +42324,7 @@ MOD18_0224E0CC: ; 0x0224E0CC mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 add r0, r5, #0 add r0, #0x14 @@ -42359,7 +42359,7 @@ _0224E186: cmp r6, #4 blt _0224E186 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _0224E208 ; =0x022507D0 add r3, sp, #0x24 add r2, r3, #0 @@ -42777,13 +42777,13 @@ _0224E454: mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] ldr r2, _0224E690 ; =0x00000242 mov r0, #0 mov r1, #0x1a mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x24] add r0, r5, #0 add r0, #0x18 @@ -42856,7 +42856,7 @@ _0224E454: add r0, r4, #0 bl FUN_02021A20 ldr r0, [sp, #0x24] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x20] mov r4, #0 cmp r0, #0 @@ -42897,7 +42897,7 @@ _0224E5CE: add r3, r3, #1 bl FUN_02012880 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData bl MOD18_0223D678 ldr r1, _0224E68C ; =0x00000237 mov r2, #0 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 6cfd48bd..8b3921cf 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -305,7 +305,7 @@ _02254A62: add r1, r6, #0 bl FUN_0206B9B0 add r4, r0, #0 - bl FUN_020669D4 + bl TryDecryptMon add r7, r0, #0 add r0, r4, #0 bl FUN_0206B688 @@ -354,7 +354,7 @@ _02254ABE: strb r0, [r5, #0x13] add r0, r4, #0 add r1, r7, #0 - bl FUN_02066A20 + bl TryEncryptMon ldr r0, [sp] add r6, r6, #1 ldr r0, [r0] diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 727fced8..d24971d9 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -330,7 +330,7 @@ _02254A7A: str r0, [sp, #8] bl FUN_02023C7C add r4, r0, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0xc] add r0, r4, #0 bl FUN_0206B688 @@ -338,22 +338,22 @@ _02254A7A: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r6, #0x1c] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r6, #0x20] ldr r0, [sp, #8] bl MOD05_021EC7B4 str r0, [r5, #0xc] add r0, r4, #0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted str r0, [r5, #0x14] ldr r1, [sp, #0xc] add r0, r4, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r0, [sp] add r7, r7, #1 ldrb r0, [r0] diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 1620e737..a9a94ebe 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -527,7 +527,7 @@ MOD38_02254BC4: ; 0x02254BC4 mov r0, #1 mov r1, #0x1a mov r3, #8 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xb4 str r0, [r1] @@ -535,7 +535,7 @@ MOD38_02254BC4: ; 0x02254BC4 mov r0, #1 mov r1, #0x1a mov r3, #8 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xb8 str r0, [r1] @@ -675,11 +675,11 @@ MOD38_02254D04: ; 0x02254D04 add r0, r4, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add r0, #0xb8 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl MOD38_02254CC4 add r0, r4, #0 diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index f92acbb8..cdfaa3dc 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -712,7 +712,7 @@ MOD47_02254D14: ; 0x02254D14 mov r0, #1 mov r1, #0x1a mov r3, #8 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x58] mov r0, #0x60 mov r1, #8 @@ -739,7 +739,7 @@ MOD47_02254D6C: ; 0x02254D6C ldr r0, [r4, #0x5c] bl FUN_02021A20 ldr r0, [r4, #0x58] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl MOD47_02254DFC add r0, r4, #0 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index c07a0192..8df998df 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -111,7 +111,7 @@ MOD51_022548F0: ; 0x022548F0 mov r1, #0x1a lsl r2, r2, #6 mov r3, #4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #4 add r3, r4, #0 @@ -345,7 +345,7 @@ _02254AEC: ldr r0, [r6, #0x28] bl FUN_0201FD58 ldr r0, [r6, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r6, #0x18] bl FUN_0200AB18 mov r0, #0x72 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 77275774..03a8eda6 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -56,7 +56,7 @@ _021D74F6: mov r0, #0 mov r1, #0x1a mov r3, #0x27 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #4 mov r1, #8 @@ -361,7 +361,7 @@ _021D77D8: bl MOD53_021D7B24 bl FUN_0201CD04 ldr r0, [r6, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r6, #0xc] bl FUN_0200AB18 ldr r0, [r7] diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 9de1ac02..48b488bf 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -63,7 +63,7 @@ _021D74F6: mov r0, #0 mov r1, #0x1a mov r3, #0x33 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x28] mov r0, #4 mov r1, #8 @@ -315,7 +315,7 @@ _021D776C: ldr r0, [r0, #4] bl FUN_02052F8C ldr r0, [r6, #0x28] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r6, #0x24] bl FUN_0200AB18 add r0, r6, #0 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 70381d8a..f4fcee0b 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -568,7 +568,7 @@ MOD55_021D7994: ; 0x021D7994 mov r0, #0 mov r1, #0x1a mov r3, #0x34 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r6, #0x10] mov r4, #0 add r5, r6, #0 @@ -640,7 +640,7 @@ MOD55_021D7A38: ; 0x021D7A38 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, [r6, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r6, #0xc] bl FUN_0200AB18 mov r4, #0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 6b14026a..3abecf47 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -283,7 +283,7 @@ MOD56_02211FD4: ; 0x02211FD4 mov r1, #0x1a lsl r2, r2, #4 mov r3, #0x36 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xcc str r0, [r1] @@ -291,7 +291,7 @@ MOD56_02211FD4: ; 0x02211FD4 mov r0, #0 mov r1, #0x1a mov r3, #0x36 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xd0 str r0, [r1] @@ -521,11 +521,11 @@ _022121EC: add r0, r6, #0 add r0, #0xd0 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 add r0, #0xcc ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r6, #0xc8 ldr r0, [r6] bl FUN_0200AB18 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index a84a5097..1996a814 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -591,14 +591,14 @@ MOD57_021D79AC: ; 0x021D79AC mov r0, #0 mov r1, #0x1a mov r3, #0x19 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r2, _021D79EC ; =0x0000330C add r4, r0, #0 ldr r2, [r5, r2] mov r1, #0xb bl FUN_0200A8E0 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3, r4, r5, pc} .align 2, 0 _021D79E8: .word 0x00003308 @@ -2754,7 +2754,7 @@ MOD57_021D89F0: ; 0x021D89F0 mov r0, #0 mov r1, #0x1a mov r3, #0x19 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x14] mov r0, #0x20 mov r1, #0x19 @@ -3018,7 +3018,7 @@ _021D8C32: add r0, r5, #0 bl FUN_02021A20 ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3077,7 +3077,7 @@ MOD57_021D8CF8: ; 0x021D8CF8 mov r0, #0 mov r1, #0x1a mov r3, #0x19 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x20 mov r1, #0x19 @@ -3335,7 +3335,7 @@ _021D8E74: add r0, r5, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -3460,7 +3460,7 @@ _021D906E: mov r0, #0 mov r1, #0x1a mov r3, #0x19 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] mov r0, #0x20 mov r1, #0x19 @@ -3519,7 +3519,7 @@ _021D906E: str r1, [sp, #0xc] bl FUN_0201BDE0 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl FUN_02021A20 ldr r0, [sp, #0x14] diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 1b86ce96..17e5c6d8 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -62,7 +62,7 @@ _021D9A36: mov r0, #0 mov r1, #0x1a mov r3, #0x27 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x14] mov r0, #4 mov r1, #8 @@ -258,7 +258,7 @@ _021D9C40: bl MOD58_021D9ED8 bl FUN_0201CD04 ldr r0, [r6, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r6, #0x10] bl FUN_0200AB18 add r0, r6, #0 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 18eeffea..70b11d2d 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -600,7 +600,7 @@ MOD59_021D79F8: ; 0x021D79F8 ldr r3, [r4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x4c] bl FUN_0201BD5C mov r0, #0 @@ -630,7 +630,7 @@ MOD59_021D7A34: ; 0x021D7A34 ldr r0, [r4, #0x60] bl FUN_020143D0 ldr r0, [r4, #0x4c] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} thumb_func_end MOD59_021D7A34 @@ -4875,7 +4875,7 @@ MOD59_021D9C48: ; 0x021D9C48 ldr r3, [r4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #8] bl FUN_0201BD5C mov r0, #0 @@ -4887,11 +4887,11 @@ _021D9C64: .word 0x00000225 thumb_func_start MOD59_021D9C68 MOD59_021D9C68: ; 0x021D9C68 - ldr r3, _021D9C70 ; =FUN_0200A8B8 + ldr r3, _021D9C70 ; =DestroyMsgData ldr r0, [r0, #8] bx r3 nop -_021D9C70: .word FUN_0200A8B8 +_021D9C70: .word DestroyMsgData thumb_func_end MOD59_021D9C68 thumb_func_start MOD59_021D9C74 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 9c4971db..f6dc106a 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -464,7 +464,7 @@ _021D7888: mov r0, #1 mov r1, #0x1a mov r2, #0xce - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x20] add r0, r4, #0 bl MOD60_021D7DF8 @@ -540,7 +540,7 @@ _021D7928: blt _021D7906 ldr r0, [sp] ldr r0, [r0, #0x20] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp] bl MOD60_021D7B98 ldr r0, [sp] diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 3b1791b2..a79053c3 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -881,7 +881,7 @@ MOD61_021D7B84: ; 0x021D7B84 add r0, #0x24 beq _021D7B98 ldr r0, [r4, #0x20] - bl FUN_0200A8B8 + bl DestroyMsgData _021D7B98: add r0, r4, #0 bl MOD61_021D80F4 @@ -1575,7 +1575,7 @@ _021D8164: ldr r3, [r4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x20] ldr r1, [r4] mov r0, #0x10 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 33be95e4..6fff3ef5 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1157,7 +1157,7 @@ MOD62_0222DE00: ; 0x0222DE00 mov r1, #0x1a mov r2, #8 mov r3, #0x35 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #5 str r0, [sp, #0x14] bl FUN_0200A914 @@ -1247,7 +1247,7 @@ MOD62_0222DE00: ; 0x0222DE00 ldr r0, [sp, #0x18] bl FUN_02021A20 ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, sp, #0x1c bl FUN_02019178 add sp, #0x5c @@ -1977,7 +1977,7 @@ _0222E442: mov r1, #0x1a mov r2, #8 mov r3, #0x35 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r6, #0 str r0, [sp, #0x20] cmp r7, #0 @@ -2010,7 +2010,7 @@ _0222E49A: blt _0222E49A _0222E4D0: ldr r0, [sp, #0x20] - bl FUN_0200A8B8 + bl DestroyMsgData mov r1, #0x67 ldr r0, [sp, #0x1c] lsl r1, r1, #2 @@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54 ldr r0, [r0, #4] mov r1, #0xa1 add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0222EC80: cmp r7, #0xff beq _0222EC9A @@ -3017,7 +3017,7 @@ _0222EC80: add r0, r1, r0 ldr r0, [r0, #4] mov r1, #0xa1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0222EC9A: add r2, r5, #4 ldr r1, [r2, r6] @@ -3272,7 +3272,7 @@ _0222EE96: mov r1, #0x1a mov r2, #8 mov r3, #0x35 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, #0 add r6, r0, #0 bl FUN_0200A914 @@ -3293,7 +3293,7 @@ _0222EE96: add r0, r5, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -3714,7 +3714,7 @@ _0222F226: mov r1, #0x1a mov r2, #0xa mov r3, #0x35 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, #0 add r6, r0, #0 bl FUN_0200A914 @@ -3735,7 +3735,7 @@ _0222F226: add r0, r5, #0 bl FUN_02021A20 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -5753,7 +5753,7 @@ MOD62_0223021C: ; 0x0223021C add r4, r0, #0 ldr r0, _02230268 ; =0x00000428 ldr r0, [r5, r0] - bl FUN_02068854 + bl GetMonNatureEncrypted add r6, r0, #0 mov r0, #0x6a lsl r0, r0, #2 @@ -6235,12 +6235,12 @@ _022305E2: mov r1, #0xa1 ldr r0, [r4, r0] add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, _02230724 ; =0x00000428 mov r1, #0xaa ldr r0, [r4, r0] add r2, sp, #0x64 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x35 add r1, sp, #0x58 bl MOD08_02228218 @@ -6531,7 +6531,7 @@ _02230860: add r2, r0, #0 add r0, r5, #0 mov r1, #0xaa - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _022308A8: mov r0, #0xf5 mov r1, #8 @@ -7091,7 +7091,7 @@ MOD62_02230D38: ; 0x02230D38 ldr r0, [r0, #4] mov r1, #0xa1 add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02230D5C: mov r0, #0xff str r0, [r4, r6] diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index c294d4a0..a6498412 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -2044,7 +2044,7 @@ _021D844C: mov r0, #1 mov r1, #0x1a add r3, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x40 add r1, r4, #0 @@ -2094,7 +2094,7 @@ _021D844C: add r0, r4, #0 bl FUN_02021A20 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r1, #0x15 add r0, sp, #0x1c strh r1, [r0, #2] diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 4dcf153c..229ab02a 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -824,7 +824,7 @@ MOD64_021D7BB4: ; 0x021D7BB4 add r4, r1, #0 lsr r0, r0, #0x10 mov r1, #0 - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -2307,7 +2307,7 @@ MOD64_021D86DC: ; 0x021D86DC mov r0, #0 mov r1, #0x1a add r3, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 bne _021D86F8 bl ErrorHandling @@ -2340,7 +2340,7 @@ _021D86F8: add r0, r6, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r7, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -2364,7 +2364,7 @@ _021D875C: mov r1, #0x1a add r2, r7, #0 add r3, r6, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 bne _021D8770 bl ErrorHandling @@ -2395,7 +2395,7 @@ _021D8770: add r3, r1, #0 bl FUN_0200D0BC add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -3498,7 +3498,7 @@ MOD64_021D8FD0: ; 0x021D8FD0 mov r0, #0 mov r1, #0x1a add r3, r4, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 bne _021D8FEC bl ErrorHandling @@ -3526,7 +3526,7 @@ _021D8FEC: add r0, r6, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 22b307e2..20b90cb6 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -1043,7 +1043,7 @@ MOD65_021D7CC8: ; 0x021D7CC8 mov r0, #0 mov r1, #0x1a lsl r2, r2, #2 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x2c] ldr r0, [r5] bl FUN_02014518 @@ -1146,7 +1146,7 @@ _021D7D94: ldr r0, [r6, #0x28] bl FUN_02014564 ldr r0, [r6, #0x2c] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #2 bl FUN_02002CF8 pop {r4, r5, r6, pc} @@ -3311,7 +3311,7 @@ MOD65_021D8EC4: ; 0x021D8EC4 ldr r3, [r6] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r6, #0x18] ldr r2, [r6] mov r0, #1 @@ -3356,7 +3356,7 @@ _021D8F10: ldr r0, [r6, #0x1c] bl FUN_0200AB18 ldr r0, [r6, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD65_021D8F08 @@ -3376,13 +3376,13 @@ MOD65_021D8F34: ; 0x021D8F34 strh r0, [r4, #0x34] ldr r0, [r4, #0x10] ldr r0, [r0] - bl FUN_020689E0 + bl GetMonGenderEncrypted add r1, r4, #0 add r1, #0x37 strb r0, [r1] ldr r0, [r4, #0x10] ldr r0, [r0] - bl FUN_02068854 + bl GetMonNatureEncrypted add r1, r4, #0 add r1, #0x36 strb r0, [r1] diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 8e3d0e84..a556a870 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -239,7 +239,7 @@ _021D7694: str r0, [r4, #0x1c] ldr r3, [r4, #4] mov r0, #1 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0x80 str r0, [r1] @@ -248,7 +248,7 @@ _021D7694: mov r0, #1 mov r1, #0x1a lsl r2, r2, #2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0x84 str r0, [r1] @@ -353,10 +353,10 @@ _021D7782: add r0, r5, #0 add r0, #0x84 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r5, #0x80 ldr r0, [r5] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD66_021D7750 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 02c76f3d..7d7666f9 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -438,7 +438,7 @@ MOD67_021D7880: ; 0x021D7880 mov r0, #0 mov r1, #0x1a mov r3, #0x2a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x50] mov r0, #0x2a bl FUN_0200AA80 @@ -457,7 +457,7 @@ MOD67_021D78AC: ; 0x021D78AC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x50] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x54] bl FUN_0200AB18 ldr r0, [r4, #0x58] @@ -3298,7 +3298,7 @@ MOD67_021D8F00: ; 0x021D8F00 str r3, [sp, #0xc] mov r0, #0x2a add r7, r1, #0 - bl FUN_020669C0 + bl AllocMonZeroed str r4, [sp] mov r1, #0 str r1, [sp, #4] @@ -3307,7 +3307,7 @@ MOD67_021D8F00: ; 0x021D8F00 add r1, r7, #0 mov r2, #1 mov r3, #0x20 - bl FUN_02066DD4 + bl CreateMonWithNatureGenderLetter add r0, r6, #0 bl FUN_020690E4 add r2, r0, #0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index a342b2d1..08507c53 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -433,7 +433,7 @@ MOD68_021D7870: ; 0x021D7870 mov r0, #0 mov r1, #0x1a mov r3, #0x24 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xc4 str r0, [r1] @@ -460,7 +460,7 @@ MOD68_021D78A8: ; 0x021D78A8 add r4, r0, #0 add r0, #0xc4 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add r0, #0xcc ldr r0, [r0] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index f12e6191..c0a49cfe 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -27,7 +27,7 @@ MOD69_0222D5C0: ; 0x0222D5C0 mov r1, #0x1a lsl r2, r2, #2 mov r3, #0x3f - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222D710 ; =0x00001B5C str r0, [r4, r1] mov r0, #0x7d @@ -209,7 +209,7 @@ _0222D762: bl FUN_02021A20 ldr r0, _0222D7F0 ; =0x00001B5C ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_0200627C mov r0, #0x3f @@ -2360,7 +2360,7 @@ MOD69_0222E8FC: ; 0x0222E8FC mov r1, #0 bl FUN_0200AC60 ldr r0, [r4, #0x24] - bl FUN_020687C0 + bl CalcMonLevelEncrypted add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -2370,7 +2370,7 @@ MOD69_0222E8FC: ; 0x0222E8FC mov r3, #3 bl FUN_0200AD38 ldr r0, [r4, #0x24] - bl FUN_020689E0 + bl GetMonGenderEncrypted cmp r0, #0 beq _0222E93C cmp r0, #1 @@ -4037,7 +4037,7 @@ MOD69_0222F6C4: ; 0x0222F6C4 add r5, r0, #0 add r0, r4, #0 add r6, r2, #0 - bl FUN_020669D4 + bl TryDecryptMon str r0, [sp] add r0, r4, #0 mov r1, #0x79 @@ -4124,7 +4124,7 @@ _0222F778: _0222F77A: ldr r1, [sp] add r0, r4, #0 - bl FUN_02066A20 + bl TryEncryptMon add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 8138a765..ec5af814 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -429,7 +429,7 @@ MOD70_021D77CC: ; 0x021D77CC mov r0, #0 mov r1, #0x1a mov r3, #0x3d - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #6 lsl r2, r2, #6 str r0, [r4, r2] @@ -437,7 +437,7 @@ MOD70_021D77CC: ; 0x021D77CC mov r1, #0x1a sub r2, #0x16 mov r3, #0x3d - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x61 lsl r2, r2, #2 str r0, [r4, r2] @@ -445,7 +445,7 @@ MOD70_021D77CC: ; 0x021D77CC mov r1, #0x1a add r2, #0xc8 mov r3, #0x3d - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x62 lsl r1, r1, #2 str r0, [r4, r1] @@ -469,7 +469,7 @@ MOD70_021D77CC: ; 0x021D77CC lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x3d - bl FUN_020669C0 + bl AllocMonZeroed mov r1, #0x66 lsl r1, r1, #2 str r0, [r4, r1] @@ -513,15 +513,15 @@ MOD70_021D78A0: ; 0x021D78A0 mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x34] bl FUN_0201FD58 bl FUN_02009FA0 @@ -1191,7 +1191,7 @@ _021D7DC8: bl FUN_0201BD84 ldrh r0, [r7, #0x10] ldr r1, [r7, #8] - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality cmp r0, #0 beq _021D7E3A cmp r0, #1 @@ -1562,7 +1562,7 @@ _021D80F4: ldr r0, [r7, r0] ldr r2, [sp, #0x1c] mov r1, #0x70 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r1, #0x66 lsl r1, r1, #2 ldr r1, [r7, r1] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index aea60f8b..a6e576b3 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -63,7 +63,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 mov r0, #0 sub r2, #0x44 add r3, r1, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x61 lsl r1, r1, #2 str r0, [r4, r1] @@ -1343,7 +1343,7 @@ MOD71_0222E118: ; 0x0222E118 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_020669D4 + bl TryDecryptMon add r7, r0, #0 add r0, r5, #0 mov r1, #0x9a @@ -1382,7 +1382,7 @@ MOD71_0222E118: ; 0x0222E118 add r6, r0, #0 add r0, r5, #0 add r1, r7, #0 - bl FUN_02066A20 + bl TryEncryptMon ldrh r0, [r4] cmp r0, #0 beq _0222E18E @@ -1754,7 +1754,7 @@ MOD71_0222E438: ; 0x0222E438 mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] @@ -4657,7 +4657,7 @@ _0222FC2C: bne _0222FC70 add r0, #0xc ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222FCEC ; =0x00003674 ldr r0, [r6, r0] bl FUN_0200AB18 @@ -4786,7 +4786,7 @@ _0222FD48: mov r1, #0x1a mov r0, #0 add r3, r1, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222FD90 ; =0x00003678 str r0, [r4, r1] ldr r0, [r4, #4] @@ -6320,10 +6320,10 @@ MOD71_022309E8: ; 0x022309E8 add r6, r2, #0 str r3, [sp, #0xc] ldr r5, [sp, #0x28] - bl FUN_020669C0 + bl AllocMonZeroed add r7, r0, #0 mov r0, #0x1a - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0 ldr r0, [sp, #4] add r1, r6, #0 @@ -6347,7 +6347,7 @@ MOD71_022309E8: ; 0x022309E8 add r0, r4, #0 mov r1, #9 add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02230A40: bl FUN_02031190 bl FUN_0202DFA4 @@ -6435,7 +6435,7 @@ MOD71_02230AE4: ; 0x02230AE4 bl FUN_020239CC add r5, r0, #0 add r0, r4, #0 - bl FUN_020689E0 + bl GetMonGenderEncrypted add r3, r0, #0 mov r0, #0x1a lsl r1, r5, #0x18 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 46c50951..97f57105 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2825,7 +2825,7 @@ MOD73_021D8BDC: ; 0x021D8BDC ldr r3, [r5] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _021D8CE4 ; =0x00001574 str r0, [r5, r1] ldr r2, [r5] @@ -3019,7 +3019,7 @@ _021D8D92: bl FUN_0200AB18 ldr r0, _021D8DF0 ; =0x00001574 ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3, r4, r5, r6, r7, pc} nop _021D8DBC: .word 0x000015A8 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 785f1686..46afe454 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -845,7 +845,7 @@ MOD74_021D7B20: ; 0x021D7B20 mov r0, #0 mov r1, #0x1a mov r2, #0x11 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x28] ldr r2, [r5] mov r0, #2 @@ -938,7 +938,7 @@ _021D7BEC: ldr r0, [r6, #0x2c] bl FUN_0200AB18 ldr r0, [r6, #0x28] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD74_021D7BB4 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index c6baf422..e4c70c65 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -434,15 +434,15 @@ MOD75_021E6F00: ; 0x021E6F00 mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x11 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -938,7 +938,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a mov r2, #7 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x45 lsl r1, r1, #2 str r0, [r4, r1] @@ -959,7 +959,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a add r2, #0x40 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x47 lsl r1, r1, #2 str r0, [r4, r1] @@ -968,7 +968,7 @@ MOD75_021E737C: ; 0x021E737C mov r1, #0x1a lsl r2, r2, #2 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x12 lsl r1, r1, #4 str r0, [r4, r1] @@ -7623,7 +7623,7 @@ MOD75_021EA7BC: ; 0x021EA7BC mov r1, #0x1a lsl r2, r2, #2 mov r3, #6 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r7, _021EA7F4 ; =0x00000404 add r6, r0, #0 mov r4, #0 @@ -7640,7 +7640,7 @@ _021EA7D4: cmp r4, #8 blo _021EA7D4 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _021EA7F4: .word 0x00000404 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index ba2092da..6f7aff75 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -514,7 +514,7 @@ MOD76_021D7900: ; 0x021D7900 mov r0, #0 mov r1, #0x1a mov r3, #0x43 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r4, #0 add r1, #0xf8 str r0, [r1] @@ -541,7 +541,7 @@ MOD76_021D7938: ; 0x021D7938 add r4, r0, #0 add r0, #0xf8 ldr r0, [r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 add r0, #0xfc ldr r0, [r0] @@ -801,7 +801,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x36 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0 str r0, [sp] ldr r1, [r4] @@ -809,7 +809,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x3e - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0 bl MOD76_021D8514 mov r1, #0 @@ -820,7 +820,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x3a - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r4] mov r1, #0 strb r1, [r0, #0x16] @@ -1266,7 +1266,7 @@ MOD76_021D7ECC: ; 0x021D7ECC mov r1, #0x1a lsl r2, r2, #2 mov r3, #0x43 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x61 lsl r0, r0, #2 @@ -1311,7 +1311,7 @@ _021D7F42: blo _021D7F0E _021D7F50: add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _021D7FA8 ; =0x021D8EFC add r3, sp, #0 add r2, r3, #0 @@ -1523,7 +1523,7 @@ _021D80BE: mov r0, #1 mov r1, #0x1a mov r3, #0x43 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #1 lsl r2, r2, #8 ldr r2, [r5, r2] @@ -1537,7 +1537,7 @@ _021D80BE: str r2, [sp] bl MOD76_021D7CC8 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData lsl r1, r4, #0x10 add r0, r5, #0 lsr r1, r1, #0x10 @@ -1615,7 +1615,7 @@ MOD76_021D81AC: ; 0x021D81AC mov r1, #0x1a mov r2, #0xc5 mov r3, #0x43 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #1 lsl r2, r2, #8 ldr r2, [r5, r2] @@ -1636,7 +1636,7 @@ MOD76_021D81AC: ; 0x021D81AC add r3, r1, #0 bl FUN_0201BDE0 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData lsl r1, r4, #0x10 add r0, r5, #0 lsr r1, r1, #0x10 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 5becbc25..71771dfb 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -164,7 +164,7 @@ _021D764C: ldr r3, [r4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _021D796C ; =0x0000C060 str r0, [r4, r1] add r0, r4, #0 @@ -769,7 +769,7 @@ _021D7B3E: bl MOD77_021D88D0 ldr r0, _021D7BA8 ; =0x0000C060 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r7, #0 str r0, [r5] mov r7, #1 @@ -1849,7 +1849,7 @@ MOD77_021D8418: ; 0x021D8418 ldr r3, [r5] mov r0, #0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #8] ldr r1, [r5] add r0, r6, #0 @@ -1871,7 +1871,7 @@ _021D844E: blo _021D844E _021D8462: ldr r0, [sp, #8] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, [sp, #4] add r3, sp, #0xc ldmia r4!, {r0, r1} @@ -3161,13 +3161,13 @@ MOD77_021D8E9C: ; 0x021D8E9C mov r1, #0x1a lsl r2, r2, #2 add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #8] add r1, r5, #0 add r2, r6, #0 bl FUN_0200A8E0 ldr r0, [sp, #8] - bl FUN_0200A8B8 + bl DestroyMsgData cmp r4, #0 bne _021D8EDA mov r5, #0 @@ -3183,13 +3183,13 @@ _021D8EDC: mov r0, #0 mov r1, #0x1a add r3, r7, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, [sp] ldr r2, [sp, #4] add r4, r0, #0 bl FUN_0200A8E0 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index ba3c09fe..ca042f7e 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1425,7 +1425,7 @@ _0222DFE4: mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E118 ; =0x00000B34 mov r2, #0x25 str r0, [r4, r1] @@ -1433,14 +1433,14 @@ _0222DFE4: mov r1, #0x1a lsl r2, r2, #4 mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E11C ; =0x00000B3C ldr r2, _0222E120 ; =0x00000265 str r0, [r4, r1] mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x2d lsl r1, r1, #6 str r0, [r4, r1] @@ -1448,7 +1448,7 @@ _0222DFE4: mov r0, #0 mov r1, #0x1a mov r3, #0x3e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222E128 ; =0x00000B38 str r0, [r4, r1] mov r0, #4 @@ -1661,17 +1661,17 @@ MOD80_0222E25C: ; 0x0222E25C bl MOD80_0222E7F0 ldr r0, _0222E2D4 ; =0x00000B38 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x2d lsl r0, r0, #6 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222E2D8 ; =0x00000B3C ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222E2DC ; =0x00000B34 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0xb3 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -4855,7 +4855,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 ldr r0, [sp, #0x48] ldr r2, [sp, #0x1c] mov r1, #0x76 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r2, #0 ldrsh r0, [r4, r2] mov r1, #6 @@ -4866,7 +4866,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 mov r0, #3 ldrsb r4, [r4, r0] ldr r0, [sp, #0x48] - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x30] add r0, r5, #0 mov r1, #0x46 @@ -10777,7 +10777,7 @@ MOD80_02232BD4: ; 0x02232BD4 MOD80_02232C2C: ; 0x02232C2C push {r4, lr} add r4, r1, #0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted strb r0, [r4, #3] pop {r4, pc} thumb_func_end MOD80_02232C2C @@ -10832,38 +10832,38 @@ MOD80_02232C88: ; 0x02232C88 add r7, r2, #0 add r6, r3, #0 ldr r4, [sp, #0x40] - bl FUN_02066A6C + bl TryDecryptBoxMon add r0, r5, #0 mov r1, #0xab mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x1c] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r6] add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x10] add r0, r5, #0 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x14] add r0, r5, #0 mov r1, #6 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x18] ldrh r0, [r6] mov r1, #0x6f mov r2, #0 strh r0, [r4] add r0, r5, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r0, r0, #1 strb r0, [r4, #2] ldr r0, [sp, #0x14] @@ -10874,7 +10874,7 @@ MOD80_02232C88: ; 0x02232C88 _02232CF2: add r0, r5, #0 mov r1, #1 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r0, [sp, #0x1c] cmp r0, #0 beq _02232D60 @@ -11266,7 +11266,7 @@ MOD80_02233018: ; 0x02233018 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 mov r4, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon ldr r5, _02233050 ; =0x02237220 str r0, [sp] add r6, r4, #0 @@ -11274,7 +11274,7 @@ _02233028: ldrh r1, [r5] add r0, r7, #0 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r6, #1 add r4, r4, r0 add r5, r5, #2 @@ -11282,7 +11282,7 @@ _02233028: blt _02233028 ldr r1, [sp] add r0, r7, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon cmp r4, #0 beq _0223304C mov r0, #1 @@ -11305,7 +11305,7 @@ MOD80_02233054: ; 0x02233054 _02233062: mov r1, #0xab mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _02233072 mov r0, #0 @@ -11314,7 +11314,7 @@ _02233072: add r0, r4, #0 mov r1, #0xac mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 beq _02233084 mov r0, #2 @@ -11386,18 +11386,18 @@ MOD80_022330E4: ; 0x022330E4 mov r1, #5 mov r2, #0 add r5, r0, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0 strh r0, [r1] add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #1 add r0, sp, #0 strb r1, [r0, #2] add r0, r5, #0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted add r1, sp, #0 strb r0, [r1, #3] add r0, sp, #0 @@ -11418,7 +11418,7 @@ MOD80_0223311C: ; 0x0223311C ldr r0, [r0] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0 strh r0, [r1, #6] add r0, r5, #0 @@ -11426,14 +11426,14 @@ MOD80_0223311C: ; 0x0223311C ldr r0, [r0] mov r1, #0x6f mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #1 add r0, sp, #0 strb r1, [r0, #8] add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted add r1, sp, #0 strb r0, [r1, #9] add r0, r4, #0 @@ -11459,13 +11459,13 @@ MOD80_0223311C: ; 0x0223311C mov r1, #5 mov r2, #0 add r5, r0, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0 strh r0, [r1] add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r0, r0, #1 add r1, sp, #0 strb r0, [r1, #2] @@ -13374,14 +13374,14 @@ MOD80_022340DC: ; 0x022340DC ldr r0, [sp, #0xc] ldr r2, [sp, #0x18] mov r1, #0x76 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r0, [sp, #0xc] mov r1, #0x6f mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #1 ldr r0, [sp, #0xc] - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted str r0, [sp, #0x10] add r0, r4, #0 mov r1, #0x64 @@ -13467,7 +13467,7 @@ _022341CA: ldr r0, [sp, #0xc] mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strh r0, [r7] ldr r0, [sp, #0x10] strb r6, [r7, #2] @@ -13570,7 +13570,7 @@ MOD80_02234288: ; 0x02234288 bl MOD80_02232FAC cmp r0, #0 beq _022342B0 - bl FUN_020669BC + bl SizeOfStructPokemon add r2, r0, #0 add r0, r4, #0 add r0, #0xbc @@ -15243,7 +15243,7 @@ _02234F38: cmp r0, #0 beq _02234F9C mov r0, #0x3e - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0 ldr r0, [r4] add r1, r5, #0 @@ -15289,7 +15289,7 @@ _02234FA4: cmp r0, #0 beq _02235006 mov r0, #0x3e - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0 ldr r0, [r4] add r1, r5, #0 @@ -16064,7 +16064,7 @@ MOD80_02235534: ; 0x02235534 cmp r0, #0x12 beq _02235590 mov r0, #0x3e - bl FUN_020669C0 + bl AllocMonZeroed add r1, r5, #0 add r2, r5, #0 add r4, r0, #0 @@ -16175,7 +16175,7 @@ _02235624: add r0, r4, #0 mov r1, #9 add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r5] ldr r0, [r0] bl MOD80_02235754 @@ -16258,7 +16258,7 @@ _022356D2: add r0, r4, #0 mov r1, #9 add r2, sp, #0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x20] cmp r0, #0x12 bne _02235706 @@ -16366,7 +16366,7 @@ MOD80_022357A0: ; 0x022357A0 add r2, sp, #4 bl GetMonDataEncrypted add r0, r4, #0 - bl FUN_020689E0 + bl GetMonGenderEncrypted add r3, r0, #0 mov r0, #0x3e str r0, [sp] @@ -17194,7 +17194,7 @@ MOD80_02235E08: ; 0x02235E08 push {r4, lr} add r4, r0, #0 mov r0, #0x3e - bl FUN_020669C0 + bl AllocMonZeroed mov r1, #1 lsl r1, r1, #0xc str r0, [r4, r1] @@ -17493,7 +17493,7 @@ _02236068: bl MOD80_022361E8 add r7, r0, #0 mov r0, #0x3e - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x20] ldr r0, [r4] ldr r1, [sp, #0x20] diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index f852db8d..87239548 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -52,7 +52,7 @@ _02237E84: mov r0, #0 mov r1, #0x1a mov r3, #0x39 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x39 bl FUN_0200AA80 @@ -136,7 +136,7 @@ _02237F22: mov r1, #5 ldr r0, [r0] mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x53 lsl r1, r1, #2 strh r0, [r4, r1] @@ -144,7 +144,7 @@ _02237F22: mov r1, #5 ldr r0, [r0, #4] mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _02237FD8 ; =0x0000014E strh r0, [r4, r1] mov r0, #0 @@ -197,7 +197,7 @@ MOD81_02237FE8: ; 0x02237FE8 push {r3, lr} mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x1c bl GetMonBaseStat cmp r0, #0 @@ -226,7 +226,7 @@ MOD81_02238004: ; 0x02238004 ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x14] bl FUN_02021A20 ldr r0, [r4, #8] @@ -999,7 +999,7 @@ _0223860E: ldr r4, [r0, #4] _02238610: add r0, r4, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x20] add r0, sp, #0x34 add r1, r4, #0 @@ -1008,12 +1008,12 @@ _02238610: mov r1, #0 add r0, r4, #0 add r2, r1, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x1c] add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 ldr r1, [sp, #0x58] lsr r0, r0, #0x10 @@ -1051,7 +1051,7 @@ _02238648: bl FUN_02017E14 ldr r1, [sp, #0x20] add r0, r4, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add r0, r7, #0 bl FreeToHeap _02238690: @@ -2514,7 +2514,7 @@ _02239138: bl MOD81_02238818 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _0223918A ldr r0, [r4, #0x10] @@ -9501,7 +9501,7 @@ _0223C8D6: bl MOD81_02238820 mov r1, #0x4c mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0 bne _0223C902 ldr r0, [r4] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 794685b9..c1a907de 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -674,7 +674,7 @@ _0222DA48: mov r0, #0 mov r1, #0x1a mov r3, #0x44 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222DB6C ; =0x00000B7C mov r2, #0x25 str r0, [r4, r1] @@ -682,7 +682,7 @@ _0222DA48: mov r1, #0x1a lsl r2, r2, #4 mov r3, #0x44 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x2e lsl r1, r1, #6 str r0, [r4, r1] @@ -690,7 +690,7 @@ _0222DA48: mov r0, #0 mov r1, #0x1a mov r3, #0x44 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0222DB74 ; =0x00000B84 str r0, [r4, r1] mov r0, #4 @@ -865,14 +865,14 @@ MOD82_0222DC50: ; 0x0222DC50 bl MOD82_0222DFFC ldr r0, _0222DCB8 ; =0x00000B84 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x2e lsl r0, r0, #6 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222DCBC ; =0x00000B7C ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222DCC0 ; =0x00000B78 ldr r0, [r4, r0] bl FUN_0200AB18 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index e63eedb4..0ce9b5c7 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -969,7 +969,7 @@ MOD83_0222DD24: ; 0x0222DD24 mov r0, #1 mov r1, #0x1a mov r3, #0x51 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x24] mov r0, #0x51 bl FUN_0200AA80 @@ -1139,7 +1139,7 @@ _0222DE76: ldr r0, [sp, #0x28] bl FUN_0200AB18 ldr r0, [sp, #0x24] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #1 add sp, #0x2c pop {r4, r5, r6, r7, pc} @@ -3343,7 +3343,7 @@ MOD83_0222F074: ; 0x0222F074 ldr r3, [r5] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 ldr r0, [r5] bl FUN_0200AA80 @@ -3444,7 +3444,7 @@ MOD83_0222F074: ; 0x0222F074 ldr r0, [sp] bl FUN_0200AB18 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222F1A8 ; =0x00003174 add r1, r4, #0 ldr r0, [r5, r0] @@ -5821,7 +5821,7 @@ _022303CC: mov r0, #0 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r6, #0 str r0, [r4, #0x10] cmp r7, #0 @@ -5838,7 +5838,7 @@ _022303EA: blt _022303EA _022303FE: ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r3, _02230460 ; =0x0223AE00 add r2, sp, #8 ldmia r3!, {r0, r1} @@ -5982,7 +5982,7 @@ MOD83_0223050C: ; 0x0223050C mov r0, #1 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x56 bl FUN_0200AA80 @@ -6027,7 +6027,7 @@ _0223057A: mov r3, #2 bl FUN_0200D0BC ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0xc] bl FUN_0200AB18 mov r0, #0xff @@ -6422,7 +6422,7 @@ MOD83_0223089C: ; 0x0223089C mov r0, #1 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x56 bl FUN_0200AA80 @@ -6443,7 +6443,7 @@ MOD83_0223089C: ; 0x0223089C ldr r0, [sp, #8] bl FUN_0200AB18 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData b _02230918 _022308F8: ldr r0, [r4, #0x6c] @@ -8160,7 +8160,7 @@ _02231718: mov r0, #0 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _022317A0 ; =0x000029A4 mov r6, #0 str r0, [r5, r1] @@ -8181,7 +8181,7 @@ _0223173A: _02231752: ldr r0, _022317A0 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _022317A4 ; =0x0223AE90 add r3, sp, #4 add r2, r3, #0 @@ -8227,7 +8227,7 @@ MOD83_022317A8: ; 0x022317A8 mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 mov r0, #0x57 bl FUN_0200AA80 @@ -8260,7 +8260,7 @@ MOD83_022317A8: ; 0x022317A8 add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_0200AB18 add sp, #0x10 @@ -9023,7 +9023,7 @@ MOD83_02231DF0: ; 0x02231DF0 mov r0, #1 mov r1, #0x1a ldr r4, _02231F6C ; =0x0223AEB0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02231F70 ; =0x000029A4 str r0, [r5, r1] ldr r0, [r5] @@ -9182,7 +9182,7 @@ _02231F2E: blo _02231E72 ldr r0, _02231F70 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _02231F74 ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -9256,7 +9256,7 @@ _02231FD2: mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02232090 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 @@ -9298,7 +9298,7 @@ _02231FFE: bl FUN_02021A20 ldr r0, _02232090 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _02232094 ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -11082,7 +11082,7 @@ _02232E7E: mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x1c] mov r5, #0 ldr r0, [sp, #0x10] @@ -11193,7 +11193,7 @@ _02232FAE: bl FUN_020191D0 _02232FB8: ldr r0, [sp, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl FUN_0200AB18 add r0, r6, #0 @@ -11220,7 +11220,7 @@ MOD83_02232FE4: ; 0x02232FE4 mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02233078 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 @@ -11264,7 +11264,7 @@ MOD83_02232FE4: ; 0x02232FE4 bl FUN_02021A20 ldr r0, _02233078 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0223307C ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -15517,7 +15517,7 @@ _02234F8C: mov r0, #1 mov r1, #0x1a mov r3, #0x4e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r7, [r5, #0x40] str r0, [sp, #0x14] cmp r7, #0 @@ -15558,7 +15558,7 @@ _02234FB2: bl FUN_0200AB18 _02234FF8: ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0 mvn r0, r0 str r0, [r5, #0x34] @@ -17254,7 +17254,7 @@ _02235CCA: mov r0, #1 mov r1, #0x1a mov r3, #0x4e - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 add r0, r4, #0 mov r1, #0xb @@ -17278,7 +17278,7 @@ _02235CCA: str r6, [sp, #0x68] bl MOD83_02234F2C add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_02021A20 add r0, r4, #0 @@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC add r1, r0, #0 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl CalcMonLevel + bl CalcLevelBySpeciesAndExp pop {r3, r4, r5, pc} thumb_func_end MOD83_02237EDC @@ -21809,7 +21809,7 @@ MOD83_02237F04: ; 0x02237F04 add r0, r1, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, #0 @@ -21864,9 +21864,9 @@ MOD83_02237F6C: ; 0x02237F6C add r4, r1, #0 add r6, r0, #0 add r0, r4, #0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r4, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon mov r1, #0 str r0, [sp] add r0, r6, #0 @@ -21876,7 +21876,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #0 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0xb mov r2, #0 @@ -21887,7 +21887,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #5 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0xc mov r2, #0 @@ -21903,7 +21903,7 @@ _02237FCE: add r0, r4, #0 mov r1, #6 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #1 mov r2, #0 @@ -21912,7 +21912,7 @@ _02237FCE: add r0, r4, #0 mov r1, #7 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x19 mov r2, #0 @@ -21921,13 +21921,13 @@ _02237FCE: add r0, r4, #0 mov r1, #8 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x46 str r0, [sp, #8] add r0, r4, #0 mov r1, #9 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 add r1, r4, #0 bl MOD83_02237F04 @@ -21935,7 +21935,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xa add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #8 mov r2, #0 @@ -21944,7 +21944,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xb add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -21953,7 +21953,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xc add r2, sp, #4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1a mov r2, #0 @@ -21962,7 +21962,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xd add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1b mov r2, #0 @@ -21971,7 +21971,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xe add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1c mov r2, #0 @@ -21980,7 +21980,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xf add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1d mov r2, #0 @@ -21989,7 +21989,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x10 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1e mov r2, #0 @@ -21998,7 +21998,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x11 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1f mov r2, #0 @@ -22007,7 +22007,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x12 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x16 mov r2, #0 @@ -22016,7 +22016,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x13 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x17 mov r2, #0 @@ -22025,7 +22025,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x14 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x18 mov r2, #0 @@ -22034,7 +22034,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x15 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x21 mov r2, #0 @@ -22043,7 +22043,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x16 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2f mov r2, #0 @@ -22052,7 +22052,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x17 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x30 mov r2, #0 @@ -22061,7 +22061,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x18 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r5, #0 add r7, r5, #0 _0223815E: @@ -22075,7 +22075,7 @@ _0223815E: add r0, r4, #0 add r1, #0x36 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x15 mov r2, #0 @@ -22090,18 +22090,18 @@ _0223815E: add r0, r4, #0 add r1, #0x3e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r5, #0 add r0, r4, #0 add r1, #0x42 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r5, #0 str r0, [sp, #8] add r0, r4, #0 add r1, #0x3a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 add r7, r7, #2 cmp r5, #4 @@ -22114,7 +22114,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x46 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x28 mov r2, #0 @@ -22123,7 +22123,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x47 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x29 mov r2, #0 @@ -22132,7 +22132,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x48 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2a mov r2, #0 @@ -22141,7 +22141,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x49 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2b mov r2, #0 @@ -22150,7 +22150,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2c mov r2, #0 @@ -22159,7 +22159,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2d mov r2, #0 @@ -22168,7 +22168,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x32 mov r2, #0 @@ -22186,7 +22186,7 @@ _0223826C: add r0, r4, #0 add r1, #0x4e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _0223826C @@ -22208,7 +22208,7 @@ _02238298: add r0, r4, #0 add r1, #0x52 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _02238298 @@ -22230,7 +22230,7 @@ _022382C4: add r0, r4, #0 add r1, #0x56 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _022382C4 @@ -22252,7 +22252,7 @@ _022382F0: add r0, r4, #0 add r1, #0x5a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _022382F0 @@ -22274,7 +22274,7 @@ _0223831C: add r0, r4, #0 add r1, #0x5e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _0223831C @@ -22287,7 +22287,7 @@ _02238332: add r0, r4, #0 mov r1, #0x62 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x44 mov r2, #0 @@ -22296,7 +22296,7 @@ _02238332: add r0, r4, #0 mov r1, #0x63 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x45 mov r2, #0 @@ -22305,7 +22305,7 @@ _02238332: add r0, r4, #0 mov r1, #0x64 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x46 mov r2, #0 @@ -22314,7 +22314,7 @@ _02238332: add r0, r4, #0 mov r1, #0x65 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x47 mov r2, #0 @@ -22323,7 +22323,7 @@ _02238332: add r0, r4, #0 mov r1, #0x66 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x48 mov r2, #0 @@ -22332,7 +22332,7 @@ _02238332: add r0, r4, #0 mov r1, #0x67 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x49 mov r2, #0 @@ -22341,7 +22341,7 @@ _02238332: add r0, r4, #0 mov r1, #0x68 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4a mov r2, #0 @@ -22350,7 +22350,7 @@ _02238332: add r0, r4, #0 mov r1, #0x69 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4b mov r2, #0 @@ -22359,7 +22359,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4c mov r2, #0 @@ -22368,7 +22368,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4d mov r2, #0 @@ -22377,7 +22377,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4e mov r2, #0 @@ -22386,7 +22386,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6d add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x50 mov r2, #0 @@ -22395,18 +22395,18 @@ _02238332: add r0, r4, #0 mov r1, #0x6e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6f add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0xc9 bne _022384AE mov r1, #0 @@ -22436,12 +22436,12 @@ _02238332: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _022384AE: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _022385F0 ; =0x00000182 cmp r0, r1 bne _022384FE @@ -22481,7 +22481,7 @@ _022384F4: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _022384FE: add r0, r6, #0 mov r1, #2 @@ -22495,7 +22495,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x75 add r2, sp, #0xc - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -22509,7 +22509,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x4d add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _0223853E: add r0, r6, #0 mov r1, #0x25 @@ -22519,7 +22519,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x79 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #7 add r2, sp, #0x24 @@ -22532,7 +22532,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x8f add r2, sp, #0xc - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x23 mov r2, #0 @@ -22541,7 +22541,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x98 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x22 mov r2, #0 @@ -22550,7 +22550,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x99 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x26 mov r2, #0 @@ -22559,7 +22559,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x24 mov r2, #0 @@ -22568,7 +22568,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x31 mov r2, #0 @@ -22577,10 +22577,10 @@ _0223853E: add r0, r4, #0 mov r1, #0x9c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r1, [sp] add r0, r4, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -23082,7 +23082,7 @@ _02238976: ldr r3, [r4, #4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r6, [r5, #0x14] str r0, [sp, #0x10] cmp r6, #0 @@ -23155,7 +23155,7 @@ _02238A12: bl FUN_0200AB18 _02238A24: ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData _02238A2A: mov r0, #0xff str r0, [r5, #0x50] @@ -23885,7 +23885,7 @@ MOD83_02238F94: ; 0x02238F94 add r7, r2, #0 add r6, r3, #0 ldr r4, [sp, #0x40] - bl FUN_020689E0 + bl GetMonGenderEncrypted str r0, [sp, #0x24] ldr r0, [sp, #0x20] bl FUN_02068A80 diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index 75dc0d1e..fc7ebf31 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -99,7 +99,7 @@ _021D7516: mov r0, #0 mov r1, #0x1a mov r3, #0x4b - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x14] str r0, [sp] mov r1, #0xef @@ -245,7 +245,7 @@ _021D76EE: ldr r0, [r5, #8] bl MOD84_021D85B8 ldr r0, [r5, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0 bl MOD84_021D8000 add r0, r5, #0 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index c5eddf82..f89be7c2 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -779,7 +779,7 @@ MOD85_021D7B28: ; 0x021D7B28 mov r0, #0 mov r1, #0x1a mov r3, #0x4f - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _021D7BA4 ; =0x00000408 str r0, [r5, r1] mov r0, #0x4f @@ -820,7 +820,7 @@ MOD85_021D7BB8: ; 0x021D7BB8 bl FUN_02019178 ldr r0, _021D7BE8 ; =0x00000408 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #4] bl FUN_0200AB18 ldr r0, [r4, #0x18] diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 920d9ed9..2f636fb7 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -481,7 +481,7 @@ MOD86_021D78D4: ; 0x021D78D4 ldr r3, [r4] mov r1, #0x1a add r2, r0, #0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x34] ldr r0, [r4] bl FUN_0200AA80 @@ -542,7 +542,7 @@ MOD86_021D7964: ; 0x021D7964 ldr r0, [r4, #0x38] bl FUN_0200AB18 ldr r0, [r4, #0x34] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} thumb_func_end MOD86_021D7964 |