diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 14:31:58 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-11 14:31:58 -0400 |
| commit | 5106f9a218925320e0807bcd8b45e299d49f5214 (patch) | |
| tree | 8be90314fd2ed4e0792dc12bc57653b5feac5799 | |
| parent | 877cfc467bc97b98e6c7e69cf98a30137427b8c8 (diff) | |
Fixup pokemon substructs and fill out MON_DATA_ defines
92 files changed, 717 insertions, 657 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 diff --git a/arm9/global.inc b/arm9/global.inc index 0a69b506..db7e72c3 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -526,13 +526,13 @@ .extern FUN_0200A344
.extern FUN_0200A648
.extern FUN_0200A738
-.extern FUN_0200A86C
-.extern FUN_0200A8B8
+.extern NewMsgDataFromNarc
+.extern DestroyMsgData
.extern FUN_0200A8E0
.extern FUN_0200A914
.extern FUN_0200A940
-.extern FUN_0200A968
-.extern FUN_0200A99C
+.extern DecryptCopyString
+.extern GetSpeciesName
.extern FUN_0200A9C4
.extern FUN_0200AA14
.extern FUN_0200AA50
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 2d1572ab..72d4bbbd 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -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 @@ -45658,7 +45658,7 @@ 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 @@ -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 e2b98b89..2f478ef3 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -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 @@ -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 @@ -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 @@ -22056,7 +22056,7 @@ _022443D4: add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData b _02244508 _022444FC: add r2, r6, #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} @@ -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 @@ -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 f91383e5..cb716405 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -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 f22afecb..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
@@ -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 bb31ff4e..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
@@ -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
@@ -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]
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 02642d35..00b933b8 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -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] @@ -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] @@ -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 @@ -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 a5144946..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 @@ -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 a50461a7..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} @@ -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 @@ -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/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 795c5fee..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 @@ -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 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 929d07b7..229ab02a 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -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 5e8b7634..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 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 34c47800..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] 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 cd0e0a13..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 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index f71dd7cd..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] @@ -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 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index d51246f5..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] @@ -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] 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 6a72146c..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] @@ -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 6ec0721a..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] diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index e9a154d2..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 @@ -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] 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 2ff2b41f..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 @@ -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] 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 diff --git a/include/pokemon.h b/include/pokemon.h index 49a30dbc..68cc0d59 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -62,9 +62,53 @@ // TODO: ribbon flags through 109 #define MON_DATA_FATEFUL_ENCOUNTER 110 #define MON_DATA_GENDER 111 +#define MON_DATA_FORME 112 +#define MON_DATA_RESERVED_113 113 // HGSS +#define MON_DATA_RESERVED_114 114 // Plat +#define MON_DATA_UNUSED_115 115 +#define MON_DATA_NICKNAME 116 +#define MON_DATA_UNUSED_117 117 +#define MON_DATA_NICKNAME_2 118 // ??? +#define MON_DATA_NICKNAME_3 119 // ??? +#define MON_DATA_UNK_120 120 #define MON_DATA_GAME_VERSION 121 -#define MON_TYPE_1 176 -#define MON_TYPE_2 177 +// TODO: ribbon flags 122-142 +#define MON_DATA_OT_NAME 143 +#define MON_DATA_OT_NAME_2 144 // ??? +#define MON_DATA_EGG_MET_YEAR 145 +#define MON_DATA_EGG_MET_MONTH 146 +#define MON_DATA_EGG_MET_DAY 147 +#define MON_DATA_MET_YEAR 148 +#define MON_DATA_MET_MONTH 149 +#define MON_DATA_MET_DAY 150 +#define MON_DATA_EGG_MET_LOCATION 151 +#define MON_DATA_MET_LOCATION 152 +#define MON_DATA_POKERUS 153 +#define MON_DATA_POKEBALL 154 +#define MON_DATA_MET_LEVEL 155 +#define MON_DATA_MET_GENDER 156 +#define MON_DATA_ENCOUNTER_TYPE 157 +#define MON_DATA_RESERVED_158 158 // HGSS +#define MON_DATA_STATUS 159 +#define MON_DATA_LEVEL 160 +#define MON_DATA_CAPSULE 161 +#define MON_DATA_HP 162 +#define MON_DATA_MAXHP 163 +#define MON_DATA_ATK 164 +#define MON_DATA_DEF 165 +#define MON_DATA_SPEED 166 +#define MON_DATA_SPATK 167 +#define MON_DATA_SPDEF 168 +#define MON_DATA_SEAL_TYPES_MAYBE 169 +#define MON_DATA_SEAL_COORDS 170 +#define MON_DATA_SPECIES_EXISTS 171 +#define MON_DATA_SANITY_CHECK_172 172 +#define MON_DATA_SANITY_CHECK_173 173 +#define MON_DATA_IVS_WORD 174 +#define MON_DATA_IS_FEMALE 175 +#define MON_DATA_TYPE_1 176 +#define MON_DATA_TYPE_2 177 +#define MON_DATA_SPECIES_NAME 178 // TODO: Identify the rest of these enum BaseStat { @@ -226,28 +270,28 @@ typedef enum { // Structs typedef struct { - u16 species; - u16 heldItem; - u32 otID; // low 16: visible; high 16: secret - u32 exp; - u8 friendship; - u8 ability; - u8 markings; // circle, triangle, square, heart, star, diamond - u8 originLanguage; - u8 hpEV; - u8 atkEV; - u8 defEV; - u8 spdEV; - u8 spatkEV; - u8 spdefEV; - u8 coolStat; - u8 beautyStat; - u8 cuteStat; - u8 smartStat; - u8 toughStat; - u8 sheen; + /* 0x00 */ u16 species; + /* 0x02 */ u16 heldItem; + /* 0x04 */ u32 otID; // low 16: visible; high 16: secret + /* 0x08 */ u32 exp; + /* 0x0C */ u8 friendship; + /* 0x0D */ u8 ability; + /* 0x0E */ u8 markings; // circle, triangle, square, heart, star, diamond + /* 0x0F */ u8 originLanguage; + /* 0x10 */ u8 hpEV; + /* 0x11 */ u8 atkEV; + /* 0x12 */ u8 defEV; + /* 0x13 */ u8 spdEV; + /* 0x14 */ u8 spatkEV; + /* 0x15 */ u8 spdefEV; + /* 0x16 */ u8 coolStat; + /* 0x17 */ u8 beautyStat; + /* 0x18 */ u8 cuteStat; + /* 0x19 */ u8 smartStat; + /* 0x1A */ u8 toughStat; + /* 0x1B */ u8 sheen; // TODO: Finish SinnohRibbonSet1 - u32 sinnohRibbons; + /* 0x1C */ u32 sinnohRibbons; // u8 sinnohChampRibbon:1, abilityRibbon:1; // u8 field_0x1d; // u8 gorgeousRoyalRibbon:1, footprintRibbon:1; @@ -255,45 +299,38 @@ typedef struct { } PokemonDataBlockA; typedef struct { - u16 moves[4]; - u8 movePP[4]; - u8 movePpUps[4]; - u32 hpIV:5, atkIV:5, defIV:5, spdIV:5, spatkIV:5, spdefIV:5, isEgg:1, isNicknamed:1; + /* 0x00 */ u16 moves[4]; + /* 0x08 */ u8 movePP[4]; + /* 0x0C */ u8 movePpUps[4]; + /* 0x10 */ u32 hpIV:5, atkIV:5, defIV:5, spdIV:5, spatkIV:5, spdefIV:5, isEgg:1, isNicknamed:1; // TODO: Finish HoennRibbonSet - u32 ribbonFlags; // cool, ... - u8 fatefulEncounter:1, female:1, genderless:1, alternateForm:5; - u8 HGSS_shinyLeaves; // TODO: Turn into bitfield - u16 Unused; - u16 Platinum_EggLocation; - u16 Platinum_MetLocation; + /* 0x14 */ u32 ribbonFlags; // cool, ... + /* 0x18 */ u8 fatefulEncounter:1, female:1, genderless:1, alternateForm:5; + /* 0x19 */ u8 HGSS_shinyLeaves; // TODO: Turn into bitfield + /* 0x1A */ u16 Unused; + /* 0x1C */ u16 Platinum_EggLocation; + /* 0x1E */ u16 Platinum_MetLocation; } PokemonDataBlockB; typedef struct { - u16 nickname[11]; - u8 Unused; - u8 originGame; + /* 0x00 */ u16 nickname[11]; + /* 0x1A */ u8 Unused; + /* 0x1B */ u8 originGame; // TODO: Finish SinnohRibbonSet2 - u8 coolRibbon:1; - u8 field_0x19; - u8 field_0x1a; - u8 field_0x1b; - u32 Unused2; + /* 0x1C */ u32 sinnohRibbons2; // cool, ... } PokemonDataBlockC; typedef struct { - u16 otTrainerName[8]; - u8 dateEggReceived[3]; - u8 dateMet[3]; - u16 DP_EggLocation; - u16 DP_MetLocation; - u8 pokerus; - u8 pokeball; - u8 flags; - u8 padding[3]; - EncounterType encounterType; - u8 HGSS_Pokeball; - u8 HGSS_Performance; - u8 padding2[2]; + /* 0x00 */ u16 otTrainerName[8]; + /* 0x10 */ u8 dateEggReceived[3]; + /* 0x13 */ u8 dateMet[3]; + /* 0x16 */ u16 DP_EggLocation; + /* 0x18 */ u16 DP_MetLocation; + /* 0x1A */ u8 pokerus; + /* 0x1B */ u8 pokeball; + /* 0x1C */ u8 flags; + /* 0x1D */ u8 encounterType; + /* 0x1E */ u16 HGSS_Pokeball; } PokemonDataBlockD; typedef union { @@ -333,8 +370,8 @@ struct PartyPokemon /* 0x096 */ u16 speed; /* 0x098 */ u16 spatk; /* 0x09A */ u16 spdef; - /* 0x09C */ u8 filler9C[0x38]; - /* 0x0D4 */ u8 sealCoords[0x18]; + /* 0x09C */ u8 seal_something[0x38]; // a struct? + /* 0x0D4 */ u8 sealCoords[0x18]; // u8 pairs? }; struct Pokemon { |