summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-11 14:31:58 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-11 14:31:58 -0400
commit5106f9a218925320e0807bcd8b45e299d49f5214 (patch)
tree8be90314fd2ed4e0792dc12bc57653b5feac5799 /arm9/modules
parent877cfc467bc97b98e6c7e69cf98a30137427b8c8 (diff)
Fixup pokemon substructs and fill out MON_DATA_ defines
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s42
-rw-r--r--arm9/modules/06/asm/module_06.s62
-rw-r--r--arm9/modules/07/asm/module_07.s4
-rw-r--r--arm9/modules/09/asm/module_09.s24
-rw-r--r--arm9/modules/11/asm/module_11.s16
-rw-r--r--arm9/modules/12/asm/module_12.s36
-rw-r--r--arm9/modules/14/asm/module_14.s28
-rw-r--r--arm9/modules/15/asm/module_15.s12
-rw-r--r--arm9/modules/16/asm/module_16.s68
-rw-r--r--arm9/modules/17/asm/module_17.s32
-rw-r--r--arm9/modules/18/asm/module_18.s60
-rw-r--r--arm9/modules/38/asm/module_38.s8
-rw-r--r--arm9/modules/47/asm/module_47.s4
-rw-r--r--arm9/modules/51/asm/module_51.s4
-rw-r--r--arm9/modules/53/asm/module_53.s4
-rw-r--r--arm9/modules/54/asm/module_54.s4
-rw-r--r--arm9/modules/55/asm/module_55.s4
-rw-r--r--arm9/modules/56/asm/module_56.s8
-rw-r--r--arm9/modules/57/asm/module_57.s16
-rw-r--r--arm9/modules/58/asm/module_58.s4
-rw-r--r--arm9/modules/59/asm/module_59.s10
-rw-r--r--arm9/modules/60/asm/module_60.s4
-rw-r--r--arm9/modules/61/asm/module_61.s4
-rw-r--r--arm9/modules/62/asm/module_62.s16
-rw-r--r--arm9/modules/63/asm/module_63.s4
-rw-r--r--arm9/modules/64/asm/module_64.s12
-rw-r--r--arm9/modules/65/asm/module_65.s8
-rw-r--r--arm9/modules/66/asm/module_66.s8
-rw-r--r--arm9/modules/67/asm/module_67.s4
-rw-r--r--arm9/modules/68/asm/module_68.s4
-rw-r--r--arm9/modules/69/asm/module_69.s4
-rw-r--r--arm9/modules/70/asm/module_70.s12
-rw-r--r--arm9/modules/71/asm/module_71.s8
-rw-r--r--arm9/modules/73/asm/module_73.s4
-rw-r--r--arm9/modules/74/asm/module_74.s4
-rw-r--r--arm9/modules/75/asm/module_75.s16
-rw-r--r--arm9/modules/76/asm/module_76.s16
-rw-r--r--arm9/modules/77/asm/module_77.s16
-rw-r--r--arm9/modules/80/asm/module_80.s16
-rw-r--r--arm9/modules/81/asm/module_81.s4
-rw-r--r--arm9/modules/82/asm/module_82.s12
-rw-r--r--arm9/modules/83/asm/module_83.s56
-rw-r--r--arm9/modules/84/asm/module_84.s4
-rw-r--r--arm9/modules/85/asm/module_85.s4
-rw-r--r--arm9/modules/86/asm/module_86.s4
45 files changed, 347 insertions, 347 deletions
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