diff options
Diffstat (limited to 'arm9/asm')
45 files changed, 273 insertions, 250 deletions
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s index 6ffae771..3bfbd197 100644 --- a/arm9/asm/pokemon.s +++ b/arm9/asm/pokemon.s @@ -1812,7 +1812,7 @@ _0206769C: ldr r0, _02067824 ; =SPECIES_MANAPHY_EGG ldr r2, [sp, #0x8] add r1, r4, #0x0 - bl FUN_0200A99C + bl GetSpeciesName b _0206781A _020676B2: ldr r1, [sp, #0x8] @@ -2015,7 +2015,7 @@ _02067810: ldrh r0, [r5, #0x0] ldr r2, [sp, #0x8] add r1, r4, #0x0 - bl FUN_0200A99C + bl GetSpeciesName _0206781A: add r0, r4, #0x0 add sp, #0xc @@ -2832,7 +2832,7 @@ _02067E0E: ldrh r0, [r7, #0x0] mov r1, #0x0 add r2, sp, #0x34 - bl FUN_0200A99C + bl GetSpeciesName add r0, sp, #0x34 add r1, r4, #0x0 bl StringNotEqual @@ -2859,7 +2859,7 @@ _02067E40: add r2, sp, #0x1c mov r1, #0x0 add r2, #0x2 - bl FUN_0200A99C + bl GetSpeciesName add r0, r4, #0x0 add r1, sp, #0x8 mov r2, #0xb diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 40b1c33d..275875f4 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -938,14 +938,14 @@ FUN_0203A04C: ; 0x0203A04C mov r1, #0x1a add r2, r5, #0x0 mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 bl MOD05_021E2C24 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x0 pop {r4-r6, pc} @@ -973,7 +973,7 @@ FUN_0203A098: ; 0x0203A098 mov r1, #0x1a add r2, r5, #0x0 mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -983,7 +983,7 @@ FUN_0203A098: ; 0x0203A098 mov r3, #0x1 bl MOD05_021E2BD0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r1, _0203A0F8 ; =FUN_0203A2F0 add r0, r4, #0x0 bl SetupNativeScript @@ -1090,7 +1090,7 @@ _0203A1AA: mov r0, #0x1 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -1100,7 +1100,7 @@ _0203A1AA: mov r3, #0x1 bl MOD05_021E2BD0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData b _0203A1F4 _0203A1E2: mov r2, #0x6 @@ -12179,7 +12179,7 @@ FUN_0203FA58: ; 0x0203FA58 mov r0, #0x0 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 ldr r2, [sp, #0x4] add r0, r4, #0x0 @@ -12223,7 +12223,7 @@ _0203FB26: ldr r0, [sp, #0x0] bl FUN_02021A20 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0200AB18 mov r0, #0x0 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 0d477bf0..7310f545 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -509,13 +509,13 @@ FUN_02040AE4: ; 0x02040AE4 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 68b67ed7..f75ac5ce 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -582,7 +582,7 @@ FUN_020422C0: ; 0x020422C0 ldrh r0, [r0, #0x2] mov r1, #0x4 add r2, sp, #0x8 - bl FUN_0200A99C + bl GetSpeciesName mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x1 diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 40e9a53d..d2319bbb 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -768,7 +768,7 @@ FUN_020020EC: ; 0x020020EC mov r0, #0x1 mov r1, #0x1a add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r0, #0x2 add r1, r5, #0x0 @@ -785,7 +785,7 @@ FUN_020020EC: ; 0x020020EC sub r3, #0x2c bl FUN_02012880 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0x0 mov r1, #0x1 str r6, [sp, #0x14] diff --git a/arm9/asm/unk_0200A384.s b/arm9/asm/unk_0200A384.s index 482cdfd7..0584dfbf 100644 --- a/arm9/asm/unk_0200A384.s +++ b/arm9/asm/unk_0200A384.s @@ -3,22 +3,22 @@ .text - thumb_func_start FUN_0200A384 -FUN_0200A384: ; 0x0200A384 + thumb_func_start LoadSingleElementFromNarc +LoadSingleElementFromNarc: ; 0x0200A384 ldr r3, _0200A388 ; =AllocAndReadWholeNarcMemberByIdPair bx r3 .balign 4 _0200A388: .word AllocAndReadWholeNarcMemberByIdPair - thumb_func_start FUN_0200A38C -FUN_0200A38C: ; 0x0200A38C + thumb_func_start FreeMsgDataRawData +FreeMsgDataRawData: ; 0x0200A38C ldr r3, _0200A390 ; =FreeToHeap bx r3 .balign 4 _0200A390: .word FreeToHeap - thumb_func_start FUN_0200A394 -FUN_0200A394: ; 0x0200A394 + thumb_func_start DecryptMessageDirect +DecryptMessageDirect: ; 0x0200A394 push {r3-r7, lr} sub sp, #0x8 add r3, r0, #0x0 @@ -50,7 +50,7 @@ FUN_0200A394: ; 0x0200A394 add r1, r3, r2 add r0, r4, #0x0 add r2, sp, #0x0 - bl FUN_0200A4C0 + bl CopyEncryptedMessage16 ldr r2, [sp, #0x4] ldr r0, _0200A410 ; =0x00091BD3 add r1, r7, #0x0 @@ -85,8 +85,12 @@ _0200A40C: .word 0x000002FD _0200A410: .word 0x00091BD3 _0200A414: .word 0x0000493D - thumb_func_start FUN_0200A418 -FUN_0200A418: ; 0x0200A418 + thumb_func_start DecryptMessageViaNewNarcHandle +DecryptMessageViaNewNarcHandle: ; 0x0200A418 + ; r0: narc_id + ; r1: ??? + ; r2: ??? + ; r3: heap_id push {r4-r6, lr} sub sp, #0x10 add r5, r1, #0x0 @@ -167,8 +171,8 @@ _0200A4B4: .word 0x000002FD _0200A4B8: .word 0x00091BD3 _0200A4BC: .word 0x0000493D - thumb_func_start FUN_0200A4C0 -FUN_0200A4C0: ; 0x0200A4C0 + thumb_func_start CopyEncryptedMessage16 +CopyEncryptedMessage16: ; 0x0200A4C0 add r3, r0, #0x0 add r0, r1, #0x0 add r1, r3, #0x0 @@ -636,8 +640,24 @@ FUN_0200A84C: ; 0x0200A84C pop {r3, pc} .balign 4 - thumb_func_start FUN_0200A86C -FUN_0200A86C: ; 0x0200A86C +; struct MsgData +; { +; u16 unk0; +; u16 unk2; +; u16 unk4; +; u16 unk6; +; union { +; u16 * raw; +; NARC * narc; +; } data; +; }; + + thumb_func_start NewMsgDataFromNarc +NewMsgDataFromNarc: ; 0x0200A86C + ; r0: msg data type + ; r1: NARC ID + ; r2: File ID + ; r3: heap_id push {r3-r7, lr} add r5, r0, #0x0 add r6, r1, #0x0 @@ -653,7 +673,7 @@ FUN_0200A86C: ; 0x0200A86C ldr r2, [sp, #0x0] add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_0200A384 + bl LoadSingleElementFromNarc str r0, [r4, #0x8] cmp r0, #0x0 bne _0200A8AA @@ -676,8 +696,8 @@ _0200A8B4: add r0, r4, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0200A8B8 -FUN_0200A8B8: ; 0x0200A8B8 + thumb_func_start DestroyMsgData +DestroyMsgData: ; 0x0200A8B8 push {r4, lr} add r4, r0, #0x0 beq _0200A8DE @@ -689,7 +709,7 @@ FUN_0200A8B8: ; 0x0200A8B8 b _0200A8D8 _0200A8CA: ldr r0, [r4, #0x8] - bl FUN_0200A38C + bl FreeMsgDataRawData b _0200A8D8 _0200A8D2: ldr r0, [r4, #0x8] @@ -779,8 +799,8 @@ _0200A962: pop {r3, pc} .balign 4 - thumb_func_start FUN_0200A968 -FUN_0200A968: ; 0x0200A968 + thumb_func_start DecryptCopyString +DecryptCopyString: ; 0x0200A968 push {r3-r4, lr} sub sp, #0x4 add r4, r0, #0x0 @@ -794,7 +814,7 @@ FUN_0200A968: ; 0x0200A968 pop {r3-r4, pc} _0200A97E: ldr r0, [r4, #0x8] - bl FUN_0200A394 + bl DecryptMessageDirect add sp, #0x4 pop {r3-r4, pc} _0200A988: @@ -803,27 +823,30 @@ _0200A988: ldrh r0, [r4, #0x4] ldrh r1, [r4, #0x6] ldrh r3, [r4, #0x2] - bl FUN_0200A418 + bl DecryptMessageViaNewNarcHandle add sp, #0x4 pop {r3-r4, pc} .balign 4 - thumb_func_start FUN_0200A99C -FUN_0200A99C: ; 0x0200A99C + thumb_func_start GetSpeciesName +GetSpeciesName: ; 0x0200A99C + ; r0: species + ; r1: heap_id + ; r2: dest push {r4-r6, lr} add r4, r2, #0x0 add r5, r0, #0x0 add r3, r1, #0x0 ldr r2, _0200A9C0 ; =0x0000016A mov r0, #0x1 - mov r1, #0x1a - bl FUN_0200A86C + mov r1, #0x1a ; NARC_MSGDATA_MSG + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_0200A968 + bl DecryptCopyString add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _0200A9C0: .word 0x0000016A @@ -877,7 +900,7 @@ FUN_0200AA14: ; 0x0200AA14 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 beq _0200AA4C mov r0, #0x10 @@ -891,7 +914,7 @@ FUN_0200AA14: ; 0x0200AA14 bl FUN_0200A8E0 _0200AA42: add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0x0 pop {r4-r6, pc} _0200AA4C: @@ -906,14 +929,14 @@ FUN_0200AA50: ; 0x0200AA50 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 beq _0200AA76 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} _0200AA76: diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index 8141cd9b..2da52f7f 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -242,7 +242,7 @@ FUN_0200AC0C: ; 0x0200AC0C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 bl FUN_020239CC @@ -265,7 +265,7 @@ _0200AC48: mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 _0200AC5C: .word 0x000001F1 @@ -280,7 +280,7 @@ FUN_0200AC60: ; 0x0200AC60 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x5 @@ -296,7 +296,7 @@ FUN_0200AC60: ; 0x0200AC60 mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} nop _0200ACA0: .word 0x0000016A @@ -326,7 +326,7 @@ FUN_0200ACC0: ; 0x0200ACC0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r2, [r5, #0xc] add r1, r6, #0x0 add r7, r0, #0x0 @@ -337,7 +337,7 @@ FUN_0200ACC0: ; 0x0200ACC0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} nop _0200ACF4: .word 0x0000016B @@ -406,7 +406,7 @@ FUN_0200AD5C: ; 0x0200AD5C mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AD90 ldr r2, [r5, #0xc] @@ -418,7 +418,7 @@ FUN_0200AD5C: ; 0x0200AD5C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AD90: pop {r3-r7, pc} .balign 4 @@ -434,7 +434,7 @@ FUN_0200AD94: ; 0x0200AD94 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200ADC8 ldr r2, [r5, #0xc] @@ -446,7 +446,7 @@ FUN_0200AD94: ; 0x0200AD94 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200ADC8: pop {r3-r7, pc} .balign 4 @@ -462,7 +462,7 @@ FUN_0200ADCC: ; 0x0200ADCC mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AE00 ldr r2, [r5, #0xc] @@ -474,7 +474,7 @@ FUN_0200ADCC: ; 0x0200ADCC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AE00: pop {r3-r7, pc} .balign 4 @@ -489,7 +489,7 @@ FUN_0200AE04: ; 0x0200AE04 mov r0, #0x1 mov r1, #0x1a mov r2, #0xbe - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r2, [r5, #0xc] add r1, r6, #0x0 add r7, r0, #0x0 @@ -500,7 +500,7 @@ FUN_0200AE04: ; 0x0200AE04 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 @@ -515,7 +515,7 @@ FUN_0200AE38: ; 0x0200AE38 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AE6C ldr r2, [r5, #0xc] @@ -527,7 +527,7 @@ FUN_0200AE38: ; 0x0200AE38 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AE6C: pop {r3-r7, pc} .balign 4 @@ -542,7 +542,7 @@ FUN_0200AE70: ; 0x0200AE70 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AEA2 ldr r2, [r5, #0xc] @@ -554,7 +554,7 @@ FUN_0200AE70: ; 0x0200AE70 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AEA2: pop {r3-r7, pc} .balign 4 @@ -570,7 +570,7 @@ FUN_0200AEA8: ; 0x0200AEA8 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AEDA ldr r2, [r5, #0xc] @@ -582,7 +582,7 @@ FUN_0200AEA8: ; 0x0200AEA8 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AEDA: pop {r3-r7, pc} .balign 4 @@ -598,7 +598,7 @@ FUN_0200AEE0: ; 0x0200AEE0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF12 ldr r2, [r5, #0xc] @@ -610,7 +610,7 @@ FUN_0200AEE0: ; 0x0200AEE0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF12: pop {r3-r7, pc} .balign 4 @@ -626,7 +626,7 @@ FUN_0200AF18: ; 0x0200AF18 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF4A ldr r2, [r5, #0xc] @@ -638,7 +638,7 @@ FUN_0200AF18: ; 0x0200AF18 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF4A: pop {r3-r7, pc} .balign 4 @@ -654,7 +654,7 @@ FUN_0200AF50: ; 0x0200AF50 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF82 ldr r2, [r5, #0xc] @@ -666,7 +666,7 @@ FUN_0200AF50: ; 0x0200AF50 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF82: pop {r3-r7, pc} .balign 4 @@ -682,7 +682,7 @@ FUN_0200AF88: ; 0x0200AF88 mov r0, #0x1 mov r1, #0x1a mov r2, #0xcd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AFBA ldr r2, [r5, #0xc] @@ -694,7 +694,7 @@ FUN_0200AF88: ; 0x0200AF88 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AFBA: pop {r3-r7, pc} @@ -709,7 +709,7 @@ FUN_0200AFBC: ; 0x0200AFBC mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AFF0 ldr r2, [r5, #0xc] @@ -721,7 +721,7 @@ FUN_0200AFBC: ; 0x0200AFBC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AFF0: pop {r3-r7, pc} .balign 4 @@ -736,7 +736,7 @@ FUN_0200AFF4: ; 0x0200AFF4 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B026 ldr r2, [r5, #0xc] @@ -748,7 +748,7 @@ FUN_0200AFF4: ; 0x0200AFF4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B026: pop {r3-r7, pc} .balign 4 @@ -764,7 +764,7 @@ FUN_0200B02C: ; 0x0200B02C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B05E ldr r2, [r5, #0xc] @@ -776,7 +776,7 @@ FUN_0200B02C: ; 0x0200B02C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B05E: pop {r3-r7, pc} .balign 4 @@ -793,7 +793,7 @@ FUN_0200B064: ; 0x0200B064 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B098 ldr r2, [r5, #0xc] @@ -805,7 +805,7 @@ FUN_0200B064: ; 0x0200B064 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B098: pop {r3-r7, pc} .balign 4 @@ -820,7 +820,7 @@ FUN_0200B09C: ; 0x0200B09C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B0CE ldr r2, [r5, #0xc] @@ -832,7 +832,7 @@ FUN_0200B09C: ; 0x0200B09C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B0CE: pop {r3-r7, pc} .balign 4 @@ -849,7 +849,7 @@ FUN_0200B0D4: ; 0x0200B0D4 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B108 ldrb r1, [r4, #0x1] @@ -861,7 +861,7 @@ FUN_0200B0D4: ; 0x0200B0D4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B108: pop {r3-r7, pc} .balign 4 @@ -876,7 +876,7 @@ FUN_0200B10C: ; 0x0200B10C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B13E ldr r2, [r5, #0xc] @@ -888,7 +888,7 @@ FUN_0200B10C: ; 0x0200B10C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B13E: pop {r3-r7, pc} .balign 4 @@ -921,7 +921,7 @@ FUN_0200B164: ; 0x0200B164 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B196 ldr r2, [r5, #0xc] @@ -933,7 +933,7 @@ FUN_0200B164: ; 0x0200B164 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B196: pop {r3-r7, pc} .balign 4 @@ -949,7 +949,7 @@ FUN_0200B19C: ; 0x0200B19C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B1CE ldr r2, [r5, #0xc] @@ -961,7 +961,7 @@ FUN_0200B19C: ; 0x0200B19C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B1CE: pop {r3-r7, pc} .balign 4 @@ -977,7 +977,7 @@ FUN_0200B1D4: ; 0x0200B1D4 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B206 ldr r2, [r5, #0xc] @@ -989,7 +989,7 @@ FUN_0200B1D4: ; 0x0200B1D4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B206: pop {r3-r7, pc} .balign 4 @@ -1006,7 +1006,7 @@ FUN_0200B20C: ; 0x0200B20C mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B240 ldr r2, [r5, #0xc] @@ -1018,7 +1018,7 @@ FUN_0200B20C: ; 0x0200B20C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B240: pop {r3-r7, pc} .balign 4 @@ -1033,7 +1033,7 @@ FUN_0200B244: ; 0x0200B244 mov r0, #0x1 mov r1, #0x1a mov r2, #0xc2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B276 ldr r2, [r5, #0xc] @@ -1045,7 +1045,7 @@ FUN_0200B244: ; 0x0200B244 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B276: pop {r3-r7, pc} @@ -1059,7 +1059,7 @@ FUN_0200B278: ; 0x0200B278 mov r0, #0x1 mov r1, #0x1a mov r2, #0xbf - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B2AA ldr r2, [r5, #0xc] @@ -1071,7 +1071,7 @@ FUN_0200B278: ; 0x0200B278 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B2AA: pop {r3-r7, pc} @@ -1085,7 +1085,7 @@ FUN_0200B2AC: ; 0x0200B2AC mov r0, #0x1 mov r1, #0x1a mov r2, #0xbf - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B2DE ldr r2, [r5, #0xc] @@ -1097,7 +1097,7 @@ FUN_0200B2AC: ; 0x0200B2AC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B2DE: pop {r3-r7, pc} @@ -1111,7 +1111,7 @@ FUN_0200B2E0: ; 0x0200B2E0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B312 ldr r2, [r5, #0xc] @@ -1123,7 +1123,7 @@ FUN_0200B2E0: ; 0x0200B2E0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B312: pop {r3-r7, pc} .balign 4 @@ -1139,7 +1139,7 @@ FUN_0200B318: ; 0x0200B318 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B34A ldr r2, [r5, #0xc] @@ -1151,7 +1151,7 @@ FUN_0200B318: ; 0x0200B318 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B34A: pop {r3-r7, pc} .balign 4 @@ -1167,7 +1167,7 @@ FUN_0200B350: ; 0x0200B350 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B382 ldr r2, [r5, #0xc] @@ -1179,7 +1179,7 @@ FUN_0200B350: ; 0x0200B350 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B382: pop {r3-r7, pc} .balign 4 @@ -1196,7 +1196,7 @@ FUN_0200B388: ; 0x0200B388 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B3BC ldr r2, [r5, #0xc] @@ -1208,7 +1208,7 @@ FUN_0200B388: ; 0x0200B388 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B3BC: pop {r3-r7, pc} .balign 4 @@ -1223,7 +1223,7 @@ FUN_0200B3C0: ; 0x0200B3C0 mov r0, #0x1 mov r1, #0x1a mov r2, #0xc7 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r4, #0x0 beq _0200B3E0 @@ -1250,7 +1250,7 @@ _0200B3FA: mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 @@ -1281,7 +1281,7 @@ FUN_0200B430: ; 0x0200B430 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B462 ldr r2, [r5, #0xc] @@ -1293,7 +1293,7 @@ FUN_0200B430: ; 0x0200B430 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B462: pop {r3-r7, pc} .balign 4 @@ -1309,7 +1309,7 @@ FUN_0200B468: ; 0x0200B468 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B49A ldr r2, [r5, #0xc] @@ -1321,7 +1321,7 @@ FUN_0200B468: ; 0x0200B468 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B49A: pop {r3-r7, pc} .balign 4 @@ -1338,7 +1338,7 @@ FUN_0200B4A0: ; 0x0200B4A0 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B4D4 ldr r2, [r5, #0xc] @@ -1350,7 +1350,7 @@ FUN_0200B4A0: ; 0x0200B4A0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B4D4: pop {r3-r7, pc} .balign 4 @@ -1370,7 +1370,7 @@ FUN_0200B4D8: ; 0x0200B4D8 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B516 ldr r2, [r5, #0xc] @@ -1382,7 +1382,7 @@ FUN_0200B4D8: ; 0x0200B4D8 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B516: pop {r3-r7, pc} @@ -1411,7 +1411,7 @@ FUN_0200B534: ; 0x0200B534 mov r0, #0x1 mov r1, #0x1a mov r2, #0xa - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B566 ldr r2, [r5, #0xc] @@ -1423,7 +1423,7 @@ FUN_0200B534: ; 0x0200B534 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B566: pop {r3-r7, pc} @@ -1437,7 +1437,7 @@ FUN_0200B568: ; 0x0200B568 mov r0, #0x1 mov r1, #0x1a mov r2, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B59A ldr r2, [r5, #0xc] @@ -1449,7 +1449,7 @@ FUN_0200B568: ; 0x0200B568 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B59A: pop {r3-r7, pc} @@ -1471,7 +1471,7 @@ FUN_0200B59C: ; 0x0200B59C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0200B61E bl FUN_0200A940 @@ -1487,16 +1487,16 @@ FUN_0200B59C: ; 0x0200B59C mov r3, #0x0 bl FUN_0200AB70 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0200B5EE: add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r2, _0200B624 ; =0x0000017E ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 beq _0200B61E ldr r2, [r5, #0xc] @@ -1508,7 +1508,7 @@ _0200B5EE: mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B61E: pop {r3-r7, pc} .balign 4 @@ -1525,7 +1525,7 @@ FUN_0200B628: ; 0x0200B628 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B65A ldr r2, [r5, #0xc] @@ -1537,7 +1537,7 @@ FUN_0200B628: ; 0x0200B628 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B65A: pop {r3-r7, pc} .balign 4 @@ -1553,7 +1553,7 @@ FUN_0200B660: ; 0x0200B660 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B692 ldr r2, [r5, #0xc] @@ -1565,7 +1565,7 @@ FUN_0200B660: ; 0x0200B660 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B692: pop {r3-r7, pc} .balign 4 @@ -1581,7 +1581,7 @@ FUN_0200B698: ; 0x0200B698 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B6CA ldr r2, [r5, #0xc] @@ -1593,7 +1593,7 @@ FUN_0200B698: ; 0x0200B698 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B6CA: pop {r3-r7, pc} .balign 4 @@ -1610,7 +1610,7 @@ FUN_0200B6D0: ; 0x0200B6D0 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B704 ldr r2, [r5, #0xc] @@ -1622,7 +1622,7 @@ FUN_0200B6D0: ; 0x0200B6D0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B704: pop {r3-r7, pc} .balign 4 @@ -1679,7 +1679,7 @@ FUN_0200B764: ; 0x0200B764 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0200B7A4 cmp r4, #0x1 @@ -1699,7 +1699,7 @@ _0200B788: mov r3, #0x0 bl FUN_0200AB70 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B7A4: pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02013724.s b/arm9/asm/unk_02013724.s index 83050853..66e27343 100644 --- a/arm9/asm/unk_02013724.s +++ b/arm9/asm/unk_02013724.s @@ -160,7 +160,7 @@ _02013800: ldr r2, _0201383C ; =UNK_020ED54C ldrh r2, [r2, r3] ldr r3, [sp, #0x4] - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 ldr r2, [sp, #0x0] ldr r3, [sp, #0x4] @@ -170,7 +170,7 @@ _02013800: bl FUN_0200A9C4 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0x0 bl FUN_0200AB18 add r0, r4, #0x0 diff --git a/arm9/asm/unk_020139D8.s b/arm9/asm/unk_020139D8.s index 3fbf2466..f1fafe99 100644 --- a/arm9/asm/unk_020139D8.s +++ b/arm9/asm/unk_020139D8.s @@ -115,7 +115,7 @@ _020139EA: ldrh r2, [r4, #0x0] mov r0, #0x1 add r3, r6, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x4] add r7, r7, #0x1 add r4, r4, #0x2 @@ -135,7 +135,7 @@ FUN_02013A10: ; 0x02013A10 add r5, r6, #0x0 _02013A18: ldr r0, [r5, #0x4] - bl FUN_0200A8B8 + bl DestroyMsgData add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0xb diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index 00a3066d..5ba5f631 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -33,7 +33,7 @@ FUN_02014518: ; 0x02014518 mov r0, #0x0 mov r1, #0x1a add r3, r7, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r6, #0x0] mov r4, #0x0 add r5, r6, #0x0 @@ -69,7 +69,7 @@ _0201456E: sub r4, r4, #0x1 bpl _0201456E ldr r0, [r6, #0x0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0x0 bl FreeToHeap pop {r4-r6, pc} diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index 029709da..0a50978c 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -227,14 +227,14 @@ FUN_02023C04: ; 0x02023C04 ldr r2, _02023C3C ; =0x0000013A mov r0, #0x0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, #0x38 add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} _02023C2C: mov r1, #0x0 diff --git a/arm9/asm/unk_0202A1E0.s b/arm9/asm/unk_0202A1E0.s index 1b3ad961..c63116ff 100644 --- a/arm9/asm/unk_0202A1E0.s +++ b/arm9/asm/unk_0202A1E0.s @@ -897,7 +897,7 @@ FUN_0202A798: ; 0x0202A798 mov r1, #0x1a mov r2, #0x11 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, r4 add r1, #0xc8 ldrb r1, [r1, #0x0] @@ -907,9 +907,9 @@ FUN_0202A798: ; 0x0202A798 lsr r1, r1, #0x1f add r1, #0x16 add r2, #0x8 - bl FUN_0200A968 + bl DecryptCopyString ldr r0, [sp, #0x0] - bl FUN_0200A8B8 + bl DestroyMsgData b _0202A7FC _0202A7EE: add r0, r5, r4 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index 7d92eb85..e56914e2 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -170,7 +170,7 @@ _02033FA4: mov r1, #0x1a mov r2, #0xc8 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] mov r0, #0x6 lsl r0, r0, #0x6 @@ -243,7 +243,7 @@ _02033FA4: add r0, sp, #0x18 bl FUN_02019178 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0200AB18 add r0, r6, #0x0 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index e0027d0b..18161609 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -118,7 +118,7 @@ FUN_02034188: ; 0x02034188 mov r0, #0x1 mov r1, #0x1a add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #0x6 lsl r0, r0, #0x6 @@ -191,7 +191,7 @@ _02034308: add r0, sp, #0x14 bl FUN_02019178 ldr r0, [sp, #0xc] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x0 add r1, r0, #0x0 bl FUN_0201797C diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 639703a5..74c41707 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -629,7 +629,7 @@ FUN_0203549C: ; 0x0203549C mov r0, #0x0 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] ldr r0, [sp, #0x14] mov r1, #0xb @@ -717,7 +717,7 @@ _020355BC: add r0, #0x8c str r1, [r0, #0x0] ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x24] mov r1, #0x1 str r0, [sp, #0x24] @@ -965,7 +965,7 @@ _0203576C: mov r0, #0x0 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x1c] cmp r6, #0x0 bne _020357D0 @@ -1049,7 +1049,7 @@ _0203584C: add r0, r7, #0x0 bl FUN_0200AB18 ldr r0, [sp, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData add r5, #0x10 add r0, r5, #0x0 bl FUN_02019220 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index a756552a..92eed507 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1107,7 +1107,7 @@ FUN_02038E48: ; 0x02038E48 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x78] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x7c] bl FreeToHeap add r0, r4, #0x0 @@ -1641,7 +1641,7 @@ FUN_020392B4: ; 0x020392B4 mov r1, #0x1a add r2, r4, #0x0 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x78] pop {r3-r5, pc} .balign 4 @@ -1662,7 +1662,7 @@ FUN_020392D8: ; 0x020392D8 mov r0, #0x1 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x78] pop {r3-r5, pc} diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 2f041902..8944e0b3 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -196,7 +196,7 @@ FUN_02047814: ; 0x02047814 mov r0, #0x1 mov r1, #0x1a add r3, r6, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] mov r0, #0x8 add r1, r6, #0x0 @@ -220,7 +220,7 @@ FUN_02047814: ; 0x02047814 add r0, r7, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x10] bl FUN_020239CC add r2, r0, #0x0 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index d7391e7d..bc9fa3d7 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -85,7 +85,7 @@ _0204817A: mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #0xb bl FUN_0200AA80 @@ -225,7 +225,7 @@ _020482B2: ldr r0, [r4, #0x20] bl FUN_0200AB18 ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x8] mov r1, #0x3 bl FUN_020178A0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index dd7ef2a4..a9bc2e07 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -461,7 +461,7 @@ FUN_02048864: ; 0x02048864 mov r1, #0x1a mov r2, #0xc7 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r6, #0x2 bne _020488AC @@ -489,7 +489,7 @@ _020488AC: str r0, [r4, #0x2c] _020488B4: add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5, #0xc] bl LoadPlayerDataAddress add r2, r0, #0x0 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index a872c481..e902058a 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -1986,13 +1986,13 @@ _02049884: mov r1, #0x1a mov r2, #0xcf mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r1, #0x7c bl FUN_0200A914 str r0, [r4, #0x34] add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r1, r4, #0x0 ldr r0, [r5, #0x8] add r1, #0x24 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 037d98fd..cfaf8e37 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1313,7 +1313,7 @@ _0205188E: mov r1, #0x1a mov r2, #0x9 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x2c] mov r0, #0xc8 mov r1, #0xb @@ -1434,7 +1434,7 @@ _020519B0: bl FreeToHeap _020519BA: ldr r0, [r4, #0x2c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x28] bl FUN_0200AB18 ldr r0, [r4, #0xc] @@ -1680,7 +1680,7 @@ FUN_02051B68: ; 0x02051B68 mov r0, #0x1 mov r1, #0x1a mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] bl FUN_020690C4 str r0, [sp, #0x1c] @@ -1756,7 +1756,7 @@ _02051BD6: mov r3, #0x10 bl FUN_0201BD84 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData _02051C34: mov r0, #0x10 str r0, [sp, #0x0] @@ -2130,7 +2130,7 @@ _02051EF2: mov r1, #0x1a mov r2, #0x9 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #0xc8 mov r1, #0x4 @@ -2192,7 +2192,7 @@ _02051F7C: tst r0, r1 beq _0205203A ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x18] bl FUN_0200AB18 ldr r0, [r4, #0x0] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 1cd297c6..1fed433c 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -1795,7 +1795,7 @@ FUN_02052D08: ; 0x02052D08 mov r1, #0x1a lsl r2, r2, #0x6 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r4, #0x0 bne _02052D30 @@ -1891,7 +1891,7 @@ _02052DBA: add r0, r6, #0x0 bl FreeToHeap add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _02052DE0: add sp, #0xc pop {r4-r7, pc} diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index 3018895c..2910f716 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -372,7 +372,7 @@ FUN_02060E70: ; 0x02060E70 mov r1, #0x4 add r2, sp, #0x8 add r6, r3, #0x0 - bl FUN_0200A99C + bl GetSpeciesName add r0, sp, #0x20 ldrb r0, [r0, #0x10] add r1, r4, #0x0 @@ -396,7 +396,7 @@ FUN_02060EA0: ; 0x02060EA0 add r0, r2, #0x0 mov r1, #0x4 add r2, sp, #0x8 - bl FUN_0200A99C + bl GetSpeciesName mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x1 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index a87efb7f..ecc0c89a 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -921,7 +921,7 @@ FUN_02062C80: ; 0x02062C80 ldr r3, [r5, #0x0] mov r0, #0x0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x2c] ldr r2, [r5, #0x0] mov r0, #0x2 @@ -1054,7 +1054,7 @@ _02062D84: ldr r0, [r6, #0x30] bl FUN_0200AB18 ldr r0, [r6, #0x2c] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} thumb_func_start FUN_02062DB0 diff --git a/arm9/asm/unk_02064E4C.s b/arm9/asm/unk_02064E4C.s index 74f6af8a..07144d43 100644 --- a/arm9/asm/unk_02064E4C.s +++ b/arm9/asm/unk_02064E4C.s @@ -23,7 +23,7 @@ FUN_02064E60: ; 0x02064E60 ldr r2, _02064E8C ; =0x0000017E mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02034824 @@ -32,7 +32,7 @@ FUN_02064E60: ; 0x02064E60 add r2, r6, #0x0 bl FUN_02064E4C add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _02064E8C: .word 0x0000017E diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index e454991f..2aea9e30 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1855,7 +1855,7 @@ FUN_02066270: ; 0x02066270 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x43 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -1936,7 +1936,7 @@ _020662F0: mov r0, #0x43 lsl r0, r0, #0x2 ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s index 07a7a4b6..776bd5c3 100644 --- a/arm9/asm/unk_0206ABC4.s +++ b/arm9/asm/unk_0206ABC4.s @@ -26,7 +26,7 @@ FUN_0206ABC4: ; 0x0206ABC4 ldr r3, [sp, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] add r0, r4, #0x0 bl FUN_02024EC0 @@ -94,7 +94,7 @@ _0206AC48: ldr r0, [sp, #0x0] str r1, [r0, #0x0] ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x48 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s index 51d7739d..b6ec1416 100644 --- a/arm9/asm/unk_0206B16C.s +++ b/arm9/asm/unk_0206B16C.s @@ -62,7 +62,7 @@ _0206B1BC: mov r0, #0x1 mov r1, #0x1a mov r2, #0xe - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0206B1F8 ldr r1, _0206B208 ; =0x00011EE4 @@ -73,13 +73,13 @@ _0206B1E0: add r0, r6, #0x0 add r1, r5, #0x6 add r2, r4, #0x0 - bl FUN_0200A968 + bl DecryptCopyString add r5, r5, #0x1 add r4, #0x28 cmp r5, #0x12 blo _0206B1E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0206B1F8: ldr r0, [sp, #0x0] mov r1, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index e9e77793..9265cbd9 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -174,7 +174,7 @@ FUN_0206C700: ; 0x0206C700 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x8] add r0, r5, #0x0 bl FUN_0200AA80 @@ -321,7 +321,7 @@ FUN_0206C92C: ; 0x0206C92C ldr r0, [r4, #0x0] bl FUN_0206DC48 ldr r0, [r4, #0x8] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index fc0ebdad..fb9f1e67 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -185,7 +185,7 @@ FUN_0206E3F8: ; 0x0206E3F8 mov r0, #0x0 mov r1, #0x1a mov r2, #0x7 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r0, r4, #0x0 bl FUN_0200AA80 @@ -287,7 +287,7 @@ _0206E4C0: _0206E4EA: bl FUN_0200AB18 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0xc mov r0, #0x0 pop {r4-r7, pc} @@ -301,7 +301,7 @@ _0206E4FA: add r0, r4, #0x0 bl FUN_0200AB18 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x1 add sp, #0xc pop {r4-r7, pc} @@ -322,33 +322,33 @@ _0206E52E: mov r1, #0x1a mov r2, #0x7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r1, #0x38 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0206E54C: mov r0, #0x1 mov r1, #0x1a mov r2, #0x7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r1, #0x6f add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0206E56A: mov r0, #0x1 mov r1, #0x1a mov r2, #0xc7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 add r0, r4, #0x0 bl FUN_0200AA80 @@ -370,6 +370,6 @@ _0206E56A: add r0, r4, #0x0 bl FUN_0200AB18 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s index 51c6ace1..e527bfb2 100644 --- a/arm9/asm/unk_0206E5B4.s +++ b/arm9/asm/unk_0206E5B4.s @@ -538,13 +538,13 @@ FUN_0206E768: ; 0x0206E768 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r4, #0x0 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 @@ -557,13 +557,13 @@ FUN_0206E790: ; 0x0206E790 ldr r2, _0206E7B4 ; =0x00000157 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r4, #0x0 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _0206E7B4: .word 0x00000157 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 99a12495..2a03ef5f 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1002,7 +1002,7 @@ _0206FAFC: blo _0206FAFC ldr r0, _0206FB4C ; =0x0000069C ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0206FB50 ; =0x00000698 ldr r0, [r6, r0] bl FUN_0200B990 @@ -1431,7 +1431,7 @@ _0206FEC2: mov r0, #0x0 mov r1, #0x1a mov r3, #0xc - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0206FF60 ; =0x0000069C mov r2, #0x0 str r0, [r6, r1] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 8ec0552a..11b2ded1 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -430,7 +430,7 @@ _020772FE: mov r1, #0x1a add r2, #0xb mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x5b lsl r2, r2, #0x2 str r0, [r4, r2] @@ -438,7 +438,7 @@ _020772FE: mov r1, #0x1a add r2, #0xc mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x17 lsl r2, r2, #0x4 str r0, [r4, r2] @@ -446,7 +446,7 @@ _020772FE: mov r1, #0x1a sub r2, #0x2c mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x5d lsl r1, r1, #0x2 str r0, [r4, r1] @@ -1228,15 +1228,15 @@ _02077A0C: mov r0, #0x5d lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x17 lsl r0, r0, #0x4 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x5a lsl r0, r0, #0x2 ldr r0, [r4, r0] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 8f112a90..11d65c38 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -649,7 +649,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A250 ; =0x00000674 mov r2, #0x79 str r0, [r4, r1] @@ -657,7 +657,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A254 ; =0x00000678 mov r2, #0x0 str r0, [r4, r1] @@ -701,7 +701,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A25C ; =0x00000688 str r0, [r4, r1] mov r0, #0x8 @@ -732,13 +732,13 @@ FUN_0207A264: ; 0x0207A264 add r4, r0, #0x0 ldr r0, _0207A2C4 ; =0x00000688 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0207A2C8 ; =0x00000678 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0207A2CC ; =0x00000674 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x67 lsl r0, r0, #0x4 ldr r0, [r4, r0] diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 43537521..26580e37 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1782,7 +1782,7 @@ FUN_0207E200: ; 0x0207E200 mov r0, #0x1 mov r1, #0x1a mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207E490 ; =0x00000282 mov r2, #0x1a lsl r2, r2, #0x6 @@ -1791,7 +1791,7 @@ FUN_0207E200: ; 0x0207E200 add r5, r0, #0x0 bl FUN_0200A8E0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r1, #0x91 lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -2733,7 +2733,7 @@ _0207EC1C: mov r0, #0x1 mov r1, #0x1a mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x1a lsl r2, r2, #0x6 ldr r2, [r5, r2] @@ -2749,7 +2749,7 @@ _0207EC1C: mov r3, #0x0 bl FUN_0207D998 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -2987,7 +2987,7 @@ FUN_0207EE2C: ; 0x0207EE2C mov r1, #0x1a mov r2, #0xc5 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x1a lsl r2, r2, #0x6 ldr r2, [r5, r2] @@ -3011,7 +3011,7 @@ FUN_0207EE2C: ; 0x0207EE2C add r3, r1, #0x0 bl FUN_0201BDE0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x75 lsl r0, r0, #0x2 add r0, r5, r0 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 9e78553d..903c4d94 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -32,7 +32,7 @@ FUN_0207FD00: ; 0x0207FD00 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r7, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x4] ldr r2, [r4, #0x0] mov r0, #0x9 @@ -461,7 +461,7 @@ _020800CA: ldr r0, [r4, #0x8] bl FUN_0200AB18 ldr r0, [r4, #0x4] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index afd66a05..fb6f03c8 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -798,7 +798,7 @@ _02082D9A: mov r0, #0x1 mov r1, #0x1a mov r2, #0xc0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldrh r1, [r7, #0x16] add r4, r0, #0x0 bl FUN_0200A914 @@ -820,7 +820,7 @@ _02082D9A: ldr r0, [sp, #0x14] bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r2, sp, #0x1c ldrb r1, [r7, #0x1a] add r0, sp, #0x18 diff --git a/arm9/asm/unk_02085258.s b/arm9/asm/unk_02085258.s index 5af55be3..ba69aea4 100644 --- a/arm9/asm/unk_02085258.s +++ b/arm9/asm/unk_02085258.s @@ -113,13 +113,13 @@ FUN_020852E8: ; 0x020852E8 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 @@ -134,13 +134,13 @@ FUN_02085310: ; 0x02085310 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 184e3bfd..83a10e29 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -572,7 +572,7 @@ FUN_020867EC: ; 0x020867EC mov r0, #0x0 mov r1, #0x1a mov r3, #0x47 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r0, #0x47 bl FUN_0200AA80 @@ -605,7 +605,7 @@ FUN_020867EC: ; 0x020867EC bl FUN_0201BD84 add r6, r0, #0x0 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x14] @@ -664,7 +664,7 @@ FUN_02086878: ; 0x02086878 mov r0, #0x0 mov r1, #0x1a mov r3, #0x47 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r4, #0x0 _020868DE: @@ -682,7 +682,7 @@ _020868DE: cmp r4, #0x2 blt _020868DE add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5, #0x44] mov r1, #0x0 str r0, [sp, #0x18] diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 1b3721af..46c25eab 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -341,7 +341,7 @@ FUN_02089734: ; 0x02089734 mov r0, #0x1 mov r1, #0x1a mov r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x18] bl FUN_0201BD5C mov r0, #0x0 @@ -373,7 +373,7 @@ FUN_0208977C: ; 0x0208977C add r0, #0x1c bl FUN_02019178 ldr r0, [r4, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 94f81187..1b59c6dc 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -280,7 +280,7 @@ FUN_02089B80: ; 0x02089B80 ldr r3, [r4, #0x0] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] bl FUN_0201BD5C mov r0, #0x0 @@ -313,7 +313,7 @@ FUN_02089BCC: ; 0x02089BCC add r0, #0x20 bl FUN_02019178 ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index 7e3d265f..e1f4f7cb 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -117,7 +117,7 @@ FUN_02089D90: ; 0x02089D90 mov r1, #0x1a mov r2, #0x5 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 8b5b9a23..0990f54b 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -121,7 +121,7 @@ FUN_02089F24: ; 0x02089F24 mov r1, #0x1a mov r2, #0x5 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 @@ -290,7 +290,7 @@ _0208A0C8: mov r1, #0x1a mov r2, #0x6 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 34ce5c45..548990da 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -33,7 +33,7 @@ FUN_0208A338: ; 0x0208A338 mov r0, #0x1 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x20 bl FUN_02013690 @@ -81,7 +81,7 @@ FUN_0208A3C8: ; 0x0208A3C8 ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0208A400 add r0, r4, #0x0 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index ba1509f7..f4bc14ea 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -172,7 +172,7 @@ _0208A9C6: mov r1, #0x1a mov r2, #0xc8 mov r3, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #0x6 lsl r0, r0, #0x6 @@ -264,7 +264,7 @@ _0208AB9C: add r0, sp, #0x14 bl FUN_02019178 ldr r0, [sp, #0xc] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x10] bl FreeToHeap mov r0, #0x0 |