summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Ananyin <ananinegor@gmail.com>2020-06-12 09:06:23 +0300
committerEgor Ananyin <ananinegor@gmail.com>2020-06-12 09:06:23 +0300
commit10c763389f50e38572c71b7c482005ec5f1655e7 (patch)
treefc20d0fcc5df7a977647c4d0cbe6cd4899f52431
parentc0793478b0fdfcf314f5ff58e46c3ac88bf46525 (diff)
parente2d7f9f796889087a3da50f7eeb2383731ca3262 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--arm7/asm/OS_alloc.s433
-rw-r--r--arm7/lib/include/OS_alloc.h17
-rw-r--r--arm7/lib/src/OS_alloc.c311
-rw-r--r--arm9/asm/pokemon.s714
-rw-r--r--arm9/asm/scrcmd.s22
-rw-r--r--arm9/asm/scrcmd_12.s26
-rw-r--r--arm9/asm/scrcmd_13.s4
-rw-r--r--arm9/asm/scrcmd_18.s14
-rw-r--r--arm9/asm/scrcmd_4.s4
-rw-r--r--arm9/asm/scrcmd_5.s6
-rw-r--r--arm9/asm/scrcmd_9.s2
-rw-r--r--arm9/asm/unk_02001B80.s4
-rw-r--r--arm9/asm/unk_0200A384.s85
-rw-r--r--arm9/asm/unk_0200AA80.s194
-rw-r--r--arm9/asm/unk_02013724.s4
-rw-r--r--arm9/asm/unk_020139D8.s4
-rw-r--r--arm9/asm/unk_020144FC.s4
-rw-r--r--arm9/asm/unk_02023AC4.s4
-rw-r--r--arm9/asm/unk_02023C40.s14
-rw-r--r--arm9/asm/unk_02026CD0.s8
-rw-r--r--arm9/asm/unk_0202A1E0.s6
-rw-r--r--arm9/asm/unk_0202B034.s4
-rw-r--r--arm9/asm/unk_02033F50.s4
-rw-r--r--arm9/asm/unk_02034188.s4
-rw-r--r--arm9/asm/unk_02035068.s8
-rw-r--r--arm9/asm/unk_020377F0.s2
-rw-r--r--arm9/asm/unk_02038C78.s6
-rw-r--r--arm9/asm/unk_020476CC.s14
-rw-r--r--arm9/asm/unk_02048120.s4
-rw-r--r--arm9/asm/unk_020484A8.s4
-rw-r--r--arm9/asm/unk_02048904.s4
-rw-r--r--arm9/asm/unk_0204A01C.s14
-rw-r--r--arm9/asm/unk_0204B9EC.s4
-rw-r--r--arm9/asm/unk_0204BE14.s2
-rw-r--r--arm9/asm/unk_02050E48.s12
-rw-r--r--arm9/asm/unk_020520AC.s4
-rw-r--r--arm9/asm/unk_020603B0.s2
-rw-r--r--arm9/asm/unk_020606B0.s4
-rw-r--r--arm9/asm/unk_02060CCC.s6
-rw-r--r--arm9/asm/unk_020625EC.s4
-rw-r--r--arm9/asm/unk_02064E4C.s4
-rw-r--r--arm9/asm/unk_020653EC.s4
-rw-r--r--arm9/asm/unk_0206ABC4.s10
-rw-r--r--arm9/asm/unk_0206B16C.s26
-rw-r--r--arm9/asm/unk_0206B688.s20
-rw-r--r--arm9/asm/unk_0206C700.s50
-rw-r--r--arm9/asm/unk_0206E2F0.s18
-rw-r--r--arm9/asm/unk_0206E5B4.s8
-rw-r--r--arm9/asm/unk_0206F3FC.s12
-rw-r--r--arm9/asm/unk_02073DA8.s4
-rw-r--r--arm9/asm/unk_0207550C.s8
-rw-r--r--arm9/asm/unk_020772F0.s18
-rw-r--r--arm9/asm/unk_02079C70.s28
-rw-r--r--arm9/asm/unk_0207D5BC.s14
-rw-r--r--arm9/asm/unk_0207FD00.s76
-rw-r--r--arm9/asm/unk_02080C38.s6
-rw-r--r--arm9/asm/unk_020828BC.s22
-rw-r--r--arm9/asm/unk_020834D0.s8
-rw-r--r--arm9/asm/unk_020842DC.s46
-rw-r--r--arm9/asm/unk_02085258.s8
-rw-r--r--arm9/asm/unk_020854E0.s10
-rw-r--r--arm9/asm/unk_020859C0.s6
-rw-r--r--arm9/asm/unk_02086084.s6
-rw-r--r--arm9/asm/unk_02086414.s12
-rw-r--r--arm9/asm/unk_02087D00.s6
-rw-r--r--arm9/asm/unk_02088DD8.s2
-rw-r--r--arm9/asm/unk_02089498.s4
-rw-r--r--arm9/asm/unk_02089960.s4
-rw-r--r--arm9/asm/unk_02089D90.s2
-rw-r--r--arm9/asm/unk_02089F24.s4
-rw-r--r--arm9/asm/unk_0208A338.s4
-rw-r--r--arm9/asm/unk_0208A998.s4
-rw-r--r--arm9/global.inc60
-rw-r--r--arm9/lib/include/OS_alloc.h31
-rw-r--r--arm9/lib/include/consts.h3
-rw-r--r--arm9/lib/src/OS_alloc.c6
-rw-r--r--arm9/modules/05/asm/module_05.s240
-rw-r--r--arm9/modules/06/asm/module_06.s170
-rw-r--r--arm9/modules/07/asm/module_07.s6
-rw-r--r--arm9/modules/09/asm/module_09.s26
-rw-r--r--arm9/modules/11/asm/module_11.s82
-rw-r--r--arm9/modules/12/asm/module_12.s36
-rw-r--r--arm9/modules/14/asm/module_14.s144
-rw-r--r--arm9/modules/15/asm/module_15.s12
-rw-r--r--arm9/modules/16/asm/module_16.s70
-rw-r--r--arm9/modules/17/asm/module_17.s38
-rw-r--r--arm9/modules/18/asm/module_18.s60
-rw-r--r--arm9/modules/27/asm/module_27.s4
-rw-r--r--arm9/modules/35/asm/module_35.s10
-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.s30
-rw-r--r--arm9/modules/63/asm/module_63.s4
-rw-r--r--arm9/modules/64/asm/module_64.s14
-rw-r--r--arm9/modules/65/asm/module_65.s12
-rw-r--r--arm9/modules/66/asm/module_66.s8
-rw-r--r--arm9/modules/67/asm/module_67.s8
-rw-r--r--arm9/modules/68/asm/module_68.s4
-rw-r--r--arm9/modules/69/asm/module_69.s12
-rw-r--r--arm9/modules/70/asm/module_70.s18
-rw-r--r--arm9/modules/71/asm/module_71.s20
-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.s22
-rw-r--r--arm9/modules/77/asm/module_77.s16
-rw-r--r--arm9/modules/80/asm/module_80.s90
-rw-r--r--arm9/modules/81/asm/module_81.s22
-rw-r--r--arm9/modules/82/asm/module_82.s12
-rw-r--r--arm9/modules/83/asm/module_83.s198
-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
-rw-r--r--include/nitro/OS_alloc_shared.h40
-rw-r--r--include/nitro/consts_shared.h5
-rw-r--r--include/pokemon.h304
126 files changed, 2217 insertions, 2170 deletions
diff --git a/arm7/asm/OS_alloc.s b/arm7/asm/OS_alloc.s
deleted file mode 100644
index 1c174548..00000000
--- a/arm7/asm/OS_alloc.s
+++ /dev/null
@@ -1,433 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .bss
-
- .global OSiHeapInfo
-OSiHeapInfo: ;0x038078F8
- .space 0x0380791C - 0x038078F8
-
- .section .text
-
- arm_func_start OS_CheckHeap
-OS_CheckHeap: ; 0x037F9D88
- stmdb sp!, {r4, r5, r6, r7, r8, lr}
- mov r8, r0
- mov r7, r1
- mov r6, #0
- mov r5, r6
- mvn r4, #0
- bl OS_DisableInterrupts
- ldr r1, _037F9F34 ; =OSiHeapInfo
- ldr ip, [r1, r8, lsl #2]
- mov r1, r4
- cmp r7, r1
- ldreq r7, [ip]
- ldr r2, [ip, #16]
- cmp r2, #0
- beq _037F9F24
- cmp r7, #0
- blt _037F9F24
- ldr r1, [ip, #4]
- cmp r7, r1
- bge _037F9F24
- mov r1, #12
- mul r1, r7, r1
- add r3, r2, r1
- ldr r2, [r2, r1]
- cmp r2, #0
- blt _037F9F24
- ldr r1, [r3, #8]
- cmp r1, #0
- beq _037F9E70
- ldr r7, [r1]
- cmp r7, #0
- bne _037F9F24
- b _037F9E70
-_037F9E0C:
- ldr r7, [ip, #8]
- cmp r7, r1
- bhi _037F9F24
- ldr r7, [ip, #12]
- cmp r1, r7
- bcs _037F9F24
- ands r7, r1, #31
- bne _037F9F24
- ldr lr, [r1, #4]
- cmp lr, #0
- beq _037F9E44
- ldr r7, [lr]
- cmp r7, r1
- bne _037F9F24
-_037F9E44:
- ldr r7, [r1, #8]
- cmp r7, #64 ; 0x40
- bcc _037F9F24
- ands r1, r7, #31
- bne _037F9F24
- add r6, r6, r7
- cmp r6, #0
- ble _037F9F24
- cmp r6, r2
- bgt _037F9F24
- mov r1, lr
-_037F9E70:
- cmp r1, #0
- bne _037F9E0C
- ldr r1, [r3, #4]
- cmp r1, #0
- beq _037F9F14
- ldr r3, [r1]
- cmp r3, #0
- bne _037F9F24
- b _037F9F14
-_037F9E94:
- ldr r3, [ip, #8]
- cmp r3, r1
- bhi _037F9F24
- ldr r3, [ip, #12]
- cmp r1, r3
- bcs _037F9F24
- ands r3, r1, #31
- bne _037F9F24
- ldr lr, [r1, #4]
- cmp lr, #0
- beq _037F9ECC
- ldr r3, [lr]
- cmp r3, r1
- bne _037F9F24
-_037F9ECC:
- ldr r7, [r1, #8]
- cmp r7, #64 ; 0x40
- bcc _037F9F24
- ands r3, r7, #31
- bne _037F9F24
- cmp lr, #0
- beq _037F9EF4
- add r1, r1, r7
- cmp r1, lr
- bcs _037F9F24
-_037F9EF4:
- add r6, r6, r7
- sub r1, r7, #32
- add r5, r5, r1
- cmp r6, #0
- ble _037F9F24
- cmp r6, r2
- bgt _037F9F24
- mov r1, lr
-_037F9F14:
- cmp r1, #0
- bne _037F9E94
- cmp r6, r2
- moveq r4, r5
-_037F9F24:
- bl OS_RestoreInterrupts
- mov r0, r4
- ldmia sp!, {r4, r5, r6, r7, r8, lr}
- bx lr
-_037F9F34: .word OSiHeapInfo
-
- arm_func_start OS_CreateHeap
-OS_CreateHeap: ; 0x037F9F38
- stmdb sp!, {r4, r5, r6, r7, lr}
- sub sp, sp, #4
- mov r4, r0
- mov r6, r1
- mov r5, r2
- bl OS_DisableInterrupts
- ldr r1, _037F9FDC ; =OSiHeapInfo
- ldr r7, [r1, r4, lsl #2]
- add r1, r6, #31
- bic r6, r1, #31
- bic r5, r5, #31
- mov r4, #0
- ldr lr, [r7, #4]
- mov r1, #12
- b _037F9FC0
-_037F9F74:
- ldr r3, [r7, #16]
- mul r2, r4, r1
- add ip, r3, r2
- ldr r2, [r3, r2]
- cmp r2, #0
- bge _037F9FBC
- sub r1, r5, r6
- str r1, [ip]
- mov r2, #0
- str r2, [r6]
- str r2, [r6, #4]
- ldr r1, [ip]
- str r1, [r6, #8]
- str r6, [ip, #4]
- str r2, [ip, #8]
- bl OS_RestoreInterrupts
- mov r0, r4
- b _037F9FD0
-_037F9FBC:
- add r4, r4, #1
-_037F9FC0:
- cmp r4, lr
- blt _037F9F74
- bl OS_RestoreInterrupts
- mvn r0, #0
-_037F9FD0:
- add sp, sp, #4
- ldmia sp!, {r4, r5, r6, r7, lr}
- bx lr
-_037F9FDC: .word OSiHeapInfo
-
- arm_func_start OS_InitAlloc
-OS_InitAlloc: ; 0x037F9FE0
- stmdb sp!, {r4, r5, r6, r7, r8, lr}
- mov r7, r0
- mov r5, r1
- mov r4, r2
- mov r6, r3
- bl OS_DisableInterrupts
- ldr r1, _037FA084 ; =OSiHeapInfo
- str r5, [r1, r7, lsl #2]
- mov r2, #12
- mul r1, r6, r2
- add r3, r5, #20
- str r3, [r5, #16]
- str r6, [r5, #4]
- mov r8, #0
- mvn lr, #0
- mov ip, r8
- b _037FA044
-_037FA024:
- ldr r6, [r5, #16]
- mul r3, r8, r2
- add r7, r6, r3
- str lr, [r6, r3]
- str ip, [r7, #8]
- ldr r3, [r7, #8]
- str r3, [r7, #4]
- add r8, r8, #1
-_037FA044:
- ldr r3, [r5, #4]
- cmp r8, r3
- blt _037FA024
- mvn r2, #0
- str r2, [r5]
- ldr r2, [r5, #16]
- add r1, r2, r1
- add r1, r1, #31
- bic r1, r1, #31
- str r1, [r5, #8]
- bic r1, r4, #31
- str r1, [r5, #12]
- bl OS_RestoreInterrupts
- ldr r0, [r5, #8]
- ldmia sp!, {r4, r5, r6, r7, r8, lr}
- bx lr
-_037FA084: .word OSiHeapInfo
-
- arm_func_start OS_SetCurrentHeap
-OS_SetCurrentHeap: ; 0x037FA088
- stmdb sp!, {r4, r5, lr}
- sub sp, sp, #4
- mov r4, r0
- mov r5, r1
- bl OS_DisableInterrupts
- ldr r1, _037FA0C0 ; =OSiHeapInfo
- ldr r1, [r1, r4, lsl #2]
- ldr r4, [r1]
- str r5, [r1]
- bl OS_RestoreInterrupts
- mov r0, r4
- add sp, sp, #4
- ldmia sp!, {r4, r5, lr}
- bx lr
-_037FA0C0: .word OSiHeapInfo
-
- arm_func_start OS_FreeToHeap
-OS_FreeToHeap: ; 0x037FA0C4
- stmdb sp!, {r4, r5, r6, r7, lr}
- sub sp, sp, #4
- mov r7, r0
- mov r4, r1
- mov r6, r2
- bl OS_DisableInterrupts
- mov r5, r0
- ldr r0, _037FA134 ; =OSiHeapInfo
- ldr r0, [r0, r7, lsl #2]
- cmp r4, #0
- ldrlt r4, [r0]
- sub r6, r6, #32
- ldr r1, [r0, #16]
- mov r0, #12
- mla r7, r4, r0, r1
- ldr r0, [r7, #8]
- mov r1, r6
- bl DLExtract
- str r0, [r7, #8]
- ldr r0, [r7, #4]
- mov r1, r6
- bl DLInsert
- str r0, [r7, #4]
- mov r0, r5
- bl OS_RestoreInterrupts
- add sp, sp, #4
- ldmia sp!, {r4, r5, r6, r7, lr}
- bx lr
-_037FA134: .word OSiHeapInfo
-
- arm_func_start OS_AllocFromHeap
-OS_AllocFromHeap: ; 0x037FA138
- stmdb sp!, {r4, r5, r6, r7, lr}
- sub sp, sp, #4
- mov r6, r0
- mov r5, r1
- mov r7, r2
- bl OS_DisableInterrupts
- mov r4, r0
- ldr r1, _037FA24C ; =OSiHeapInfo
- ldr r1, [r1, r6, lsl #2]
- cmp r1, #0
- bne _037FA170
- bl OS_RestoreInterrupts
- mov r0, #0
- b _037FA240
-_037FA170:
- cmp r5, #0
- ldrlt r5, [r1]
- ldr r1, [r1, #16]
- mov r0, #12
- mla r6, r5, r0, r1
- add r0, r7, #32
- add r0, r0, #31
- bic r7, r0, #31
- ldr r0, [r6, #4]
- mov r5, r0
- b _037FA1AC
-_037FA19C:
- ldr r1, [r5, #8]
- cmp r7, r1
- ble _037FA1B4
- ldr r5, [r5, #4]
-_037FA1AC:
- cmp r5, #0
- bne _037FA19C
-_037FA1B4:
- cmp r5, #0
- bne _037FA1CC
- mov r0, r4
- bl OS_RestoreInterrupts
- mov r0, #0
- b _037FA240
-_037FA1CC:
- ldr r1, [r5, #8]
- sub r1, r1, r7
- cmp r1, #64 ; 0x40
- bcs _037FA1EC
- mov r1, r5
- bl DLExtract
- str r0, [r6, #4]
- b _037FA224
-_037FA1EC:
- str r7, [r5, #8]
- add r2, r5, r7
- str r1, [r2, #8]
- ldr r0, [r5]
- str r0, [r5, r7]
- ldr r0, [r5, #4]
- str r0, [r2, #4]
- ldr r0, [r2, #4]
- cmp r0, #0
- strne r2, [r0]
- ldr r0, [r2]
- cmp r0, #0
- strne r2, [r0, #4]
- streq r2, [r6, #4]
-_037FA224:
- ldr r0, [r6, #8]
- mov r1, r5
- bl DLAddFront
- str r0, [r6, #8]
- mov r0, r4
- bl OS_RestoreInterrupts
- add r0, r5, #32
-_037FA240:
- add sp, sp, #4
- ldmia sp!, {r4, r5, r6, r7, lr}
- bx lr
-_037FA24C: .word OSiHeapInfo
-
- arm_func_start DLInsert
-DLInsert: ; 0x037FA250
- stmfd sp!, {lr}
- sub sp, sp, #4
- mov ip, r0
- mov lr, #0
- b _037FA274
-_037FA264:
- cmp r1, ip
- bls _037FA27C
- mov lr, ip
- ldr ip, [ip, #4]
-_037FA274:
- cmp ip, #0
- bne _037FA264
-_037FA27C:
- str ip, [r1, #4]
- str lr, [r1]
- cmp ip, #0
- beq _037FA2BC
- str r1, [ip]
- ldr r3, [r1, #8]
- add r2, r1, r3
- cmp r2, ip
- bne _037FA2BC
- ldr r2, [ip, #8]
- add r2, r3, r2
- str r2, [r1, #8]
- ldr ip, [ip, #4]
- str ip, [r1, #4]
- cmp ip, #0
- strne r1, [ip]
-_037FA2BC:
- cmp lr, #0
- beq _037FA2F4
- str r1, [lr, #4]
- ldr r2, [lr, #8]
- add r3, lr, r2
- cmp r3, r1
- bne _037FA2F8
- ldr r1, [r1, #8]
- add r1, r2, r1
- str r1, [lr, #8]
- str ip, [lr, #4]
- cmp ip, #0
- strne lr, [ip]
- b _037FA2F8
-_037FA2F4:
- mov r0, r1
-_037FA2F8:
- add sp, sp, #4
- ldmia sp!, {lr}
- bx lr
-
- arm_func_start DLExtract
-DLExtract: ; 0x037FA304
- ldr r3, [r1, #4]
- cmp r3, #0
- ldrne r2, [r1]
- strne r2, [r3]
- ldr r2, [r1]
- cmp r2, #0
- ldreq r0, [r1, #4]
- ldrne r1, [r1, #4]
- strne r1, [r2, #4]
- bx lr
-
- arm_func_start DLAddFront
-DLAddFront: ; 0x037FA32C
- str r0, [r1, #4]
- mov r2, #0
- str r2, [r1]
- cmp r0, #0
- strne r1, [r0]
- mov r0, r1
- bx lr
diff --git a/arm7/lib/include/OS_alloc.h b/arm7/lib/include/OS_alloc.h
new file mode 100644
index 00000000..bf18da0f
--- /dev/null
+++ b/arm7/lib/include/OS_alloc.h
@@ -0,0 +1,17 @@
+#ifndef POKEDIAMOND_ARM7_OS_ALLOC_H
+#define POKEDIAMOND_ARM7_OS_ALLOC_H
+
+#include "nitro/OS_alloc_shared.h"
+#include "OS_arena.h"
+
+Cell *DLAddFront(Cell* list, Cell* cell);
+Cell *DLExtract(Cell* list, Cell* cell);
+Cell *DLInsert(Cell *original, Cell *inserted);
+void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size);
+void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr);
+OSHeapHandle OS_SetCurrentHeap(OSArenaId id, OSHeapHandle heap);
+void *OS_InitAlloc(OSArenaId id, void *arenaStart, void *arenaEnd, s32 maxHeaps);
+OSHeapHandle OS_CreateHeap(OSArenaId id, void *start, void *end);
+s32 OS_CheckHeap(OSArenaId id, OSHeapHandle heap);
+
+#endif //POKEDIAMOND_ARM7_OS_ALLOC_H
diff --git a/arm7/lib/src/OS_alloc.c b/arm7/lib/src/OS_alloc.c
new file mode 100644
index 00000000..7ea11723
--- /dev/null
+++ b/arm7/lib/src/OS_alloc.c
@@ -0,0 +1,311 @@
+#include "function_target.h"
+#include "consts.h"
+#include "OS_alloc.h"
+#include "OS_system.h"
+
+void* OSiHeapInfo[OS_ARENA_MAX];
+
+ARM_FUNC Cell* DLAddFront(Cell* list, Cell* cell)
+{
+ cell->next = list;
+ cell->prev = NULL;
+
+ if (list != NULL)
+ list->prev = cell;
+ return cell;
+}
+
+ARM_FUNC Cell* DLExtract(Cell* list, Cell* cell)
+{
+ if (cell->next) {
+ cell->next->prev = cell->prev;
+ }
+ if (cell->prev == NULL) {
+ list = cell->next;
+ } else {
+ cell->prev->next = cell->next;
+ }
+ return list;
+}
+
+ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted)
+{
+ Cell *prevCell;
+ Cell *nextCell;
+
+ for (nextCell = original, prevCell = NULL; nextCell; prevCell = nextCell, nextCell = nextCell->next)
+ {
+ if (inserted <= nextCell)
+ break;
+ }
+
+ inserted->next = nextCell;
+ inserted->prev = prevCell;
+
+ if (nextCell != NULL)
+ {
+ nextCell->prev = inserted;
+ Cell * temp = (Cell *)((char *)inserted + inserted->size);
+ if (temp == nextCell)
+ {
+ inserted->size += nextCell->size;
+ nextCell = nextCell->next;
+ inserted->next = nextCell;
+ if (nextCell != NULL)
+ nextCell->prev = inserted;
+ }
+ }
+
+ if (prevCell != NULL)
+ {
+ prevCell->next = inserted;
+ Cell * temp = (Cell *)((char *)prevCell + prevCell->size);
+
+ if (temp != inserted)
+ return original;
+
+ prevCell->size += inserted->size;
+ prevCell->next = nextCell;
+ if (nextCell != NULL)
+ nextCell->prev = prevCell;
+
+ return original;
+ }
+
+ return inserted;
+}
+
+#define HEADERSIZE OSi_ROUND(sizeof(Cell), 32)
+#define MINOBJSIZE (HEADERSIZE+32)
+
+ARM_FUNC void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size)
+{
+ OSHeapInfo* heapInfo;
+ HeapDesc* hd;
+ Cell* cell;
+ Cell* newCell;
+ long leftoverSize;
+
+ OSIntrMode enabled = OS_DisableInterrupts();
+ heapInfo = OSiHeapInfo[id];
+ if (!heapInfo) {
+ (void)OS_RestoreInterrupts(enabled);
+ return NULL;
+ }
+
+ if (heap < 0) {
+ heap = heapInfo->currentHeap;
+ }
+
+ hd = &heapInfo->heapArray[heap];
+
+ size += HEADERSIZE;
+ size = OSi_ROUND(size, 32);
+
+ for (cell = hd->free; cell != NULL; cell = cell->next) {
+ if ((long)size <= cell->size) {
+ break;
+ }
+ }
+
+ if (cell == NULL) {
+ (void)OS_RestoreInterrupts(enabled);
+ return NULL;
+ }
+
+ leftoverSize = cell->size - (long)size;
+ if (leftoverSize < MINOBJSIZE) {
+ hd->free = DLExtract(hd->free, cell);
+ } else {
+ cell->size = (long)size;
+
+ newCell = (Cell *) ((char *)cell + size);
+ newCell->size = leftoverSize;
+
+ newCell->prev = cell->prev;
+ newCell->next = cell->next;
+
+ if (newCell->next != NULL) {
+ newCell->next->prev = newCell;
+ }
+
+ if (newCell->prev != NULL) {
+ newCell->prev->next = newCell;
+ } else {
+ hd->free = newCell;
+ }
+ }
+
+ hd->allocated = DLAddFront(hd->allocated, cell);
+
+ (void)OS_RestoreInterrupts(enabled);
+ return (void *)((char *)cell + HEADERSIZE);
+}
+
+ARM_FUNC void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr)
+{
+ OSHeapInfo *heapInfo;
+ HeapDesc *hd;
+ Cell *cell;
+
+ OSIntrMode enabled = OS_DisableInterrupts();
+ heapInfo = OSiHeapInfo[id];
+
+ if (heap < 0) {
+ heap = heapInfo->currentHeap;
+ }
+
+ cell = (Cell *) ((char *)ptr - HEADERSIZE);
+ hd = &heapInfo->heapArray[heap];
+
+ hd->allocated = DLExtract(hd->allocated, cell);
+ hd->free = DLInsert(hd->free, cell);
+
+ (void)OS_RestoreInterrupts(enabled);
+}
+
+ARM_FUNC OSHeapHandle OS_SetCurrentHeap(OSArenaId id, OSHeapHandle heap)
+{
+ OSIntrMode enabled = OS_DisableInterrupts();
+
+ OSHeapInfo *heapInfo = OSiHeapInfo[id];
+ OSHeapHandle prev = heapInfo->currentHeap;
+ heapInfo->currentHeap = heap;
+
+ (void)OS_RestoreInterrupts(enabled);
+ return prev;
+}
+
+ARM_FUNC void *OS_InitAlloc(OSArenaId id, void *arenaStart, void *arenaEnd, s32 maxHeaps)
+{
+ OSIntrMode enabled = OS_DisableInterrupts();
+
+ OSHeapInfo *heapInfo = arenaStart;
+ OSiHeapInfo[id] = heapInfo;
+
+ u32 arraySize = sizeof(HeapDesc) * maxHeaps;
+ heapInfo->heapArray = (void *)((u32)arenaStart + sizeof(OSHeapInfo));
+ heapInfo->numHeaps = maxHeaps;
+
+ for (OSHeapHandle i = 0; i < heapInfo->numHeaps; i++)
+ {
+ HeapDesc *hd = &heapInfo->heapArray[i];
+
+ hd->size = -1;
+ hd->free = hd->allocated = NULL;
+ }
+
+ heapInfo->currentHeap = -1;
+
+ arenaStart = (void *)((char *)heapInfo->heapArray + arraySize);
+ arenaStart = (void *)OSi_ROUND(arenaStart, 32);
+
+ heapInfo->arenaStart = arenaStart;
+ heapInfo->arenaEnd = (void *)OSi_TRUNC(arenaEnd, 32);
+
+ (void)OS_RestoreInterrupts(enabled);
+ return heapInfo->arenaStart;
+}
+
+ARM_FUNC OSHeapHandle OS_CreateHeap(OSArenaId id, void *start, void *end)
+{
+ OSIntrMode enabled = OS_DisableInterrupts();
+
+ OSHeapInfo *heapInfo = OSiHeapInfo[id];
+
+ start = (void *)OSi_ROUND(start, 32);
+ end = (void *)OSi_TRUNC(end, 32);
+
+ for (OSHeapHandle heap = 0; heap < heapInfo->numHeaps; heap++)
+ {
+ HeapDesc *hd = &heapInfo->heapArray[heap];
+ if (hd->size < 0)
+ {
+ hd->size = (s8 *)end - (s8 *)start;
+
+ Cell *cell = (Cell *)start;
+ cell->prev = NULL;
+ cell->next = NULL;
+ cell->size = hd->size;
+
+ hd->free = cell;
+ hd->allocated = 0;
+
+ (void)OS_RestoreInterrupts(enabled);
+ return heap;
+ }
+ }
+
+ (void)OS_RestoreInterrupts(enabled);
+ return -1;
+}
+
+//wtf nintendo is this shit
+#define OSi_CHECK(exp) \
+ do \
+ { \
+ if (!(exp)) \
+ { \
+ goto exit_OS_CheckHeap; \
+ } \
+ } while (0)
+
+ARM_FUNC s32 OS_CheckHeap(OSArenaId id, OSHeapHandle heap)
+{
+ OSHeapInfo *heapInfo;
+ HeapDesc *hd;
+ Cell *cell;
+ s32 total = 0;
+ s32 free = 0;
+ s32 retValue = -1;
+ OSIntrMode enabled = OS_DisableInterrupts();
+
+ heapInfo = OSiHeapInfo[id];
+
+ if (heap == (OSHeapHandle)-1)
+ {
+ heap = heapInfo->currentHeap;
+ }
+
+ OSi_CHECK(heapInfo->heapArray);
+ OSi_CHECK(0 <= heap && heap < heapInfo->numHeaps);
+
+ hd = &heapInfo->heapArray[heap];
+ OSi_CHECK(0 <= hd->size);
+
+ OSi_CHECK(hd->allocated == NULL || hd->allocated->prev == NULL);
+ for (cell = hd->allocated; cell; cell = cell->next)
+ {
+ OSi_CHECK(OSi_InRange(cell, heapInfo->arenaStart, heapInfo->arenaEnd));
+ OSi_CHECK(OSi_OFFSET(cell, 32) == 0);
+ OSi_CHECK(cell->next == NULL || cell->next->prev == cell);
+ OSi_CHECK(MINOBJSIZE <= cell->size);
+ OSi_CHECK(OSi_OFFSET(cell->size, 32) == 0);
+
+ total += cell->size;
+ OSi_CHECK(0 < total && total <= hd->size);
+ }
+
+ OSi_CHECK(hd->free == NULL || hd->free->prev == NULL);
+ for (cell = hd->free; cell; cell = cell->next)
+ {
+ OSi_CHECK(OSi_InRange(cell, heapInfo->arenaStart, heapInfo->arenaEnd));
+ OSi_CHECK(OSi_OFFSET(cell, 32) == 0);
+ OSi_CHECK(cell->next == NULL || cell->next->prev == cell);
+ OSi_CHECK(MINOBJSIZE <= cell->size);
+ OSi_CHECK(OSi_OFFSET(cell->size, 32) == 0);
+ OSi_CHECK(cell->next == NULL || (s8 *)cell + cell->size < (s8 *)cell->next);
+
+ total += cell->size;
+ free += cell->size - HEADERSIZE;
+
+ OSi_CHECK(0 < total && total <= hd->size);
+ }
+
+ OSi_CHECK(total == hd->size);
+ retValue = free;
+
+exit_OS_CheckHeap:
+ (void)OS_RestoreInterrupts(enabled);
+ return retValue;
+}
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s
index f58ad635..3bfbd197 100644
--- a/arm9/asm/pokemon.s
+++ b/arm9/asm/pokemon.s
@@ -7,23 +7,23 @@
.section .rodata
- .global UNK_020F7ECC
-UNK_020F7ECC: ; 0x020F7ECC
+ .global sItemOdds
+sItemOdds: ; 0x020F7ECC
.short 0x002D, 0x005F
.short 0x0014, 0x0050
- .global UNK_020F7ED4
-UNK_020F7ED4: ; 0x020F7ED4
- .byte 0x05, 0x03, 0x02
- .byte 0x05, 0x03, 0x02
- .byte 0x01, 0x01, 0x00
- .byte 0x03, 0x02, 0x01
- .byte 0x01, 0x01, 0x00
- .byte 0x01, 0x01, 0x01
- .byte 0xFF, 0xFF, 0xFF
- .byte 0xFB, 0xFB, 0xF6
- .byte 0xFB, 0xFB, 0xF6
- .byte 0x03, 0x02, 0x01
+ .global sFriendshipModTable
+sFriendshipModTable: ; 0x020F7ED4
+ .byte 5, 3, 2
+ .byte 5, 3, 2
+ .byte 1, 1, 0
+ .byte 3, 2, 1
+ .byte 1, 1, 0
+ .byte 1, 1, 1
+ .byte -1, -1, -1
+ .byte -5, -5, -10
+ .byte -5, -5, -10
+ .byte 3, 2, 1
.global sLegendaryMonsList
sLegendaryMonsList: ; 0x020F7EF2
@@ -74,8 +74,8 @@ UNK_020F7F16: ; 0x020F7F16
.byte 0, -1, 0, 1, 0
.byte 0, 0, 0, 0, 0
- .global UNK_020F7F93
-UNK_020F7F93: ; 0x020F7F93
+ .global sNatureStatMods
+sNatureStatMods: ; 0x020F7F93
.byte 0, 0, 0, 0, 0
.byte 1, -1, 0, 0, 0
.byte 1, 0, -1, 0, 0
@@ -104,8 +104,8 @@ UNK_020F7F93: ; 0x020F7F93
.section .data
- .global UNK_02105FC8
-UNK_02105FC8: ; 0x02105FC8
+ .global __local_str_poketool_personal_pms_narc
+__local_str_poketool_personal_pms_narc: ; 0x02105FC8
.asciz "poketool/personal/pms.narc"
.section .bss
@@ -128,16 +128,16 @@ ZeroMonData: ; 0x02066978
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r4, #0x0
ldr r2, [r4, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4, pc}
- thumb_func_start FUN_020669A0
-FUN_020669A0: ; 0x020669A0
+ thumb_func_start WipeBoxMonDataAndEncrypt
+WipeBoxMonDataAndEncrypt: ; 0x020669A0
push {r4, lr}
add r4, r0, #0x0
mov r0, #0x0
@@ -148,16 +148,16 @@ FUN_020669A0: ; 0x020669A0
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4, pc}
- thumb_func_start FUN_020669BC
-FUN_020669BC: ; 0x020669BC
+ thumb_func_start SizeOfStructPokemon
+SizeOfStructPokemon: ; 0x020669BC
mov r0, #0xec
bx lr
- thumb_func_start FUN_020669C0
-FUN_020669C0: ; 0x020669C0
+ thumb_func_start AllocMonZeroed
+AllocMonZeroed: ; 0x020669C0
push {r4, lr}
mov r1, #0xec
bl AllocFromHeap
@@ -167,8 +167,8 @@ FUN_020669C0: ; 0x020669C0
pop {r4, pc}
.balign 4
- thumb_func_start FUN_020669D4
-FUN_020669D4: ; 0x020669D4
+ thumb_func_start TryDecryptMon
+TryDecryptMon: ; 0x020669D4
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -196,19 +196,19 @@ _020669EE:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
_02066A1A:
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
- thumb_func_start FUN_02066A20
-FUN_02066A20: ; 0x02066A20
+ thumb_func_start TryEncryptMon
+TryEncryptMon: ; 0x02066A20
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r2, [r5, #0x4]
@@ -231,23 +231,23 @@ FUN_02066A20: ; 0x02066A20
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02066A68:
add r0, r4, #0x0
pop {r3-r5, pc}
- thumb_func_start FUN_02066A6C
-FUN_02066A6C: ; 0x02066A6C
+ thumb_func_start TryDecryptBoxMon
+TryDecryptBoxMon: ; 0x02066A6C
push {r4, lr}
add r2, r0, #0x0
ldrh r1, [r2, #0x4]
@@ -263,14 +263,14 @@ FUN_02066A6C: ; 0x02066A6C
add r0, #0x8
mov r1, #0x80
mov r4, #0x1
- bl DecryptMon
+ bl MonDecryptSegment
_02066A8E:
add r0, r4, #0x0
pop {r4, pc}
.balign 4
- thumb_func_start FUN_02066A94
-FUN_02066A94: ; 0x02066A94
+ thumb_func_start TryEncryptBoxMon
+TryEncryptBoxMon: ; 0x02066A94
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r2, [r5, #0x4]
@@ -288,13 +288,13 @@ FUN_02066A94: ; 0x02066A94
add r0, #0x8
mov r1, #0x80
mov r4, #0x1
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02066AC8:
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -325,23 +325,23 @@ CreateMon: ; 0x02066ACC
add r0, #0x88
mov r1, #0x64
mov r2, #0x0
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FreeToHeap
mov r0, #0x0
@@ -349,7 +349,7 @@ CreateMon: ; 0x02066ACC
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x14
mov r2, #0x18
@@ -357,9 +357,9 @@ CreateMon: ; 0x02066ACC
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x2c
pop {r3-r6}
pop {r3}
@@ -372,9 +372,9 @@ CreateBoxMon: ; 0x02066B64
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r5, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x0]
ldr r0, [sp, #0x30]
cmp r0, #0x0
@@ -389,7 +389,7 @@ _02066B8E:
add r0, r5, #0x0
mov r1, #0x0
add r2, sp, #0x34
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x38]
cmp r0, #0x2
bne _02066BD6
@@ -429,19 +429,19 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x7
add r2, sp, #0x3c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r2, _02066D88 ; =gGameLanguage
add r0, r5, #0x0
mov r1, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x24
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x28]
bl GetMonExpByLevel
@@ -449,7 +449,7 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x24]
mov r1, #0x14
bl GetMonBaseStat
@@ -457,48 +457,48 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9b
add r2, sp, #0x28
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r2, _02066D8C ; =gGameVersion
add r0, r5, #0x0
mov r1, #0x79
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x4
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x2c]
cmp r0, #0x20
bge _02066C94
add r0, r5, #0x0
mov r1, #0x46
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x47
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x48
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x49
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4a
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4b
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D18
_02066C94:
bl rand_LC
@@ -509,7 +509,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x46
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x3e
ldr r1, [sp, #0x8]
lsl r0, r0, #0x4
@@ -519,7 +519,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x47
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x1f
ldr r1, [sp, #0x8]
lsl r0, r0, #0xa
@@ -529,7 +529,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x48
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
bl rand_LC
mov r1, #0x1f
str r0, [sp, #0x8]
@@ -538,7 +538,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x49
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x3e
ldr r1, [sp, #0x8]
lsl r0, r0, #0x4
@@ -548,7 +548,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x4a
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x1f
ldr r1, [sp, #0x8]
lsl r0, r0, #0xa
@@ -558,7 +558,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x4b
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02066D18:
ldr r0, [sp, #0x24]
mov r1, #0x18
@@ -577,32 +577,32 @@ _02066D18:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D5A
_02066D44:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D5A
_02066D50:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02066D5A:
add r0, r5, #0x0
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x6f
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
- bl FUN_020695F4
+ bl InitBoxMonMoveset
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0xc
pop {r4-r7}
pop {r3}
@@ -647,8 +647,8 @@ _02066D9E:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_02066DD4
-FUN_02066DD4: ; 0x02066DD4
+ thumb_func_start CreateMonWithNatureGenderLetter
+CreateMonWithNatureGenderLetter: ; 0x02066DD4
push {r4-r7, lr}
sub sp, #0x24
str r1, [sp, #0x14]
@@ -698,7 +698,7 @@ _02066DF4:
bne _02066DF4
ldr r0, [sp, #0x14]
add r1, r4, #0x0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
cmp r6, r0
bne _02066DF4
ldr r0, [sp, #0x20]
@@ -769,41 +769,41 @@ FUN_02066EA4: ; 0x02066EA4
add r0, r4, #0x0
mov r1, #0xae
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x10
pop {r4}
pop {r3}
add sp, #0x10
bx r3
- thumb_func_start FUN_02066ED8
-FUN_02066ED8: ; 0x02066ED8
+ thumb_func_start UpdateMonLevelAndRecalcStats
+UpdateMonLevelAndRecalcStats: ; 0x02066ED8
push {r3-r5, lr}
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_020687C0
+ bl CalcMonLevelEncrypted
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066F04
+ bl CalcMonStatsMaybeEncrypted
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
pop {r3-r5, pc}
- thumb_func_start FUN_02066F04
-FUN_02066F04: ; 0x02066F04
+ thumb_func_start CalcMonStatsMaybeEncrypted
+CalcMonStatsMaybeEncrypted: ; 0x02066F04
push {r3-r7, lr}
sub sp, #0x58
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0xa0
@@ -897,7 +897,7 @@ FUN_02066F04: ; 0x02066F04
ldr r1, [sp, #0x38]
add r0, r7, #0x0
add r2, r6, #0x0
- bl LoadMonBaseStats_HandleUnownOrArceus
+ bl LoadMonBaseStats_HandleAlternateForme
mov r0, #0x49
lsl r0, r0, #0x2
cmp r7, r0
@@ -926,7 +926,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa3
add r2, sp, #0x50
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x14]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -944,17 +944,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x4c]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x4c]
mov r2, #0x1
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x4c]
add r0, r5, #0x0
mov r1, #0xa4
add r2, sp, #0x4c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -972,17 +972,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x48]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x48]
mov r2, #0x2
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x48]
add r0, r5, #0x0
mov r1, #0xa5
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0xc]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1000,17 +1000,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x44]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x44]
mov r2, #0x3
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x44]
add r0, r5, #0x0
mov r1, #0xa6
add r2, sp, #0x44
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x8]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1028,17 +1028,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x40]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x40]
mov r2, #0x4
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x40]
add r0, r5, #0x0
mov r1, #0xa7
add r2, sp, #0x40
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1056,17 +1056,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x3c]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x3c]
mov r2, #0x5
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x3c]
add r0, r5, #0x0
mov r1, #0xa8
add r2, sp, #0x3c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
ldr r1, [sp, #0x54]
@@ -1103,11 +1103,11 @@ _020671A0:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020671B0:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
add sp, #0x58
pop {r3-r7, pc}
@@ -1125,16 +1125,16 @@ GetMonDataEncrypted: ; 0x020671BC
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02067204
@@ -1160,12 +1160,12 @@ _02067204:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02067230:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1252,8 +1252,8 @@ _020672B6:
bl GetBoxMonData
pop {r3, pc}
- thumb_func_start FUN_020672BC
-FUN_020672BC: ; 0x020672BC
+ thumb_func_start GetBoxMonDataEncrypted
+GetBoxMonDataEncrypted: ; 0x020672BC
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -1266,11 +1266,11 @@ FUN_020672BC: ; 0x020672BC
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _020672F8
@@ -1296,7 +1296,7 @@ _020672F8:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02067318:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1314,24 +1314,28 @@ GetBoxMonData: ; 0x0206731C
add r2, r4, #0x0
bl GetSubstruct
add r5, r0, #0x0
+
ldr r0, [sp, #0x0]
mov r2, #0x1
add r1, r0, #0x0
ldr r1, [r1, #0x0]
bl GetSubstruct
add r6, r0, #0x0
+
ldr r0, [sp, #0x0]
mov r2, #0x2
add r1, r0, #0x0
ldr r1, [r1, #0x0]
bl GetSubstruct
add r7, r0, #0x0
+
ldr r0, [sp, #0x0]
mov r2, #0x3
add r1, r0, #0x0
ldr r1, [r1, #0x0]
bl GetSubstruct
add r1, r0, #0x0
+
ldr r0, [sp, #0x4]
cmp r0, #0xb2
bls _02067366
@@ -1589,7 +1593,7 @@ _0206753C:
_02067540:
ldrh r0, [r5, #0x0]
ldr r1, [r5, #0x8]
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
add r4, r0, #0x0
b _0206781A
_0206754C:
@@ -1808,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]
@@ -2011,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
@@ -2022,8 +2026,8 @@ _02067824: .word SPECIES_MANAPHY_EGG
_02067828: .word 0x0000FFFF
_0206782C: .word SPECIES_ARCEUS
- thumb_func_start SetBoxMonDataEncrypted
-SetBoxMonDataEncrypted: ; 0x02067830
+ thumb_func_start SetMonDataEncrypted
+SetMonDataEncrypted: ; 0x02067830
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -2036,16 +2040,16 @@ SetBoxMonDataEncrypted: ; 0x02067830
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02067886
@@ -2061,7 +2065,7 @@ _02067870:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_02067886:
add r0, r5, #0x0
@@ -2076,17 +2080,17 @@ _02067886:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_020678BC:
pop {r4-r6, pc}
.balign 4
@@ -2185,8 +2189,8 @@ _02067958:
bl SetBoxMonData
pop {r3, pc}
- thumb_func_start FUN_02067960
-FUN_02067960: ; 0x02067960
+ thumb_func_start SetBoxMonDataEncrypted
+SetBoxMonDataEncrypted: ; 0x02067960
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -2199,11 +2203,11 @@ FUN_02067960: ; 0x02067960
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _020679AA
@@ -2219,7 +2223,7 @@ _02067994:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_020679AA:
add r0, r5, #0x0
@@ -2233,13 +2237,13 @@ _020679AA:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_020679D4:
pop {r4-r6, pc}
.balign 4
@@ -2828,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
@@ -2855,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
@@ -3097,8 +3101,8 @@ _0206800C: .word 0xC1FFFFFF
_02068010: .word 0xBFFFFFFF
_02068014: .word 0x7FFFFFFF
- thumb_func_start FUN_02068018
-FUN_02068018: ; 0x02068018
+ thumb_func_start AddMonPartyStatEncrypted
+AddMonPartyStatEncrypted: ; 0x02068018
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -3111,16 +3115,16 @@ FUN_02068018: ; 0x02068018
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02068066
@@ -3132,13 +3136,13 @@ _02068058:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_02068066:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_020680A0
+ bl AddMonPartyStat
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1f
lsr r0, r0, #0x1f
@@ -3147,23 +3151,23 @@ _02068066:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_0206809C:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_020680A0
-FUN_020680A0: ; 0x020680A0
+ thumb_func_start AddMonPartyStat
+AddMonPartyStat: ; 0x020680A0
push {r3, lr}
add r3, r1, #0x0
sub r3, #0x9f
@@ -3784,7 +3788,7 @@ AllocAndLoadMonPersonal: ; 0x0206851C
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_0206A370
+ bl LoadMonPersonal
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -4008,7 +4012,7 @@ GetMonBaseStat: ; 0x02068678
FUN_02068698: ; 0x02068698
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x5
@@ -4037,7 +4041,7 @@ FUN_02068698: ; 0x02068698
add r7, r0, #0x0
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
sub r1, r7, r4
mov r0, #0x64
mul r0, r1
@@ -4047,31 +4051,31 @@ FUN_02068698: ; 0x02068698
lsr r0, r0, #0x18
pop {r3-r7, pc}
- thumb_func_start FUN_020686F8
-FUN_020686F8: ; 0x020686F8
- ldr r3, _020686FC ; =FUN_02068700
+ thumb_func_start CalcMonExpToNextLevelEncrypted
+CalcMonExpToNextLevelEncrypted: ; 0x020686F8
+ ldr r3, _020686FC ; =CalcBoxMonExpToNextLevelEncrypted
bx r3
.balign 4
-_020686FC: .word FUN_02068700
+_020686FC: .word CalcBoxMonExpToNextLevelEncrypted
- thumb_func_start FUN_02068700
-FUN_02068700: ; 0x02068700
+ thumb_func_start CalcBoxMonExpToNextLevelEncrypted
+CalcBoxMonExpToNextLevelEncrypted: ; 0x02068700
push {r4-r6, lr}
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0x0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r0, r0, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r5, #0x0
@@ -4152,41 +4156,41 @@ _0206879E:
add r0, r5, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_020687C0
-FUN_020687C0: ; 0x020687C0
- ldr r3, _020687C4 ; =FUN_020687C8
+ thumb_func_start CalcMonLevelEncrypted
+CalcMonLevelEncrypted: ; 0x020687C0
+ ldr r3, _020687C4 ; =CalcBoxMonLevelEncrypted
bx r3
.balign 4
-_020687C4: .word FUN_020687C8
+_020687C4: .word CalcBoxMonLevelEncrypted
- thumb_func_start FUN_020687C8
-FUN_020687C8: ; 0x020687C8
+ thumb_func_start CalcBoxMonLevelEncrypted
+CalcBoxMonLevelEncrypted: ; 0x020687C8
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
lsl r0, r4, #0x10
lsr r0, r0, #0x10
add r1, r7, #0x0
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
pop {r3-r7, pc}
.balign 4
- thumb_func_start CalcMonLevel
-CalcMonLevel: ; 0x02068800
+ thumb_func_start CalcLevelBySpeciesAndExp
+CalcLevelBySpeciesAndExp: ; 0x02068800
push {r4-r6, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -4195,7 +4199,7 @@ CalcMonLevel: ; 0x02068800
add r6, r0, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- bl CalcMonLevelInternal
+ bl CalcLevelBySpeciesAndExp_PreloadedPersonal
add r4, r0, #0x0
add r0, r6, #0x0
bl FreeMonPersonal
@@ -4203,8 +4207,8 @@ CalcMonLevel: ; 0x02068800
pop {r4-r6, pc}
.balign 4
- thumb_func_start CalcMonLevelInternal
-CalcMonLevelInternal: ; 0x02068824
+ thumb_func_start CalcLevelBySpeciesAndExp_PreloadedPersonal
+CalcLevelBySpeciesAndExp_PreloadedPersonal: ; 0x02068824
push {r4, lr}
mov r1, #0x15
add r4, r2, #0x0
@@ -4228,27 +4232,27 @@ _02068846:
_0206884C: .word UNK_021C5AC0
_02068850: .word UNK_021C5AC0 + 4
- thumb_func_start FUN_02068854
-FUN_02068854: ; 0x02068854
- ldr r3, _02068858 ; =FUN_0206885C
+ thumb_func_start GetMonNatureEncrypted
+GetMonNatureEncrypted: ; 0x02068854
+ ldr r3, _02068858 ; =GetBoxMonNatureEncrypted
bx r3
.balign 4
-_02068858: .word FUN_0206885C
+_02068858: .word GetBoxMonNatureEncrypted
- thumb_func_start FUN_0206885C
-FUN_0206885C: ; 0x0206885C
+ thumb_func_start GetBoxMonNatureEncrypted
+GetBoxMonNatureEncrypted: ; 0x0206885C
push {r4-r6, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r6, #0x0
bl GetNatureFromPersonality
pop {r4-r6, pc}
@@ -4264,8 +4268,8 @@ GetNatureFromPersonality: ; 0x02068884
pop {r3, pc}
.balign 4
- thumb_func_start FUN_02068894
-FUN_02068894: ; 0x02068894
+ thumb_func_start ApplyNatureModToStat
+ApplyNatureModToStat: ; 0x02068894
push {r3, lr}
cmp r2, #0x1
blo _0206889E
@@ -4277,7 +4281,7 @@ _0206889E:
_020688A2:
lsl r3, r0, #0x2
add r3, r0, r3
- ldr r0, _020688E4 ; =UNK_020F7F93
+ ldr r0, _020688E4 ; =sNatureStatMods
sub r2, r2, #0x1
add r0, r0, r3
ldrsb r2, [r2, r0]
@@ -4287,21 +4291,21 @@ _020688A2:
beq _020688CE
cmp r2, #0x1
bne _020688E0
- mov r0, #0x6e
+ mov r0, #110
mul r0, r1
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- mov r1, #0x64
+ mov r1, #100
bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
b _020688E0
_020688CE:
- mov r0, #0x5a
+ mov r0, #90
mul r0, r1
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- mov r1, #0x64
+ mov r1, #100
bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
@@ -4309,10 +4313,10 @@ _020688E0:
add r0, r1, #0x0
pop {r3, pc}
.balign 4
-_020688E4: .word UNK_020F7F93
+_020688E4: .word sNatureStatMods
- thumb_func_start FUN_020688E8
-FUN_020688E8: ; 0x020688E8
+ thumb_func_start MonApplyFriendshipModEncrypted
+MonApplyFriendshipModEncrypted: ; 0x020688E8
push {r3-r7, lr}
sub sp, #0x8
add r6, r1, #0x0
@@ -4369,7 +4373,7 @@ _0206894E:
_02068958:
lsl r0, r6, #0x1
add r1, r6, r0
- ldr r0, _020689DC ; =UNK_020F7ED4
+ ldr r0, _020689DC ; =sFriendshipModTable
add r0, r0, r1
ldrsb r4, [r4, r0]
cmp r4, #0x0
@@ -4429,49 +4433,49 @@ _020689CA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020689D4:
add sp, #0x8
pop {r3-r7, pc}
.balign 4
_020689D8: .word SPECIES_EGG
-_020689DC: .word UNK_020F7ED4
+_020689DC: .word sFriendshipModTable
- thumb_func_start FUN_020689E0
-FUN_020689E0: ; 0x020689E0
- ldr r3, _020689E4 ; =FUN_020689E8
+ thumb_func_start GetMonGenderEncrypted
+GetMonGenderEncrypted: ; 0x020689E0
+ ldr r3, _020689E4 ; =GetBoxMonGenderEncrypted
bx r3
.balign 4
-_020689E4: .word FUN_020689E8
+_020689E4: .word GetBoxMonGenderEncrypted
- thumb_func_start FUN_020689E8
-FUN_020689E8: ; 0x020689E8
+ thumb_func_start GetBoxMonGenderEncrypted
+GetBoxMonGenderEncrypted: ; 0x020689E8
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
mov r1, #0x0
lsr r4, r0, #0x10
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_02068A20
-FUN_02068A20: ; 0x02068A20
+ thumb_func_start GetGenderBySpeciesAndPersonality
+GetGenderBySpeciesAndPersonality: ; 0x02068A20
push {r4-r6, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -4480,7 +4484,7 @@ FUN_02068A20: ; 0x02068A20
add r6, r0, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_02068A44
+ bl GetGenderBySpeciesAndPersonality_PreloadedPersonal
add r4, r0, #0x0
add r0, r6, #0x0
bl FreeMonPersonal
@@ -4488,8 +4492,8 @@ FUN_02068A20: ; 0x02068A20
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_02068A44
-FUN_02068A44: ; 0x02068A44
+ thumb_func_start GetGenderBySpeciesAndPersonality_PreloadedPersonal
+GetGenderBySpeciesAndPersonality_PreloadedPersonal: ; 0x02068A44
push {r4, lr}
mov r1, #0x12
add r4, r2, #0x0
@@ -4539,12 +4543,12 @@ FUN_02068A88: ; 0x02068A88
mov r1, #0x7
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
add r0, r4, #0x0
bl FUN_02068AAC
@@ -4662,16 +4666,16 @@ FUN_02068B70: ; 0x02068B70
str r0, [sp, #0xc]
add r0, r5, #0x0
str r2, [sp, #0x10]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0xad
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
str r0, [sp, #0x14]
add r0, r5, #0x0
bl FUN_02068A88
@@ -4679,7 +4683,7 @@ FUN_02068B70: ; 0x02068B70
add r7, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
ldr r0, _02068BF8 ; =SPECIES_EGG
cmp r4, r0
@@ -4687,7 +4691,7 @@ FUN_02068B70: ; 0x02068B70
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02068BFC ; =0x000001EA
cmp r0, r1
bne _02068BC6
@@ -4700,7 +4704,7 @@ _02068BCA:
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
_02068BD8:
@@ -4714,7 +4718,7 @@ _02068BD8:
bl FUN_02068C00
ldr r1, [sp, #0x18]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x1c
pop {r4-r7, pc}
nop
@@ -5040,16 +5044,16 @@ FUN_02068E1C: ; 0x02068E1C
mov r1, #0xad
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
mov r1, #0x0
str r0, [sp, #0x4]
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
ldr r0, _02068E80 ; =SPECIES_EGG
cmp r4, r0
@@ -5057,7 +5061,7 @@ FUN_02068E1C: ; 0x02068E1C
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02068E84 ; =0x000001EA
cmp r0, r1
bne _02068E5E
@@ -5070,7 +5074,7 @@ _02068E62:
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r3, r0, #0x18
_02068E70:
@@ -5434,7 +5438,7 @@ FUN_020690D4: ; 0x020690D4
push {r3, lr}
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
pop {r3, pc}
@@ -5479,7 +5483,7 @@ FUN_020690E8: ; 0x020690E8
add r0, r4, #0x0
mov r1, #0x8
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069138:
add r0, sp, #0x0
ldrb r1, [r0, #0x0]
@@ -5497,7 +5501,7 @@ _02069146:
add r0, r4, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r5, pc}
@@ -6045,7 +6049,7 @@ ReadFromPersonalPmsNarc: ; 0x02069558
_0206956E:
add r0, sp, #0x4
bl FS_InitFile
- ldr r1, _020695A4 ; =UNK_02105FC8
+ ldr r1, _020695A4 ; =__local_str_poketool_personal_pms_narc
add r0, sp, #0x4
bl FS_OpenFile
add r0, sp, #0x4
@@ -6064,7 +6068,7 @@ _0206956E:
pop {r3-r4, pc}
nop
_020695A0: .word SPECIES_EGG
-_020695A4: .word UNK_02105FC8
+_020695A4: .word __local_str_poketool_personal_pms_narc
thumb_func_start GetEggSpecies
GetEggSpecies: ; 0x020695A8
@@ -6112,8 +6116,8 @@ _020695EC:
nop
_020695F0: .word SPECIES_ROSELIA
- thumb_func_start FUN_020695F4
-FUN_020695F4: ; 0x020695F4
+ thumb_func_start InitBoxMonMoveset
+InitBoxMonMoveset: ; 0x020695F4
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
@@ -6122,27 +6126,27 @@ FUN_020695F4: ; 0x020695F4
bl AllocFromHeap
str r0, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r2, [sp, #0x0]
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_02069F9C
+ bl LoadWotbl_HandleAlternateForme
ldr r0, [sp, #0x0]
ldrh r1, [r0, #0x0]
ldr r0, _02069690 ; =0x0000FFFF
@@ -6181,7 +6185,7 @@ _0206967C:
bl FreeToHeap
ldr r1, [sp, #0x4]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -6205,7 +6209,7 @@ FUN_020696A8: ; 0x020696A8
ldr r1, _02069700 ; =0x0000FFFF
add r6, r0, #0x0
str r1, [sp, #0x4]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r4, #0x0
str r0, [sp, #0x0]
add r7, r4, #0x0
@@ -6214,7 +6218,7 @@ _020696BE:
add r0, r6, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _020696E0
@@ -6238,7 +6242,7 @@ _020696EA:
_020696F0:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x4]
add sp, #0x8
pop {r3-r7, pc}
@@ -6261,7 +6265,7 @@ FUN_02069718: ; 0x02069718
sub sp, #0x20
add r5, r0, #0x0
str r1, [sp, #0x0]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0xc]
add r0, sp, #0x18
mov r4, #0x0
@@ -6273,20 +6277,20 @@ _02069730:
add r0, r5, #0x0
add r1, #0x37
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x4]
mov r2, #0x0
strh r0, [r1, #0x0]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3b
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
strb r0, [r7, #0x0]
add r0, r5, #0x0
add r1, #0x3f
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6, #0x0]
ldr r0, [sp, #0x4]
add r4, r4, #0x1
@@ -6315,17 +6319,17 @@ _0206978A:
ldr r2, [sp, #0x8]
add r0, r5, #0x0
add r1, #0x36
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, r7, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
add r2, r6, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x8]
add r4, r4, #0x1
add r0, r0, #0x2
@@ -6336,7 +6340,7 @@ _0206978A:
blt _0206978A
ldr r1, [sp, #0xc]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x20
pop {r3-r7, pc}
.balign 4
@@ -6357,12 +6361,12 @@ FUN_020697D4: ; 0x020697D4
add r1, #0x36
add r2, sp, #0x14
add r5, r0, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
add r0, sp, #0x10
@@ -6374,7 +6378,7 @@ FUN_020697D4: ; 0x020697D4
add r0, r5, #0x0
add r1, r4, #0x0
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
pop {r3-r5}
pop {r3}
add sp, #0x10
@@ -6414,7 +6418,7 @@ FUN_02069818: ; 0x02069818
ldr r0, [sp, #0x4]
ldr r1, [sp, #0xc]
add r2, r4, #0x0
- bl FUN_02069F9C
+ bl LoadWotbl_HandleAlternateForme
ldr r0, [r5, #0x0]
lsl r0, r0, #0x1
ldrh r2, [r4, r0]
@@ -6495,42 +6499,42 @@ FUN_020698E8: ; 0x020698E8
add r1, #0x36
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x4]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3a
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x2]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x0]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x6]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x3a
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x3]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x1]
add r1, r4, #0x0
@@ -6538,35 +6542,35 @@ FUN_020698E8: ; 0x020698E8
add r0, r5, #0x0
add r1, #0x36
add r2, #0x2
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x3
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r4, #0x3e
add r2, sp, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
add r2, #0x1
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x36
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r6, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x2
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r6, #0x3e
add r0, r5, #0x0
add r1, r6, #0x0
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x8
pop {r4-r6, pc}
.balign 4
@@ -6604,18 +6608,18 @@ _020699B2:
add r0, r5, #0x0
add r1, #0x36
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
cmp r4, #0x3
blo _020699B2
@@ -6629,16 +6633,16 @@ _02069A0A:
add r0, r5, #0x0
mov r1, #0x39
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x0
add r0, r5, #0x0
mov r1, #0x3d
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x41
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3-r7, pc}
thumb_func_start FUN_02069A38
@@ -6696,28 +6700,28 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa2
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa3
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0xa9
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FreeToHeap
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x4
mov r2, #0x18
@@ -6725,9 +6729,9 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0xaa
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x1c
pop {r4-r5, pc}
@@ -6872,7 +6876,7 @@ FUN_02069BD0: ; 0x02069BD0
add r4, r1, #0x0
mov r1, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
bl FUN_02069BE4
pop {r4, pc}
@@ -6904,7 +6908,7 @@ FUN_02069BFC: ; 0x02069BFC
add r0, r4, #0x0
add r1, r7, #0x0
add r2, r6, #0x0
- bl FUN_02069F9C
+ bl LoadWotbl_HandleAlternateForme
ldrh r1, [r6, #0x0]
ldr r0, _02069C44 ; =0x0000FFFF
mov r4, #0x0
@@ -7008,7 +7012,7 @@ _02069CD0:
strb r0, [r1, #0x0]
add r0, r4, #0x0
mov r1, #0x99
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069CF2:
pop {r3-r7, pc}
@@ -7115,7 +7119,7 @@ _02069DB0:
add r0, r7, #0x0
mov r1, #0x99
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069DBA:
ldr r0, [sp, #0x4]
add r6, r6, #0x1
@@ -7179,7 +7183,7 @@ _02069DEC:
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069E40:
ldr r0, [sp, #0x0]
cmp r4, r0
@@ -7197,7 +7201,7 @@ _02069E40:
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
_02069E6A:
add r4, r4, #0x1
@@ -7219,7 +7223,7 @@ FUN_02069E7C: ; 0x02069E7C
push {r3, lr}
mov r1, #0x99
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0xf
tst r0, r1
beq _02069E90
@@ -7241,7 +7245,7 @@ FUN_02069E9C: ; 0x02069E9C
push {r3, lr}
mov r1, #0x99
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
mov r0, #0xf
@@ -7274,17 +7278,17 @@ FUN_02069ECC: ; 0x02069ECC
add r5, r0, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02069F20 ; =SPECIES_ARCEUS
cmp r4, r1
bne _02069F1C
@@ -7302,7 +7306,7 @@ FUN_02069ECC: ; 0x02069ECC
add r0, r5, #0x0
mov r1, #0x70
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02069F1C:
add sp, #0x4
pop {r3-r6, pc}
@@ -7390,8 +7394,8 @@ _02069F96:
bx lr
.balign 4
- thumb_func_start FUN_02069F9C
-FUN_02069F9C: ; 0x02069F9C
+ thumb_func_start LoadWotbl_HandleAlternateForme
+LoadWotbl_HandleAlternateForme: ; 0x02069F9C
push {r4, lr}
add r4, r2, #0x0
bl ResolveMonForme
@@ -7471,13 +7475,13 @@ FUN_0206A014: ; 0x0206A014
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206A050:
add sp, #0xc
pop {r3-r6, pc}
@@ -7495,15 +7499,15 @@ FUN_0206A054: ; 0x0206A054
ldr r2, _0206A090 ; =gGameVersion
add r0, r4, #0x0
mov r1, #0x79
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x9a
add r2, sp, #0x18
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x9d
add r2, sp, #0x20
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4}
pop {r3}
@@ -7560,16 +7564,16 @@ FUN_0206A094: ; 0x0206A094
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A104:
- ldr r0, _0206A134 ; =UNK_020F7ECC
+ ldr r0, _0206A134 ; =sItemOdds
lsl r1, r7, #0x2
ldrh r0, [r0, r1]
cmp r4, r0
blo _0206A12E
- ldr r0, _0206A138 ; =UNK_020F7ECC + 2
+ ldr r0, _0206A138 ; =sItemOdds + 2
ldrh r0, [r0, r1]
cmp r4, r0
add r2, sp, #0x4
@@ -7577,19 +7581,19 @@ _0206A104:
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A126:
add r0, r5, #0x0
mov r1, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206A12E:
add sp, #0x8
pop {r3-r7, pc}
nop
-_0206A134: .word UNK_020F7ECC
-_0206A138: .word UNK_020F7ECC + 2
+_0206A134: .word sItemOdds
+_0206A138: .word sItemOdds + 2
thumb_func_start FUN_0206A13C
FUN_0206A13C: ; 0x0206A13C
@@ -7605,13 +7609,13 @@ FUN_0206A144: ; 0x0206A144
mov r1, #0xad
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
add r0, r4, #0x0
add r2, r6, #0x0
@@ -7682,17 +7686,17 @@ FUN_0206A1CC: ; 0x0206A1CC
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x18
@@ -7710,23 +7714,23 @@ FUN_0206A1CC: ; 0x0206A1CC
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _0206A230
_0206A21A:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _0206A230
_0206A226:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0206A230:
add r0, r5, #0x0
add r1, r7, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
@@ -7737,7 +7741,7 @@ FUN_0206A23C: ; 0x0206A23C
add r5, r0, #0x0
mov r0, #0x0
str r1, [sp, #0x0]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x4]
ldr r1, [sp, #0x4]
add r0, r5, #0x0
@@ -7787,17 +7791,17 @@ FUN_0206A23C: ; 0x0206A23C
ldrh r2, [r2, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
ldr r0, [sp, #0x0]
str r0, [r5, #0x0]
ldr r2, [sp, #0xc]
@@ -7854,25 +7858,25 @@ _0206A32E:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
ldr r0, [sp, #0x4]
bl FreeToHeap
add sp, #0x1c
pop {r4-r7, pc}
- thumb_func_start FUN_0206A370
-FUN_0206A370: ; 0x0206A370
+ thumb_func_start LoadMonPersonal
+LoadMonPersonal: ; 0x0206A370
ldr r3, _0206A37C ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
@@ -7881,8 +7885,8 @@ FUN_0206A370: ; 0x0206A370
nop
_0206A37C: .word ReadWholeNarcMemberByIdPair
- thumb_func_start LoadMonBaseStats_HandleUnownOrArceus
-LoadMonBaseStats_HandleUnownOrArceus: ; 0x0206A380
+ thumb_func_start LoadMonBaseStats_HandleAlternateForme
+LoadMonBaseStats_HandleAlternateForme: ; 0x0206A380
push {r4, lr}
add r4, r2, #0x0
bl ResolveMonForme
@@ -7902,8 +7906,8 @@ LoadMonEvolutionTable: ; 0x0206A394
nop
_0206A3A0: .word ReadWholeNarcMemberByIdPair
- thumb_func_start EncryptMon
-EncryptMon: ; 0x0206A3A4
+ thumb_func_start MonEncryptSegment
+MonEncryptSegment: ; 0x0206A3A4
push {r0-r3}
push {r3-r7, lr}
add r5, r0, #0x0
@@ -7928,12 +7932,12 @@ _0206A3C6:
bx r3
.balign 4
- thumb_func_start DecryptMon
-DecryptMon: ; 0x0206A3D0
- ldr r3, _0206A3D4 ; =EncryptMon
+ thumb_func_start MonDecryptSegment
+MonDecryptSegment: ; 0x0206A3D0
+ ldr r3, _0206A3D4 ; =MonEncryptSegment
bx r3
.balign 4
-_0206A3D4: .word EncryptMon
+_0206A3D4: .word MonEncryptSegment
thumb_func_start MonEncryptionLCRNG
MonEncryptionLCRNG: ; 0x0206A3D8
@@ -7952,8 +7956,8 @@ MonEncryptionLCRNG: ; 0x0206A3D8
_0206A3F0: .word 0x41C64E6D
_0206A3F4: .word 0x00006073
- thumb_func_start FUN_0206A3F8
-FUN_0206A3F8: ; 0x0206A3F8
+ thumb_func_start CalcMonChecksum
+CalcMonChecksum: ; 0x0206A3F8
push {r3-r4}
mov r3, #0x0
add r2, r3, #0x0
@@ -8881,7 +8885,7 @@ FUN_0206A9AC: ; 0x0206A9AC
add r0, r5, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x4]
add r0, r4, #0x0
bl FUN_020239CC
@@ -8889,7 +8893,7 @@ FUN_0206A9AC: ; 0x0206A9AC
add r0, r5, #0x0
mov r1, #0x9c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0xc]
add r0, r4, #0x0
add r1, r6, #0x0
@@ -8903,7 +8907,7 @@ FUN_0206A9AC: ; 0x0206A9AC
mov r1, #0x90
add r2, r6, #0x0
mov r4, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x0]
ldr r0, [sp, #0x4]
cmp r1, r0
@@ -8995,12 +8999,12 @@ FUN_0206AA84: ; 0x0206AA84
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x0
add r0, r4, #0x0
mov r1, #0xaa
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x1c
pop {r3-r4, pc}
@@ -9009,7 +9013,7 @@ FUN_0206AAB4: ; 0x0206AAB4
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r4, #0x0
str r0, [sp, #0x0]
add r7, r4, #0x0
@@ -9019,27 +9023,27 @@ _0206AAC6:
add r0, r5, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206AAF0
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x42
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
strb r0, [r6, #0x0]
add r0, r5, #0x0
add r1, #0x3a
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0206AAF0:
add r4, r4, #0x1
cmp r4, #0x4
blt _0206AAC6
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index f3f565d9..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
@@ -10474,7 +10474,7 @@ FUN_0203ED2C: ; 0x0203ED2C
bl FUN_02024DA0
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x0
@@ -10727,9 +10727,9 @@ _0203EF18:
add r0, r4, #0x0
mov r1, #0x70
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add r0, r7, #0x0
add r1, r4, #0x0
bl FUN_02024AF0
@@ -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_12.s b/arm9/asm/scrcmd_12.s
index 308f2afa..43e29bb0 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -391,12 +391,12 @@ _02042FE8:
add r0, r4, #0x0
bl FUN_0206A23C
add r0, r4, #0x0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
str r0, [sp, #0x30]
add r0, r4, #0x0
mov r1, #0x6f
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x4b
mov r2, #0x0
@@ -445,7 +445,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x46
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@@ -454,7 +454,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x47
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@@ -463,7 +463,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x48
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
bl rand_LC
add r6, r0, #0x0
mov r0, #0x1f
@@ -472,7 +472,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x49
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@@ -481,7 +481,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4a
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@@ -490,7 +490,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4b
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020430DA:
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
@@ -621,7 +621,7 @@ _020431D4:
bl FUN_020239CC
str r0, [sp, #0x28]
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0x0
add r0, r4, #0x0
add r1, r7, #0x0
@@ -629,15 +629,15 @@ _020431D4:
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x7
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x9c
add r2, sp, #0x28
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
add r4, r7, #0x0
bl FUN_02021A20
@@ -653,7 +653,7 @@ _0204322C:
mov r2, #0x4
bl FUN_0208089C
add r0, r4, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s
index 276ad62e..46e1fbda 100644
--- a/arm9/asm/scrcmd_13.s
+++ b/arm9/asm/scrcmd_13.s
@@ -53,7 +53,7 @@ FUN_020438D0: ; 0x020438D0
bl FUN_02022528
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -95,7 +95,7 @@ FUN_02043918: ; 0x02043918
bl FUN_02022510
str r0, [sp, #0x8]
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r0, #0x80
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 13d8bece..f52aaf69 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -193,7 +193,7 @@ FUN_02044414: ; 0x02044414
cmp r0, #0x6
bhs _02044494
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x1
@@ -609,7 +609,7 @@ _020447D2:
pop {r4-r6, pc}
_020447F2:
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -659,7 +659,7 @@ _02044848:
cmp r0, #0x0
bne _02044874
add r0, r4, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x0]
cmp r1, r0
bne _02044874
@@ -804,7 +804,7 @@ _02044994:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -853,7 +853,7 @@ _020449FA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -1484,7 +1484,7 @@ FUN_02044F20: ; 0x02044F20
strh r2, [r1, #0x0]
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
pop {r3-r5, pc}
@@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170
add r1, r0, #0x0
add r0, r5, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
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_5.s b/arm9/asm/scrcmd_5.s
index b449fd86..bb367973 100644
--- a/arm9/asm/scrcmd_5.s
+++ b/arm9/asm/scrcmd_5.s
@@ -132,19 +132,19 @@ _02041290:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _020412E0
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _020412E0
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
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 351b8eab..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,12 +280,12 @@ 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
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
ldr r2, [r5, #0xc]
add r0, r4, #0x0
@@ -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
@@ -309,7 +309,7 @@ FUN_0200ACA4: ; 0x0200ACA4
add r0, r2, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -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
@@ -350,7 +350,7 @@ FUN_0200ACF8: ; 0x0200ACF8
add r4, r1, #0x0
ldr r2, [r5, #0xc]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -367,7 +367,7 @@ FUN_0200AD18: ; 0x0200AD18
add r4, r1, #0x0
ldr r2, [r5, #0xc]
mov r1, #0x90
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -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_02023C40.s b/arm9/asm/unk_02023C40.s
index 04275173..30aa59a0 100644
--- a/arm9/asm/unk_02023C40.s
+++ b/arm9/asm/unk_02023C40.s
@@ -26,10 +26,10 @@ FUN_02023C48: ; 0x02023C48
lsl r2, r2, #0x4
bl memset
add r0, r4, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0x0
add r0, #0xec
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
mov r0, #0x76
mov r1, #0x0
lsl r0, r0, #0x2
@@ -120,13 +120,13 @@ FUN_02023CC8: ; 0x02023CC8
add r5, r0, #0x0
mov r1, #0xc
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r5, #0xec
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xc
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r4, r0
beq _02023CEA
mov r0, #0x1
@@ -187,7 +187,7 @@ _02023D38: .word 0x0000FFFF
FUN_02023D3C: ; 0x02023D3C
push {r4, lr}
add r4, r0, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0x0
mov r1, #0x0
add r0, #0xe8
@@ -1926,7 +1926,7 @@ FUN_0202498C: ; 0x0202498C
bl GetMonDataEncrypted
add r7, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
add r6, r0, #0x0
ldr r1, [r5, #0x0]
ldr r0, _02024AE4 ; =0xBEEFCAFE
@@ -2113,7 +2113,7 @@ FUN_02024AF0: ; 0x02024AF0
bl GetMonDataEncrypted
str r0, [sp, #0x4]
ldr r0, [sp, #0x0]
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
add r7, r0, #0x0
ldr r1, [r4, #0x0]
ldr r0, _02024C78 ; =0xBEEFCAFE
diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s
index dd0001ea..98d65c78 100644
--- a/arm9/asm/unk_02026CD0.s
+++ b/arm9/asm/unk_02026CD0.s
@@ -2125,12 +2125,12 @@ _02027B9C:
add r0, r4, #0x0
mov r1, #0x74
add r2, #0x12
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, #0x3b
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x10
pop {r3-r5, pc}
nop
@@ -2300,12 +2300,12 @@ FUN_02027CB8: ; 0x02027CB8
add r0, r4, #0x0
mov r1, #0x74
add r2, #0xa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, #0x33
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x10
pop {r3-r5, pc}
.balign 4
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_0202B034.s b/arm9/asm/unk_0202B034.s
index 88a0df53..a72a3829 100644
--- a/arm9/asm/unk_0202B034.s
+++ b/arm9/asm/unk_0202B034.s
@@ -79,7 +79,7 @@ _0202B0BA:
add r1, r7, #0x0
bl FUN_0206B9B0
add r4, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0xc]
add r0, r4, #0x0
mov r1, #0x4c
@@ -162,7 +162,7 @@ _0202B17C:
_0202B17E:
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
ldr r0, [sp, #0x10]
add r7, r7, #0x1
cmp r7, r0
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_020377F0.s b/arm9/asm/unk_020377F0.s
index 5c30449f..1b513296 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1910,7 +1910,7 @@ _02038590:
ldr r2, [r4, #0xc]
mov r1, #0x75
add r2, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3-r5, pc}
_020385A8:
ldr r0, [r5, #0xc]
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 073183fe..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
@@ -250,7 +250,7 @@ FUN_02047814: ; 0x02047814
add r3, r6, #0x0
bl FUN_0206ED38
add r0, r6, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_020462AC
@@ -646,7 +646,7 @@ FUN_02047BC0: ; 0x02047BC0
mov r2, #0x0
bl FUN_02047A44
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [sp, #0x14]
bl FUN_0206B9AC
@@ -682,9 +682,9 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
_02047C82:
add r0, r6, #0x0
add r1, r5, #0x0
@@ -844,7 +844,7 @@ _02047DC2:
b _02047E14
_02047DD8:
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x8]
ldr r0, [r5, #0x4]
add r1, r4, #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_0204A01C.s b/arm9/asm/unk_0204A01C.s
index f9bf1b3c..83324f37 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -43,7 +43,7 @@ FUN_0204A048: ; 0x0204A048
bl FUN_0206BB1C
str r0, [sp, #0x18]
add r0, r5, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x0
@@ -70,7 +70,7 @@ FUN_0204A048: ; 0x0204A048
add r2, sp, #0x1c
str r0, [sp, #0x1c]
add r0, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x18]
add r1, r4, #0x0
bl FUN_0206B900
@@ -100,7 +100,7 @@ FUN_0204A0C8: ; 0x0204A0C8
bl FUN_0206BB1C
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
ldr r0, [sp, #0x20]
@@ -320,7 +320,7 @@ _0204A272:
add r0, r4, #0x0
mov r1, #0x19
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0204A292:
add r5, r5, #0x1
cmp r5, r6
@@ -370,7 +370,7 @@ _0204A2EA:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0xc]
cmp r0, #0x1
bne _0204A306
@@ -378,7 +378,7 @@ _0204A2EA:
add r0, r5, #0x0
mov r1, #0x7
add r6, r6, #0x1
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0204A306:
add r7, r7, #0x1
_0204A308:
@@ -426,7 +426,7 @@ FUN_0204A32C: ; 0x0204A32C
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x4
mov r0, #0x1
pop {r3-r4, pc}
diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s
index 5889e176..2d779ce3 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -180,7 +180,7 @@ FUN_0204BB20: ; 0x0204BB20
bl FUN_02022528
str r0, [sp, #0x4]
mov r0, #0x4
- bl FUN_020669C0
+ bl AllocMonZeroed
ldr r5, [sp, #0x0]
add r4, r0, #0x0
mov r6, #0x0
@@ -473,7 +473,7 @@ FUN_0204BD40: ; 0x0204BD40
add r5, r0, #0x0
mov r0, #0x20
add r6, r1, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02022528
diff --git a/arm9/asm/unk_0204BE14.s b/arm9/asm/unk_0204BE14.s
index 794977f1..afb3bc59 100644
--- a/arm9/asm/unk_0204BE14.s
+++ b/arm9/asm/unk_0204BE14.s
@@ -497,7 +497,7 @@ _0204C138:
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r5, r4
add r1, #0xb6
strh r0, [r1, #0x0]
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_020603B0.s b/arm9/asm/unk_020603B0.s
index b644f6b3..53b84d9a 100644
--- a/arm9/asm/unk_020603B0.s
+++ b/arm9/asm/unk_020603B0.s
@@ -215,7 +215,7 @@ _020604D0:
bl FUN_020238F4
str r0, [sp, #0x18]
mov r0, #0x4
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x1c]
bl ZeroMonData
ldr r0, [sp, #0x18]
diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s
index 6a271d62..013e445c 100644
--- a/arm9/asm/unk_020606B0.s
+++ b/arm9/asm/unk_020606B0.s
@@ -140,10 +140,10 @@ FUN_02060790: ; 0x02060790
str r5, [r4, #0x0]
ldr r0, [sp, #0x0]
str r6, [r4, #0x8]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #0x24]
ldr r0, [sp, #0x0]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #0x28]
ldr r1, _020607D0 ; =FUN_020606D0
add r0, r7, #0x0
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index f655ecb9..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
@@ -479,7 +479,7 @@ FUN_02060F3C: ; 0x02060F3C
mov r0, #0x0
strb r0, [r4, #0x1f]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
strb r0, [r4, #0x1e]
add r0, r4, #0x6
str r0, [sp, #0x0]
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 456b97f6..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
@@ -340,7 +340,7 @@ FUN_0206AE0C: ; 0x0206AE0C
bl AllocFromHeap
str r0, [sp, #0x4c]
add r0, r5, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x40]
add r0, r4, r6
ldr r0, [r0, #0x18]
@@ -622,7 +622,7 @@ _0206B030:
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r7, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x34]
ldr r1, [sp, #0x40]
ldr r0, [r0, #0x4]
@@ -709,7 +709,7 @@ _0206B0DA:
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r2, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r7, [sp, #0x3c]
mov r6, #0x0
_0206B120:
diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s
index 2dd1244b..b6ec1416 100644
--- a/arm9/asm/unk_0206B16C.s
+++ b/arm9/asm/unk_0206B16C.s
@@ -28,7 +28,7 @@ _0206B188:
add r5, r6, #0x0
_0206B18C:
add r0, r5, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r4, r4, #0x1
add r5, #0x88
cmp r4, #0x1e
@@ -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
@@ -149,7 +149,7 @@ _0206B270:
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B2A0
mov r0, #0x88
@@ -241,7 +241,7 @@ _0206B308:
mov r0, #0x88
mul r0, r2
add r0, r1, r0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
bl FUN_02022830
pop {r3, pc}
_0206B32A:
@@ -274,7 +274,7 @@ _0206B350:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B364
add sp, #0x8
@@ -327,7 +327,7 @@ _0206B3A2:
add r0, r1, r0
mov r1, #0xab
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B3C6
ldr r0, [sp, #0x0]
@@ -371,7 +371,7 @@ _0206B3F6:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B406
add r6, r6, #0x1
@@ -521,7 +521,7 @@ _0206B504:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B514
add r4, r4, #0x1
@@ -560,13 +560,13 @@ _0206B548:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B566
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B566
add r4, r4, #0x1
@@ -635,7 +635,7 @@ _0206B5C4:
add r0, r1, r0
ldr r2, [sp, #0x18]
add r1, r7, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
bl FUN_02022830
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/unk_0206B688.s b/arm9/asm/unk_0206B688.s
index 77aac714..2e4a392b 100644
--- a/arm9/asm/unk_0206B688.s
+++ b/arm9/asm/unk_0206B688.s
@@ -46,17 +46,17 @@ UNK_020F8074: ; 0x020F8074
FUN_0206B688: ; 0x0206B688
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
bl FUN_0206B754
@@ -67,7 +67,7 @@ FUN_0206B688: ; 0x0206B688
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r7, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r4, #0x0
pop {r3-r7, pc}
@@ -158,7 +158,7 @@ FUN_0206B754: ; 0x0206B754
mov r1, #0xad
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, _0206B7B8 ; =0x0000019D
cmp r0, r2
bhi _0206B784
@@ -201,7 +201,7 @@ _0206B7A4:
add r0, r4, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r4, pc}
@@ -289,7 +289,7 @@ _0206B838: .word UNK_020F8074
FUN_0206B83C: ; 0x0206B83C
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_0206B754
@@ -297,16 +297,16 @@ FUN_0206B83C: ; 0x0206B83C
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r2, [sp, #0x0]
add r0, r7, #0x0
add r1, r6, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 31ad48cb..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]
@@ -1040,11 +1040,11 @@ _0206CF7E:
ldr r0, [r4, #0x28]
mov r1, #0x5
add r2, #0x62
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4, #0x28]
bl FUN_0206A1C4
ldr r0, [r4, #0x28]
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
ldr r0, [r4, #0x28]
bl FUN_020690E4
add r2, r0, #0x0
@@ -1117,7 +1117,7 @@ _0206CFFA:
ldr r0, [r4, #0x28]
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206D05E:
add r0, r4, #0x0
add r0, #0x64
@@ -1736,7 +1736,7 @@ _0206D560:
ldr r0, [r4, #0x28]
add r2, #0x66
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r2, r4, #0x0
add r1, #0x6c
@@ -2092,7 +2092,7 @@ _0206D86C:
b _0206D9AE
_0206D86E:
ldr r0, [r4, #0x5c]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@@ -2103,30 +2103,30 @@ _0206D86E:
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x4
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0xb
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r1, #0x19
str r1, [sp, #0x4]
add r6, sp, #0x0
_0206D8BA:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2138,7 +2138,7 @@ _0206D8BA:
_0206D8D2:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2150,7 +2150,7 @@ _0206D8D2:
_0206D8EA:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2159,28 +2159,28 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4d
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4, #0x5c]
bl FUN_020256BC
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x8
mov r2, #0x18
@@ -2188,11 +2188,11 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_0206A1C4
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
ldr r0, [r4, #0x24]
add r1, r5, #0x0
bl FUN_0206B900
@@ -2225,7 +2225,7 @@ _0206D9A0:
ldr r0, [r4, #0x28]
mov r1, #0x6
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206D9AE:
add sp, #0x20
pop {r4-r6, pc}
@@ -2572,7 +2572,7 @@ FUN_0206DC80: ; 0x0206DC80
bl FUN_020073A0
str r0, [r4, #0x1c]
ldr r0, [r4, #0x5c]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@@ -2581,9 +2581,9 @@ FUN_0206DC80: ; 0x0206DC80
add r0, r5, #0x0
mov r1, #0x5
add r2, #0x62
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add r0, sp, #0x10
add r1, r5, #0x0
mov r2, #0x2
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 7f255340..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]
@@ -1775,7 +1775,7 @@ _0207018E:
ldr r0, _020701FC ; =0x0000070E
add r6, r5, r0
add r0, r7, #0x0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
lsl r0, r0, #0x1e
ldrh r2, [r6, r4]
ldr r1, _02070204 ; =0xFFFF9FFF
@@ -5249,7 +5249,7 @@ _02071D14:
add r2, sp, #0x0
str r1, [sp, #0x0]
mov r1, #0xa2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r3-r7, pc}
_02071D30:
@@ -5670,7 +5670,7 @@ FUN_02072080: ; 0x02072080
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _020720D8 ; =0x00000B25
@@ -5713,7 +5713,7 @@ FUN_020720E0: ; 0x020720E0
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02072138 ; =0x00000B25
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index ef8b86b1..9afd1e10 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -244,7 +244,7 @@ _02073F66:
add r6, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FUN_02069EC4
ldr r2, _02074058 ; =0x0000069C
@@ -631,7 +631,7 @@ FUN_020742A8: ; 0x020742A8
add r5, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02074330 ; =0x00000B25
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index a69191eb..7186cf11 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -3080,14 +3080,14 @@ FUN_02076F2C: ; 0x02076F2C
str r0, [sp, #0x0]
add r0, r4, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, r6, #0x0
str r0, [sp, #0x0]
add r0, r4, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02076FAC ; =0x000005A4
mov r1, #0x0
ldr r0, [r5, r0]
@@ -3098,7 +3098,7 @@ FUN_02076F2C: ; 0x02076F2C
add r0, r4, #0x0
add r1, r6, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02076FAC ; =0x000005A4
ldr r1, [r5, r0]
ldrh r0, [r1, #0x24]
@@ -3121,7 +3121,7 @@ _02076F98:
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x4
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_02076FA8:
add sp, #0x4
pop {r3-r6, pc}
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 9cb86502..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]
@@ -1071,7 +1071,7 @@ FUN_02077894: ; 0x02077894
cmp r0, #0x1
bne _020778DE
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@@ -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]
@@ -1642,7 +1642,7 @@ _02077D88:
cmp r0, #0x1
bne _02077DCE
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@@ -1822,7 +1822,7 @@ _02077F04:
beq _02077F50
_02077F1A:
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0x0
str r3, [sp, #0x0]
str r3, [sp, #0x4]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 3175f5f9..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]
@@ -1532,7 +1532,7 @@ _0207A896:
bl FUN_0207B628
add r6, r0, #0x0
mov r0, #0x13
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@@ -1821,7 +1821,7 @@ FUN_0207AAE0: ; 0x0207AAE0
mov r0, #0x13
add r6, r1, #0x0
add r7, r2, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@@ -1843,7 +1843,7 @@ FUN_0207AB0C: ; 0x0207AB0C
add r7, r0, #0x0
add r0, r6, #0x0
add r5, r2, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x4]
add r0, r6, #0x0
mov r1, #0x5
@@ -1961,7 +1961,7 @@ _0207AC16:
strb r0, [r5, #0x12]
_0207AC1E:
add r0, r6, #0x0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldrb r1, [r5, #0x13]
mov r2, #0x3
bic r1, r2
@@ -2071,7 +2071,7 @@ _0207ACB2:
add r1, #0x32
strb r0, [r1, #0x0]
add r0, r6, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r1, r5, #0x0
add r1, #0x33
strb r0, [r1, #0x0]
@@ -2308,7 +2308,7 @@ _0207AF04:
blo _0207AECC
ldr r1, [sp, #0x4]
add r0, r6, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -3227,13 +3227,13 @@ _0207B5EC:
add r0, r6, r7
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0207B5D0
add r0, r6, r7
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0207B622
add r0, r5, #0x0
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 839b275b..26580e37 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -1536,7 +1536,7 @@ FUN_0207E190: ; 0x0207E190
cmp r1, #0x2
bne _0207E1E8
mov r0, #0x13
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@@ -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 1baeda16..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}
@@ -472,7 +472,7 @@ FUN_020800E0: ; 0x020800E0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r4, r0, #0x0
cmp r4, #0x18
bgt _02080106
@@ -1484,7 +1484,7 @@ _020808E4:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0208090C
add r0, r4, #0x0
@@ -1514,7 +1514,7 @@ _0208091E:
_0208092A:
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _02080958
add r0, r4, #0x0
@@ -1575,7 +1575,7 @@ _020809B0:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _020809E2
add r0, r4, #0x0
@@ -1601,7 +1601,7 @@ _020809F6:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _02080A1E
add r0, r4, #0x0
@@ -1629,7 +1629,7 @@ _02080A30:
_02080A38:
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _02080AE0
mov r0, #0x1
@@ -1657,39 +1657,39 @@ _02080A66:
add r0, r4, #0x0
mov r1, #0x98
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x97
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x94
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x95
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x96
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02080ACC:
add r0, r4, #0x0
add r1, r5, #0x0
@@ -1723,15 +1723,15 @@ FUN_02080AE4: ; 0x02080AE4
add r0, r5, #0x0
mov r1, #0x7
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9c
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x90
add r2, r4, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
bl FUN_02021A20
add sp, #0x8
@@ -1751,19 +1751,19 @@ FUN_02080B30: ; 0x02080B30
bne _02080B76
add r0, r5, #0x0
mov r1, #0x97
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x92
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x93
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x10
pop {r3-r5}
pop {r3}
@@ -1772,19 +1772,19 @@ FUN_02080B30: ; 0x02080B30
_02080B76:
add r0, r5, #0x0
mov r1, #0x98
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x94
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x95
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x96
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x10
pop {r3-r5}
pop {r3}
@@ -1803,36 +1803,36 @@ FUN_02080BA8: ; 0x02080BA8
add r2, sp, #0x0
bne _02080BE0
mov r1, #0x97
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
_02080BE0:
mov r1, #0x98
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x94
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x95
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x96
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
@@ -1843,12 +1843,12 @@ FUN_02080C08: ; 0x02080C08
add r4, r0, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x9b
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
.balign 4
@@ -1860,5 +1860,5 @@ FUN_02080C28: ; 0x02080C28
str r1, [sp, #0x0]
mov r1, #0x6e
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
pop {r3, pc}
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 1cce712f..f40af68a 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -907,7 +907,7 @@ _020812B6:
add r5, r4, #0x0
_020812F2:
mov r0, #0x14
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r7, #0x1
stmia r5!, {r0}
cmp r7, #0x4
@@ -3599,7 +3599,7 @@ _020826DE:
add r1, r6, #0x0
ldr r0, [r4, r0]
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020826EA:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
@@ -3748,7 +3748,7 @@ _02082820:
lsl r2, r2, #0x10
mov r1, #0x9
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0208283A:
add sp, #0xc
pop {r4-r7, pc}
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 591b7226..fb6f03c8 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -789,7 +789,7 @@ _02082D9A:
add r0, r6, #0x0
add r1, #0x36
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
add r5, r5, #0x2
cmp r4, #0x4
@@ -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
@@ -810,17 +810,17 @@ _02082D9A:
add r0, r6, #0x0
mov r1, #0x76
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #0x14]
add r0, r6, #0x0
mov r1, #0x90
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02021A20
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
@@ -838,30 +838,30 @@ _02082D9A:
strb r1, [r0, #0x0]
add r0, r6, #0x0
mov r1, #0x13
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x14
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x15
add r2, #0x3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x16
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x17
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x18
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x20
pop {r3-r7, pc}
nop
diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s
index 7f5a041a..ec1b74b2 100644
--- a/arm9/asm/unk_020834D0.s
+++ b/arm9/asm/unk_020834D0.s
@@ -284,7 +284,7 @@ FUN_02083694: ; 0x02083694
push {r3-r5, lr}
add r5, r2, #0x0
add r4, r3, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r2, r0, #0x0
ldrb r1, [r5, r2]
add r0, r5, #0x0
@@ -304,7 +304,7 @@ FUN_020836BC: ; 0x020836BC
push {r3-r7, lr}
add r6, r1, #0x0
add r7, r2, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r4, r0, #0x0
mov r0, #0x14
add r1, r4, #0x1
@@ -337,7 +337,7 @@ FUN_020836FC: ; 0x020836FC
sub sp, #0x8
str r2, [sp, #0x0]
str r3, [sp, #0x4]
- bl FUN_020669BC
+ bl SizeOfStructPokemon
mov r7, #0x0
ldr r4, [sp, #0x4]
add r6, r0, #0x0
@@ -370,7 +370,7 @@ FUN_0208373C: ; 0x0208373C
sub sp, #0x8
add r4, r0, #0x0
add r5, r1, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r6, r0, #0x0
lsl r0, r6, #0x2
str r0, [sp, #0x0]
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index 659f3a36..17aec9b7 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -717,7 +717,7 @@ _020848C0:
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r6, #0x1
_020848D4:
add r0, r5, #0x0
@@ -797,13 +797,13 @@ _0208495C:
cmp r0, #0x64
bge _020849B2
add r0, r5, #0x0
- bl FUN_020686F8
+ bl CalcMonExpToNextLevelEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
ldr r0, [sp, #0x50]
cmp r0, #0x0
bne _020849B0
@@ -985,9 +985,9 @@ _02084A66:
add r0, r5, #0x0
mov r1, #0xd
add r2, sp, #0x50
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084B18:
ldr r0, [sp, #0x6c]
@@ -1030,9 +1030,9 @@ _02084B20:
add r0, r5, #0x0
mov r1, #0xe
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084B78:
ldr r0, [sp, #0x6c]
@@ -1075,9 +1075,9 @@ _02084B80:
add r0, r5, #0x0
mov r1, #0xf
add r2, sp, #0x58
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084BD8:
ldr r0, [sp, #0x6c]
@@ -1120,9 +1120,9 @@ _02084BE0:
add r0, r5, #0x0
mov r1, #0x10
add r2, sp, #0x5c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084C38:
ldr r0, [sp, #0x6c]
@@ -1165,9 +1165,9 @@ _02084C40:
add r0, r5, #0x0
mov r1, #0x11
add r2, sp, #0x60
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084C98:
ldr r0, [sp, #0x6c]
@@ -1210,9 +1210,9 @@ _02084CA0:
add r0, r5, #0x0
mov r1, #0x12
add r2, sp, #0x64
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
mov r6, #0x1
_02084CF8:
ldr r0, [sp, #0x6c]
@@ -1429,7 +1429,7 @@ _02084EA8:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -1511,12 +1511,12 @@ _02084F34:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x8
add r0, r5, #0x0
add r1, r4, #0x0
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
add sp, #0xc
pop {r4-r7, pc}
@@ -1556,7 +1556,7 @@ _02084F96:
_02084F98:
mov r1, #0xa2
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3}
pop {r3}
add sp, #0x10
@@ -1775,7 +1775,7 @@ _0208512C:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r4-r6}
pop {r3}
@@ -1811,13 +1811,13 @@ _02085154:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r4, #0x0
_02085190:
add r0, r5, #0x0
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_020854E0.s b/arm9/asm/unk_020854E0.s
index 76d5564d..0921775e 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -180,7 +180,7 @@ _0208561E:
ldr r2, [r5, #0x14]
add r0, r4, #0x0
mov r1, #0xa9
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r3-r5, pc}
@@ -229,11 +229,11 @@ FUN_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FreeToHeap
add r0, r6, #0x0
@@ -262,11 +262,11 @@ _020856BC:
add r0, r4, #0x0
mov r1, #0xa9
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x0
add r2, r5, #0x0
diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s
index 1a2050fe..ed131b94 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -113,7 +113,7 @@ FUN_020859C0: ; 0x020859C0
bl FUN_0200628C
str r0, [r4, #0x0]
mov r0, #0x35
- bl FUN_020669C0
+ bl AllocMonZeroed
ldr r1, _02085BA4 ; =0x00000428
mov r2, #0xff
str r0, [r4, r1]
@@ -675,7 +675,7 @@ _02085EA6:
mov r1, #0xa1
add r2, sp, #0x8
add r5, r0, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1
@@ -683,7 +683,7 @@ _02085EA6:
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0xaa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1
diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s
index 51a7378c..8a6d5079 100644
--- a/arm9/asm/unk_02086084.s
+++ b/arm9/asm/unk_02086084.s
@@ -286,7 +286,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0x4c
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0xb
str r0, [sp, #0x0]
ldr r3, [sp, #0x4]
@@ -297,7 +297,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FUN_020377AC
ldr r1, [r4, #0xc]
@@ -359,7 +359,7 @@ _02086396:
ldr r0, [r4, #0xc]
ldr r2, [r2, #0x18]
mov r1, #0x77
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020863A8:
ldr r0, [r4, #0x8]
bl FUN_02077AC4
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index 73ff0ee5..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]
@@ -1452,7 +1452,7 @@ FUN_02086EE8: ; 0x02086EE8
add r0, r4, #0x0
mov r1, #0x4c
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, sp, #0x28
add r1, r4, #0x0
mov r2, #0x2
@@ -1491,7 +1491,7 @@ FUN_02086F4C: ; 0x02086F4C
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r6, r0, #0x0
ldr r0, [r5, #0x68]
mov r1, #0x1
diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s
index a5a9b7c9..c3c27acb 100644
--- a/arm9/asm/unk_02087D00.s
+++ b/arm9/asm/unk_02087D00.s
@@ -704,7 +704,7 @@ FUN_0208821C: ; 0x0208821C
add r6, r1, #0x0
add r4, r0, #0x0
add r0, r6, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
lsl r1, r0, #0x1
ldr r0, _02088310 ; =UNK_020FD17C
ldrb r0, [r0, r1]
@@ -791,7 +791,7 @@ _020882D4:
add r0, r6, #0x0
add r1, #0x13
add r2, r4, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -811,7 +811,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0208830C:
add sp, #0x30
pop {r3-r7, pc}
diff --git a/arm9/asm/unk_02088DD8.s b/arm9/asm/unk_02088DD8.s
index 0bb527c8..9e8c27a7 100644
--- a/arm9/asm/unk_02088DD8.s
+++ b/arm9/asm/unk_02088DD8.s
@@ -78,7 +78,7 @@ _02088E34:
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x8]
add r2, r7, #0x0
- bl FUN_02069F9C
+ bl LoadWotbl_HandleAlternateForme
mov r2, #0x0
mov r12, r2
_02088E70:
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 b1937f13..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
@@ -4705,46 +4705,46 @@
.extern FUN_02066818
.extern FUN_02066840
.extern ZeroMonData
-.extern FUN_020669A0
-.extern FUN_020669BC
-.extern FUN_020669C0
-.extern FUN_020669D4
-.extern FUN_02066A20
-.extern FUN_02066A6C
-.extern FUN_02066A94
+.extern WipeBoxMonDataAndEncrypt
+.extern SizeOfStructPokemon
+.extern AllocMonZeroed
+.extern TryDecryptMon
+.extern TryEncryptMon
+.extern TryDecryptBoxMon
+.extern TryEncryptBoxMon
.extern CreateMon
.extern CreateMonWithNature
-.extern FUN_02066DD4
+.extern CreateMonWithNatureGenderLetter
.extern FUN_02066E74
.extern FUN_02066EA4
-.extern FUN_02066ED8
-.extern FUN_02066F04
+.extern UpdateMonLevelAndRecalcStats
+.extern CalcMonStatsMaybeEncrypted
.extern GetMonDataEncrypted
-.extern FUN_020672BC
+.extern GetBoxMonDataEncrypted
+.extern SetMonDataEncrypted
.extern SetBoxMonDataEncrypted
-.extern FUN_02067960
-.extern FUN_02068018
+.extern AddMonPartyStatEncrypted
.extern AllocAndLoadMonPersonal
.extern GetPersonalAttr
.extern FreeMonPersonal
.extern GetMonBaseStat_HandleFormeConversion
.extern GetMonBaseStat
.extern FUN_02068698
-.extern FUN_020686F8
+.extern CalcMonExpToNextLevelEncrypted
.extern FUN_02068734
.extern GetMonExpByLevel
-.extern FUN_020687C0
-.extern FUN_020687C8
-.extern CalcMonLevel
-.extern CalcMonLevelInternal
-.extern FUN_02068854
-.extern FUN_0206885C
+.extern CalcMonLevelEncrypted
+.extern CalcBoxMonLevelEncrypted
+.extern CalcLevelBySpeciesAndExp
+.extern CalcLevelBySpeciesAndExp_PreloadedPersonal
+.extern GetMonNatureEncrypted
+.extern GetBoxMonNatureEncrypted
.extern GetNatureFromPersonality
-.extern FUN_020688E8
-.extern FUN_020689E0
-.extern FUN_020689E8
-.extern FUN_02068A20
-.extern FUN_02068A44
+.extern MonApplyFriendshipModEncrypted
+.extern GetMonGenderEncrypted
+.extern GetBoxMonGenderEncrypted
+.extern GetGenderBySpeciesAndPersonality
+.extern GetGenderBySpeciesAndPersonality_PreloadedPersonal
.extern FUN_02068A80
.extern FUN_02068AAC
.extern FUN_02068AD8
@@ -4793,7 +4793,7 @@
.extern FUN_02069EC4
.extern FUN_02069ECC
.extern GetArceusTypeByPlate
-.extern FUN_02069F9C
+.extern LoadWotbl_HandleAlternateForme
.extern FUN_02069FB0
.extern FUN_0206A014
.extern FUN_0206A094
diff --git a/arm9/lib/include/OS_alloc.h b/arm9/lib/include/OS_alloc.h
index 5ee95395..e73c2971 100644
--- a/arm9/lib/include/OS_alloc.h
+++ b/arm9/lib/include/OS_alloc.h
@@ -1,32 +1,9 @@
-#ifndef POKEDIAMOND_OS_ALLOC_H
-#define POKEDIAMOND_OS_ALLOC_H
+#ifndef POKEDIAMOND_ARM9_OS_ALLOC_H
+#define POKEDIAMOND_ARM9_OS_ALLOC_H
#include "nitro/types.h"
#include "OS_arena.h"
-
-typedef int OSHeapHandle;
-
-typedef struct Cell Cell;
-
-struct Cell {
- Cell* prev;
- Cell* next;
- long size;
-};
-
-typedef struct {
- long size;
- Cell *free;
- Cell *allocated;
-} HeapDesc;
-
-typedef struct {
- volatile OSHeapHandle currentHeap;
- int numHeaps;
- void* arenaStart;
- void* arenaEnd;
- HeapDesc* heapArray;
-} OSHeapInfo;
+#include "nitro/OS_alloc_shared.h"
Cell* DLAddFront(Cell* list, Cell* cell);
Cell* DLExtract(Cell* list, Cell* cell);
@@ -34,4 +11,4 @@ Cell *DLInsert(Cell *original, Cell *inserted);
void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size);
void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void *ptr);
-#endif //POKEDIAMOND_OS_ALLOC_H
+#endif //POKEDIAMOND_ARM9_OS_ALLOC_H
diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h
index c09e8cd9..a24e9d89 100644
--- a/arm9/lib/include/consts.h
+++ b/arm9/lib/include/consts.h
@@ -46,9 +46,6 @@
#define OSi_TCM_REGION_BASE_MASK 0xfffff000
-#define OSi_TRUNC(n, a) (((u32) (n)) & ~((a) - 1))
-#define OSi_ROUND(n, a) (((u32) (n) + (a) - 1) & ~((a) - 1))
-
#define OS_IE_V_BLANK (1UL << 0)
#endif //POKEDIAMOND_ARM9_CONSTS_H
diff --git a/arm9/lib/src/OS_alloc.c b/arm9/lib/src/OS_alloc.c
index 32f386a8..00028d3c 100644
--- a/arm9/lib/src/OS_alloc.c
+++ b/arm9/lib/src/OS_alloc.c
@@ -35,14 +35,12 @@ ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted)
{
Cell *prevCell = NULL;
Cell *nextCell = original;
-
- while (nextCell != NULL)
+
+ for (nextCell = original, prevCell = NULL; nextCell; prevCell = nextCell, nextCell = nextCell->next)
{
if (inserted <= nextCell)
break;
- prevCell = nextCell;
- nextCell = nextCell->next;
}
inserted->next = nextCell;
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 7a16d48c..72d4bbbd 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3290,7 +3290,7 @@ _021D8FF6:
bl FUN_0206B9B0
mov r1, #5
add r2, r5, #0
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
add r4, r4, #1
cmp r4, r7
blt _021D8FF6
@@ -21420,7 +21420,7 @@ MOD05_021E1AD8: ; 0x021E1AD8
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r6, #0
add r1, #0x8c
str r0, [r1]
@@ -21968,7 +21968,7 @@ _021E1EFC:
add r0, r6, #0
add r0, #0x8c
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021E1F22:
ldr r0, [r6, #4]
bl FUN_0200CAB4
@@ -22565,7 +22565,7 @@ _021E2398:
add r0, r6, #0
add r0, #0x8c
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021E23BE:
ldr r0, [r6, #4]
bl FUN_0200CAB4
@@ -22834,7 +22834,7 @@ _021E25D0:
add r0, r6, #0
add r0, #0x8c
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021E25F6:
ldr r0, [r6, #4]
bl FUN_0200CAB4
@@ -23159,7 +23159,7 @@ MOD05_021E27E8: ; 0x021E27E8
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x12
add r7, r0, #0
bl FUN_0200A914
@@ -23174,7 +23174,7 @@ MOD05_021E27E8: ; 0x021E27E8
str r1, [sp, #8]
bl FUN_0201BD84
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
bl FUN_02021A20
add r0, r5, #0
@@ -23216,7 +23216,7 @@ MOD05_021E28A0: ; 0x021E28A0
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0xc]
mov r0, #4
bl FUN_0200AA80
@@ -23266,7 +23266,7 @@ MOD05_021E28A0: ; 0x021E28A0
add r0, r6, #0
bl FUN_0200AB18
ldr r0, [sp, #0xc]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
bl FUN_02019220
add sp, #0x14
@@ -23344,7 +23344,7 @@ MOD05_021E29C8: ; 0x021E29C8
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #4
bl FUN_0200AA80
@@ -23393,7 +23393,7 @@ MOD05_021E29C8: ; 0x021E29C8
add r0, r5, #0
bl FUN_0200AB18
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0xc]
bl FUN_02019220
add sp, #0x14
@@ -23462,7 +23462,7 @@ MOD05_021E2AD4: ; 0x021E2AD4
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #4
bl FUN_0200AA80
@@ -23513,7 +23513,7 @@ MOD05_021E2AD4: ; 0x021E2AD4
add r0, r5, #0
bl FUN_0200AB18
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0xc]
bl FUN_02019220
add sp, #0x14
@@ -24389,7 +24389,7 @@ MOD05_021E320C: ; 0x021E320C
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x3c]
add r0, r4, #0
pop {r3, r4, r5, pc}
@@ -24401,7 +24401,7 @@ MOD05_021E3248: ; 0x021E3248
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x3c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0x20
bl FUN_02019178
@@ -35346,7 +35346,7 @@ MOD05_021E8588: ; 0x021E8588
mov r0, #1
mov r1, #0x1a
add r3, r5, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x18]
add r0, r4, #0
ldr r1, [r4]
@@ -35372,7 +35372,7 @@ MOD05_021E85E4: ; 0x021E85E4
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x18]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_0200AB18
add r0, r4, #0
@@ -43049,7 +43049,7 @@ _021EC46E:
bl FUN_02023C7C
add r1, r7, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC48C
add r0, r4, #1
@@ -43081,7 +43081,7 @@ _021EC4AA:
bl FUN_02023C7C
add r1, r6, #0
add r2, r7, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021EC4C6
add r0, r4, #0
@@ -43103,7 +43103,7 @@ MOD05_021EC4DC: ; 0x021EC4DC
push {r3, lr}
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_0206EA98
@@ -43211,13 +43211,13 @@ MOD05_021EC5B0: ; 0x021EC5B0
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021EC600
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC600
add r0, r5, #0
@@ -43275,7 +43275,7 @@ _021EC64E:
blt _021EC616
_021EC658:
add r0, r5, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
@@ -43289,7 +43289,7 @@ MOD05_021EC668: ; 0x021EC668
add r6, r1, #0
mov r0, #4
add r7, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
add r0, r6, #0
bl FUN_02023C7C
@@ -43304,7 +43304,7 @@ MOD05_021EC668: ; 0x021EC668
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
add r0, r5, #0
@@ -43329,7 +43329,7 @@ MOD05_021EC668: ; 0x021EC668
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl MOD05_021EC604
_021EC6E0:
@@ -43342,13 +43342,13 @@ _021EC6E0:
add r2, r0, #0
add r0, r4, #0
mov r1, #0xa9
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021EC6FA:
ldr r0, [sp]
add r1, r4, #0
bl FUN_0206B900
add r0, r5, #0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r6, #0
mov r1, #0
bl FUN_02023CA0
@@ -43384,7 +43384,7 @@ MOD05_021EC744: ; 0x021EC744
add r6, r0, #0
mov r0, #4
add r5, r1, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0
bl FUN_020690E4
add r4, r0, #0
@@ -43394,16 +43394,16 @@ MOD05_021EC744: ; 0x021EC744
add r0, r4, #0
mov r1, #8
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp]
add r0, r0, r5
str r0, [sp]
add r0, r4, #0
mov r1, #8
add r2, sp, #0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r4, r0, #0
add r0, r7, #0
bl FreeToHeap
@@ -43416,7 +43416,7 @@ MOD05_021EC78C: ; 0x021EC78C
add r5, r0, #0
bl FUN_02023C7C
add r6, r0, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0
@@ -43525,7 +43525,7 @@ MOD05_021EC864: ; 0x021EC864
bl FUN_02023C7C
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC888
add r0, r4, #0
@@ -43564,7 +43564,7 @@ MOD05_021EC8A8: ; 0x021EC8A8
add r5, sp, #4
_021EC8BC:
ldr r0, [r5]
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
cmp r0, #1
bne _021EC8C8
str r4, [sp]
@@ -43581,7 +43581,7 @@ _021EC8D8:
ldr r0, [r4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [r5]
cmp r0, #0x84
bne _021EC8EC
@@ -43612,7 +43612,7 @@ _021EC90E:
add r0, sp, #4
ldr r0, [r0, r1]
mov r1, #6
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0xe5
bne _021EC938
bl rand_LC
@@ -43652,7 +43652,7 @@ _021EC960:
bl MOD05_021EC458
add r1, r5, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
bl GetNatureFromPersonality
mov r7, #0x96
add r6, r0, #0
@@ -43791,62 +43791,62 @@ _021ECA60: ; jump table
_021ECA6C:
mov r1, #0x46
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x46
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECA82:
mov r1, #0x47
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x47
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECA98:
mov r1, #0x48
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x48
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECAAE:
mov r1, #0x49
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x49
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECAC4:
mov r1, #0x4a
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x4a
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECADA:
mov r1, #0x4b
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x4b
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021ECAEE:
add r0, r5, #1
lsl r0, r0, #0x18
@@ -43965,13 +43965,13 @@ _021ECBC0:
ldr r0, [sp]
add r1, r6, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x20]
mov r2, #0
str r0, [r4, r1]
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x10]
str r0, [r1, #0x20]
add r0, r5, #1
@@ -44218,13 +44218,13 @@ _021ECDAE:
ldr r0, [sp]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
ldr r0, [sp, #4]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r2, r0, #0x10
mov r0, #6
@@ -44258,12 +44258,12 @@ MOD05_021ECDF4: ; 0x021ECDF4
ldr r0, [sp]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r5, r0, #0
ldr r0, [sp, #4]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r5, #0xec
beq _021ECE20
cmp r0, #0xec
@@ -44301,7 +44301,7 @@ _021ECE56:
ldr r0, [r7, r6]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r1, r4, #1
add r2, sp, #0xc
strh r0, [r2, r1]
@@ -44316,7 +44316,7 @@ _021ECE56:
b _021ECE8C
_021ECE7A:
ldr r0, [r7, r6]
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
cmp r0, #1
bne _021ECE8C
mov r0, #1
@@ -44377,7 +44377,7 @@ _021ECEDE:
lsl r1, r0, #2
add r0, sp, #4
ldr r0, [r0, r1]
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
cmp r0, #1
beq _021ECF02
ldrb r1, [r5, #1]
@@ -44424,16 +44424,16 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r5, #0
mov r1, #0x9a
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x10
add r0, r5, #0
mov r1, #0x9b
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, sp, #0x30
ldrb r0, [r0, #8]
cmp r0, #0
@@ -44441,7 +44441,7 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r5, #0
mov r1, #0x97
add r2, sp, #0x38
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021ECF7E:
add r2, sp, #0x10
mov r1, #1
@@ -44450,7 +44450,7 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x4c
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _021ED008 ; =0x000001EE
mov r1, #4
bl FUN_0200AA50
@@ -44458,7 +44458,7 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x76
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
ldr r0, [sp, #0x40]
@@ -44477,15 +44477,15 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #7
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #0x9c
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
_021ECFEE:
@@ -44562,20 +44562,20 @@ _021ED05E:
add r0, r7, #0
mov r1, #0x9a
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #9
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x14
add r0, r7, #0
mov r1, #0x9b
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #0x70
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _021ED0C8 ; =0x000001EE
mov r1, #4
bl FUN_0200AA50
@@ -44583,7 +44583,7 @@ _021ED05E:
add r0, r7, #0
mov r1, #0x76
add r2, r4, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl FUN_02021A20
add sp, #0x18
@@ -44599,7 +44599,7 @@ MOD05_021ED0CC: ; 0x021ED0CC
mov r0, #4
str r1, [sp, #4]
add r7, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r1, sp, #0x10
add r4, r0, #0
add r0, r5, #0
@@ -44617,7 +44617,7 @@ MOD05_021ED0CC: ; 0x021ED0CC
bl MOD05_021EC458
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@@ -44664,7 +44664,7 @@ _021ED168:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #4]
add r1, r4, #0
bl FUN_0206B900
@@ -44765,21 +44765,21 @@ _021ED228:
ldr r0, [r5]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4]
ldr r0, [r5]
mov r1, #7
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp]
str r0, [r1]
mov r1, #0
ldr r0, [r5]
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0
ldrh r0, [r4]
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
stmia r7!, {r0}
ldrh r0, [r4]
mov r1, #0x16
@@ -44956,7 +44956,7 @@ _021ED38E:
ldr r0, [r5]
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED3AC
ldr r0, [sp]
@@ -45055,7 +45055,7 @@ _021ED472:
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ED484
_021ED47E:
add sp, #0x14
@@ -45120,7 +45120,7 @@ MOD05_021ED4E0: ; 0x021ED4E0
ldr r0, [sp]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED50E
ldr r2, [sp]
@@ -45135,7 +45135,7 @@ _021ED50E:
ldr r0, [sp, #4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED526
ldr r2, [sp, #4]
@@ -45186,7 +45186,7 @@ MOD05_021ED52C: ; 0x021ED52C
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r4, r0, #0x18
cmp r4, #2
@@ -45194,7 +45194,7 @@ MOD05_021ED52C: ; 0x021ED52C
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
cmp r0, #0x1d
@@ -45205,7 +45205,7 @@ _021ED5A4:
add r0, r5, #0
mov r1, #0x4d
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021ED5B4
mov r4, #2
@@ -45311,7 +45311,7 @@ MOD05_021ED650: ; 0x021ED650
bl FUN_020219F4
str r0, [sp, #0x10]
add r0, r5, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
add r0, r4, #0
mov r1, #5
@@ -45460,13 +45460,13 @@ _021ED7A2:
add r0, r6, #0
add r1, #0x36
add r2, r7, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r5, #0
add r2, sp, #0x30
add r0, r6, #0
add r1, #0x3a
add r2, r2, r5
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -45480,7 +45480,7 @@ _021ED7CE:
add r0, r6, #0
add r1, #0x46
add r2, r7, r5
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -45490,16 +45490,16 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0xc
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x79
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0xb
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
mov r1, #0x78
add r0, sp, #0x18
@@ -45507,34 +45507,34 @@ _021ED7CE:
add r0, r6, #0
mov r1, #9
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x20
add r0, r6, #0
mov r1, #0x99
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0x6e
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #0x10]
add r0, r6, #0
mov r1, #0x90
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x9c
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #7
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x97
mov r2, #0
@@ -45562,21 +45562,21 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0x97
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x91
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x92
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x93
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x98
mov r2, #0
@@ -45604,21 +45604,21 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0x98
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x94
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x95
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x96
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
bl FUN_02069B88
@@ -45649,7 +45649,7 @@ MOD05_021ED940: ; 0x021ED940
add r0, r4, #0
mov r1, #0x4c
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #5
add r2, r5, #0
@@ -45658,27 +45658,27 @@ MOD05_021ED940: ; 0x021ED940
lsr r0, r0, #0x10
add r1, r5, #0
add r2, sp, #4
- bl FUN_0200A99C
+ bl GetSpeciesName
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x4d
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x9a
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x1c
pop {r4, r5, pc}
.balign 4, 0
@@ -51032,7 +51032,7 @@ MOD05_021F0254: ; 0x021F0254
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x3c]
mov r0, #0x6e
mov r1, #4
@@ -51051,7 +51051,7 @@ MOD05_021F0290: ; 0x021F0290
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x3c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x38]
bl FUN_0200AB18
ldr r0, [r4, #0xc]
@@ -63495,7 +63495,7 @@ MOD05_021F60C4: ; 0x021F60C4
mov r1, #0x1a
mov r2, #0xc7
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x48]
mov r0, #1
lsl r0, r0, #0xa
@@ -63525,7 +63525,7 @@ MOD05_021F60FC: ; 0x021F60FC
ldr r0, [r4, #0x30]
bl FUN_02021A20
ldr r0, [r4, #0x48]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, pc}
.align 2, 0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 529aeb97..2f478ef3 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6555,7 +6555,7 @@ MOD06_0223C854: ; 0x0223C854
mov r0, #0xb
str r2, [sp, #0x18]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x1c]
bl ZeroMonData
ldrb r0, [r6, #0xd]
@@ -6607,7 +6607,7 @@ _0223C8D2:
cmp r4, #0
bne _0223C8E0
ldr r0, [sp, #0x44]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
str r0, [sp, #0x20]
mov r7, #1
_0223C8E0:
@@ -6622,7 +6622,7 @@ _0223C8EC:
bne _0223C914
ldr r0, [sp, #0x10]
add r1, r4, #0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
add r7, r0, #0
cmp r7, #2
bne _0223C904
@@ -6684,7 +6684,7 @@ MOD06_0223C968: ; 0x0223C968
str r1, [sp, #0xc]
str r2, [sp, #0x10]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
bl ZeroMonData
add r0, r7, #0
@@ -6748,11 +6748,11 @@ _0223C9E4:
add r0, r4, #0
add r1, r7, #0
mov r3, #0x20
- bl FUN_02066DD4
+ bl CreateMonWithNatureGenderLetter
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -6779,7 +6779,7 @@ _0223CA28:
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -7586,7 +7586,7 @@ MOD06_0223D044: ; 0x0223D044
add r5, r1, #0
mov r0, #4
add r6, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
add r0, r5, #0
mov r1, #4
@@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #8]
add r1, r4, #0
bl FUN_0206B900
@@ -7839,7 +7839,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@@ -8340,7 +8340,7 @@ MOD06_0223D618: ; 0x0223D618
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0x88
str r0, [r1]
@@ -8588,7 +8588,7 @@ _0223D804:
add r0, r4, #0
add r0, #0x88
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0x8c
ldr r0, [r0]
@@ -9055,7 +9055,7 @@ MOD06_0223DBF4: ; 0x0223DBF4
mov r1, #0x1a
sub r2, #0xe9
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
b _0223DC34
_0223DC12:
@@ -9065,7 +9065,7 @@ _0223DC12:
mov r1, #0x1a
sub r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
b _0223DC34
_0223DC26:
@@ -9073,7 +9073,7 @@ _0223DC26:
mov r1, #0x1a
mov r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp]
_0223DC34:
mov r0, #0x8b
@@ -9127,7 +9127,7 @@ _0223DC8E:
sub r3, #0xa
bl FUN_02012880
ldr r0, [sp]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _0223DCEC ; =0x0224F38C
add r3, sp, #4
add r2, r3, #0
@@ -9206,21 +9206,21 @@ _0223DD3C:
mov r1, #0x1a
sub r2, #0xa
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r7, r0, #0
add r1, #0x8a
bl FUN_0200A914
add r6, r0, #0
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _0223DD86
_0223DD60:
mov r0, #0
mov r1, #0x1a
sub r2, #0x5a
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
lsl r0, r5, #0x18
lsr r0, r0, #0x18
@@ -9230,7 +9230,7 @@ _0223DD60:
bl FUN_0200A914
add r6, r0, #0
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
_0223DD86:
mov r1, #0
str r1, [sp]
@@ -11371,7 +11371,7 @@ _0223EF28:
strb r2, [r0]
ldr r2, _0223EFF8 ; =0x0000013A
mov r0, #1
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0223EFF4 ; =0x02252420
ldr r2, [r1]
str r0, [r2, #0x74]
@@ -11498,7 +11498,7 @@ _0223F060:
ldr r0, _0223F08C ; =0x02252420
ldr r0, [r0]
ldr r0, [r0, #0x74]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0223F08C ; =0x02252420
ldr r0, [r0]
ldr r1, [r0, #0x4c]
@@ -14889,7 +14889,7 @@ MOD06_02240C58: ; 0x02240C58
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x30]
mov r0, #0xb4
mov r1, #4
@@ -15195,7 +15195,7 @@ _02240EE0:
ldr r0, [sp, #0x28]
bl FUN_02021A20
ldr r0, [sp, #0x30]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0x24]
bl FUN_020191D0
add sp, #0x34
@@ -15488,7 +15488,7 @@ _0224113A:
ldr r0, [r4, #0x64]
bl FUN_0200AB18
ldr r0, [r4, #0x68]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_02021A20
ldr r0, [r4, #0x18]
@@ -15535,7 +15535,7 @@ MOD06_02241188: ; 0x02241188
mov r1, #0x1a
mov r2, #0xcf
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x68]
mov r0, #0xb4
mov r1, #4
@@ -18878,7 +18878,7 @@ MOD06_02242C78: ; 0x02242C78
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x54]
mov r0, #4
bl FUN_0200AA80
@@ -19392,7 +19392,7 @@ _02243060:
ldr r0, [r6, #0x58]
bl FUN_0200AB18
ldr r0, [r6, #0x54]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, r5, r6, pc}
.align 2, 0
_0224307C: .word 0x000005DC
@@ -21463,7 +21463,7 @@ _02243FFA:
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -21734,7 +21734,7 @@ MOD06_02244210: ; 0x02244210
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
mov r0, #0x13
mov r1, #0xe
@@ -21781,7 +21781,7 @@ _0224429E:
cmp r4, #0x12
blo _02244264
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0x1c]
bl FUN_02021A20
add r0, r6, #0
@@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #6
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r4, #0
str r6, [sp, #4]
add r7, r4, #0
@@ -21937,7 +21937,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x36
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@@ -21950,7 +21950,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
@@ -21962,7 +21962,7 @@ _022443D4:
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #4]
add r4, r4, #1
add r0, r0, #2
@@ -21975,7 +21975,7 @@ _022443D4:
str r0, [sp, #0xc]
add r0, r5, #0
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x18]
add r0, sp, #8
@@ -21983,7 +21983,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xd
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x19]
add r0, sp, #8
@@ -21991,7 +21991,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xe
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1a]
add r0, sp, #8
@@ -21999,7 +21999,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xf
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1b]
add r0, sp, #8
@@ -22007,7 +22007,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1c]
add r0, sp, #8
@@ -22015,7 +22015,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x11
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1d]
add r0, sp, #8
@@ -22023,17 +22023,17 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x12
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@@ -22042,7 +22042,7 @@ _022443D4:
mov r0, #1
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldrh r1, [r6]
add r4, r0, #0
lsl r1, r1, #0x15
@@ -22052,26 +22052,26 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _02244508
_022444FC:
add r2, r6, #0
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -22137,7 +22137,7 @@ MOD06_02244558: ; 0x02244558
add r0, r0, #4
str r1, [r7, r0]
ldr r0, [r5, #4]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldrb r1, [r5, #0xe]
ldr r0, [r7, #4]
@@ -22170,9 +22170,9 @@ _022445A6:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
_022445E8:
add r0, r7, #0
add r1, r4, #0
@@ -22477,7 +22477,7 @@ MOD06_02244820: ; 0x02244820
mov r1, #0x1a
mov r2, #0x10
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -22502,7 +22502,7 @@ MOD06_02244820: ; 0x02244820
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -22713,7 +22713,7 @@ _022449F2:
lsl r0, r0, #0x15
lsr r0, r0, #0x15
add r2, r5, #0
- bl FUN_0200A99C
+ bl GetSpeciesName
add r0, r7, #0
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
@@ -23177,7 +23177,7 @@ MOD06_02244D04: ; 0x02244D04
add r0, #0x5a
strh r1, [r0]
ldr r0, [sp, #0x20]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldr r0, [sp]
mov r6, #0
@@ -30932,7 +30932,7 @@ _0224886C:
str r5, [r4, #0x10]
str r6, [r4, #0xc]
add r0, r5, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #4]
add r0, r5, #0
bl FUN_02023928
@@ -31078,13 +31078,13 @@ MOD06_022489AC: ; 0x022489AC
add r4, r1, #0
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
add r1, r4, #0
bl FUN_0200A914
add r4, r0, #0
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
@@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
mov r1, #1
@@ -31123,66 +31123,66 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x4d
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x28]
add r1, r6, #4
bl MOD06_022489AC
@@ -31190,19 +31190,19 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x2c]
bl FUN_02034824
add r3, r0, #0
@@ -31213,7 +31213,7 @@ MOD06_022489D4: ; 0x022489D4
mov r2, #1
bl FUN_0208089C
add r0, r5, #0
- bl FUN_02066ED8
+ bl UpdateMonLevelAndRecalcStats
add r0, r5, #0
bl FUN_02068A80
cmp r0, #0
@@ -40792,7 +40792,7 @@ MOD06_0224D46C: ; 0x0224D46C
mov r1, #0x1a
mov r2, #0xc3
mov r3, #0xb
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #0xb
bl FUN_0200AA80
@@ -41031,7 +41031,7 @@ MOD06_0224D6A4: ; 0x0224D6A4
add r0, r4, #0
bl FUN_02019178
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_0200AB18
add r0, r4, #0
@@ -41103,7 +41103,7 @@ MOD06_0224D70C: ; 0x0224D70C
mov r0, #0
mov r1, #0x1a
lsl r2, r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x52
lsl r1, r1, #2
str r0, [r4, r1]
@@ -41123,7 +41123,7 @@ MOD06_0224D76C: ; 0x0224D76C
mov r0, #0x52
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl MOD06_0224DC28
add r0, r4, #0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 7fbc2c22..cb716405 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3758,7 +3758,7 @@ _02213CEA:
ldr r0, _02213D28 ; =0x00000222
strb r1, [r7, r0]
add r0, r4, #0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldr r1, _02213D2C ; =0x00000221
strb r0, [r5, r1]
add r0, r4, #0
@@ -4965,7 +4965,7 @@ MOD07_0221469C: ; 0x0221469C
ldr r3, [r3, #0x24]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r3, [r6]
str r0, [sp, #0x10]
ldr r3, [r3, #0x24]
@@ -5006,7 +5006,7 @@ _022146F6:
add r0, r7, #0
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0xc]
bl FUN_0200B990
ldr r0, [sp, #8]
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index a5b5560b..9ac54172 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2360,7 +2360,7 @@ MOD09_02213138: ; 0x02213138
ldr r3, [r3, #0xc]
mov r1, #0x1a
mov r2, #3
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _02213180 ; =0x00001FA8
mov r2, #0
str r0, [r4, r1]
@@ -2396,7 +2396,7 @@ MOD09_02213190: ; 0x02213190
add r4, r0, #0
ldr r0, _022131B8 ; =0x00001FA8
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _022131BC ; =0x00001FA4
ldr r0, [r4, r0]
bl FUN_0200B990
@@ -2535,7 +2535,7 @@ _022132C2:
add r6, r0, #0
ldr r0, [r4, #4]
add r6, #0x1b
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldrb r1, [r6, r5]
mov r2, #7
bic r1, r2
@@ -5747,7 +5747,7 @@ MOD09_02214D24: ; 0x02214D24
ldr r3, [r3, #0xc]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x50
mul r1, r6
add r1, r5, r1
@@ -5773,7 +5773,7 @@ MOD09_02214D24: ; 0x02214D24
add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _02214D9C ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
@@ -6072,7 +6072,7 @@ MOD09_02215000: ; 0x02215000
ldr r3, [r3, #0xc]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r6, #0
add r7, r0, #0
bl FUN_0200A914
@@ -6091,7 +6091,7 @@ MOD09_02215000: ; 0x02215000
add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, r4
bl FUN_02019220
add sp, #0x10
@@ -6119,7 +6119,7 @@ MOD09_02215060: ; 0x02215060
mov r0, #0
mov r1, #0x1a
mov r2, #0xc5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r7, #0
str r0, [sp, #0x10]
bl FUN_0200A914
@@ -6138,7 +6138,7 @@ MOD09_02215060: ; 0x02215060
add r0, r6, #0
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, r4
bl FUN_02019220
add sp, #0x14
@@ -13408,7 +13408,7 @@ _02218D22:
add r0, r1, #0
mov r1, #0x1a
mov r2, #0xc7
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x24
add r7, r0, #0
bl FUN_0200A914
@@ -13424,7 +13424,7 @@ _02218D22:
add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
bl MOD09_02219BE0
ldr r0, _02218E40 ; =0x0000114B
@@ -14088,7 +14088,7 @@ MOD09_022192A4: ; 0x022192A4
ldr r3, [r3, #0xc]
mov r1, #0x1a
mov r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
ldr r3, [r4]
mov r0, #0xf
@@ -14115,7 +14115,7 @@ MOD09_022192E4: ; 0x022192E4
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0xc]
bl FUN_0200B990
ldr r0, [r4, #0x14]
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 55c064d7..dd2316a4 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -893,13 +893,13 @@ _0222DC42:
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0xc]
mov r0, #1
mov r1, #0x1a
mov r2, #0
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #5
bl FUN_0200AA80
@@ -1303,9 +1303,9 @@ _0222E10A:
ldr r0, [r4, #0x28]
bl FUN_02002FEC
ldr r0, [r4, #0xc]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_0200AB18
mov r0, #0x71
@@ -2898,7 +2898,7 @@ _0222EE8C:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x68]
add r5, r5, #1
bl FUN_0206B9AC
@@ -2920,7 +2920,7 @@ _0222EEBC:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x70]
add r5, r5, #1
bl FUN_0206B9AC
@@ -3586,7 +3586,7 @@ _0222F30E:
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
mov r0, #1
lsl r0, r0, #8
@@ -3608,7 +3608,7 @@ _0222F30E:
add r0, r6, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222F4D8 ; =MOD11_0222F0D4
add r1, r5, #0
bl FUN_02015F10
@@ -5714,7 +5714,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@@ -5776,7 +5776,7 @@ _02230478:
str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@@ -5824,7 +5824,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@@ -5872,7 +5872,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@@ -5920,7 +5920,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@@ -6313,7 +6313,7 @@ _022308C4:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223091C
@@ -6384,7 +6384,7 @@ _0223097E:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022309B4
@@ -6524,7 +6524,7 @@ _02230AC2:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
mov r1, #0xa2
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x38]
mov r1, #0x17
lsl r0, r0, #0x10
@@ -6692,7 +6692,7 @@ _02230C28:
ldr r0, [sp, #0x18]
ldr r2, [sp, #8]
mov r1, #9
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230C3E
@@ -7152,7 +7152,7 @@ _02230F4E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230F58:
add r0, r5, #0
mov r1, #0
@@ -8274,7 +8274,7 @@ _02231708:
mov r0, #0
mov r1, #0x1a
mov r3, #5
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r7, r0, #0
bl FUN_0200A914
@@ -8296,7 +8296,7 @@ _02231708:
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _02231778
_0223174C:
ldr r2, [r5, #0x18]
@@ -23939,7 +23939,7 @@ _022392AA:
add r0, r4, #0
mov r1, #6
add r2, r5, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392C4:
cmp r5, #0x62
@@ -23954,7 +23954,7 @@ _022392C4:
add r0, r4, #0
mov r1, #6
add r2, r2, r3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392E2:
add r1, r1, #1
@@ -24010,7 +24010,7 @@ _0223932E:
add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02239350:
ldr r0, [sp]
mov r1, #0
@@ -26914,7 +26914,7 @@ _0223AA0C:
add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@@ -27099,9 +27099,9 @@ _0223AB58:
add r0, r6, #0
mov r1, #0
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
add r0, r6, #0
- bl FUN_02066F04
+ bl CalcMonStatsMaybeEncrypted
ldr r1, [r4, #4]
ldr r0, _0223ABB0 ; =0x0000219C
b _0223ABBC
@@ -27897,7 +27897,7 @@ _0223B1F6:
add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@@ -28183,7 +28183,7 @@ _0223B45A:
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@@ -29102,7 +29102,7 @@ _0223BC38:
bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223BC62:
add r0, r5, #0
bl FUN_02077AC4
@@ -29210,7 +29210,7 @@ _0223BD3E:
add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@@ -31697,7 +31697,7 @@ _0223D148:
add r0, r7, #0
mov r1, #8
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D18E:
add r0, r5, #0
@@ -31707,7 +31707,7 @@ _0223D18E:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D1A4:
add r0, r5, #0
@@ -31717,7 +31717,7 @@ _0223D1A4:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0223D1B8:
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -43613,7 +43613,7 @@ _02242D2E:
add r0, r7, r1
str r0, [sp, #0x1c]
add r0, r4, #0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
ldr r1, [sp, #0x1c]
mov r2, #0xf
ldrb r1, [r1, r5]
@@ -64908,13 +64908,13 @@ _0224CEE2:
add r0, r7, #0
add r1, #0x36
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF0C:
add r4, r4, #1
add r5, r5, #2
@@ -64932,16 +64932,16 @@ _0224CF14:
add r0, r7, #0
mov r1, #6
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@@ -65066,7 +65066,7 @@ _0224D038:
add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@@ -75135,7 +75135,7 @@ _02252196:
str r0, [sp, #0x14]
_022521A4:
mov r0, #5
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
mov r5, #0
_022521AE:
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index d77621d5..acf2d363 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -162,25 +162,25 @@ MOD12_0222D5C0: ; 0x0222D5C0
mov r1, #0x1a
mov r2, #0xbf
mov r3, #0x15
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x44]
mov r0, #0
mov r1, #0x1a
mov r2, #0xc0
mov r3, #0x15
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x48]
mov r0, #0
mov r1, #0x1a
mov r2, #0xc5
mov r3, #0x15
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x4c]
mov r0, #0
mov r1, #0x1a
mov r2, #0xc6
mov r3, #0x15
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x50]
mov r0, #8
mov r1, #0x15
@@ -500,13 +500,13 @@ MOD12_0222D9B0: ; 0x0222D9B0
ldr r0, [r4, #0x54]
bl FUN_0200AB18
ldr r0, [r4, #0x44]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x48]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x4c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x50]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x30]
bl FreeToHeap
ldr r0, [r4, #4]
@@ -3283,7 +3283,7 @@ MOD12_0222EF04: ; 0x0222EF04
mov r1, #0x1a
mov r2, #0xc4
mov r3, #0x16
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x44]
mov r0, #0x16
bl FUN_0200AA80
@@ -3671,7 +3671,7 @@ _0222F3AE:
ldr r0, [r4, #0x4c]
bl FUN_02021A20
ldr r0, [r4, #0x44]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x30]
bl FreeToHeap
ldr r0, [r4, #4]
@@ -5151,7 +5151,7 @@ MOD12_0222FE4C: ; 0x0222FE4C
mov r1, #0x1a
mov r2, #0xc1
mov r3, #0x17
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r1, #0x98
str r0, [r1]
@@ -5515,7 +5515,7 @@ _02230296:
add r0, r4, #0
add r0, #0x98
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x74]
bl FreeToHeap
ldr r0, [r4, #4]
@@ -7695,13 +7695,13 @@ MOD12_022314A8: ; 0x022314A8
mov r0, #1
mov r1, #0x1a
mov r2, #0xc2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
add r1, r4, #0
bl FUN_0200A914
add r4, r0, #0
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
pop {r3, r4, r5, pc}
@@ -29420,7 +29420,7 @@ MOD12_0223B940: ; 0x0223B940
mov r1, #0x1a
mov r2, #0xbf
mov r3, #0x17
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
ldr r0, [r5, #4]
mov r2, #0x12
@@ -29489,7 +29489,7 @@ MOD12_0223B940: ; 0x0223B940
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -41222,7 +41222,7 @@ MOD12_02241210: ; 0x02241210
mov r1, #0x1a
mov r2, #0xcc
mov r3, #0x18
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r1, #0xc4
str r0, [r1]
@@ -41550,7 +41550,7 @@ _022415D4:
add r0, r4, #0
add r0, #0xc4
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x30]
bl FreeToHeap
ldr r0, [r4, #4]
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index c0d531a8..00b933b8 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -3868,7 +3868,7 @@ _021D9488:
bl FUN_0206B5E4
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021D94AE
mov r0, #0
@@ -4713,7 +4713,7 @@ _021D9B9E:
add r1, r6, #0
bl FUN_0206B9B0
add r4, r0, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r4, #0
mov r1, #0xac
@@ -4731,7 +4731,7 @@ _021D9B9E:
_021D9BD2:
add r0, r4, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
cmp r5, #2
blt _021D9BE4
add sp, #8
@@ -5301,7 +5301,7 @@ _021DA042:
mov r1, #0xab
mov r2, #0
add r7, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DA080
ldr r4, _021DA164 ; =0x021E6224
@@ -5455,12 +5455,12 @@ MOD14_021DA168: ; 0x021DA168
mov r1, #0
add r5, r0, #0
str r1, [sp, #4]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp]
add r0, r5, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021DA1A8
mov r4, #0
@@ -5470,7 +5470,7 @@ _021DA18C:
add r0, r5, #0
add r1, #0x36
add r2, r7, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r6, r0
bne _021DA1A2
mov r0, #1
@@ -5483,7 +5483,7 @@ _021DA1A2:
_021DA1A8:
ldr r1, [sp]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #4]
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
@@ -7543,7 +7543,7 @@ MOD14_021DB220: ; 0x021DB220
mov r2, #0xf
mov r3, #9
str r0, [r4, #8]
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #0x63
lsl r2, r2, #2
str r0, [r5, r2]
@@ -7551,7 +7551,7 @@ MOD14_021DB220: ; 0x021DB220
mov r1, #0x1a
sub r2, #0x22
mov r3, #9
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x19
lsl r1, r1, #4
str r0, [r5, r1]
@@ -7559,7 +7559,7 @@ MOD14_021DB220: ; 0x021DB220
mov r1, #0x1a
mov r2, #0xbe
mov r3, #9
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #0x65
lsl r2, r2, #2
str r0, [r5, r2]
@@ -7567,7 +7567,7 @@ MOD14_021DB220: ; 0x021DB220
mov r1, #0x1a
add r2, #0x94
mov r3, #9
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x66
lsl r1, r1, #2
str r0, [r5, r1]
@@ -7576,7 +7576,7 @@ MOD14_021DB220: ; 0x021DB220
mov r1, #0x67
lsl r1, r1, #2
str r0, [r5, r1]
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r1, r0, #0
mov r0, #9
bl AllocFromHeap
@@ -7706,19 +7706,19 @@ _021DB3BE:
mov r0, #0x63
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x19
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x65
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x66
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x4a
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -8518,7 +8518,7 @@ _021DB998:
beq _021DB9C4
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DB9C4
mov r0, #1
@@ -8739,7 +8739,7 @@ _021DBB36:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DBB86
ldr r0, [sp, #0x20]
@@ -9122,7 +9122,7 @@ MOD14_021DBE34: ; 0x021DBE34
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
mov r0, #1
strb r0, [r4, #0x13]
add r0, r4, #0
@@ -9189,18 +9189,18 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
add r6, r2, #0
add r4, #0x4c
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp]
str r5, [r7, #0x4c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #4]
add r0, r5, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #6]
mov r0, #0x47
lsl r0, r0, #2
@@ -9212,7 +9212,7 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xf]
ldrh r0, [r4, #4]
mov r1, #9
@@ -9221,26 +9221,26 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #8
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
- bl CalcMonLevelInternal
+ bl CalcLevelBySpeciesAndExp_PreloadedPersonal
strb r0, [r4, #0xa]
add r0, r5, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xb]
add r0, r5, #0
mov r1, #0xb0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xc]
add r0, r5, #0
mov r1, #0xb1
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xd]
ldrb r0, [r4, #0xf]
cmp r0, #0
@@ -9248,17 +9248,17 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xaf
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DBF68
mov r1, #0
add r0, r5, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
- bl FUN_02068A44
+ bl GetGenderBySpeciesAndPersonality_PreloadedPersonal
strb r0, [r4, #0xe]
b _021DBF6C
_021DBF68:
@@ -9268,7 +9268,7 @@ _021DBF6C:
ldr r2, [r4, #0x14]
add r0, r5, #0
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _021DBF8C
@@ -9302,7 +9302,7 @@ _021DBFAA:
bl FUN_0200A8E0
_021DBFB8:
add r0, r5, #0
- bl FUN_0206885C
+ bl GetBoxMonNatureEncrypted
add r1, r0, #0
mov r0, #0x65
lsl r0, r0, #2
@@ -9312,7 +9312,7 @@ _021DBFB8:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0
mov r0, #0x66
lsl r0, r0, #2
@@ -9323,7 +9323,7 @@ _021DBFB8:
bl FreeMonPersonal
ldr r1, [sp]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
pop {r3, r4, r5, r6, r7, pc}
thumb_func_start MOD14_021DBFF4
@@ -9371,7 +9371,7 @@ _021DC034:
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
- bl FUN_020669D4
+ bl TryDecryptMon
add r6, r0, #0
mov r0, #0x1a
lsl r0, r0, #4
@@ -9489,7 +9489,7 @@ _021DC034:
lsl r0, r0, #4
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_02066A20
+ bl TryEncryptMon
add r0, r7, #0
add r0, #0xa4
ldrb r0, [r0]
@@ -9557,7 +9557,7 @@ MOD14_021DC1AC: ; 0x021DC1AC
ldr r0, [r4, #0x4c]
mov r1, #0xb
add r2, sp, #0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl MOD14_021DC3CC
cmp r0, #0
@@ -9623,12 +9623,12 @@ _021DC24A:
ldr r0, [r4]
mov r1, #6
add r2, sp, #0x1c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_021DC254:
ldr r0, [r4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _021DC274 ; =0x000001ED
cmp r0, r1
bne _021DC26A
@@ -10215,7 +10215,7 @@ MOD14_021DC58C: ; 0x021DC58C
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5B2:
ldrb r0, [r5, #0x1f]
@@ -10224,7 +10224,7 @@ _021DC5B2:
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5C4:
ldr r0, [r5, #0x4c]
@@ -10245,7 +10245,7 @@ MOD14_021DC5D0: ; 0x021DC5D0
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5EC:
ldr r0, [r5, #8]
@@ -14333,7 +14333,7 @@ _021DE5FE:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x34]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DE64E
add r0, r4, #0
@@ -14434,7 +14434,7 @@ _021DE6D0:
mov r1, #5
mov r2, #0
add r7, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DE70A
ldr r1, _021DE724 ; =0x00005814
@@ -14908,7 +14908,7 @@ _021DEA70:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DEB02
ldrb r1, [r5, #2]
@@ -15025,7 +15025,7 @@ _021DEB5C:
mov r1, #5
mov r2, #0
str r0, [sp, #0x2c]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DEBA0
add r0, r4, #0
@@ -18859,7 +18859,7 @@ MOD14_021E0940: ; 0x021E0940
str r2, [sp, #8]
str r3, [sp, #0xc]
ldr r4, [sp, #0x64]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
@@ -18877,21 +18877,21 @@ MOD14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x18]
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r7, r0, #0x18
add r0, r6, #0
@@ -18905,12 +18905,12 @@ MOD14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x2e]
add r0, r4, #4
bl FUN_020B1A24
@@ -18971,7 +18971,7 @@ _021E0A36:
bl MOD14_021E0B54
ldr r1, [sp, #0x10]
add r0, r6, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x44
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -18987,19 +18987,19 @@ MOD14_021E0A60: ; 0x021E0A60
str r2, [sp, #8]
add r7, r3, #0
ldr r4, [sp, #0x70]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0xc]
@@ -19023,12 +19023,12 @@ MOD14_021E0A60: ; 0x021E0A60
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x2e]
add r0, r4, #4
bl FUN_020B1A24
@@ -19079,7 +19079,7 @@ _021E0B28:
bl MOD14_021E0B54
ldr r1, [sp, #0x14]
add r0, r6, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -20658,7 +20658,7 @@ MOD14_021E1750: ; 0x021E1750
mov r3, #0xa
str r0, [r4, #0x10]
mov r0, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x14]
mov r0, #0x40
mov r1, #0xa
@@ -20724,7 +20724,7 @@ _021E17EC:
ldr r0, [r5, #0x14]
cmp r0, #0
beq _021E17F6
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021E17F6:
ldr r0, [r5, #0x30]
cmp r0, #0
@@ -21579,7 +21579,7 @@ _021E1DBC:
strh r1, [r0]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _021E1EE8 ; =0x00004BF8
add r2, r5, #0
str r0, [r5, r1]
@@ -21662,7 +21662,7 @@ MOD14_021E1F20: ; 0x021E1F20
ldr r0, [r5, r0]
cmp r0, #0
beq _021E1F30
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021E1F30:
ldr r0, [r5, #0x14]
cmp r0, #0
@@ -21819,26 +21819,26 @@ _021E204A:
bl FUN_0206B5E4
add r4, r4, #1
add r5, r0, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x1c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0
beq _021E20C8
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021E209A
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r7, #0
@@ -21876,7 +21876,7 @@ _021E20AA:
_021E20C8:
ldr r1, [sp, #0x1c]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x24]
add r6, r6, #2
add r0, r0, #1
@@ -28213,7 +28213,7 @@ _021E5064:
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #0xa
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x70]
mov r0, #0x20
mov r1, #0xa
@@ -28246,7 +28246,7 @@ MOD14_021E50EC: ; 0x021E50EC
ldr r0, [r4, r0]
bl FreeToHeap
ldr r0, [r4, #0x70]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl MOD14_021E5C04
add r0, r4, #0
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index 800f1e57..f63c7b7a 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -4342,7 +4342,7 @@ MOD15_021D95E8: ; 0x021D95E8
mov r0, #0
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x48]
mov r0, #0x23
bl FUN_02013690
@@ -4379,7 +4379,7 @@ _021D9660:
ldr r0, [r4, #0x48]
cmp r0, #0
beq _021D966A
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021D966A:
ldr r0, [r4, #0x4c]
cmp r0, #0
@@ -5955,7 +5955,7 @@ MOD15_021DA2AC: ; 0x021DA2AC
mov r0, #1
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x20]
mov r0, #9
mov r7, #1
@@ -6055,7 +6055,7 @@ _021DA31A:
cmp r4, #0xc
blt _021DA2CC
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
add sp, #0x38
pop {r3, r4, r5, r6, r7, pc}
@@ -6170,7 +6170,7 @@ MOD15_021DA480: ; 0x021DA480
mov r0, #1
mov r1, #0x1a
mov r3, #0x23
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0xd
str r0, [sp, #0x20]
bl FUN_0200A914
@@ -6243,7 +6243,7 @@ _021DA4C2:
ldr r0, [sp, #0x1c]
bl FUN_02021A20
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
add sp, #0x34
pop {r4, r5, r6, r7, pc}
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 22511fc3..3191e90c 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -1796,13 +1796,13 @@ MOD16_021D8270: ; 0x021D8270
add r3, r1, #0
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
add r1, r4, #0
bl FUN_0200A914
add r4, r0, #0
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
@@ -2392,7 +2392,7 @@ _021D873A:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
mov r1, #0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
add r4, r0, #0
_021D874E:
ldr r0, [sp, #0x40]
@@ -8470,7 +8470,7 @@ MOD16_021DB3C8: ; 0x021DB3C8
ldr r3, [r5, #0x14]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
bne _021DB3E4
bl ErrorHandling
@@ -8500,7 +8500,7 @@ _021DB3E4:
add r0, r4, #0
bl FUN_02021A20
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
add sp, #0x10
pop {r4, r5, r6, pc}
@@ -9807,7 +9807,7 @@ MOD16_021DBCA0: ; 0x021DBCA0
mov r0, #1
mov r1, #0x1a
add r3, r5, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
beq _021DBCDA
mov r0, #1
@@ -9822,7 +9822,7 @@ MOD16_021DBCA0: ; 0x021DBCA0
bl FUN_0200A8E0
_021DBCD0:
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
pop {r4, r5, r6, pc}
_021DBCDA:
@@ -11514,7 +11514,7 @@ MOD16_021DC958: ; 0x021DC958
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0
add r2, r4, #0
add r6, r0, #0
@@ -11584,7 +11584,7 @@ MOD16_021DC958: ; 0x021DC958
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r5]
mov r1, #1
bl FUN_0201AC68
@@ -11609,7 +11609,7 @@ MOD16_021DCA2C: ; 0x021DCA2C
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x6c
add r2, r4, #0
add r6, r0, #0
@@ -11646,7 +11646,7 @@ MOD16_021DCA2C: ; 0x021DCA2C
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r5]
mov r1, #1
bl FUN_0201AC68
@@ -12790,7 +12790,7 @@ MOD16_021DD370: ; 0x021DD370
mov r0, #0
mov r1, #0x1a
add r3, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x15
lsl r1, r1, #4
str r0, [sp, #0x14]
@@ -12868,7 +12868,7 @@ _021DD420:
add r0, r7, #0
bl FUN_02021A20
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -29763,7 +29763,7 @@ MOD16_021E5064: ; 0x021E5064
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #9
add r2, r7, #0
str r0, [sp, #0x18]
@@ -29795,7 +29795,7 @@ MOD16_021E5064: ; 0x021E5064
add r0, r7, #0
bl FUN_02021A20
ldr r0, [sp, #0x18]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r2, [sp, #0x10]
add r0, r5, #0
add r1, r6, #0
@@ -29834,7 +29834,7 @@ MOD16_021E5104: ; 0x021E5104
mov r1, #0x1a
lsl r2, r2, #2
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, [sp, #0x10]
add r2, r4, #0
add r6, r0, #0
@@ -29852,7 +29852,7 @@ MOD16_021E5104: ; 0x021E5104
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -29873,7 +29873,7 @@ MOD16_021E5158: ; 0x021E5158
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, [sp, #0x10]
add r2, r4, #0
add r6, r0, #0
@@ -29891,7 +29891,7 @@ MOD16_021E5158: ; 0x021E5158
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -34441,7 +34441,7 @@ MOD16_021E72E4: ; 0x021E72E4
ldr r3, [sp, #0x10]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x14]
ldr r0, [r4, #4]
bl MOD16_021D9DE8
@@ -34483,7 +34483,7 @@ _021E731E:
ldr r0, [sp, #0x18]
bl FUN_02021A20
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x1c]
ldr r1, [sp, #0x10]
str r0, [sp]
@@ -45799,7 +45799,7 @@ MOD16_021EC7E8: ; 0x021EC7E8
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x2b
add r2, r4, #0
add r6, r0, #0
@@ -45857,7 +45857,7 @@ MOD16_021EC7E8: ; 0x021EC7E8
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x10
pop {r4, r5, r6, pc}
nop
@@ -45881,7 +45881,7 @@ MOD16_021EC898: ; 0x021EC898
mov r1, #0x1a
lsl r2, r2, #2
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
ldr r0, [r6, #4]
bl MOD16_021D9DE8
@@ -45925,12 +45925,12 @@ MOD16_021EC898: ; 0x021EC898
ldr r0, [sp, #0x18]
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r2, _021EC9AC ; =0x00000266
mov r0, #0
mov r1, #0x1a
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
ldr r0, [r6, #4]
bl MOD16_021D9F40
@@ -45981,7 +45981,7 @@ _021EC970:
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
nop
@@ -48779,7 +48779,7 @@ MOD16_021EDEC8: ; 0x021EDEC8
mov r0, #0
mov r1, #0x1a
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x2c
add r2, r4, #0
add r6, r0, #0
@@ -48837,7 +48837,7 @@ MOD16_021EDEC8: ; 0x021EDEC8
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x10
pop {r4, r5, r6, pc}
nop
@@ -48860,7 +48860,7 @@ MOD16_021EDF78: ; 0x021EDF78
mov r0, #0
mov r1, #0x1a
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
ldr r0, [r6]
bl MOD16_021D9DE8
@@ -48904,12 +48904,12 @@ MOD16_021EDF78: ; 0x021EDF78
ldr r0, [sp, #0x18]
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r2, _021EE08C ; =0x00000266
mov r0, #0
mov r1, #0x1a
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
ldr r0, [r6]
bl MOD16_021D9F40
@@ -48960,7 +48960,7 @@ _021EE04E:
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -52406,7 +52406,7 @@ MOD16_021EFA6C: ; 0x021EFA6C
mov r0, #0
mov r1, #0x1a
add r3, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x6d
add r2, r5, #0
add r4, r0, #0
@@ -52425,7 +52425,7 @@ MOD16_021EFA6C: ; 0x021EFA6C
add r0, r5, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x10
pop {r4, r5, r6, pc}
nop
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index ab858387..4f74dada 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -4712,7 +4712,7 @@ MOD17_021D9918: ; 0x021D9918
mov r0, #0
mov r1, #0x1a
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, [sp, #0x14]
add r6, r0, #0
bl FUN_0200A914
@@ -4731,7 +4731,7 @@ MOD17_021D9918: ; 0x021D9918
add r0, r4, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _021D99D4 ; =0x000006A8
ldr r0, [r5, r0]
bl FUN_020191D0
@@ -4758,7 +4758,7 @@ MOD17_021D99E0: ; 0x021D99E0
mov r0, #0
mov r1, #0x1a
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r7, r0, #0
bl FUN_0200A914
@@ -4789,7 +4789,7 @@ MOD17_021D99E0: ; 0x021D99E0
add r0, r6, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _021D9A58 ; =0x000006A8
ldr r0, [r5, r0]
bl FUN_020191D0
@@ -4823,7 +4823,7 @@ _021D9A7E:
mov r0, #0
mov r1, #0x1a
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r7, r0, #0
bl FUN_0200A914
@@ -4868,7 +4868,7 @@ _021D9AD0:
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _021D9B08 ; =0x000006A8
ldr r0, [r5, r0]
bl FUN_020191D0
@@ -11254,7 +11254,7 @@ MOD17_021DC880: ; 0x021DC880
add r4, r3, #0
mov r0, #0
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
bne _021DC898
bl ErrorHandling
@@ -11294,7 +11294,7 @@ _021DC898:
add r0, r7, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@@ -11933,7 +11933,7 @@ MOD17_021DCD80: ; 0x021DCD80
add r4, r3, #0
mov r0, #0
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
bne _021DCD98
bl ErrorHandling
@@ -11959,7 +11959,7 @@ _021DCD98:
add r0, r4, #0
bl FUN_02021A20
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
add sp, #0x10
pop {r4, r5, r6, pc}
@@ -11984,7 +11984,7 @@ _021DCDEC:
add r1, r5, #0
add r2, r6, #0
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
bne _021DCE00
bl ErrorHandling
@@ -12008,7 +12008,7 @@ _021DCE00:
bl FUN_0201BDE0
add r4, r0, #0
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@@ -13208,7 +13208,7 @@ MOD17_021DD6DC: ; 0x021DD6DC
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@@ -13278,7 +13278,7 @@ MOD17_021DD778: ; 0x021DD778
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@@ -14340,7 +14340,7 @@ MOD17_021DDFDC: ; 0x021DDFDC
mov r0, #0
mov r1, #0x1a
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
cmp r0, #0
bne _021DDFF8
@@ -14443,7 +14443,7 @@ _021DDFF8:
add r0, r7, #0
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
bl FUN_0200AB18
add sp, #0x20
@@ -14501,7 +14501,7 @@ MOD17_021DE0F4: ; 0x021DE0F4
add r3, r6, #0
bl FUN_0200ABB4
mov r0, #0xd
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
ldr r0, [r5, #4]
add r1, r6, #0
@@ -14518,7 +14518,7 @@ MOD17_021DE0F4: ; 0x021DE0F4
mov r0, #0
mov r1, #0x1a
mov r3, #0xd
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
cmp r0, #0
bne _021DE1A0
@@ -14591,7 +14591,7 @@ _021DE1A0:
add r0, r4, #0
bl FUN_02021A20
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r7, #0
bl FUN_0200AB18
add sp, #0x14
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 879113e6..36ef4cf5 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -29544,7 +29544,7 @@ MOD18_02247AA8: ; 0x02247AA8
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r4, _02247B5C ; =0x02250548
add r7, r0, #0
mov r6, #0
@@ -29559,7 +29559,7 @@ _02247AFA:
cmp r6, #4
blo _02247AFA
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
bl MOD18_0224DAD8
add r1, sp, #0x14
mov r2, #0x20
@@ -29670,7 +29670,7 @@ MOD18_02247BB8: ; 0x02247BB8
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
mov r4, #0
add r7, sp, #0x14
@@ -29707,7 +29707,7 @@ _02247C40:
cmp r4, #4
blt _02247C0A
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _02247C94 ; =0x02250528
add r3, sp, #0x18
add r2, r3, #0
@@ -29843,7 +29843,7 @@ MOD18_02247D1C: ; 0x02247D1C
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
mov r4, #0
_02247D6C:
@@ -29860,7 +29860,7 @@ _02247D6C:
cmp r4, #4
blt _02247D6C
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _02247DD4 ; =0x02250528
add r3, sp, #0x14
add r2, r3, #0
@@ -31214,7 +31214,7 @@ MOD18_02248820: ; 0x02248820
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
mov r4, #0
_02248870:
@@ -31236,7 +31236,7 @@ _02248870:
mov r3, #0x33
bl FUN_02012880
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _022488EC ; =0x02250528
add r3, sp, #0x14
add r2, r3, #0
@@ -36642,7 +36642,7 @@ _0224B374:
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
ldr r0, [sp, #0x18]
mov r4, #0
@@ -36673,7 +36673,7 @@ _0224B3F4:
blt _0224B3D4
_0224B3FC:
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
bl MOD18_0224DAD8
add r1, sp, #0x20
mov r2, #0x20
@@ -36765,7 +36765,7 @@ MOD18_0224B464: ; 0x0224B464
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
ldr r0, [sp, #0x1c]
mov r4, #0
@@ -36794,7 +36794,7 @@ _0224B4F0:
blt _0224B4D0
_0224B4F8:
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
bl MOD18_0224DAD8
add r1, sp, #0x20
mov r2, #0x20
@@ -39102,7 +39102,7 @@ MOD18_0224C7D4: ; 0x0224C7D4
mov r1, #0x1a
sub r2, #0xd
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
bl MOD18_0223D678
ldr r1, _0224C938 ; =0x0000023B
@@ -39116,7 +39116,7 @@ _0224C83C:
mov r1, #0x1a
sub r2, #0x11
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
bl MOD18_0223D678
ldr r1, _0224C93C ; =0x00000237
@@ -39128,7 +39128,7 @@ _0224C85C:
mov r1, #0x1a
sub r2, #0xf
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
bl MOD18_0223D678
ldr r1, _0224C940 ; =0x00000239
@@ -39154,7 +39154,7 @@ _0224C87C:
sub r3, r2, #2
bl FUN_02012880
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
bl MOD18_0224DAD8
add r1, sp, #0x14
mov r2, #0x20
@@ -40806,7 +40806,7 @@ MOD18_0224D5CC: ; 0x0224D5CC
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r5, r0, #0
add r0, r4, #0
add r0, #8
@@ -40844,7 +40844,7 @@ _0224D64A:
ldr r0, [r1]
str r4, [r0]
add r0, r5, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -41311,7 +41311,7 @@ MOD18_0224DA00: ; 0x0224DA00
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
add r0, r5, #0
add r0, #8
@@ -41332,7 +41332,7 @@ MOD18_0224DA00: ; 0x0224DA00
add r0, #8
bl FUN_02019220
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
@@ -41413,7 +41413,7 @@ _0224DB08:
mov r0, #1
mov r1, #0x1a
add r3, r5, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x24]
str r5, [r4, #0x34]
add r0, r4, #0
@@ -41446,7 +41446,7 @@ MOD18_0224DB5C: ; 0x0224DB5C
ldr r0, [r4, #0x28]
bl FUN_0200AB18
ldr r0, [r4, #0x24]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl FreeToHeap
pop {r4, pc}
@@ -41463,12 +41463,12 @@ MOD18_0224DB80: ; 0x0224DB80
beq _0224DBAC
str r4, [r5, #0x2c]
ldr r0, [r5, #0x24]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r3, [r5, #0x34]
add r0, r6, #0
mov r1, #0x1a
add r2, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x24]
cmp r0, #0
bne _0224DBAC
@@ -42324,7 +42324,7 @@ MOD18_0224E0CC: ; 0x0224E0CC
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
add r0, r5, #0
add r0, #0x14
@@ -42359,7 +42359,7 @@ _0224E186:
cmp r6, #4
blt _0224E186
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _0224E208 ; =0x022507D0
add r3, sp, #0x24
add r2, r3, #0
@@ -42777,13 +42777,13 @@ _0224E454:
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x18]
ldr r2, _0224E690 ; =0x00000242
mov r0, #0
mov r1, #0x1a
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x24]
add r0, r5, #0
add r0, #0x18
@@ -42856,7 +42856,7 @@ _0224E454:
add r0, r4, #0
bl FUN_02021A20
ldr r0, [sp, #0x24]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp, #0x20]
mov r4, #0
cmp r0, #0
@@ -42897,7 +42897,7 @@ _0224E5CE:
add r3, r3, #1
bl FUN_02012880
ldr r0, [sp, #0x18]
- bl FUN_0200A8B8
+ bl DestroyMsgData
bl MOD18_0223D678
ldr r1, _0224E68C ; =0x00000237
mov r2, #0
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 6cfd48bd..8b3921cf 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -305,7 +305,7 @@ _02254A62:
add r1, r6, #0
bl FUN_0206B9B0
add r4, r0, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r4, #0
bl FUN_0206B688
@@ -354,7 +354,7 @@ _02254ABE:
strb r0, [r5, #0x13]
add r0, r4, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
ldr r0, [sp]
add r6, r6, #1
ldr r0, [r0]
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 727fced8..d24971d9 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -330,7 +330,7 @@ _02254A7A:
str r0, [sp, #8]
bl FUN_02023C7C
add r4, r0, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0xc]
add r0, r4, #0
bl FUN_0206B688
@@ -338,22 +338,22 @@ _02254A7A:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6, #0x1c]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6, #0x20]
ldr r0, [sp, #8]
bl MOD05_021EC7B4
str r0, [r5, #0xc]
add r0, r4, #0
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
str r0, [r5, #0x14]
ldr r1, [sp, #0xc]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp]
add r7, r7, #1
ldrb r0, [r0]
diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s
index 1620e737..a9a94ebe 100644
--- a/arm9/modules/38/asm/module_38.s
+++ b/arm9/modules/38/asm/module_38.s
@@ -527,7 +527,7 @@ MOD38_02254BC4: ; 0x02254BC4
mov r0, #1
mov r1, #0x1a
mov r3, #8
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xb4
str r0, [r1]
@@ -535,7 +535,7 @@ MOD38_02254BC4: ; 0x02254BC4
mov r0, #1
mov r1, #0x1a
mov r3, #8
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xb8
str r0, [r1]
@@ -675,11 +675,11 @@ MOD38_02254D04: ; 0x02254D04
add r0, r4, #0
add r0, #0xb4
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0xb8
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl MOD38_02254CC4
add r0, r4, #0
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index f92acbb8..cdfaa3dc 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -712,7 +712,7 @@ MOD47_02254D14: ; 0x02254D14
mov r0, #1
mov r1, #0x1a
mov r3, #8
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x58]
mov r0, #0x60
mov r1, #8
@@ -739,7 +739,7 @@ MOD47_02254D6C: ; 0x02254D6C
ldr r0, [r4, #0x5c]
bl FUN_02021A20
ldr r0, [r4, #0x58]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl MOD47_02254DFC
add r0, r4, #0
diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s
index c07a0192..8df998df 100644
--- a/arm9/modules/51/asm/module_51.s
+++ b/arm9/modules/51/asm/module_51.s
@@ -111,7 +111,7 @@ MOD51_022548F0: ; 0x022548F0
mov r1, #0x1a
lsl r2, r2, #6
mov r3, #4
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x1c]
mov r0, #4
add r3, r4, #0
@@ -345,7 +345,7 @@ _02254AEC:
ldr r0, [r6, #0x28]
bl FUN_0201FD58
ldr r0, [r6, #0x1c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r6, #0x18]
bl FUN_0200AB18
mov r0, #0x72
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s
index 77275774..03a8eda6 100644
--- a/arm9/modules/53/asm/module_53.s
+++ b/arm9/modules/53/asm/module_53.s
@@ -56,7 +56,7 @@ _021D74F6:
mov r0, #0
mov r1, #0x1a
mov r3, #0x27
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #4
mov r1, #8
@@ -361,7 +361,7 @@ _021D77D8:
bl MOD53_021D7B24
bl FUN_0201CD04
ldr r0, [r6, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r6, #0xc]
bl FUN_0200AB18
ldr r0, [r7]
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 9de1ac02..48b488bf 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -63,7 +63,7 @@ _021D74F6:
mov r0, #0
mov r1, #0x1a
mov r3, #0x33
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x28]
mov r0, #4
mov r1, #8
@@ -315,7 +315,7 @@ _021D776C:
ldr r0, [r0, #4]
bl FUN_02052F8C
ldr r0, [r6, #0x28]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r6, #0x24]
bl FUN_0200AB18
add r0, r6, #0
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index 70381d8a..f4fcee0b 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -568,7 +568,7 @@ MOD55_021D7994: ; 0x021D7994
mov r0, #0
mov r1, #0x1a
mov r3, #0x34
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r6, #0x10]
mov r4, #0
add r5, r6, #0
@@ -640,7 +640,7 @@ MOD55_021D7A38: ; 0x021D7A38
push {r4, r5, r6, lr}
add r6, r0, #0
ldr r0, [r6, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r6, #0xc]
bl FUN_0200AB18
mov r4, #0
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 6b14026a..3abecf47 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -283,7 +283,7 @@ MOD56_02211FD4: ; 0x02211FD4
mov r1, #0x1a
lsl r2, r2, #4
mov r3, #0x36
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xcc
str r0, [r1]
@@ -291,7 +291,7 @@ MOD56_02211FD4: ; 0x02211FD4
mov r0, #0
mov r1, #0x1a
mov r3, #0x36
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xd0
str r0, [r1]
@@ -521,11 +521,11 @@ _022121EC:
add r0, r6, #0
add r0, #0xd0
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
add r0, #0xcc
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r6, #0xc8
ldr r0, [r6]
bl FUN_0200AB18
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index a84a5097..1996a814 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -591,14 +591,14 @@ MOD57_021D79AC: ; 0x021D79AC
mov r0, #0
mov r1, #0x1a
mov r3, #0x19
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r2, _021D79EC ; =0x0000330C
add r4, r0, #0
ldr r2, [r5, r2]
mov r1, #0xb
bl FUN_0200A8E0
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r3, r4, r5, pc}
.align 2, 0
_021D79E8: .word 0x00003308
@@ -2754,7 +2754,7 @@ MOD57_021D89F0: ; 0x021D89F0
mov r0, #0
mov r1, #0x1a
mov r3, #0x19
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x14]
mov r0, #0x20
mov r1, #0x19
@@ -3018,7 +3018,7 @@ _021D8C32:
add r0, r5, #0
bl FUN_02021A20
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -3077,7 +3077,7 @@ MOD57_021D8CF8: ; 0x021D8CF8
mov r0, #0
mov r1, #0x1a
mov r3, #0x19
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #0x20
mov r1, #0x19
@@ -3335,7 +3335,7 @@ _021D8E74:
add r0, r5, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -3460,7 +3460,7 @@ _021D906E:
mov r0, #0
mov r1, #0x1a
mov r3, #0x19
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x10]
mov r0, #0x20
mov r1, #0x19
@@ -3519,7 +3519,7 @@ _021D906E:
str r1, [sp, #0xc]
bl FUN_0201BDE0
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl FUN_02021A20
ldr r0, [sp, #0x14]
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s
index 1b86ce96..17e5c6d8 100644
--- a/arm9/modules/58/asm/module_58.s
+++ b/arm9/modules/58/asm/module_58.s
@@ -62,7 +62,7 @@ _021D9A36:
mov r0, #0
mov r1, #0x1a
mov r3, #0x27
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x14]
mov r0, #4
mov r1, #8
@@ -258,7 +258,7 @@ _021D9C40:
bl MOD58_021D9ED8
bl FUN_0201CD04
ldr r0, [r6, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r6, #0x10]
bl FUN_0200AB18
add r0, r6, #0
diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s
index 18eeffea..70b11d2d 100644
--- a/arm9/modules/59/asm/module_59.s
+++ b/arm9/modules/59/asm/module_59.s
@@ -600,7 +600,7 @@ MOD59_021D79F8: ; 0x021D79F8
ldr r3, [r4]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x4c]
bl FUN_0201BD5C
mov r0, #0
@@ -630,7 +630,7 @@ MOD59_021D7A34: ; 0x021D7A34
ldr r0, [r4, #0x60]
bl FUN_020143D0
ldr r0, [r4, #0x4c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, pc}
thumb_func_end MOD59_021D7A34
@@ -4875,7 +4875,7 @@ MOD59_021D9C48: ; 0x021D9C48
ldr r3, [r4]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #8]
bl FUN_0201BD5C
mov r0, #0
@@ -4887,11 +4887,11 @@ _021D9C64: .word 0x00000225
thumb_func_start MOD59_021D9C68
MOD59_021D9C68: ; 0x021D9C68
- ldr r3, _021D9C70 ; =FUN_0200A8B8
+ ldr r3, _021D9C70 ; =DestroyMsgData
ldr r0, [r0, #8]
bx r3
nop
-_021D9C70: .word FUN_0200A8B8
+_021D9C70: .word DestroyMsgData
thumb_func_end MOD59_021D9C68
thumb_func_start MOD59_021D9C74
diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s
index 9c4971db..f6dc106a 100644
--- a/arm9/modules/60/asm/module_60.s
+++ b/arm9/modules/60/asm/module_60.s
@@ -464,7 +464,7 @@ _021D7888:
mov r0, #1
mov r1, #0x1a
mov r2, #0xce
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x20]
add r0, r4, #0
bl MOD60_021D7DF8
@@ -540,7 +540,7 @@ _021D7928:
blt _021D7906
ldr r0, [sp]
ldr r0, [r0, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [sp]
bl MOD60_021D7B98
ldr r0, [sp]
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index 3b1791b2..a79053c3 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -881,7 +881,7 @@ MOD61_021D7B84: ; 0x021D7B84
add r0, #0x24
beq _021D7B98
ldr r0, [r4, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
_021D7B98:
add r0, r4, #0
bl MOD61_021D80F4
@@ -1575,7 +1575,7 @@ _021D8164:
ldr r3, [r4]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x20]
ldr r1, [r4]
mov r0, #0x10
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 33be95e4..6fff3ef5 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1157,7 +1157,7 @@ MOD62_0222DE00: ; 0x0222DE00
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #5
str r0, [sp, #0x14]
bl FUN_0200A914
@@ -1247,7 +1247,7 @@ MOD62_0222DE00: ; 0x0222DE00
ldr r0, [sp, #0x18]
bl FUN_02021A20
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, sp, #0x1c
bl FUN_02019178
add sp, #0x5c
@@ -1977,7 +1977,7 @@ _0222E442:
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r6, #0
str r0, [sp, #0x20]
cmp r7, #0
@@ -2010,7 +2010,7 @@ _0222E49A:
blt _0222E49A
_0222E4D0:
ldr r0, [sp, #0x20]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r1, #0x67
ldr r0, [sp, #0x1c]
lsl r1, r1, #2
@@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC80:
cmp r7, #0xff
beq _0222EC9A
@@ -3017,7 +3017,7 @@ _0222EC80:
add r0, r1, r0
ldr r0, [r0, #4]
mov r1, #0xa1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC9A:
add r2, r5, #4
ldr r1, [r2, r6]
@@ -3272,7 +3272,7 @@ _0222EE96:
mov r1, #0x1a
mov r2, #8
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r6, r0, #0
bl FUN_0200A914
@@ -3293,7 +3293,7 @@ _0222EE96:
add r0, r5, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -3714,7 +3714,7 @@ _0222F226:
mov r1, #0x1a
mov r2, #0xa
mov r3, #0x35
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r5, #0
add r6, r0, #0
bl FUN_0200A914
@@ -3735,7 +3735,7 @@ _0222F226:
add r0, r5, #0
bl FUN_02021A20
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -5753,7 +5753,7 @@ MOD62_0223021C: ; 0x0223021C
add r4, r0, #0
ldr r0, _02230268 ; =0x00000428
ldr r0, [r5, r0]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r6, r0, #0
mov r0, #0x6a
lsl r0, r0, #2
@@ -6235,12 +6235,12 @@ _022305E2:
mov r1, #0xa1
ldr r0, [r4, r0]
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02230724 ; =0x00000428
mov r1, #0xaa
ldr r0, [r4, r0]
add r2, sp, #0x64
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x35
add r1, sp, #0x58
bl MOD08_02228218
@@ -6531,7 +6531,7 @@ _02230860:
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_022308A8:
mov r0, #0xf5
mov r1, #8
@@ -7091,7 +7091,7 @@ MOD62_02230D38: ; 0x02230D38
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230D5C:
mov r0, #0xff
str r0, [r4, r6]
diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s
index c294d4a0..a6498412 100644
--- a/arm9/modules/63/asm/module_63.s
+++ b/arm9/modules/63/asm/module_63.s
@@ -2044,7 +2044,7 @@ _021D844C:
mov r0, #1
mov r1, #0x1a
add r3, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #0x40
add r1, r4, #0
@@ -2094,7 +2094,7 @@ _021D844C:
add r0, r4, #0
bl FUN_02021A20
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r1, #0x15
add r0, sp, #0x1c
strh r1, [r0, #2]
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 4dcf153c..229ab02a 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -824,7 +824,7 @@ MOD64_021D7BB4: ; 0x021D7BB4
add r4, r1, #0
lsr r0, r0, #0x10
mov r1, #0
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -2307,7 +2307,7 @@ MOD64_021D86DC: ; 0x021D86DC
mov r0, #0
mov r1, #0x1a
add r3, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
bne _021D86F8
bl ErrorHandling
@@ -2340,7 +2340,7 @@ _021D86F8:
add r0, r6, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r7, #0
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@@ -2364,7 +2364,7 @@ _021D875C:
mov r1, #0x1a
add r2, r7, #0
add r3, r6, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
bne _021D8770
bl ErrorHandling
@@ -2395,7 +2395,7 @@ _021D8770:
add r3, r1, #0
bl FUN_0200D0BC
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@@ -3498,7 +3498,7 @@ MOD64_021D8FD0: ; 0x021D8FD0
mov r0, #0
mov r1, #0x1a
add r3, r4, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
bne _021D8FEC
bl ErrorHandling
@@ -3526,7 +3526,7 @@ _021D8FEC:
add r0, r6, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index 22b307e2..20b90cb6 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -1043,7 +1043,7 @@ MOD65_021D7CC8: ; 0x021D7CC8
mov r0, #0
mov r1, #0x1a
lsl r2, r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x2c]
ldr r0, [r5]
bl FUN_02014518
@@ -1146,7 +1146,7 @@ _021D7D94:
ldr r0, [r6, #0x28]
bl FUN_02014564
ldr r0, [r6, #0x2c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #2
bl FUN_02002CF8
pop {r4, r5, r6, pc}
@@ -3311,7 +3311,7 @@ MOD65_021D8EC4: ; 0x021D8EC4
ldr r3, [r6]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r6, #0x18]
ldr r2, [r6]
mov r0, #1
@@ -3356,7 +3356,7 @@ _021D8F10:
ldr r0, [r6, #0x1c]
bl FUN_0200AB18
ldr r0, [r6, #0x18]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_end MOD65_021D8F08
@@ -3376,13 +3376,13 @@ MOD65_021D8F34: ; 0x021D8F34
strh r0, [r4, #0x34]
ldr r0, [r4, #0x10]
ldr r0, [r0]
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
add r1, r4, #0
add r1, #0x37
strb r0, [r1]
ldr r0, [r4, #0x10]
ldr r0, [r0]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r1, r4, #0
add r1, #0x36
strb r0, [r1]
diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s
index 8e3d0e84..a556a870 100644
--- a/arm9/modules/66/asm/module_66.s
+++ b/arm9/modules/66/asm/module_66.s
@@ -239,7 +239,7 @@ _021D7694:
str r0, [r4, #0x1c]
ldr r3, [r4, #4]
mov r0, #1
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0x80
str r0, [r1]
@@ -248,7 +248,7 @@ _021D7694:
mov r0, #1
mov r1, #0x1a
lsl r2, r2, #2
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0x84
str r0, [r1]
@@ -353,10 +353,10 @@ _021D7782:
add r0, r5, #0
add r0, #0x84
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r5, #0x80
ldr r0, [r5]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_end MOD66_021D7750
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 02c76f3d..7d7666f9 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -438,7 +438,7 @@ MOD67_021D7880: ; 0x021D7880
mov r0, #0
mov r1, #0x1a
mov r3, #0x2a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x50]
mov r0, #0x2a
bl FUN_0200AA80
@@ -457,7 +457,7 @@ MOD67_021D78AC: ; 0x021D78AC
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x50]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x54]
bl FUN_0200AB18
ldr r0, [r4, #0x58]
@@ -3298,7 +3298,7 @@ MOD67_021D8F00: ; 0x021D8F00
str r3, [sp, #0xc]
mov r0, #0x2a
add r7, r1, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r4, [sp]
mov r1, #0
str r1, [sp, #4]
@@ -3307,7 +3307,7 @@ MOD67_021D8F00: ; 0x021D8F00
add r1, r7, #0
mov r2, #1
mov r3, #0x20
- bl FUN_02066DD4
+ bl CreateMonWithNatureGenderLetter
add r0, r6, #0
bl FUN_020690E4
add r2, r0, #0
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index a342b2d1..08507c53 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -433,7 +433,7 @@ MOD68_021D7870: ; 0x021D7870
mov r0, #0
mov r1, #0x1a
mov r3, #0x24
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xc4
str r0, [r1]
@@ -460,7 +460,7 @@ MOD68_021D78A8: ; 0x021D78A8
add r4, r0, #0
add r0, #0xc4
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0xcc
ldr r0, [r0]
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index f12e6191..c0a49cfe 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -27,7 +27,7 @@ MOD69_0222D5C0: ; 0x0222D5C0
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #0x3f
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222D710 ; =0x00001B5C
str r0, [r4, r1]
mov r0, #0x7d
@@ -209,7 +209,7 @@ _0222D762:
bl FUN_02021A20
ldr r0, _0222D7F0 ; =0x00001B5C
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
bl FUN_0200627C
mov r0, #0x3f
@@ -2360,7 +2360,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
mov r1, #0
bl FUN_0200AC60
ldr r0, [r4, #0x24]
- bl FUN_020687C0
+ bl CalcMonLevelEncrypted
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -2370,7 +2370,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
mov r3, #3
bl FUN_0200AD38
ldr r0, [r4, #0x24]
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
cmp r0, #0
beq _0222E93C
cmp r0, #1
@@ -4037,7 +4037,7 @@ MOD69_0222F6C4: ; 0x0222F6C4
add r5, r0, #0
add r0, r4, #0
add r6, r2, #0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp]
add r0, r4, #0
mov r1, #0x79
@@ -4124,7 +4124,7 @@ _0222F778:
_0222F77A:
ldr r1, [sp]
add r0, r4, #0
- bl FUN_02066A20
+ bl TryEncryptMon
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
nop
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index 8138a765..ec5af814 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -429,7 +429,7 @@ MOD70_021D77CC: ; 0x021D77CC
mov r0, #0
mov r1, #0x1a
mov r3, #0x3d
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #6
lsl r2, r2, #6
str r0, [r4, r2]
@@ -437,7 +437,7 @@ MOD70_021D77CC: ; 0x021D77CC
mov r1, #0x1a
sub r2, #0x16
mov r3, #0x3d
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #0x61
lsl r2, r2, #2
str r0, [r4, r2]
@@ -445,7 +445,7 @@ MOD70_021D77CC: ; 0x021D77CC
mov r1, #0x1a
add r2, #0xc8
mov r3, #0x3d
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x62
lsl r1, r1, #2
str r0, [r4, r1]
@@ -469,7 +469,7 @@ MOD70_021D77CC: ; 0x021D77CC
lsl r1, r1, #2
str r0, [r4, r1]
mov r0, #0x3d
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x66
lsl r1, r1, #2
str r0, [r4, r1]
@@ -513,15 +513,15 @@ MOD70_021D78A0: ; 0x021D78A0
mov r0, #0x62
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x61
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #6
lsl r0, r0, #6
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x34]
bl FUN_0201FD58
bl FUN_02009FA0
@@ -1191,7 +1191,7 @@ _021D7DC8:
bl FUN_0201BD84
ldrh r0, [r7, #0x10]
ldr r1, [r7, #8]
- bl FUN_02068A20
+ bl GetGenderBySpeciesAndPersonality
cmp r0, #0
beq _021D7E3A
cmp r0, #1
@@ -1562,7 +1562,7 @@ _021D80F4:
ldr r0, [r7, r0]
ldr r2, [sp, #0x1c]
mov r1, #0x70
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r1, #0x66
lsl r1, r1, #2
ldr r1, [r7, r1]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index aea60f8b..a6e576b3 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -63,7 +63,7 @@ MOD71_0222D5C0: ; 0x0222D5C0
mov r0, #0
sub r2, #0x44
add r3, r1, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x61
lsl r1, r1, #2
str r0, [r4, r1]
@@ -1343,7 +1343,7 @@ MOD71_0222E118: ; 0x0222E118
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
add r4, r1, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r5, #0
mov r1, #0x9a
@@ -1382,7 +1382,7 @@ MOD71_0222E118: ; 0x0222E118
add r6, r0, #0
add r0, r5, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
ldrh r0, [r4]
cmp r0, #0
beq _0222E18E
@@ -1754,7 +1754,7 @@ MOD71_0222E438: ; 0x0222E438
mov r0, #0x61
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #6
lsl r0, r0, #6
ldr r0, [r4, r0]
@@ -4657,7 +4657,7 @@ _0222FC2C:
bne _0222FC70
add r0, #0xc
ldr r0, [r6, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222FCEC ; =0x00003674
ldr r0, [r6, r0]
bl FUN_0200AB18
@@ -4786,7 +4786,7 @@ _0222FD48:
mov r1, #0x1a
mov r0, #0
add r3, r1, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222FD90 ; =0x00003678
str r0, [r4, r1]
ldr r0, [r4, #4]
@@ -6320,10 +6320,10 @@ MOD71_022309E8: ; 0x022309E8
add r6, r2, #0
str r3, [sp, #0xc]
ldr r5, [sp, #0x28]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0
mov r0, #0x1a
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
@@ -6347,7 +6347,7 @@ MOD71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230A40:
bl FUN_02031190
bl FUN_0202DFA4
@@ -6435,7 +6435,7 @@ MOD71_02230AE4: ; 0x02230AE4
bl FUN_020239CC
add r5, r0, #0
add r0, r4, #0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
add r3, r0, #0
mov r0, #0x1a
lsl r1, r5, #0x18
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 46c50951..97f57105 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -2825,7 +2825,7 @@ MOD73_021D8BDC: ; 0x021D8BDC
ldr r3, [r5]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _021D8CE4 ; =0x00001574
str r0, [r5, r1]
ldr r2, [r5]
@@ -3019,7 +3019,7 @@ _021D8D92:
bl FUN_0200AB18
ldr r0, _021D8DF0 ; =0x00001574
ldr r0, [r6, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r3, r4, r5, r6, r7, pc}
nop
_021D8DBC: .word 0x000015A8
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 785f1686..46afe454 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -845,7 +845,7 @@ MOD74_021D7B20: ; 0x021D7B20
mov r0, #0
mov r1, #0x1a
mov r2, #0x11
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r5, #0x28]
ldr r2, [r5]
mov r0, #2
@@ -938,7 +938,7 @@ _021D7BEC:
ldr r0, [r6, #0x2c]
bl FUN_0200AB18
ldr r0, [r6, #0x28]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_end MOD74_021D7BB4
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index c6baf422..e4c70c65 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -434,15 +434,15 @@ MOD75_021E6F00: ; 0x021E6F00
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x47
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x11
lsl r0, r0, #4
ldr r0, [r4, r0]
@@ -938,7 +938,7 @@ MOD75_021E737C: ; 0x021E737C
mov r1, #0x1a
mov r2, #7
mov r3, #6
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x45
lsl r1, r1, #2
str r0, [r4, r1]
@@ -959,7 +959,7 @@ MOD75_021E737C: ; 0x021E737C
mov r1, #0x1a
add r2, #0x40
mov r3, #6
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x47
lsl r1, r1, #2
str r0, [r4, r1]
@@ -968,7 +968,7 @@ MOD75_021E737C: ; 0x021E737C
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #6
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x12
lsl r1, r1, #4
str r0, [r4, r1]
@@ -7623,7 +7623,7 @@ MOD75_021EA7BC: ; 0x021EA7BC
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #6
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r7, _021EA7F4 ; =0x00000404
add r6, r0, #0
mov r4, #0
@@ -7640,7 +7640,7 @@ _021EA7D4:
cmp r4, #8
blo _021EA7D4
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021EA7F4: .word 0x00000404
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index ba2092da..6f7aff75 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -514,7 +514,7 @@ MOD76_021D7900: ; 0x021D7900
mov r0, #0
mov r1, #0x1a
mov r3, #0x43
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r1, r4, #0
add r1, #0xf8
str r0, [r1]
@@ -541,7 +541,7 @@ MOD76_021D7938: ; 0x021D7938
add r4, r0, #0
add r0, #0xf8
ldr r0, [r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
add r0, #0xfc
ldr r0, [r0]
@@ -801,7 +801,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0
str r0, [sp]
ldr r1, [r4]
@@ -809,7 +809,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl MOD76_021D8514
mov r1, #0
@@ -820,7 +820,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3a
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4]
mov r1, #0
strb r1, [r0, #0x16]
@@ -1266,7 +1266,7 @@ MOD76_021D7ECC: ; 0x021D7ECC
mov r1, #0x1a
lsl r2, r2, #2
mov r3, #0x43
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #0x61
lsl r0, r0, #2
@@ -1311,7 +1311,7 @@ _021D7F42:
blo _021D7F0E
_021D7F50:
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _021D7FA8 ; =0x021D8EFC
add r3, sp, #0
add r2, r3, #0
@@ -1523,7 +1523,7 @@ _021D80BE:
mov r0, #1
mov r1, #0x1a
mov r3, #0x43
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #1
lsl r2, r2, #8
ldr r2, [r5, r2]
@@ -1537,7 +1537,7 @@ _021D80BE:
str r2, [sp]
bl MOD76_021D7CC8
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
lsl r1, r4, #0x10
add r0, r5, #0
lsr r1, r1, #0x10
@@ -1615,7 +1615,7 @@ MOD76_021D81AC: ; 0x021D81AC
mov r1, #0x1a
mov r2, #0xc5
mov r3, #0x43
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r2, #1
lsl r2, r2, #8
ldr r2, [r5, r2]
@@ -1636,7 +1636,7 @@ MOD76_021D81AC: ; 0x021D81AC
add r3, r1, #0
bl FUN_0201BDE0
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
lsl r1, r4, #0x10
add r0, r5, #0
lsr r1, r1, #0x10
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index 5becbc25..71771dfb 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -164,7 +164,7 @@ _021D764C:
ldr r3, [r4]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _021D796C ; =0x0000C060
str r0, [r4, r1]
add r0, r4, #0
@@ -769,7 +769,7 @@ _021D7B3E:
bl MOD77_021D88D0
ldr r0, _021D7BA8 ; =0x0000C060
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r7, #0
str r0, [r5]
mov r7, #1
@@ -1849,7 +1849,7 @@ MOD77_021D8418: ; 0x021D8418
ldr r3, [r5]
mov r0, #0
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #8]
ldr r1, [r5]
add r0, r6, #0
@@ -1871,7 +1871,7 @@ _021D844E:
blo _021D844E
_021D8462:
ldr r0, [sp, #8]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, [sp, #4]
add r3, sp, #0xc
ldmia r4!, {r0, r1}
@@ -3161,13 +3161,13 @@ MOD77_021D8E9C: ; 0x021D8E9C
mov r1, #0x1a
lsl r2, r2, #2
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #8]
add r1, r5, #0
add r2, r6, #0
bl FUN_0200A8E0
ldr r0, [sp, #8]
- bl FUN_0200A8B8
+ bl DestroyMsgData
cmp r4, #0
bne _021D8EDA
mov r5, #0
@@ -3183,13 +3183,13 @@ _021D8EDC:
mov r0, #0
mov r1, #0x1a
add r3, r7, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, [sp]
ldr r2, [sp, #4]
add r4, r0, #0
bl FUN_0200A8E0
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
add sp, #0xc
pop {r4, r5, r6, r7, pc}
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index ba3c09fe..ca042f7e 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -1425,7 +1425,7 @@ _0222DFE4:
mov r0, #0
mov r1, #0x1a
mov r3, #0x3e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222E118 ; =0x00000B34
mov r2, #0x25
str r0, [r4, r1]
@@ -1433,14 +1433,14 @@ _0222DFE4:
mov r1, #0x1a
lsl r2, r2, #4
mov r3, #0x3e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222E11C ; =0x00000B3C
ldr r2, _0222E120 ; =0x00000265
str r0, [r4, r1]
mov r0, #0
mov r1, #0x1a
mov r3, #0x3e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x2d
lsl r1, r1, #6
str r0, [r4, r1]
@@ -1448,7 +1448,7 @@ _0222DFE4:
mov r0, #0
mov r1, #0x1a
mov r3, #0x3e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222E128 ; =0x00000B38
str r0, [r4, r1]
mov r0, #4
@@ -1661,17 +1661,17 @@ MOD80_0222E25C: ; 0x0222E25C
bl MOD80_0222E7F0
ldr r0, _0222E2D4 ; =0x00000B38
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x2d
lsl r0, r0, #6
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222E2D8 ; =0x00000B3C
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222E2DC ; =0x00000B34
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0xb3
lsl r0, r0, #4
ldr r0, [r4, r0]
@@ -4855,7 +4855,7 @@ MOD80_0222FBC0: ; 0x0222FBC0
ldr r0, [sp, #0x48]
ldr r2, [sp, #0x1c]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r2, #0
ldrsh r0, [r4, r2]
mov r1, #6
@@ -4866,7 +4866,7 @@ MOD80_0222FBC0: ; 0x0222FBC0
mov r0, #3
ldrsb r4, [r4, r0]
ldr r0, [sp, #0x48]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x30]
add r0, r5, #0
mov r1, #0x46
@@ -10777,7 +10777,7 @@ MOD80_02232BD4: ; 0x02232BD4
MOD80_02232C2C: ; 0x02232C2C
push {r4, lr}
add r4, r1, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
strb r0, [r4, #3]
pop {r4, pc}
thumb_func_end MOD80_02232C2C
@@ -10832,38 +10832,38 @@ MOD80_02232C88: ; 0x02232C88
add r7, r2, #0
add r6, r3, #0
ldr r4, [sp, #0x40]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r0, r5, #0
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x10]
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x14]
add r0, r5, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x18]
ldrh r0, [r6]
mov r1, #0x6f
mov r2, #0
strh r0, [r4]
add r0, r5, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r0, r0, #1
strb r0, [r4, #2]
ldr r0, [sp, #0x14]
@@ -10874,7 +10874,7 @@ MOD80_02232C88: ; 0x02232C88
_02232CF2:
add r0, r5, #0
mov r1, #1
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x1c]
cmp r0, #0
beq _02232D60
@@ -11266,7 +11266,7 @@ MOD80_02233018: ; 0x02233018
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
mov r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
ldr r5, _02233050 ; =0x02237220
str r0, [sp]
add r6, r4, #0
@@ -11274,7 +11274,7 @@ _02233028:
ldrh r1, [r5]
add r0, r7, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r6, #1
add r4, r4, r0
add r5, r5, #2
@@ -11282,7 +11282,7 @@ _02233028:
blt _02233028
ldr r1, [sp]
add r0, r7, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
cmp r4, #0
beq _0223304C
mov r0, #1
@@ -11305,7 +11305,7 @@ MOD80_02233054: ; 0x02233054
_02233062:
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _02233072
mov r0, #0
@@ -11314,7 +11314,7 @@ _02233072:
add r0, r4, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _02233084
mov r0, #2
@@ -11386,18 +11386,18 @@ MOD80_022330E4: ; 0x022330E4
mov r1, #5
mov r2, #0
add r5, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #2]
add r0, r5, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r1, sp, #0
strb r0, [r1, #3]
add r0, sp, #0
@@ -11418,7 +11418,7 @@ MOD80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1, #6]
add r0, r5, #0
@@ -11426,14 +11426,14 @@ MOD80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #8]
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r1, sp, #0
strb r0, [r1, #9]
add r0, r4, #0
@@ -11459,13 +11459,13 @@ MOD80_0223311C: ; 0x0223311C
mov r1, #5
mov r2, #0
add r5, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r0, r0, #1
add r1, sp, #0
strb r0, [r1, #2]
@@ -13374,14 +13374,14 @@ MOD80_022340DC: ; 0x022340DC
ldr r0, [sp, #0xc]
ldr r2, [sp, #0x18]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r0, [sp, #0xc]
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #1
ldr r0, [sp, #0xc]
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
str r0, [sp, #0x10]
add r0, r4, #0
mov r1, #0x64
@@ -13467,7 +13467,7 @@ _022341CA:
ldr r0, [sp, #0xc]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r7]
ldr r0, [sp, #0x10]
strb r6, [r7, #2]
@@ -13570,7 +13570,7 @@ MOD80_02234288: ; 0x02234288
bl MOD80_02232FAC
cmp r0, #0
beq _022342B0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r2, r0, #0
add r0, r4, #0
add r0, #0xbc
@@ -15243,7 +15243,7 @@ _02234F38:
cmp r0, #0
beq _02234F9C
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@@ -15289,7 +15289,7 @@ _02234FA4:
cmp r0, #0
beq _02235006
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@@ -16064,7 +16064,7 @@ MOD80_02235534: ; 0x02235534
cmp r0, #0x12
beq _02235590
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r1, r5, #0
add r2, r5, #0
add r4, r0, #0
@@ -16175,7 +16175,7 @@ _02235624:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r5]
ldr r0, [r0]
bl MOD80_02235754
@@ -16258,7 +16258,7 @@ _022356D2:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x20]
cmp r0, #0x12
bne _02235706
@@ -16366,7 +16366,7 @@ MOD80_022357A0: ; 0x022357A0
add r2, sp, #4
bl GetMonDataEncrypted
add r0, r4, #0
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
add r3, r0, #0
mov r0, #0x3e
str r0, [sp]
@@ -17194,7 +17194,7 @@ MOD80_02235E08: ; 0x02235E08
push {r4, lr}
add r4, r0, #0
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #1
lsl r1, r1, #0xc
str r0, [r4, r1]
@@ -17493,7 +17493,7 @@ _02236068:
bl MOD80_022361E8
add r7, r0, #0
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x20]
ldr r0, [r4]
ldr r1, [sp, #0x20]
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index f852db8d..87239548 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -52,7 +52,7 @@ _02237E84:
mov r0, #0
mov r1, #0x1a
mov r3, #0x39
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #0x39
bl FUN_0200AA80
@@ -136,7 +136,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0]
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x53
lsl r1, r1, #2
strh r0, [r4, r1]
@@ -144,7 +144,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0, #4]
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02237FD8 ; =0x0000014E
strh r0, [r4, r1]
mov r0, #0
@@ -197,7 +197,7 @@ MOD81_02237FE8: ; 0x02237FE8
push {r3, lr}
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x1c
bl GetMonBaseStat
cmp r0, #0
@@ -226,7 +226,7 @@ MOD81_02238004: ; 0x02238004
ldr r0, [r4, #0xc]
bl FUN_0200AB18
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0x14]
bl FUN_02021A20
ldr r0, [r4, #8]
@@ -999,7 +999,7 @@ _0223860E:
ldr r4, [r0, #4]
_02238610:
add r0, r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x20]
add r0, sp, #0x34
add r1, r4, #0
@@ -1008,12 +1008,12 @@ _02238610:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
ldr r1, [sp, #0x58]
lsr r0, r0, #0x10
@@ -1051,7 +1051,7 @@ _02238648:
bl FUN_02017E14
ldr r1, [sp, #0x20]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r7, #0
bl FreeToHeap
_02238690:
@@ -2514,7 +2514,7 @@ _02239138:
bl MOD81_02238818
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _0223918A
ldr r0, [r4, #0x10]
@@ -9501,7 +9501,7 @@ _0223C8D6:
bl MOD81_02238820
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _0223C902
ldr r0, [r4]
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 794685b9..c1a907de 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -674,7 +674,7 @@ _0222DA48:
mov r0, #0
mov r1, #0x1a
mov r3, #0x44
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222DB6C ; =0x00000B7C
mov r2, #0x25
str r0, [r4, r1]
@@ -682,7 +682,7 @@ _0222DA48:
mov r1, #0x1a
lsl r2, r2, #4
mov r3, #0x44
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r1, #0x2e
lsl r1, r1, #6
str r0, [r4, r1]
@@ -690,7 +690,7 @@ _0222DA48:
mov r0, #0
mov r1, #0x1a
mov r3, #0x44
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _0222DB74 ; =0x00000B84
str r0, [r4, r1]
mov r0, #4
@@ -865,14 +865,14 @@ MOD82_0222DC50: ; 0x0222DC50
bl MOD82_0222DFFC
ldr r0, _0222DCB8 ; =0x00000B84
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0x2e
lsl r0, r0, #6
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222DCBC ; =0x00000B7C
ldr r0, [r4, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222DCC0 ; =0x00000B78
ldr r0, [r4, r0]
bl FUN_0200AB18
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index e63eedb4..0ce9b5c7 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -969,7 +969,7 @@ MOD83_0222DD24: ; 0x0222DD24
mov r0, #1
mov r1, #0x1a
mov r3, #0x51
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x24]
mov r0, #0x51
bl FUN_0200AA80
@@ -1139,7 +1139,7 @@ _0222DE76:
ldr r0, [sp, #0x28]
bl FUN_0200AB18
ldr r0, [sp, #0x24]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #1
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
@@ -3343,7 +3343,7 @@ MOD83_0222F074: ; 0x0222F074
ldr r3, [r5]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r6, r0, #0
ldr r0, [r5]
bl FUN_0200AA80
@@ -3444,7 +3444,7 @@ MOD83_0222F074: ; 0x0222F074
ldr r0, [sp]
bl FUN_0200AB18
add r0, r6, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0222F1A8 ; =0x00003174
add r1, r4, #0
ldr r0, [r5, r0]
@@ -5821,7 +5821,7 @@ _022303CC:
mov r0, #0
mov r1, #0x1a
mov r3, #0x56
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
mov r6, #0
str r0, [r4, #0x10]
cmp r7, #0
@@ -5838,7 +5838,7 @@ _022303EA:
blt _022303EA
_022303FE:
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r3, _02230460 ; =0x0223AE00
add r2, sp, #8
ldmia r3!, {r0, r1}
@@ -5982,7 +5982,7 @@ MOD83_0223050C: ; 0x0223050C
mov r0, #1
mov r1, #0x1a
mov r3, #0x56
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #0x56
bl FUN_0200AA80
@@ -6027,7 +6027,7 @@ _0223057A:
mov r3, #2
bl FUN_0200D0BC
ldr r0, [r4, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #0xc]
bl FUN_0200AB18
mov r0, #0xff
@@ -6422,7 +6422,7 @@ MOD83_0223089C: ; 0x0223089C
mov r0, #1
mov r1, #0x1a
mov r3, #0x56
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
mov r0, #0x56
bl FUN_0200AA80
@@ -6443,7 +6443,7 @@ MOD83_0223089C: ; 0x0223089C
ldr r0, [sp, #8]
bl FUN_0200AB18
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
b _02230918
_022308F8:
ldr r0, [r4, #0x6c]
@@ -8160,7 +8160,7 @@ _02231718:
mov r0, #0
mov r1, #0x1a
mov r3, #0x57
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _022317A0 ; =0x000029A4
mov r6, #0
str r0, [r5, r1]
@@ -8181,7 +8181,7 @@ _0223173A:
_02231752:
ldr r0, _022317A0 ; =0x000029A4
ldr r0, [r5, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r4, _022317A4 ; =0x0223AE90
add r3, sp, #4
add r2, r3, #0
@@ -8227,7 +8227,7 @@ MOD83_022317A8: ; 0x022317A8
mov r0, #1
mov r1, #0x1a
mov r3, #0x57
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r4, r0, #0
mov r0, #0x57
bl FUN_0200AA80
@@ -8260,7 +8260,7 @@ MOD83_022317A8: ; 0x022317A8
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
bl FUN_0200AB18
add sp, #0x10
@@ -9023,7 +9023,7 @@ MOD83_02231DF0: ; 0x02231DF0
mov r0, #1
mov r1, #0x1a
ldr r4, _02231F6C ; =0x0223AEB0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _02231F70 ; =0x000029A4
str r0, [r5, r1]
ldr r0, [r5]
@@ -9182,7 +9182,7 @@ _02231F2E:
blo _02231E72
ldr r0, _02231F70 ; =0x000029A4
ldr r0, [r5, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _02231F74 ; =0x000029A0
ldr r0, [r5, r0]
bl FUN_0200AB18
@@ -9256,7 +9256,7 @@ _02231FD2:
mov r0, #1
mov r1, #0x1a
mov r3, #0x57
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _02232090 ; =0x000029A4
str r0, [r5, r1]
mov r0, #0x57
@@ -9298,7 +9298,7 @@ _02231FFE:
bl FUN_02021A20
ldr r0, _02232090 ; =0x000029A4
ldr r0, [r5, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _02232094 ; =0x000029A0
ldr r0, [r5, r0]
bl FUN_0200AB18
@@ -11082,7 +11082,7 @@ _02232E7E:
mov r0, #1
mov r1, #0x1a
mov r3, #0x57
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [sp, #0x1c]
mov r5, #0
ldr r0, [sp, #0x10]
@@ -11193,7 +11193,7 @@ _02232FAE:
bl FUN_020191D0
_02232FB8:
ldr r0, [sp, #0x1c]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r4, #0
bl FUN_0200AB18
add r0, r6, #0
@@ -11220,7 +11220,7 @@ MOD83_02232FE4: ; 0x02232FE4
mov r0, #1
mov r1, #0x1a
mov r3, #0x57
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _02233078 ; =0x000029A4
str r0, [r5, r1]
mov r0, #0x57
@@ -11264,7 +11264,7 @@ MOD83_02232FE4: ; 0x02232FE4
bl FUN_02021A20
ldr r0, _02233078 ; =0x000029A4
ldr r0, [r5, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, _0223307C ; =0x000029A0
ldr r0, [r5, r0]
bl FUN_0200AB18
@@ -15517,7 +15517,7 @@ _02234F8C:
mov r0, #1
mov r1, #0x1a
mov r3, #0x4e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r7, [r5, #0x40]
str r0, [sp, #0x14]
cmp r7, #0
@@ -15558,7 +15558,7 @@ _02234FB2:
bl FUN_0200AB18
_02234FF8:
ldr r0, [sp, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
mov r0, #0
mvn r0, r0
str r0, [r5, #0x34]
@@ -17254,7 +17254,7 @@ _02235CCA:
mov r0, #1
mov r1, #0x1a
mov r3, #0x4e
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
add r7, r0, #0
add r0, r4, #0
mov r1, #0xb
@@ -17278,7 +17278,7 @@ _02235CCA:
str r6, [sp, #0x68]
bl MOD83_02234F2C
add r0, r7, #0
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r6, #0
bl FUN_02021A20
add r0, r4, #0
@@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC
add r1, r0, #0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
pop {r3, r4, r5, pc}
thumb_func_end MOD83_02237EDC
@@ -21809,7 +21809,7 @@ MOD83_02237F04: ; 0x02237F04
add r0, r1, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0
@@ -21864,9 +21864,9 @@ MOD83_02237F6C: ; 0x02237F6C
add r4, r1, #0
add r6, r0, #0
add r0, r4, #0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r1, #0
str r0, [sp]
add r0, r6, #0
@@ -21876,7 +21876,7 @@ MOD83_02237F6C: ; 0x02237F6C
add r0, r4, #0
mov r1, #0
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0xb
mov r2, #0
@@ -21887,7 +21887,7 @@ MOD83_02237F6C: ; 0x02237F6C
add r0, r4, #0
mov r1, #5
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0xc
mov r2, #0
@@ -21903,7 +21903,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #6
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #1
mov r2, #0
@@ -21912,7 +21912,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #7
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x19
mov r2, #0
@@ -21921,13 +21921,13 @@ _02237FCE:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x46
str r0, [sp, #8]
add r0, r4, #0
mov r1, #9
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
bl MOD83_02237F04
@@ -21935,7 +21935,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xa
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #8
mov r2, #0
@@ -21944,7 +21944,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xb
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #3
mov r2, #0
@@ -21953,7 +21953,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xc
add r2, sp, #4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1a
mov r2, #0
@@ -21962,7 +21962,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xd
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1b
mov r2, #0
@@ -21971,7 +21971,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xe
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1c
mov r2, #0
@@ -21980,7 +21980,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xf
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1d
mov r2, #0
@@ -21989,7 +21989,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x10
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1e
mov r2, #0
@@ -21998,7 +21998,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x11
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1f
mov r2, #0
@@ -22007,7 +22007,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x12
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x16
mov r2, #0
@@ -22016,7 +22016,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x13
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x17
mov r2, #0
@@ -22025,7 +22025,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x14
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x18
mov r2, #0
@@ -22034,7 +22034,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x15
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x21
mov r2, #0
@@ -22043,7 +22043,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x16
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2f
mov r2, #0
@@ -22052,7 +22052,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x17
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x30
mov r2, #0
@@ -22061,7 +22061,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x18
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r5, #0
add r7, r5, #0
_0223815E:
@@ -22075,7 +22075,7 @@ _0223815E:
add r0, r4, #0
add r1, #0x36
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x15
mov r2, #0
@@ -22090,18 +22090,18 @@ _0223815E:
add r0, r4, #0
add r1, #0x3e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r5, #0
add r0, r4, #0
add r1, #0x42
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r5, #0
str r0, [sp, #8]
add r0, r4, #0
add r1, #0x3a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
add r7, r7, #2
cmp r5, #4
@@ -22114,7 +22114,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x46
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x28
mov r2, #0
@@ -22123,7 +22123,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x47
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x29
mov r2, #0
@@ -22132,7 +22132,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x48
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2a
mov r2, #0
@@ -22141,7 +22141,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x49
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2b
mov r2, #0
@@ -22150,7 +22150,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2c
mov r2, #0
@@ -22159,7 +22159,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2d
mov r2, #0
@@ -22168,7 +22168,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x32
mov r2, #0
@@ -22186,7 +22186,7 @@ _0223826C:
add r0, r4, #0
add r1, #0x4e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _0223826C
@@ -22208,7 +22208,7 @@ _02238298:
add r0, r4, #0
add r1, #0x52
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _02238298
@@ -22230,7 +22230,7 @@ _022382C4:
add r0, r4, #0
add r1, #0x56
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _022382C4
@@ -22252,7 +22252,7 @@ _022382F0:
add r0, r4, #0
add r1, #0x5a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _022382F0
@@ -22274,7 +22274,7 @@ _0223831C:
add r0, r4, #0
add r1, #0x5e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _0223831C
@@ -22287,7 +22287,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x62
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x44
mov r2, #0
@@ -22296,7 +22296,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x63
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x45
mov r2, #0
@@ -22305,7 +22305,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x64
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x46
mov r2, #0
@@ -22314,7 +22314,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x65
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x47
mov r2, #0
@@ -22323,7 +22323,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x66
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x48
mov r2, #0
@@ -22332,7 +22332,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x67
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x49
mov r2, #0
@@ -22341,7 +22341,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x68
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4a
mov r2, #0
@@ -22350,7 +22350,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x69
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4b
mov r2, #0
@@ -22359,7 +22359,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
@@ -22368,7 +22368,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4d
mov r2, #0
@@ -22377,7 +22377,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4e
mov r2, #0
@@ -22386,7 +22386,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6d
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x50
mov r2, #0
@@ -22395,18 +22395,18 @@ _02238332:
add r0, r4, #0
mov r1, #0x6e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
- bl FUN_020689E8
+ bl GetBoxMonGenderEncrypted
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0x6f
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0xc9
bne _022384AE
mov r1, #0
@@ -22436,12 +22436,12 @@ _02238332:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_022384AE:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _022385F0 ; =0x00000182
cmp r0, r1
bne _022384FE
@@ -22481,7 +22481,7 @@ _022384F4:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_022384FE:
add r0, r6, #0
mov r1, #2
@@ -22495,7 +22495,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x75
add r2, sp, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #3
mov r2, #0
@@ -22509,7 +22509,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x4d
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0223853E:
add r0, r6, #0
mov r1, #0x25
@@ -22519,7 +22519,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x79
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #7
add r2, sp, #0x24
@@ -22532,7 +22532,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x8f
add r2, sp, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x23
mov r2, #0
@@ -22541,7 +22541,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x98
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x22
mov r2, #0
@@ -22550,7 +22550,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x99
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x26
mov r2, #0
@@ -22559,7 +22559,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x24
mov r2, #0
@@ -22568,7 +22568,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x31
mov r2, #0
@@ -22577,10 +22577,10 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r1, [sp]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x30
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -23082,7 +23082,7 @@ _02238976:
ldr r3, [r4, #4]
mov r0, #1
mov r1, #0x1a
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r6, [r5, #0x14]
str r0, [sp, #0x10]
cmp r6, #0
@@ -23155,7 +23155,7 @@ _02238A12:
bl FUN_0200AB18
_02238A24:
ldr r0, [sp, #0x10]
- bl FUN_0200A8B8
+ bl DestroyMsgData
_02238A2A:
mov r0, #0xff
str r0, [r5, #0x50]
@@ -23885,7 +23885,7 @@ MOD83_02238F94: ; 0x02238F94
add r7, r2, #0
add r6, r3, #0
ldr r4, [sp, #0x40]
- bl FUN_020689E0
+ bl GetMonGenderEncrypted
str r0, [sp, #0x24]
ldr r0, [sp, #0x20]
bl FUN_02068A80
diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s
index 75dc0d1e..fc7ebf31 100644
--- a/arm9/modules/84/asm/module_84.s
+++ b/arm9/modules/84/asm/module_84.s
@@ -99,7 +99,7 @@ _021D7516:
mov r0, #0
mov r1, #0x1a
mov r3, #0x4b
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x14]
str r0, [sp]
mov r1, #0xef
@@ -245,7 +245,7 @@ _021D76EE:
ldr r0, [r5, #8]
bl MOD84_021D85B8
ldr r0, [r5, #0x14]
- bl FUN_0200A8B8
+ bl DestroyMsgData
add r0, r5, #0
bl MOD84_021D8000
add r0, r5, #0
diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s
index c5eddf82..f89be7c2 100644
--- a/arm9/modules/85/asm/module_85.s
+++ b/arm9/modules/85/asm/module_85.s
@@ -779,7 +779,7 @@ MOD85_021D7B28: ; 0x021D7B28
mov r0, #0
mov r1, #0x1a
mov r3, #0x4f
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
ldr r1, _021D7BA4 ; =0x00000408
str r0, [r5, r1]
mov r0, #0x4f
@@ -820,7 +820,7 @@ MOD85_021D7BB8: ; 0x021D7BB8
bl FUN_02019178
ldr r0, _021D7BE8 ; =0x00000408
ldr r0, [r5, r0]
- bl FUN_0200A8B8
+ bl DestroyMsgData
ldr r0, [r4, #4]
bl FUN_0200AB18
ldr r0, [r4, #0x18]
diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s
index 920d9ed9..2f636fb7 100644
--- a/arm9/modules/86/asm/module_86.s
+++ b/arm9/modules/86/asm/module_86.s
@@ -481,7 +481,7 @@ MOD86_021D78D4: ; 0x021D78D4
ldr r3, [r4]
mov r1, #0x1a
add r2, r0, #0
- bl FUN_0200A86C
+ bl NewMsgDataFromNarc
str r0, [r4, #0x34]
ldr r0, [r4]
bl FUN_0200AA80
@@ -542,7 +542,7 @@ MOD86_021D7964: ; 0x021D7964
ldr r0, [r4, #0x38]
bl FUN_0200AB18
ldr r0, [r4, #0x34]
- bl FUN_0200A8B8
+ bl DestroyMsgData
pop {r4, pc}
thumb_func_end MOD86_021D7964
diff --git a/include/nitro/OS_alloc_shared.h b/include/nitro/OS_alloc_shared.h
new file mode 100644
index 00000000..cf92032a
--- /dev/null
+++ b/include/nitro/OS_alloc_shared.h
@@ -0,0 +1,40 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include OS_alloc.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_OS_ALLOC_SHARED_H
+#define POKEDIAMOND_OS_ALLOC_SHARED_H
+
+typedef s32 OSHeapHandle;
+
+typedef struct Cell Cell;
+
+struct Cell {
+ Cell* prev;
+ Cell* next;
+ long size;
+};
+
+typedef struct {
+ long size;
+ Cell *free;
+ Cell *allocated;
+} HeapDesc;
+
+typedef struct {
+ volatile OSHeapHandle currentHeap;
+ int numHeaps;
+ void* arenaStart;
+ void* arenaEnd;
+ HeapDesc* heapArray;
+} OSHeapInfo;
+
+#endif //POKEDIAMOND_OS_ALLOC_SHARED_H
diff --git a/include/nitro/consts_shared.h b/include/nitro/consts_shared.h
index a7fd9dcf..151212d1 100644
--- a/include/nitro/consts_shared.h
+++ b/include/nitro/consts_shared.h
@@ -24,6 +24,11 @@
#define HW_PSR_DISABLE_IRQ 0x80 // Disable IRQ
#define HW_PSR_DISABLE_IRQ_FIQ 0xc0 // Disable FIQ and IRQ
+#define OSi_ROUND(n, a) (((u32) (n) + (a) - 1) & ~((a) - 1))
+#define OSi_TRUNC(n, a) (((u32) (n)) & ~((a) - 1))
+#define OSi_InRange(targ, a, b) ((u32)(a) <= (u32)(targ) && (u32)(targ) < (u32)(b))
+#define OSi_OFFSET(n, a) (((u32) (n)) & ((a) - 1))
+
#define OSi_GetArenaInfo() (*(OSArenaInfo*)HW_ARENA_INFO_BUF)
#endif //POKEDIAMOND_CONSTS_SHARED_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 3eb7cfdd..68cc0d59 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -7,6 +7,109 @@
#include "constants/species.h"
+#define MON_DATA_PERSONALITY 0
+#define MON_DATA_IS_ENCRYPTED 1
+#define MON_DATA_CONTROL_4_1 2
+#define MON_DATA_CONTROL_4_2 3
+#define MON_DATA_CHECKSUM 4
+#define MON_DATA_SPECIES 5
+#define MON_DATA_HELD_ITEM 6
+#define MON_DATA_OTID 7
+#define MON_DATA_EXPERIENCE 8
+#define MON_DATA_FRIENDSHIP 9
+#define MON_DATA_ABILITY 10
+#define MON_DATA_MARKINGS 11
+#define MON_DATA_GAME_LANGUAGE 12
+#define MON_DATA_HP_EV 13
+#define MON_DATA_ATK_EV 14
+#define MON_DATA_DEF_EV 15
+#define MON_DATA_SPEED_EV 16
+#define MON_DATA_SPATK_EV 17
+#define MON_DATA_SPDEF_EV 18
+#define MON_DATA_COOL 19
+#define MON_DATA_BEAUTY 20
+#define MON_DATA_CUTE 21
+#define MON_DATA_SMART 22
+#define MON_DATA_TOUGH 23
+#define MON_DATA_SHEEN 24
+#define MON_DATA_SINNOH_CHAMP_RIBBON 25
+// TODO: ribbon flags through 53
+#define MON_DATA_MOVE1 54
+#define MON_DATA_MOVE2 55
+#define MON_DATA_MOVE3 56
+#define MON_DATA_MOVE4 57
+#define MON_DATA_MOVE1PP 58
+#define MON_DATA_MOVE2PP 59
+#define MON_DATA_MOVE3PP 60
+#define MON_DATA_MOVE4PP 61
+#define MON_DATA_MOVE1PPUP 62
+#define MON_DATA_MOVE2PPUP 63
+#define MON_DATA_MOVE3PPUP 64
+#define MON_DATA_MOVE4PPUP 65
+#define MON_DATA_MOVE1MAXPP 66
+#define MON_DATA_MOVE2MAXPP 67
+#define MON_DATA_MOVE3MAXPP 68
+#define MON_DATA_MOVE4MAXPP 69
+#define MON_DATA_HP_IV 70
+#define MON_DATA_ATK_IV 71
+#define MON_DATA_DEF_IV 72
+#define MON_DATA_SPEED_IV 73
+#define MON_DATA_SPATK_IV 74
+#define MON_DATA_SPDEF_IV 75
+#define MON_DATA_IS_EGG 76
+#define MON_DATA_HAS_NICKNAME 77
+#define MON_DATA_COOL_RIBBON 78
+// 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
+// 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 {
BASE_HP = 0,
@@ -25,11 +128,19 @@ enum BaseStat {
BASE_SPEED_YIELD,
BASE_SPATK_YIELD,
BASE_SPDEF_YIELD,
- BASE_GENDER_RATIO = 18,
- BASE_FIRENDSHIP = 20,
- BASE_GROWTH_RATE = 21,
- BASE_ABILITY_1 = 24,
+ BASE_ITEM_1 = 16,
+ BASE_ITEM_2,
+ BASE_GENDER_RATIO,
+ BASE_EGG_CYCLES,
+ BASE_FIRENDSHIP,
+ BASE_GROWTH_RATE,
+ BASE_EGG_GROUP_1,
+ GASE_EGG_GROUP_2,
+ BASE_ABILITY_1,
BASE_ABILITY_2,
+ BASE_GREAT_MARSH_RATE,
+ BASE_COLOR,
+ BASE_FLIP,
};
struct BaseStats {
@@ -50,18 +161,17 @@ struct BaseStats {
u16 spdef_yield:2;
u16 unkB_4:2;
u16 padding_B_6:2;
- u16 unkC;
- u16 unkE;
+ u16 item1;
+ u16 item2;
u8 genderRatio;
- u8 unk11;
+ u8 eggCycles;
u8 friendship;
u8 growthRate;
- u8 unk14;
- u8 unk15;
+ u8 eggGroups[2];
u8 abilities[2];
- u8 unk18;
- u8 unk19_0:7;
- u8 unk19_7:1;
+ u8 greatMarshRate;
+ u8 color:7;
+ u8 flip:1;
u8 padding_1A[2];
u32 unk1C;
u32 unk20;
@@ -160,87 +270,67 @@ typedef enum {
// Structs
typedef struct {
- u16 species;
- u16 heldItem;
- u16 otID;
- u16 otSecretID;
- u32 exp;
- u8 friendship;
- u8 ability;
- u8 circleMarking:1, triangleMarking:1, squareMarking:1, heartMarking:1, starMarking:1, diamondMarking:1;
- u8 padding;
- OriginLanguage 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
- u8 sinnohChampRibbon:1, abilityRibbon:1;
- u8 field_0x1d;
- u8 gorgeousRoyalRibbon:1, footprintRibbon:1;
- u8 field_0x1f;
+ /* 0x1C */ u32 sinnohRibbons;
+// u8 sinnohChampRibbon:1, abilityRibbon:1;
+// u8 field_0x1d;
+// u8 gorgeousRoyalRibbon:1, footprintRibbon:1;
+// u8 field_0x1f;
} PokemonDataBlockA;
typedef struct {
- u16 move1;
- u16 move2;
- u16 move3;
- u16 move4;
- u8 move1pp;
- u8 move2pp;
- u8 move3pp;
- u8 move4pp;
- u8 move1ppUps;
- u8 move2ppUps;
- u8 move3ppUps;
- u8 move4ppUps;
- 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
- u8 coolRibbon:1;
- u8 field_0x15;
- u8 field_0x16;
- u8 field_0x17;
- 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 {
@@ -251,31 +341,49 @@ typedef union {
} PokemonDataBlock;
struct BoxPokemon {
- u32 personalityValue;
- u16 Unused; // Might be used for validity checks
- u16 checksum; // Stored checksum of pokemon
- PokemonDataBlock block1; // Blocks A-D; Order based on personalityValue
- PokemonDataBlock block2;
- PokemonDataBlock block3;
- PokemonDataBlock block4;
+ /* 0x000 */ u32 personalityValue;
+ /* 0x004 */ u16 no_encrypt:1;
+ u16 control_4_1:1;
+ u16 control_4_2:1;
+ u16 Unused:13; // Might be used for validity checks
+ /* 0x006 */ u16 checksum; // Stored checksum of pokemon
+ /* 0x008 */ PokemonDataBlock box[4];
};
-struct Pokemon {
- u16 boxMonKey;
- u16 unused;
- u16 decrypted:1;
- u16 unkBitfield:15;
- u16 ramMonKey;
- struct BoxPokemon box;
- // TODO: RAM struct attributes
- u8 filler_88[100];
+struct PartyPokemon
+{
+ /* 0x000 */ struct BoxPokemon box;
+ /* 0x088 */ u8 slp:3;
+ u8 psn:1;
+ u8 brn:1;
+ u8 frz:1;
+ u8 prz:1;
+ u8 tox:1;
+ /* 0x089 */ u8 unk89;
+ /* 0x08A */ u8 filler8A[2];
+ /* 0x08C */ u8 level;
+ /* 0x08D */ u8 capsule;
+ /* 0x08E */ u16 hp;
+ /* 0x090 */ u16 maxHp;
+ /* 0x092 */ u16 atk;
+ /* 0x094 */ u16 def;
+ /* 0x096 */ u16 speed;
+ /* 0x098 */ u16 spatk;
+ /* 0x09A */ u16 spdef;
+ /* 0x09C */ u8 seal_something[0x38]; // a struct?
+ /* 0x0D4 */ u8 sealCoords[0x18]; // u8 pairs?
};
+struct Pokemon {
+ /* 0x000 */ struct BoxPokemon box;
+ /* 0x088 */ struct PartyPokemon party;
+}; // size: 0xEC
+
int GetMonBaseStat_HandleFormeConversion(int species, int form, int stat_id);
int GetMonBaseStat(int species, int stat_id);
int GetMonExpByLevel(int species, int level);
void LoadGrowthTable(int species, int * table);
int GetExpByGrowthRateAndLevel(int rate, int level);
-int CalcMonLevel(int species, int experience);
+int CalcLevelBySpeciesAndExp(int species, int experience);
#endif //POKEDIAMOND_POKEMON_H