summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-10 08:56:58 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-10 08:56:58 -0400
commit1b973b17c22c8b6f0ac55a5675ebdb70b045c253 (patch)
tree596060fca7e87e6902e26e41d877c48009141a6f
parent70d51296ca9d527aa19b859acc79e3744635e6f4 (diff)
Preliminary base stats struct; name pokemon.s encryption funcs
-rw-r--r--arm9/asm/pokemon.s314
-rw-r--r--arm9/asm/scrcmd.s28
-rw-r--r--arm9/asm/scrcmd_12.s58
-rw-r--r--arm9/asm/scrcmd_18.s110
-rw-r--r--arm9/asm/scrcmd_4.s2
-rw-r--r--arm9/asm/scrcmd_5.s4
-rw-r--r--arm9/asm/unk_02023C40.s20
-rw-r--r--arm9/asm/unk_02025658.s6
-rw-r--r--arm9/asm/unk_02026CD0.s18
-rw-r--r--arm9/asm/unk_0202B034.s24
-rw-r--r--arm9/asm/unk_0202BE98.s6
-rw-r--r--arm9/asm/unk_0202C144.s4
-rw-r--r--arm9/asm/unk_02035068.s2
-rw-r--r--arm9/asm/unk_020377F0.s8
-rw-r--r--arm9/asm/unk_0204653C.s12
-rw-r--r--arm9/asm/unk_02047500.s2
-rw-r--r--arm9/asm/unk_020476CC.s6
-rw-r--r--arm9/asm/unk_0204A01C.s34
-rw-r--r--arm9/asm/unk_0204B9EC.s6
-rw-r--r--arm9/asm/unk_02050E48.s2
-rw-r--r--arm9/asm/unk_02054C14.s4
-rw-r--r--arm9/asm/unk_020603B0.s6
-rw-r--r--arm9/asm/unk_02060CCC.s18
-rw-r--r--arm9/asm/unk_0206ABC4.s4
-rw-r--r--arm9/asm/unk_0206B8A4.s6
-rw-r--r--arm9/asm/unk_0206BB5C.s16
-rw-r--r--arm9/asm/unk_0206C700.s42
-rw-r--r--arm9/asm/unk_0206F3FC.s70
-rw-r--r--arm9/asm/unk_02072548.s12
-rw-r--r--arm9/asm/unk_02073710.s2
-rw-r--r--arm9/asm/unk_02073DA8.s6
-rw-r--r--arm9/asm/unk_0207550C.s70
-rw-r--r--arm9/asm/unk_02079C70.s86
-rw-r--r--arm9/asm/unk_0207FD00.s90
-rw-r--r--arm9/asm/unk_02080C38.s18
-rw-r--r--arm9/asm/unk_020828BC.s18
-rw-r--r--arm9/asm/unk_020842DC.s110
-rw-r--r--arm9/asm/unk_020854E0.s14
-rw-r--r--arm9/asm/unk_020859C0.s6
-rw-r--r--arm9/asm/unk_02086084.s14
-rw-r--r--arm9/asm/unk_02086414.s6
-rw-r--r--arm9/asm/unk_02086FA8.s4
-rw-r--r--arm9/asm/unk_02087D00.s8
-rw-r--r--arm9/asm/unk_02088DD8.s8
-rw-r--r--arm9/global.inc4
-rw-r--r--arm9/modules/05/asm/module_05.s200
-rw-r--r--arm9/modules/06/asm/module_06.s166
-rw-r--r--arm9/modules/07/asm/module_07.s22
-rw-r--r--arm9/modules/08/asm/module_08.s6
-rw-r--r--arm9/modules/09/asm/module_09.s62
-rw-r--r--arm9/modules/11/asm/module_11.s508
-rw-r--r--arm9/modules/12/asm/module_12.s84
-rw-r--r--arm9/modules/14/asm/module_14.s40
-rw-r--r--arm9/modules/16/asm/module_16.s154
-rw-r--r--arm9/modules/17/asm/module_17.s2
-rw-r--r--arm9/modules/27/asm/module_27.s14
-rw-r--r--arm9/modules/28/asm/module_28.s8
-rw-r--r--arm9/modules/39/asm/module_39.s4
-rw-r--r--arm9/modules/56/asm/module_56.s8
-rw-r--r--arm9/modules/62/asm/module_62.s28
-rw-r--r--arm9/modules/65/asm/module_65.s4
-rw-r--r--arm9/modules/69/asm/module_69.s24
-rw-r--r--arm9/modules/70/asm/module_70.s2
-rw-r--r--arm9/modules/71/asm/module_71.s32
-rw-r--r--arm9/modules/76/asm/module_76.s10
-rw-r--r--arm9/modules/80/asm/module_80.s32
-rw-r--r--arm9/modules/83/asm/module_83.s6
-rw-r--r--include/pokemon.h75
68 files changed, 1436 insertions, 1363 deletions
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s
index d83d5b41..f58ad635 100644
--- a/arm9/asm/pokemon.s
+++ b/arm9/asm/pokemon.s
@@ -128,12 +128,12 @@ ZeroMonData: ; 0x02066978
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r4, #0x0
ldr r2, [r4, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
pop {r4, pc}
thumb_func_start FUN_020669A0
@@ -148,7 +148,7 @@ FUN_020669A0: ; 0x020669A0
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
pop {r4, pc}
thumb_func_start FUN_020669BC
@@ -196,12 +196,12 @@ _020669EE:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
_02066A1A:
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -231,7 +231,7 @@ FUN_02066A20: ; 0x02066A20
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -241,7 +241,7 @@ FUN_02066A20: ; 0x02066A20
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_02066A68:
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -263,7 +263,7 @@ FUN_02066A6C: ; 0x02066A6C
add r0, #0x8
mov r1, #0x80
mov r4, #0x1
- bl FUN_0206A3D0
+ bl DecryptMon
_02066A8E:
add r0, r4, #0x0
pop {r4, pc}
@@ -294,7 +294,7 @@ FUN_02066A94: ; 0x02066A94
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_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 FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x48
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x14
mov r2, #0x18
@@ -357,7 +357,7 @@ CreateMon: ; 0x02066ACC
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x14
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
add sp, #0x2c
@@ -769,7 +769,7 @@ FUN_02066EA4: ; 0x02066EA4
add r0, r4, #0x0
mov r1, #0xae
add r2, sp, #0x24
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add sp, #0x10
@@ -790,7 +790,7 @@ FUN_02066ED8: ; 0x02066ED8
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066F04
add r0, r5, #0x0
@@ -808,87 +808,87 @@ FUN_02066F04: ; 0x02066F04
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x2c]
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x54]
add r0, r5, #0x0
mov r1, #0x46
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x30]
add r0, r5, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x34]
add r0, r5, #0x0
mov r1, #0x47
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x28]
add r0, r5, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x14]
add r0, r5, #0x0
mov r1, #0x48
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x24]
add r0, r5, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
add r0, r5, #0x0
mov r1, #0x49
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x20]
add r0, r5, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
add r0, r5, #0x0
mov r1, #0x4a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r5, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x4b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x38]
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
mov r0, #0x0
mov r1, #0x2c
@@ -926,7 +926,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa3
add r2, sp, #0x50
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x14]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -954,7 +954,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa4
add r2, sp, #0x4c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -982,7 +982,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa5
add r2, sp, #0x48
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0xc]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1010,7 +1010,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa6
add r2, sp, #0x44
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x8]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1038,7 +1038,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa7
add r2, sp, #0x40
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x4]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1066,7 +1066,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa8
add r2, sp, #0x3c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
ldr r1, [sp, #0x54]
@@ -1103,7 +1103,7 @@ _020671A0:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x54
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_020671B0:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
@@ -1111,8 +1111,8 @@ _020671B0:
add sp, #0x58
pop {r3-r7, pc}
- thumb_func_start FUN_020671BC
-FUN_020671BC: ; 0x020671BC
+ thumb_func_start GetMonDataEncrypted
+GetMonDataEncrypted: ; 0x020671BC
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -1125,12 +1125,12 @@ FUN_020671BC: ; 0x020671BC
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -1160,12 +1160,12 @@ _02067204:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_02067230:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1266,7 +1266,7 @@ FUN_020672BC: ; 0x020672BC
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -1296,7 +1296,7 @@ _020672F8:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_02067318:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -2022,8 +2022,8 @@ _02067824: .word SPECIES_MANAPHY_EGG
_02067828: .word 0x0000FFFF
_0206782C: .word SPECIES_ARCEUS
- thumb_func_start FUN_02067830
-FUN_02067830: ; 0x02067830
+ thumb_func_start SetBoxMonDataEncrypted
+SetBoxMonDataEncrypted: ; 0x02067830
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -2036,12 +2036,12 @@ FUN_02067830: ; 0x02067830
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -2061,7 +2061,7 @@ _02067870:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
pop {r4-r6, pc}
_02067886:
add r0, r5, #0x0
@@ -2076,7 +2076,7 @@ _02067886:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -2086,7 +2086,7 @@ _02067886:
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_020678BC:
pop {r4-r6, pc}
.balign 4
@@ -2199,7 +2199,7 @@ FUN_02067960: ; 0x02067960
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -2219,7 +2219,7 @@ _02067994:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
pop {r4-r6, pc}
_020679AA:
add r0, r5, #0x0
@@ -2239,7 +2239,7 @@ _020679AA:
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_020679D4:
pop {r4-r6, pc}
.balign 4
@@ -3111,12 +3111,12 @@ FUN_02068018: ; 0x02068018
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -3132,7 +3132,7 @@ _02068058:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
pop {r4-r6, pc}
_02068066:
add r0, r5, #0x0
@@ -3147,7 +3147,7 @@ _02068066:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
@@ -3157,7 +3157,7 @@ _02068066:
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
_0206809C:
pop {r4-r6, pc}
.balign 4
@@ -4013,13 +4013,13 @@ FUN_02068698: ; 0x02068698
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r7, r0, #0x18
add r0, r6, #0x0
@@ -4033,7 +4033,7 @@ FUN_02068698: ; 0x02068698
add r0, r5, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
ldr r1, [sp, #0x0]
add r0, r5, #0x0
@@ -4085,12 +4085,12 @@ FUN_02068734: ; 0x02068734
add r5, r0, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
add r0, r4, #0x0
bl GetMonExpByLevel
@@ -4328,7 +4328,7 @@ _02068900:
add r0, r5, #0x0
mov r1, #0xad
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
beq _020689D4
@@ -4338,7 +4338,7 @@ _02068900:
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
@@ -4350,7 +4350,7 @@ _02068900:
add r0, r5, #0x0
mov r1, #0x9
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x4
strh r0, [r1, #0x0]
add r0, r4, #0x0
@@ -4377,7 +4377,7 @@ _02068958:
add r0, r5, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xb
bne _0206897A
add r0, r4, #0x1
@@ -4389,7 +4389,7 @@ _0206897A:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x0]
cmp r1, r0
bne _02068994
@@ -4429,7 +4429,7 @@ _020689CA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_020689D4:
add sp, #0x8
pop {r3-r7, pc}
@@ -5451,20 +5451,20 @@ FUN_020690E8: ; 0x020690E8
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x1
add r0, sp, #0x0
strb r1, [r0, #0x0]
add r0, r4, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x15
@@ -5479,7 +5479,7 @@ FUN_020690E8: ; 0x020690E8
add r0, r4, #0x0
mov r1, #0x8
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02069138:
add r0, sp, #0x0
ldrb r1, [r0, #0x0]
@@ -5497,7 +5497,7 @@ _02069146:
add r0, r4, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r5, pc}
@@ -5519,26 +5519,26 @@ FUN_02069168: ; 0x02069168
add r2, r6, #0x0
str r3, [sp, #0x4]
ldr r5, [sp, #0x58]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x2c]
add r0, r7, #0x0
mov r1, #0x6
add r2, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
add r1, r6, #0x0
str r0, [sp, #0x28]
add r0, r7, #0x0
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x30]
add r0, r7, #0x0
mov r1, #0x14
add r2, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
@@ -5596,14 +5596,14 @@ _02069216:
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r7, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x20]
@@ -5701,12 +5701,12 @@ _020692DA:
add r0, r7, #0x0
mov r1, #0xa4
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x34]
add r0, r7, #0x0
mov r1, #0xa5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x34]
cmp r1, r0
bls _0206936C
@@ -5722,12 +5722,12 @@ _02069306:
add r0, r7, #0x0
mov r1, #0xa4
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x38]
add r0, r7, #0x0
mov r1, #0xa5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x38]
cmp r1, r0
bne _0206936C
@@ -5743,12 +5743,12 @@ _02069332:
add r0, r7, #0x0
mov r1, #0xa4
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x3c]
add r0, r7, #0x0
mov r1, #0xa5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x3c]
cmp r1, r0
bhs _0206936C
@@ -5855,7 +5855,7 @@ _0206940E:
add r0, r7, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02069472
ldrh r1, [r4, #0x2]
@@ -5870,7 +5870,7 @@ _0206942C:
add r0, r7, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _02069472
ldrh r1, [r4, #0x2]
@@ -5976,7 +5976,7 @@ _020694E4:
add r0, r7, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02069510
ldrh r1, [r4, #0x2]
@@ -5999,7 +5999,7 @@ _02069510:
add r0, r7, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _0206953E
ldrh r1, [r4, #0x2]
@@ -6396,19 +6396,19 @@ FUN_02069818: ; 0x02069818
add r0, r7, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
add r0, r7, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r0, [sp, #0x4]
@@ -6585,37 +6585,37 @@ _020699B2:
add r0, r5, #0x0
add r1, #0x37
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0x0
strh r0, [r6, #0x2]
add r0, r5, #0x0
add r1, #0x3b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0x0
strb r0, [r6, #0x1]
add r0, r5, #0x0
add r1, #0x3f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
strb r0, [r6, #0x0]
add r0, r5, #0x0
add r1, #0x36
add r2, #0x2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r4, r4, #0x1
cmp r4, #0x3
blo _020699B2
@@ -6629,16 +6629,16 @@ _02069A0A:
add r0, r5, #0x0
mov r1, #0x39
add r2, #0x2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x0
add r0, r5, #0x0
mov r1, #0x3d
add r2, #0x1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x41
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
pop {r3-r7, pc}
thumb_func_start FUN_02069A38
@@ -6653,7 +6653,7 @@ _02069A42:
add r0, r6, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02069A58
add r4, r4, #0x1
@@ -6696,28 +6696,28 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa2
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa3
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0xa9
add r2, r5, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FreeToHeap
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x4
mov r2, #0x18
@@ -6725,7 +6725,7 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0xaa
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add sp, #0x1c
@@ -6748,19 +6748,19 @@ _02069AFE:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069B36
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02069B36
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, r6
@@ -6960,13 +6960,13 @@ _02069C70:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069C70
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02069C70
add r0, r7, #0x0
@@ -7008,7 +7008,7 @@ _02069CD0:
strb r0, [r1, #0x0]
add r0, r4, #0x0
mov r1, #0x99
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02069CF2:
pop {r3-r7, pc}
@@ -7031,7 +7031,7 @@ _02069D04:
bl FUN_0206B9B0
mov r1, #0x99
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069D26
add r0, r7, #0x0
@@ -7050,7 +7050,7 @@ _02069D32:
bl FUN_0206B9B0
mov r1, #0x99
add r2, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069D4A
add r0, r7, #0x1
@@ -7080,13 +7080,13 @@ _02069D66:
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069DBA
add r0, r7, #0x0
mov r1, #0x99
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #0x0]
ldrb r1, [r4, #0x0]
mov r0, #0xf
@@ -7115,7 +7115,7 @@ _02069DB0:
add r0, r7, #0x0
mov r1, #0x99
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02069DBA:
ldr r0, [sp, #0x4]
add r6, r6, #0x1
@@ -7150,13 +7150,13 @@ _02069DEC:
mov r1, #0x5
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02069E6A
add r0, r6, #0x0
mov r1, #0x99
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x4
strb r0, [r1, #0x0]
add r0, r1, #0x0
@@ -7172,14 +7172,14 @@ _02069DEC:
mov r1, #0x99
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf0
tst r0, r1
bne _02069E40
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02069E40:
ldr r0, [sp, #0x0]
cmp r4, r0
@@ -7190,14 +7190,14 @@ _02069E40:
mov r1, #0x99
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf0
tst r0, r1
bne _02069E6A
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r4, r4, #0x1
_02069E6A:
add r4, r4, #0x1
@@ -7466,18 +7466,18 @@ FUN_0206A014: ; 0x0206A014
add r0, r5, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0206A050:
add sp, #0xc
pop {r3-r6, pc}
@@ -7528,13 +7528,13 @@ FUN_0206A094: ; 0x0206A094
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x0]
@@ -7560,7 +7560,7 @@ FUN_0206A094: ; 0x0206A094
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A104:
@@ -7577,13 +7577,13 @@ _0206A104:
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A126:
add r0, r5, #0x0
mov r1, #0x6
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0206A12E:
add sp, #0x8
pop {r3-r7, pc}
@@ -7787,17 +7787,17 @@ FUN_0206A23C: ; 0x0206A23C
ldrh r2, [r2, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3D0
+ bl DecryptMon
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3D0
+ bl DecryptMon
ldr r0, [sp, #0x0]
str r0, [r5, #0x0]
ldr r2, [sp, #0xc]
@@ -7860,12 +7860,12 @@ _0206A32E:
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3A4
+ bl EncryptMon
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl FUN_0206A3A4
+ bl EncryptMon
ldr r0, [sp, #0x4]
bl FreeToHeap
add sp, #0x1c
@@ -7902,8 +7902,8 @@ LoadMonEvolutionTable: ; 0x0206A394
nop
_0206A3A0: .word ReadWholeNarcMemberByIdPair
- thumb_func_start FUN_0206A3A4
-FUN_0206A3A4: ; 0x0206A3A4
+ thumb_func_start EncryptMon
+EncryptMon: ; 0x0206A3A4
push {r0-r3}
push {r3-r7, lr}
add r5, r0, #0x0
@@ -7913,7 +7913,7 @@ FUN_0206A3A4: ; 0x0206A3A4
add r7, sp, #0x20
_0206A3B2:
add r0, r7, #0x0
- bl FUN_0206A3D8
+ bl MonEncryptionLCRNG
ldrh r1, [r5, #0x0]
add r4, r4, #0x1
eor r0, r1
@@ -7928,15 +7928,15 @@ _0206A3C6:
bx r3
.balign 4
- thumb_func_start FUN_0206A3D0
-FUN_0206A3D0: ; 0x0206A3D0
- ldr r3, _0206A3D4 ; =FUN_0206A3A4
+ thumb_func_start DecryptMon
+DecryptMon: ; 0x0206A3D0
+ ldr r3, _0206A3D4 ; =EncryptMon
bx r3
.balign 4
-_0206A3D4: .word FUN_0206A3A4
+_0206A3D4: .word EncryptMon
- thumb_func_start FUN_0206A3D8
-FUN_0206A3D8: ; 0x0206A3D8
+ thumb_func_start MonEncryptionLCRNG
+MonEncryptionLCRNG: ; 0x0206A3D8
ldr r2, [r0, #0x0]
ldr r1, _0206A3F0 ; =0x41C64E6D
add r3, r2, #0x0
@@ -8862,7 +8862,7 @@ FUN_0206A998: ; 0x0206A998
push {r3, lr}
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl IsPokemonLegendaryOrMythical
@@ -8995,12 +8995,12 @@ FUN_0206AA84: ; 0x0206AA84
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x0
add r0, r4, #0x0
mov r1, #0xaa
add r2, #0x1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x1c
pop {r3-r4, pc}
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index ec67407a..f3f565d9 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -4635,7 +4635,7 @@ FUN_0203BDB8: ; 0x0203BDB8
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
add r5, #0x80
lsl r1, r1, #0x10
@@ -5530,7 +5530,7 @@ FUN_0203C520: ; 0x0203C520
mov r1, #0x74
add r2, sp, #0xc
add r7, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
@@ -5542,7 +5542,7 @@ FUN_0203C520: ; 0x0203C520
add r0, r7, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
str r6, [sp, #0x0]
add r0, sp, #0xc
@@ -10085,32 +10085,32 @@ FUN_0203E9CC: ; 0x0203E9CC
add r5, r0, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, r6
add r2, r7, r1
ldr r1, [sp, #0x4]
@@ -10196,7 +10196,7 @@ FUN_0203EAB0: ; 0x0203EAB0
bl FUN_0206B9B0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r5, #0x0
@@ -10720,14 +10720,14 @@ _0203EF18:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0203EF54 ; =0x00000182
cmp r0, r1
bne _0203EF48
add r0, r4, #0x0
mov r1, #0x70
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add r0, r7, #0x0
@@ -10786,12 +10786,12 @@ _0203EFA2:
add r6, r0, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
add r0, r6, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r3, r0, #0x0
mov r0, #0x67
ldr r1, [sp, #0x10]
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 57aec5f4..308f2afa 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -349,17 +349,17 @@ FUN_02042F6C: ; 0x02042F6C
mov r1, #0x97
add r2, r7, #0x0
add r5, #0xf0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r7, #0x0
str r0, [sp, #0x8]
add r0, r4, #0x0
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x14]
add r0, r4, #0x0
mov r1, #0x7
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
bl OS_GetTick
bl rand_ALT
@@ -396,36 +396,36 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x6f
add r2, sp, #0x30
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x4b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x18]
add r0, r4, #0x0
mov r1, #0x4a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r4, #0x0
mov r1, #0x49
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x20]
add r0, r4, #0x0
mov r1, #0x48
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x24]
add r0, r4, #0x0
mov r1, #0x46
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x47
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r6, r0
ldr r0, [sp, #0x24]
add r1, r0, r1
@@ -445,7 +445,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x46
add r2, sp, #0x34
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
_020430DA:
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
@@ -499,7 +499,7 @@ _020430DA:
add r0, r4, #0x0
mov r1, #0x2e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020430FC
mov r0, #0x49
@@ -510,7 +510,7 @@ _020430FC:
add r0, r4, #0x0
mov r1, #0x2f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02043114
mov r0, #0x4a
@@ -521,7 +521,7 @@ _02043114:
add r0, r4, #0x0
mov r1, #0x30
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0204312C
mov r0, #0x4b
@@ -532,7 +532,7 @@ _0204312C:
add r0, r4, #0x0
mov r1, #0x31
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02043144
mov r0, #0x4c
@@ -543,7 +543,7 @@ _02043144:
add r0, r4, #0x0
mov r1, #0x32
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0204315C
mov r0, #0x4d
@@ -554,7 +554,7 @@ _0204315C:
add r0, r4, #0x0
mov r1, #0x33
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02043174
mov r0, #0x4e
@@ -565,7 +565,7 @@ _02043174:
add r0, r4, #0x0
mov r1, #0x34
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0204318C
mov r0, #0x4f
@@ -576,7 +576,7 @@ _0204318C:
add r0, r4, #0x0
mov r1, #0x67
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020431A4
mov r0, #0x19
@@ -587,7 +587,7 @@ _020431A4:
add r0, r4, #0x0
mov r1, #0x68
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020431BC
mov r0, #0x1a
@@ -598,7 +598,7 @@ _020431BC:
add r0, r4, #0x0
mov r1, #0x69
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020431D4
mov r0, #0x1b
@@ -629,15 +629,15 @@ _020431D4:
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x7
add r2, sp, #0x2c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x9c
add r2, sp, #0x28
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
add r4, r7, #0x0
bl FUN_02021A20
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 5b96a589..13d8bece 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -95,13 +95,13 @@ FUN_0204434C: ; 0x0204434C
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _020443A0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
b _020443A2
_020443A0:
mov r0, #0x0
@@ -141,7 +141,7 @@ FUN_020443A8: ; 0x020443A8
bl FUN_0206B9B0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r7, #0x0
@@ -294,7 +294,7 @@ FUN_020444F4: ; 0x020444F4
mov r1, #0x4c
add r4, r0, #0x0
strh r2, [r6, #0x0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044556
mov r0, #0x0
@@ -303,25 +303,25 @@ _02044556:
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _02044592
_0204458E:
@@ -375,31 +375,31 @@ _020445E4:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204463E
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _0204463E
_02044638:
@@ -493,13 +493,13 @@ _020446EA:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204471A
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x0]
cmp r0, r1
bhi _0204471A
@@ -549,13 +549,13 @@ FUN_02044730: ; 0x02044730
mov r1, #0x4c
add r5, r0, #0x0
strh r2, [r4, #0x0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044786
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
_02044786:
mov r0, #0x0
@@ -601,7 +601,7 @@ _020447D2:
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020447F2
mov r0, #0x0
@@ -655,7 +655,7 @@ _02044848:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044874
add r0, r4, #0x0
@@ -707,7 +707,7 @@ FUN_0204488C: ; 0x0204488C
bl FUN_0206B9B0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -748,7 +748,7 @@ FUN_020448D4: ; 0x020448D4
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x4
strh r0, [r1, #0x0]
cmp r4, #0x0
@@ -756,7 +756,7 @@ FUN_020448D4: ; 0x020448D4
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
@@ -774,7 +774,7 @@ _0204495A:
add r0, r5, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xb
bne _0204496E
add r0, r4, #0x1
@@ -784,7 +784,7 @@ _0204496E:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
bne _02044982
add r0, r4, #0x1
@@ -804,7 +804,7 @@ _02044994:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -838,7 +838,7 @@ FUN_020449A4: ; 0x020449A4
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x0]
ldrh r0, [r1, #0x0]
@@ -853,7 +853,7 @@ _020449FA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -894,7 +894,7 @@ FUN_02044A0C: ; 0x02044A0C
add r4, #0x13
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -956,12 +956,12 @@ FUN_02044A94: ; 0x02044A94
add r4, r0, #0x0
mov r1, #0xb0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
add r0, r4, #0x0
mov r1, #0xb1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1016,7 +1016,7 @@ _02044B5A:
bl FUN_0206B9B0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044B74
add r4, r4, #0x1
@@ -1072,13 +1072,13 @@ _02044BC8:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044BF8
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044BF8
add r4, r4, #0x1
@@ -1128,13 +1128,13 @@ _02044C44:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044C6E
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044C6E
add r4, r4, #0x1
@@ -1181,7 +1181,7 @@ _02044CB6:
bl FUN_0206B9B0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044CD0
add r4, r4, #0x1
@@ -1226,7 +1226,7 @@ _02044D12:
bl FUN_0206B9B0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044D32
ldr r0, [sp, #0x0]
@@ -1272,7 +1272,7 @@ FUN_02044D44: ; 0x02044D44
bl FUN_0206B9B0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1305,7 +1305,7 @@ FUN_02044D8C: ; 0x02044D8C
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044DDA
mov r0, #0x0
@@ -1316,7 +1316,7 @@ _02044DDA:
add r0, r6, #0x0
mov r1, #0x36
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044DF0
add r0, r4, #0x1
@@ -1326,7 +1326,7 @@ _02044DF0:
add r0, r6, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E04
add r0, r4, #0x1
@@ -1336,7 +1336,7 @@ _02044E04:
add r0, r6, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E18
add r0, r4, #0x1
@@ -1346,7 +1346,7 @@ _02044E18:
add r0, r6, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E2C
add r0, r4, #0x1
@@ -1424,7 +1424,7 @@ FUN_02044E78: ; 0x02044E78
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1457,7 +1457,7 @@ FUN_02044ED8: ; 0x02044ED8
bl FUN_0206B9B0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1484,7 +1484,7 @@ FUN_02044F20: ; 0x02044F20
strh r2, [r1, #0x0]
mov r1, #0x6
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
pop {r3-r5, pc}
@@ -1527,13 +1527,13 @@ _02044F9E:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044FD4
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
ldr r0, [sp, #0x0]
@@ -1593,7 +1593,7 @@ _0204502A:
add r1, r0, #0x0
add r0, r6, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045048
add r0, r5, #0x1
@@ -1653,7 +1653,7 @@ _020450A6:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _020450E8
add r0, r7, #0x0
@@ -1662,7 +1662,7 @@ _020450A6:
add r1, r0, #0x0
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020450DE
ldr r0, [sp, #0x4]
@@ -1734,7 +1734,7 @@ FUN_02045104: ; 0x02045104
add r1, r0, #0x0
add r0, r5, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170
add r1, r0, #0x0
add r0, r5, #0x0
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -1821,13 +1821,13 @@ _02045212:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045242
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045242
ldr r0, [sp, #0x0]
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index 9179c025..0d477bf0 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -947,7 +947,7 @@ FUN_02040E4C: ; 0x02040E4C
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r2, r0, #0x10
ldr r0, [r7, #0x0]
diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s
index 96f58ea5..b449fd86 100644
--- a/arm9/asm/scrcmd_5.s
+++ b/arm9/asm/scrcmd_5.s
@@ -91,13 +91,13 @@ _0204123C:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204127C
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s
index 654401ed..04275173 100644
--- a/arm9/asm/unk_02023C40.s
+++ b/arm9/asm/unk_02023C40.s
@@ -785,7 +785,7 @@ FUN_0202415C: ; 0x0202415C
add r0, r2, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r4, r0, #0x18
ldr r0, _02024198 ; =0x00000182
@@ -884,7 +884,7 @@ _02024210:
add r0, r2, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -897,7 +897,7 @@ _0202422E:
add r0, r2, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -911,7 +911,7 @@ _0202424A:
add r0, r2, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -925,7 +925,7 @@ _02024268:
add r0, r2, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -1916,14 +1916,14 @@ FUN_0202498C: ; 0x0202498C
add r0, r1, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
mov r1, #0x0
ldr r0, [sp, #0x0]
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
ldr r0, [sp, #0x0]
bl FUN_020689E0
@@ -2099,18 +2099,18 @@ FUN_02024AF0: ; 0x02024AF0
add r0, r1, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0x0]
mov r1, #0xc
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
mov r1, #0x0
ldr r0, [sp, #0x0]
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x4]
ldr r0, [sp, #0x0]
bl FUN_020689E0
diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s
index 8670750d..f5837edd 100644
--- a/arm9/asm/unk_02025658.s
+++ b/arm9/asm/unk_02025658.s
@@ -120,19 +120,19 @@ _0202572A:
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r7, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
add r0, r7, #0x0
bl FUN_0206B6C8
diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s
index cae28930..dd0001ea 100644
--- a/arm9/asm/unk_02026CD0.s
+++ b/arm9/asm/unk_02026CD0.s
@@ -15,27 +15,27 @@ FUN_02026CD0: ; 0x02026CD0
mov r1, #0x5
mov r2, #0x0
add r7, r3, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r5, #0x0
strh r0, [r5, #0x8]
add r0, r4, #0x0
mov r1, #0x74
add r2, #0xa
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x0
add r0, r4, #0x0
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x4]
add r0, r4, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x33
strb r0, [r1, #0x0]
@@ -2125,12 +2125,12 @@ _02027B9C:
add r0, r4, #0x0
mov r1, #0x74
add r2, #0x12
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r5, #0x3b
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r5, #0x33
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x10
pop {r3-r5, pc}
.balign 4
diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s
index 5df7d3d0..88a0df53 100644
--- a/arm9/asm/unk_0202B034.s
+++ b/arm9/asm/unk_0202B034.s
@@ -84,60 +84,60 @@ _0202B0BA:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0202B17E
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x2]
add r0, r4, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x0
strb r0, [r5, #0x3]
add r0, r4, #0x0
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x4]
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x8]
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x32]
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x34]
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x36]
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x38]
cmp r6, #0x0
beq _0202B176
add r0, r4, #0x0
mov r1, #0x76
add r2, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r0, r6, #0x0
add r1, #0xc
@@ -146,7 +146,7 @@ _0202B0BA:
add r0, r4, #0x0
mov r1, #0x90
add r2, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r0, r6, #0x0
add r1, #0x22
diff --git a/arm9/asm/unk_0202BE98.s b/arm9/asm/unk_0202BE98.s
index 818023a8..edec1ae4 100644
--- a/arm9/asm/unk_0202BE98.s
+++ b/arm9/asm/unk_0202BE98.s
@@ -27,7 +27,7 @@ _0202BEB4:
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0202BECC
bl ErrorHandling
@@ -57,7 +57,7 @@ _0202BEF0:
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0202BF08
bl ErrorHandling
@@ -205,7 +205,7 @@ _0202C00A:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0202C01A
add r4, r4, #0x1
diff --git a/arm9/asm/unk_0202C144.s b/arm9/asm/unk_0202C144.s
index 5bf7d92b..50c7240b 100644
--- a/arm9/asm/unk_0202C144.s
+++ b/arm9/asm/unk_0202C144.s
@@ -11,7 +11,7 @@ FUN_0202C144: ; 0x0202C144
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0202C194
add r0, r5, #0x0
@@ -23,7 +23,7 @@ FUN_0202C144: ; 0x0202C144
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
lsl r2, r2, #0x10
add r0, r7, #0x0
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 5b78d799..639703a5 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -2457,7 +2457,7 @@ _020363F6:
ldr r0, [sp, #0xc]
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02036474
add r0, r5, #0x0
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 15e631e1..5c30449f 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1585,7 +1585,7 @@ _020382F6:
ldr r0, [r4, #0x44]
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r3, r0, #0x0
add r0, sp, #0x30
str r0, [sp, #0x0]
@@ -1910,7 +1910,7 @@ _02038590:
ldr r2, [r4, #0xc]
mov r1, #0x75
add r2, #0x1c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
pop {r3-r5, pc}
_020385A8:
ldr r0, [r5, #0xc]
@@ -1977,13 +1977,13 @@ _02038620:
mov r1, #0x6f
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r4, #0xc]
mov r2, #0x0
str r0, [r1, #0x10]
add r0, r6, #0x0
mov r1, #0x70
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r4, #0xc]
cmp r5, #0x0
str r0, [r1, #0x8]
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index 5a561e2e..bbe445d7 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -1714,7 +1714,7 @@ _0204732A:
bl FUN_0206B9B0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
mov r0, #0x0
bl FUN_0206BB48
@@ -1761,7 +1761,7 @@ _02047390:
bl FUN_0206B9B0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
mov r0, #0x0
bl FUN_0206BB48
@@ -1835,12 +1835,12 @@ _02047400:
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r6, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r3, #0xb
str r3, [sp, #0x0]
@@ -1879,12 +1879,12 @@ _02047470:
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r6, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r3, #0xb
str r3, [sp, #0x0]
diff --git a/arm9/asm/unk_02047500.s b/arm9/asm/unk_02047500.s
index 3925c2c6..8668643a 100644
--- a/arm9/asm/unk_02047500.s
+++ b/arm9/asm/unk_02047500.s
@@ -242,7 +242,7 @@ FUN_02047668: ; 0x02047668
bl FUN_0204A1D8
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020476C8 ; =0x000001DF
sub r0, r0, r1
cmp r0, #0xe
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index aa31a8f5..073183fe 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -667,7 +667,7 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _02047C82
cmp r7, #0x0
@@ -675,14 +675,14 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r7, #0x0
bl GetMonExpByLevel
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
_02047C82:
diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s
index 633c56f0..f9bf1b3c 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -9,7 +9,7 @@ FUN_0204A01C: ; 0x0204A01C
mov r1, #0xa2
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204A030
mov r0, #0x0
@@ -18,7 +18,7 @@ _0204A030:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204A042
mov r0, #0x1
@@ -70,7 +70,7 @@ FUN_0204A048: ; 0x0204A048
add r2, sp, #0x1c
str r0, [sp, #0x1c]
add r0, r4, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x18]
add r1, r4, #0x0
bl FUN_0206B900
@@ -155,31 +155,31 @@ _0204A14A:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204A19C
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204A198
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204A198
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204A198
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _0204A19C
_0204A198:
@@ -265,7 +265,7 @@ _0204A21C:
mov r1, #0x4c
mov r2, #0x0
add r7, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204A236
add r0, r7, #0x0
@@ -314,13 +314,13 @@ _0204A272:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204A292
add r0, r4, #0x0
mov r1, #0x19
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0204A292:
add r5, r5, #0x1
cmp r5, r6
@@ -353,14 +353,14 @@ _0204A2B4:
add r0, r5, #0x0
mov r1, #0x9f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x88
tst r0, r1
beq _0204A308
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
cmp r0, #0x1
bls _0204A2EA
@@ -370,7 +370,7 @@ _0204A2EA:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0xc
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0xc]
cmp r0, #0x1
bne _0204A306
@@ -411,14 +411,14 @@ FUN_0204A32C: ; 0x0204A32C
mov r1, #0x9f
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x88
tst r0, r1
beq _0204A362
add r0, r4, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _0204A362
mov r0, #0x0
@@ -426,7 +426,7 @@ FUN_0204A32C: ; 0x0204A32C
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 9c90b25f..5889e176 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -198,7 +198,7 @@ _0204BB3C:
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
strh r0, [r5, #0x0]
@@ -220,12 +220,12 @@ _0204BB72:
ldrb r0, [r7, #0x2]
strh r0, [r5, #0x4]
add r0, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x6]
add r0, r4, #0x0
mov r1, #0xb1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x7]
add r6, r6, #0x1
add r5, #0x8
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index 00281e8b..037d98fd 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -1720,7 +1720,7 @@ _02051BD6:
mov r1, #0x5
add r0, r0, r6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
ldr r0, [sp, #0x18]
ldr r2, [r5, #0xc]
diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s
index 5d88393f..46c1432a 100644
--- a/arm9/asm/unk_02054C14.s
+++ b/arm9/asm/unk_02054C14.s
@@ -302,7 +302,7 @@ _02054E02:
bl FUN_0206B9B0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02054E1E
add r0, r4, #0x0
@@ -338,7 +338,7 @@ _02054E4A:
bl FUN_0206B9B0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x0]
add r6, r6, #0x1
add r5, r5, #0x2
diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s
index 14461752..b644f6b3 100644
--- a/arm9/asm/unk_020603B0.s
+++ b/arm9/asm/unk_020603B0.s
@@ -242,7 +242,7 @@ _020604D0:
ldr r0, [sp, #0x1c]
mov r1, #0xae
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
@@ -250,7 +250,7 @@ _020604D0:
mov r1, #0x0
ldr r0, [sp, #0x1c]
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x3
@@ -258,7 +258,7 @@ _020604D0:
ldr r0, [sp, #0x1c]
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x5
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index a3cdf7b3..f655ecb9 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -323,7 +323,7 @@ FUN_02060E04: ; 0x02060E04
add r0, r6, #0x0
mov r1, #0x76
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0x0
add r1, r5, #0x0
mov r2, #0xb
@@ -342,22 +342,22 @@ FUN_02060E34: ; 0x02060E34
mov r1, #0x5
mov r2, #0x0
add r7, r3, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
add r0, r5, #0x0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r6, #0x0]
add r0, r5, #0x0
mov r1, #0xc
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r7, #0x0]
add r0, r5, #0x0
mov r1, #0x79
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x18]
strb r0, [r1, #0x0]
pop {r3-r7, pc}
@@ -420,7 +420,7 @@ FUN_02060ECC: ; 0x02060ECC
mov r1, #0x4d
mov r2, #0x0
add r7, r3, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #0x0]
ldrb r0, [r4, #0x0]
cmp r0, #0x0
@@ -432,7 +432,7 @@ FUN_02060ECC: ; 0x02060ECC
add r0, r5, #0x0
mov r1, #0x76
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0x0
add r1, r7, #0x0
mov r2, #0xb
@@ -491,7 +491,7 @@ FUN_02060F3C: ; 0x02060F3C
add r0, r5, #0x0
mov r1, #0x4d
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #0x7]
add r2, r4, #0x7
add r4, #0x8
@@ -624,7 +624,7 @@ FUN_02061028: ; 0x02061028
add r0, r4, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x22]
ldrh r0, [r5, #0x22]
cmp r0, #0x0
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index cd3d180b..456b97f6 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -622,7 +622,7 @@ _0206B030:
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r7, #0x6
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r7, [sp, #0x3c]
mov r6, #0x0
_0206B120:
diff --git a/arm9/asm/unk_0206B8A4.s b/arm9/asm/unk_0206B8A4.s
index 4bf6e391..6938e252 100644
--- a/arm9/asm/unk_0206B8A4.s
+++ b/arm9/asm/unk_0206B8A4.s
@@ -211,12 +211,12 @@ _0206BA00:
add r0, r4, #0x0
mov r1, #0xab
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r6, #0x0
mov r1, #0xab
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
sub r2, r7, r0
mov r3, #0x1d
_0206BA24:
@@ -340,7 +340,7 @@ _0206BAF6:
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _0206BB0E
ldr r0, [r6, #0x4]
diff --git a/arm9/asm/unk_0206BB5C.s b/arm9/asm/unk_0206BB5C.s
index f9c4641c..70465dd6 100644
--- a/arm9/asm/unk_0206BB5C.s
+++ b/arm9/asm/unk_0206BB5C.s
@@ -34,7 +34,7 @@ FUN_0206BB84: ; 0x0206BB84
add r0, r7, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
cmp r4, #0x0
@@ -49,7 +49,7 @@ _0206BBA2:
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, r5
bls _0206BBBE
mov r0, #0x0
@@ -58,7 +58,7 @@ _0206BBBE:
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0206BBD0
mov r0, #0x0
@@ -208,17 +208,17 @@ _0206BCE2:
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r7, #0x0]
add r0, r4, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x10]
add r0, r1, r0
str r0, [sp, #0x10]
@@ -427,12 +427,12 @@ _0206BE72:
str r0, [sp, #0x24]
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
ldr r0, [sp, #0x24]
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x0]
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x24]
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 2158d937..31ad48cb 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -76,7 +76,7 @@ FUN_0206C700: ; 0x0206C700
mov r1, #0x5
mov r2, #0x0
str r0, [r4, #0x28]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0x0
add r1, #0x60
strh r0, [r1, #0x0]
@@ -1040,7 +1040,7 @@ _0206CF7E:
ldr r0, [r4, #0x28]
mov r1, #0x5
add r2, #0x62
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [r4, #0x28]
bl FUN_0206A1C4
ldr r0, [r4, #0x28]
@@ -1111,13 +1111,13 @@ _0206CFFA:
ldr r0, [r4, #0x28]
mov r1, #0x4d
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0206D05E
ldr r0, [r4, #0x28]
mov r1, #0xb2
mov r2, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0206D05E:
add r0, r4, #0x0
add r0, #0x64
@@ -1652,7 +1652,7 @@ _0206D4A6:
ldr r0, [r4, #0x28]
mov r2, #0x0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r4, #0xc]
mov r1, #0x1
@@ -1736,7 +1736,7 @@ _0206D560:
ldr r0, [r4, #0x28]
add r2, #0x66
add r1, #0x3e
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r2, r4, #0x0
add r1, #0x6c
@@ -2103,30 +2103,30 @@ _0206D86E:
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x4
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0xb
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r1, #0x19
str r1, [sp, #0x4]
add r6, sp, #0x0
_0206D8BA:
add r0, r5, #0x0
add r2, r6, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4d
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [r4, #0x5c]
bl FUN_020256BC
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r6, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x8
mov r2, #0x18
@@ -2188,7 +2188,7 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_0206A1C4
add r0, r5, #0x0
@@ -2225,7 +2225,7 @@ _0206D9A0:
ldr r0, [r4, #0x28]
mov r1, #0x6
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0206D9AE:
add sp, #0x20
pop {r4-r6, pc}
@@ -2581,7 +2581,7 @@ FUN_0206DC80: ; 0x0206DC80
add r0, r5, #0x0
mov r1, #0x5
add r2, #0x62
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
add r0, sp, #0x10
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 21ef4169..7f255340 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1681,7 +1681,7 @@ _020700BC:
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
@@ -1705,42 +1705,42 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701E4 ; =0x00000706
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701E8 ; =0x00000708
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701EC ; =0x0000070A
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701F0 ; =0x0000070C
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xa1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701F4 ; =0x00000712
add r2, r5, r6
strh r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x71
add r2, r5, r6
lsl r1, r1, #0x4
@@ -1748,14 +1748,14 @@ _020700DE:
add r0, r7, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020701F8 ; =0x00000711
add r2, r5, r6
strb r0, [r2, r1]
add r0, r7, #0x0
mov r1, #0xaf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
ldr r0, _020701FC ; =0x0000070E
bne _02070184
@@ -1864,7 +1864,7 @@ _02070256:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207026C
add r4, r4, #0x1
@@ -1925,106 +1925,106 @@ _020702BE: ; jump table (using 16-bit offset)
_020702C8:
mov r1, #0x7a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x7d
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
b _020703B6
_020702F8:
mov r1, #0x7e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x7f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x80
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x81
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
b _020703B6
_02070328:
mov r1, #0x82
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x83
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x84
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x85
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
b _020703B6
_02070358:
mov r1, #0x86
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x87
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x88
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x89
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
b _020703B6
_02070388:
mov r1, #0x8a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
add r0, r5, #0x0
mov r1, #0x8d
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r4, r0
_020703B6:
add r0, r4, #0x0
@@ -2839,7 +2839,7 @@ _02070A38:
_02070A3A:
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02070A4E
add r0, r4, #0x2
@@ -3790,7 +3790,7 @@ _020711D0:
ldr r0, [sp, #0x8]
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
beq _02071210
@@ -5249,7 +5249,7 @@ _02071D14:
add r2, sp, #0x0
str r1, [sp, #0x0]
mov r1, #0xa2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02072138 ; =0x00000B25
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index 66dbe6b0..8c630d8e 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -1987,37 +1987,37 @@ FUN_020734C0: ; 0x020734C0
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0x0]
add r0, r4, #0x0
mov r1, #0xa4
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0x2]
add r0, r4, #0x0
mov r1, #0xa5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0x4]
add r0, r4, #0x0
mov r1, #0xa7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0x6]
add r0, r4, #0x0
mov r1, #0xa8
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0x8]
add r0, r4, #0x0
mov r1, #0xa6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strh r0, [r1, #0xa]
mov r3, #0x1
diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s
index cc8df412..7a217fbe 100644
--- a/arm9/asm/unk_02073710.s
+++ b/arm9/asm/unk_02073710.s
@@ -248,7 +248,7 @@ FUN_020737D0: ; 0x020737D0
ldr r0, [sp, #0x10]
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
str r7, [sp, #0x14]
add r0, sp, #0x14
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index a3406825..ef8b86b1 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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02074330 ; =0x00000B25
@@ -2386,7 +2386,7 @@ FUN_02075118: ; 0x02075118
bl FUN_0206B9B0
mov r1, #0xa1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
ldr r2, _02075198 ; =0x0000069C
bne _0207515C
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index cccec733..a69191eb 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -1049,49 +1049,49 @@ FUN_02075DC0: ; 0x02075DC0
mov r1, #0xd
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x1c]
add r0, r4, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x18]
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r4, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
add r0, r4, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0xc]
add r0, r4, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x8]
add r0, r4, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r7, r0, #0x18
ldr r0, _02075F4C ; =0x000005A4
@@ -1135,42 +1135,42 @@ FUN_02075DC0: ; 0x02075DC0
add r0, r4, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x1c]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x18]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x14]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x10]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0xc]
cmp r1, r0
bne _02075EFA
add r0, r4, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x8]
cmp r1, r0
beq _02075F26
@@ -1178,7 +1178,7 @@ _02075EFA:
add r0, r4, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
ldr r1, _02075F4C ; =0x000005A4
beq _02075F18
@@ -1247,7 +1247,7 @@ FUN_02075F60: ; 0x02075F60
mov r1, #0xa2
mov r2, #0x0
str r0, [sp, #0x8]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
ldr r0, _02076084 ; =0x00000B25
ldrb r1, [r5, r0]
@@ -1375,7 +1375,7 @@ FUN_020760A0: ; 0x020760A0
bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02076134 ; =0x00000B25
add r4, r0, #0x0
ldrb r2, [r5, r1]
@@ -1574,7 +1574,7 @@ _02076212:
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r0, _020763E4 ; =0x0000069C
mov r1, #0x46
ldr r0, [r4, r0]
@@ -1649,7 +1649,7 @@ _020762DC:
bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, _020763E0 ; =0x00000B25
add r5, r0, #0x0
ldr r0, _02076400 ; =0x00000706
@@ -1786,38 +1786,38 @@ FUN_0207640C: ; 0x0207640C
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765B8 ; =0x00000B28
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa4
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765BC ; =0x00000B2A
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa5
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765C0 ; =0x00000B2C
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa7
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765C4 ; =0x00000B2E
mov r2, #0x0
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa8
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xb3
lsl r1, r1, #0x4
strh r0, [r5, r1]
add r0, r4, #0x0
mov r1, #0xa6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765C8 ; =0x00000B32
strh r0, [r5, r1]
ldr r0, _020765B0 ; =0x000005A4
@@ -1836,7 +1836,7 @@ FUN_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@@ -1847,7 +1847,7 @@ FUN_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@@ -1858,7 +1858,7 @@ FUN_0207640C: ; 0x0207640C
add r0, r4, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020765B4 ; =0x00000B25
ldrb r2, [r5, r1]
mov r1, #0x2c
@@ -2335,7 +2335,7 @@ _020768E6:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x6a
lsl r0, r0, #0x4
@@ -2540,7 +2540,7 @@ _02076AAA:
add r0, r6, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r2, r0, #0x10
ldr r0, [r5, r7]
@@ -2803,7 +2803,7 @@ _02076CDC:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x6a
lsl r0, r0, #0x4
@@ -3080,14 +3080,14 @@ FUN_02076F2C: ; 0x02076F2C
str r0, [sp, #0x0]
add r0, r4, #0x0
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add r1, r6, #0x0
str r0, [sp, #0x0]
add r0, r4, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, _02076FAC ; =0x000005A4
ldr r1, [r5, r0]
ldrh r0, [r1, #0x24]
@@ -3142,7 +3142,7 @@ FUN_02076FB0: ; 0x02076FB0
add r1, r6, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
ldr r0, _02077034 ; =0x0000069C
@@ -3379,7 +3379,7 @@ _0207716A:
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02077234 ; =0x000005A4
add r2, r0, #0x0
ldr r1, [r5, r1]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 7175ad49..3175f5f9 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -1555,7 +1555,7 @@ _0207A8C0:
mov r1, #0x13
ldrb r6, [r5, r0]
add r0, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0207AA08 ; =0x00000295
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@@ -1572,7 +1572,7 @@ _0207A8F4:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0207AA0C ; =0x00000296
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@@ -1589,7 +1589,7 @@ _0207A916:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0207AA10 ; =0x00000297
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@@ -1607,7 +1607,7 @@ _0207A938:
add r0, r4, #0x0
mov r1, #0x16
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xa6
lsl r1, r1, #0x2
strb r0, [r5, r1]
@@ -1625,7 +1625,7 @@ _0207A95E:
ldrb r6, [r5, r0]
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0207AA14 ; =0x00000299
strb r0, [r5, r1]
ldrb r0, [r5, r1]
@@ -1640,7 +1640,7 @@ _0207A980:
add r0, r4, #0x0
mov r1, #0x18
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0207AA18 ; =0x0000029A
strb r0, [r5, r1]
sub r1, #0x4e
@@ -1848,7 +1848,7 @@ FUN_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0xc]
add r0, r6, #0x0
bl FUN_020690E4
@@ -1913,12 +1913,12 @@ FUN_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0xe]
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldrb r1, [r5, #0x12]
mov r2, #0x7f
lsl r0, r0, #0x18
@@ -1931,7 +1931,7 @@ FUN_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1f
ldr r2, [r5, #0x50]
ldr r1, _0207AEB4 ; =0xEFFFFFFF
@@ -1942,7 +1942,7 @@ FUN_0207AB0C: ; 0x0207AB0C
add r0, r6, #0x0
mov r1, #0xaf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _0207AC16
ldr r0, [r5, #0x50]
@@ -1972,7 +1972,7 @@ _0207AC1E:
add r0, r6, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1a
@@ -1985,27 +1985,27 @@ _0207AC1E:
add r0, r6, #0x0
mov r1, #0xb0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x10]
add r0, r6, #0x0
mov r1, #0xb1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x11]
add r0, r6, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x14]
add r0, r6, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x18]
add r0, r6, #0x0
mov r1, #0x9c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x44
strb r0, [r1, #0x0]
@@ -2031,42 +2031,42 @@ _0207ACB2:
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x24]
add r0, r6, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x26]
add r0, r6, #0x0
mov r1, #0xa4
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x28]
add r0, r6, #0x0
mov r1, #0xa5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x2a]
add r0, r6, #0x0
mov r1, #0xa7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x2c]
add r0, r6, #0x0
mov r1, #0xa8
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x2e]
add r0, r6, #0x0
mov r1, #0xa6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x30]
add r0, r6, #0x0
mov r1, #0xa
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x32
strb r0, [r1, #0x0]
@@ -2084,14 +2084,14 @@ _0207AD26:
add r0, r6, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x0]
mov r2, #0x0
strh r0, [r1, #0x34]
add r1, r4, #0x0
add r0, r6, #0x0
add r1, #0x3a
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, r4
add r1, #0x3c
strb r0, [r1, #0x0]
@@ -2099,7 +2099,7 @@ _0207AD26:
add r0, r6, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #0x0]
@@ -2116,42 +2116,42 @@ _0207AD26:
add r0, r6, #0x0
mov r1, #0x13
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x45
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x14
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x46
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x15
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x47
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x16
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x48
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x17
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x49
strb r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x18
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x4a
strb r0, [r1, #0x0]
@@ -2180,14 +2180,14 @@ _0207ADFE:
add r0, r6, #0x0
mov r1, #0xb
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x4c
strh r0, [r1, #0x0]
add r0, r6, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0x0
add r1, #0x4e
strh r0, [r1, #0x0]
@@ -2281,7 +2281,7 @@ _0207AECC:
add r1, r0, #0x0
add r0, r6, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207AF04
lsr r0, r4, #0x5
@@ -3123,13 +3123,13 @@ _0207B528:
add r0, r6, r7
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207B50C
add r0, r6, r7
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207B55E
add r0, r5, #0x0
@@ -3173,13 +3173,13 @@ _0207B58E:
mov r1, #0x5
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207B574
add r0, r6, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0207B5BC
add r0, r5, #0x0
@@ -4814,12 +4814,12 @@ FUN_0207C2D4: ; 0x0207C2D4
add r5, r0, #0x0
mov r1, #0x9f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0207C2F4
mov r0, #0x6
diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s
index 839a9c0f..1baeda16 100644
--- a/arm9/asm/unk_0207FD00.s
+++ b/arm9/asm/unk_0207FD00.s
@@ -511,7 +511,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x94
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@@ -523,7 +523,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x95
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x1
@@ -531,7 +531,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x96
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -544,7 +544,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x9b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -557,7 +557,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x98
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x4
@@ -565,7 +565,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x91
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@@ -577,7 +577,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x92
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@@ -585,7 +585,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x93
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -598,7 +598,7 @@ FUN_02080108: ; 0x02080108
ldr r0, [r5, #0xc]
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@@ -635,7 +635,7 @@ FUN_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x94
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@@ -647,7 +647,7 @@ FUN_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x95
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r4, #0x8]
mov r1, #0x1
@@ -655,7 +655,7 @@ FUN_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x96
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -668,7 +668,7 @@ FUN_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x9b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -681,7 +681,7 @@ FUN_02080228: ; 0x02080228
ldr r0, [r4, #0xc]
mov r1, #0x79
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xf
bhi _020802F8
add r0, r0, r0
@@ -797,7 +797,7 @@ FUN_02080384: ; 0x02080384
bne _02080418
mov r1, #0x91
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@@ -809,7 +809,7 @@ FUN_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x92
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@@ -817,7 +817,7 @@ FUN_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x93
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -830,7 +830,7 @@ FUN_02080384: ; 0x02080384
ldr r0, [r5, #0xc]
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@@ -839,7 +839,7 @@ FUN_02080384: ; 0x02080384
_02080418:
mov r1, #0x94
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0x2
add r2, r0, #0x0
str r3, [sp, #0x0]
@@ -851,7 +851,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x95
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x6
@@ -859,7 +859,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x96
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -872,7 +872,7 @@ _02080418:
ldr r0, [r5, #0xc]
mov r1, #0x98
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r0, [r5, #0x8]
mov r1, #0x8
@@ -899,37 +899,37 @@ FUN_0208048C: ; 0x0208048C
ldr r0, [r4, #0xc]
mov r1, #0x46
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4, #0xc]
mov r1, #0x47
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
ldr r0, [r4, #0xc]
mov r1, #0x48
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x4]
ldr r0, [r4, #0xc]
mov r1, #0x49
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x0]
ldr r0, [r4, #0xc]
mov r1, #0x4a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
ldr r0, [r4, #0xc]
mov r1, #0x4b
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r1, #0x0
ldr r0, [r4, #0xc]
add r2, r1, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x6
bl _u32_div_f
cmp r1, #0x5
@@ -1196,7 +1196,7 @@ FUN_020806B4: ; 0x020806B4
ldr r0, [r5, #0xc]
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
mov r0, #0x12
ldr r1, [r5, #0x0]
@@ -1232,7 +1232,7 @@ FUN_020806F4: ; 0x020806F4
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02080708
b _0208084E
@@ -1240,13 +1240,13 @@ _02080708:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02080774
add r0, r5, #0x0
mov r1, #0x98
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r0, #0x0
mov r1, #0x37
@@ -1259,7 +1259,7 @@ _02080732:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _0208074C
cmp r4, #0x1
@@ -1273,7 +1273,7 @@ _0208074C:
add r0, r5, #0x0
mov r1, #0x98
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
mov r0, #0x1
add r1, r0, #0x0
@@ -1294,13 +1294,13 @@ _02080774:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _020807D6
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x2
@@ -1318,7 +1318,7 @@ _020807A6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
mov r0, #0x2
mov r1, #0x1
@@ -1344,7 +1344,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r0, #0x1
add r1, r0, #0x0
@@ -1354,7 +1354,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x0
@@ -1364,7 +1364,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
mov r0, #0x1
mov r1, #0x9
@@ -1374,7 +1374,7 @@ _020807D6:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
mov r0, #0x1
mov r1, #0xa
@@ -1403,13 +1403,13 @@ _0208084E:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _02080880
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
mov r0, #0x2
mov r1, #0x1
@@ -1428,7 +1428,7 @@ _02080884:
add r0, r5, #0x0
mov r1, #0x6e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x1
bne _02080896
mov r0, #0x13
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 260609d5..1cce712f 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -1083,7 +1083,7 @@ _02081454:
ldr r0, [r4, #0x0]
ldr r2, [r2, #0x0]
mov r1, #0x90
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r6, #0x1
add r4, r4, #0x4
cmp r6, #0x4
@@ -1223,7 +1223,7 @@ _02081566:
add r0, r5, #0x0
add r1, #0x7a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
b _020815BA
_02081576:
@@ -1231,7 +1231,7 @@ _02081576:
add r0, r5, #0x0
add r1, #0x7e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
b _020815BA
_02081586:
@@ -1239,7 +1239,7 @@ _02081586:
add r0, r5, #0x0
add r1, #0x82
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
b _020815BA
_02081596:
@@ -1247,7 +1247,7 @@ _02081596:
add r0, r5, #0x0
add r1, #0x86
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
b _020815BA
_020815A6:
@@ -1255,7 +1255,7 @@ _020815A6:
add r0, r5, #0x0
add r1, #0x8a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
b _020815BA
_020815B6:
@@ -2973,7 +2973,7 @@ FUN_02082254: ; 0x02082254
ldr r0, _02082280 ; =0x00001990
mov r2, #0x0
ldr r0, [r4, r0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _0208227A
mov r0, #0x1
@@ -3590,7 +3590,7 @@ _020826AC:
add r1, r6, #0x0
ldr r0, [r4, r0]
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _020826DE
mov r5, #0x1
@@ -3599,7 +3599,7 @@ _020826DE:
add r1, r6, #0x0
ldr r0, [r4, r0]
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_020826EA:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index c54093d9..591b7226 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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r4, r4, #0x1
add r5, r5, #0x2
cmp r4, #0x4
@@ -810,11 +810,11 @@ _02082D9A:
add r0, r6, #0x0
mov r1, #0x76
add r2, r5, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r2, [sp, #0x14]
add r0, r6, #0x0
mov r1, #0x90
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02021A20
ldr r0, [sp, #0x14]
@@ -838,30 +838,30 @@ _02082D9A:
strb r1, [r0, #0x0]
add r0, r6, #0x0
mov r1, #0x13
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x14
add r2, sp, #0x1c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x15
add r2, #0x3
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x16
add r2, #0x2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x17
add r2, #0x1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x18
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x20
pop {r3-r7, pc}
nop
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index 543d051a..659f3a36 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -28,7 +28,7 @@ _02084308:
add r0, r6, #0x0
mov r1, #0x9f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0xf
@@ -103,7 +103,7 @@ _020843AA:
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0x17
@@ -139,7 +139,7 @@ _020843EA:
add r0, r6, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bhs _02084414
add r0, r4, #0x0
@@ -156,7 +156,7 @@ _02084414:
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x64
bhs _0208443A
add r0, r4, #0x0
@@ -199,14 +199,14 @@ _0208447C:
add r0, r6, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x3
bhs _020844B2
add r1, r7, #0x0
add r0, r6, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x0
@@ -260,37 +260,37 @@ _02084502:
add r0, r6, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0x0
add r0, r6, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x14]
add r0, r6, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
add r0, r6, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
add r0, r6, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r6, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x49
lsl r1, r1, #0x2
cmp r0, r1
@@ -652,7 +652,7 @@ _02084840:
mov r1, #0x9f
add r2, r6, #0x0
add r7, r6, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x50]
str r0, [sp, #0x54]
add r0, r4, #0x0
@@ -717,18 +717,18 @@ _020848C0:
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x54
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r6, #0x1
_020848D4:
add r0, r5, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x50]
add r0, r5, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x54]
add r0, r4, #0x0
mov r1, #0x17
@@ -786,7 +786,7 @@ _0208495C:
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x58]
add r0, r4, #0x0
mov r1, #0x19
@@ -810,7 +810,7 @@ _0208495C:
add r0, r5, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0x0
ldr r3, [sp, #0x54]
ldr r1, [sp, #0x50]
@@ -915,37 +915,37 @@ _02084A66:
add r0, r5, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x50]
add r0, r5, #0x0
mov r1, #0xe
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x54]
add r0, r5, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x58]
add r0, r5, #0x0
mov r1, #0x10
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x5c]
add r0, r5, #0x0
mov r1, #0x11
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x60]
add r0, r5, #0x0
mov r1, #0x12
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x64]
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x49
lsl r1, r1, #0x2
cmp r0, r1
@@ -985,7 +985,7 @@ _02084A66:
add r0, r5, #0x0
mov r1, #0xd
add r2, sp, #0x50
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1030,7 +1030,7 @@ _02084B20:
add r0, r5, #0x0
mov r1, #0xe
add r2, sp, #0x54
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1075,7 +1075,7 @@ _02084B80:
add r0, r5, #0x0
mov r1, #0xf
add r2, sp, #0x58
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1120,7 +1120,7 @@ _02084BE0:
add r0, r5, #0x0
mov r1, #0x10
add r2, sp, #0x5c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1165,7 +1165,7 @@ _02084C40:
add r0, r5, #0x0
mov r1, #0x11
add r2, sp, #0x60
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1210,7 +1210,7 @@ _02084CA0:
add r0, r5, #0x0
mov r1, #0x12
add r2, sp, #0x64
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1233,7 +1233,7 @@ _02084D14:
add r0, r5, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x50]
cmp r0, #0x64
bge _02084D54
@@ -1338,7 +1338,7 @@ FUN_02084DF0: ; 0x02084DF0
add r1, #0x36
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
bne _02084E08
@@ -1349,14 +1349,14 @@ _02084E08:
add r0, r5, #0x0
add r1, #0x3a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
add r6, #0x3e
lsr r4, r0, #0x18
add r0, r5, #0x0
add r1, r6, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
add r0, r7, #0x0
@@ -1382,7 +1382,7 @@ FUN_02084E40: ; 0x02084E40
add r1, #0x36
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
bne _02084E5E
@@ -1397,14 +1397,14 @@ _02084E5E:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x4
strb r0, [r1, #0x0]
add r5, #0x3e
add r0, r6, #0x0
add r1, r5, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0x0
lsl r1, r1, #0x18
add r0, r7, #0x0
@@ -1429,7 +1429,7 @@ _02084EA8:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -1450,7 +1450,7 @@ FUN_02084EC0: ; 0x02084EC0
mov r2, #0x0
add r5, r0, #0x0
str r1, [sp, #0x0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x8
strb r0, [r1, #0x0]
ldrb r0, [r1, #0x0]
@@ -1464,7 +1464,7 @@ _02084EE6:
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x0
@@ -1480,7 +1480,7 @@ _02084F08:
add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x8
strb r0, [r1, #0x1]
ldrb r1, [r1, #0x0]
@@ -1511,12 +1511,12 @@ _02084F34:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x8
add r0, r5, #0x0
add r1, r4, #0x0
add r2, #0x1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x1
add sp, #0xc
pop {r4-r7, pc}
@@ -1556,7 +1556,7 @@ _02084F96:
_02084F98:
mov r1, #0xa2
add r2, sp, #0xc
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
pop {r3}
pop {r3}
add sp, #0x10
@@ -1621,7 +1621,7 @@ FUN_02085000: ; 0x02085000
add r4, r1, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xff
blt _02085014
mov r0, #0x0
@@ -1723,7 +1723,7 @@ _020850BE:
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
ldr r2, [sp, #0x20]
lsr r0, r0, #0x10
@@ -1741,7 +1741,7 @@ _020850EC:
add r0, r5, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xb
bne _02085100
ldr r0, [sp, #0x18]
@@ -1751,7 +1751,7 @@ _02085100:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r6, r0
bne _02085114
ldr r0, [sp, #0x18]
@@ -1775,7 +1775,7 @@ _0208512C:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x1
pop {r4-r6}
pop {r3}
@@ -1800,24 +1800,24 @@ _02085154:
mov r1, #0xab
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020851AC
add r0, r5, #0x0
mov r1, #0xa3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r4, #0x0
_02085190:
add r0, r5, #0x0
diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s
index f23b2327..76d5564d 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -111,7 +111,7 @@ FUN_02085578: ; 0x02085578
ldr r2, [r4, #0x14]
add r0, r6, #0x0
mov r1, #0xa9
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0x0
pop {r3-r7, pc}
.balign 4
@@ -180,7 +180,7 @@ _0208561E:
ldr r2, [r5, #0x14]
add r0, r4, #0x0
mov r1, #0xa9
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x1
pop {r3-r5, pc}
@@ -218,7 +218,7 @@ FUN_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x0
add r2, r6, #0x0
@@ -229,11 +229,11 @@ FUN_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 68edc27c..1a2050fe 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -178,7 +178,7 @@ _02085A7C:
beq _02085A9A
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02085A9A
lsl r0, r0, #0x3
@@ -675,7 +675,7 @@ _02085EA6:
mov r1, #0xa1
add r2, sp, #0x8
add r5, r0, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 2afe74b0..51a7378c 100644
--- a/arm9/asm/unk_02086084.s
+++ b/arm9/asm/unk_02086084.s
@@ -125,7 +125,7 @@ _0208618C:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _020861D8 ; =0x000001EA
cmp r0, r1
bne _020861A4
@@ -286,7 +286,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0x4c
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0x0
bl FUN_020377AC
ldr r1, [r4, #0xc]
@@ -319,7 +319,7 @@ _0208633A:
ldr r0, [r4, #0xc]
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0x0
add r0, r6, #0x0
bl FUN_020377AC
@@ -334,13 +334,13 @@ _0208633A:
ldr r0, [r4, #0xc]
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r4, #0x8]
mov r2, #0x0
str r0, [r1, #0x10]
ldr r0, [r4, #0xc]
mov r1, #0x70
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r4, #0x8]
str r0, [r1, #0x8]
ldr r1, _020863D8 ; =UNK_020FA5FC
@@ -359,7 +359,7 @@ _02086396:
ldr r0, [r4, #0xc]
ldr r2, [r2, #0x18]
mov r1, #0x77
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_020863A8:
ldr r0, [r4, #0x8]
bl FUN_02077AC4
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index 1c060f0a..73ff0ee5 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -1441,7 +1441,7 @@ FUN_02086EE8: ; 0x02086EE8
ldr r4, [r0, #0xc]
mov r2, #0x0
add r0, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
@@ -1452,7 +1452,7 @@ FUN_02086EE8: ; 0x02086EE8
add r0, r4, #0x0
mov r1, #0x4c
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, sp, #0x28
add r1, r4, #0x0
mov r2, #0x2
@@ -1487,7 +1487,7 @@ FUN_02086F4C: ; 0x02086F4C
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s
index 3c022997..f27865fe 100644
--- a/arm9/asm/unk_02086FA8.s
+++ b/arm9/asm/unk_02086FA8.s
@@ -164,7 +164,7 @@ _020870D2:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_02005578
@@ -447,7 +447,7 @@ _02087322:
mov r1, #0x5
ldr r0, [r0, #0xc]
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_02005578
diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s
index 1f2ef5e9..a5a9b7c9 100644
--- a/arm9/asm/unk_02087D00.s
+++ b/arm9/asm/unk_02087D00.s
@@ -723,7 +723,7 @@ _02088246:
add r0, r6, #0x0
add r1, #0x13
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r1, r4, #0x2
str r0, [r5, r1]
add r0, r4, #0x1
@@ -791,7 +791,7 @@ _020882D4:
add r0, r6, #0x0
add r1, #0x13
add r2, r4, r2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -800,7 +800,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x8
strb r0, [r1, #0x0]
ldrb r0, [r1, #0x0]
@@ -811,7 +811,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
add r2, sp, #0x8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0208830C:
add sp, #0x30
pop {r3-r7, pc}
diff --git a/arm9/asm/unk_02088DD8.s b/arm9/asm/unk_02088DD8.s
index 19d246ac..0bb527c8 100644
--- a/arm9/asm/unk_02088DD8.s
+++ b/arm9/asm/unk_02088DD8.s
@@ -33,21 +33,21 @@ FUN_02088DF8: ; 0x02088DF8
mov r1, #0x5
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0xc]
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
mov r4, #0x0
@@ -59,7 +59,7 @@ _02088E34:
add r0, r5, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r1, r4, #0x1
strh r0, [r6, r1]
add r0, r4, #0x1
diff --git a/arm9/global.inc b/arm9/global.inc
index 90558421..b1937f13 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4719,9 +4719,9 @@
.extern FUN_02066EA4
.extern FUN_02066ED8
.extern FUN_02066F04
-.extern FUN_020671BC
+.extern GetMonDataEncrypted
.extern FUN_020672BC
-.extern FUN_02067830
+.extern SetBoxMonDataEncrypted
.extern FUN_02067960
.extern FUN_02068018
.extern AllocAndLoadMonPersonal
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 5f07ebe7..7a16d48c 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -27440,12 +27440,12 @@ _021E4980:
add r0, r7, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
ldr r0, [sp]
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x55
lsl r1, r1, #2
ldr r1, [r5, r1]
@@ -43131,7 +43131,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
add r0, r4, #0
mov r1, #0x74
add r2, sp, #0xc
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0
bl FUN_020690E4
bl MOD05_021EC4DC
@@ -43142,7 +43142,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
add r2, r0, #0
add r0, r4, #0
mov r1, #0xa9
- bl FUN_020671BC
+ bl GetMonDataEncrypted
_021EC544:
ldr r1, [sp, #4]
add r0, r4, #0
@@ -43313,13 +43313,13 @@ MOD05_021EC668: ; 0x021EC668
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x64
beq _021EC6E0
add r0, r4, #0
mov r1, #8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
add r0, r6, #0
bl FUN_02023C84
@@ -43329,7 +43329,7 @@ MOD05_021EC668: ; 0x021EC668
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl MOD05_021EC604
_021EC6E0:
@@ -43342,7 +43342,7 @@ _021EC6E0:
add r2, r0, #0
add r0, r4, #0
mov r1, #0xa9
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_021EC6FA:
ldr r0, [sp]
add r1, r4, #0
@@ -43796,7 +43796,7 @@ _021ECA6C:
add r0, r4, #0
mov r1, #0x46
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ECAEE
_021ECA82:
mov r1, #0x47
@@ -43806,7 +43806,7 @@ _021ECA82:
add r0, r4, #0
mov r1, #0x47
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ECAEE
_021ECA98:
mov r1, #0x48
@@ -43816,7 +43816,7 @@ _021ECA98:
add r0, r4, #0
mov r1, #0x48
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ECAEE
_021ECAAE:
mov r1, #0x49
@@ -43826,7 +43826,7 @@ _021ECAAE:
add r0, r4, #0
mov r1, #0x49
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ECAEE
_021ECAC4:
mov r1, #0x4a
@@ -43836,7 +43836,7 @@ _021ECAC4:
add r0, r4, #0
mov r1, #0x4a
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ECAEE
_021ECADA:
mov r1, #0x4b
@@ -43846,7 +43846,7 @@ _021ECADA:
add r0, r4, #0
mov r1, #0x4b
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_021ECAEE:
add r0, r5, #1
lsl r0, r0, #0x18
@@ -43864,7 +43864,7 @@ MOD05_021ECAFC: ; 0x021ECAFC
mov r1, #5
add r2, r4, #0
add r6, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r2, r0, #0x10
ldr r0, _021ECB60 ; =0x00004E20
@@ -43935,14 +43935,14 @@ MOD05_021ECB6C: ; 0x021ECB6C
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x18]
add r0, r7, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0xc]
@@ -44424,16 +44424,16 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r5, #0
mov r1, #0x9a
add r2, sp, #0x14
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
mov r1, #9
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x10
add r0, r5, #0
mov r1, #0x9b
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
_021ECF7E:
add r2, sp, #0x10
mov r1, #1
@@ -44450,7 +44450,7 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x4c
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
mov r1, #7
add r2, sp, #0x1c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
mov r1, #0x9c
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
_021ECFEE:
@@ -44562,20 +44562,20 @@ _021ED05E:
add r0, r7, #0
mov r1, #0x9a
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0
mov r1, #9
add r2, sp, #0x14
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x14
add r0, r7, #0
mov r1, #0x9b
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0
mov r1, #0x70
add r2, sp, #0x30
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl FUN_02021A20
add sp, #0x18
@@ -44664,7 +44664,7 @@ _021ED168:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #4]
add r1, r4, #0
bl FUN_0206B900
@@ -44691,7 +44691,7 @@ _021ED1A2:
bl FUN_0206B9B0
add r1, r7, #0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _021ED1D6
add r0, r5, #0
@@ -44699,7 +44699,7 @@ _021ED1A2:
bl FUN_0206B9B0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #0x28
@@ -45027,19 +45027,19 @@ _021ED430:
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021ED484
add r0, r4, #0
mov r1, #3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _021ED484
add r0, r4, #0
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
cmp r0, #0
beq _021ED47E
@@ -45055,7 +45055,7 @@ _021ED472:
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _021ED484
_021ED47E:
add sp, #0x14
@@ -45090,13 +45090,13 @@ _021ED4AC:
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021ED4D4
add r0, r4, #0
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _021ED4D4
add r0, r4, #0
@@ -45232,7 +45232,7 @@ MOD05_021ED5C4: ; 0x021ED5C4
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r3, r4, r5, pc}
@@ -45316,7 +45316,7 @@ MOD05_021ED650: ; 0x021ED650
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x14]
@@ -45327,14 +45327,14 @@ _021ED67C:
add r0, r4, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r1, r5, #1
strh r0, [r7, r1]
add r1, r5, #0
add r0, r4, #0
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x30
strb r0, [r1, r5]
add r0, r5, #1
@@ -45345,7 +45345,7 @@ _021ED67C:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
mov r5, #0
_021ED6B4:
@@ -45353,7 +45353,7 @@ _021ED6B4:
add r0, r4, #0
add r1, #0x46
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x24
add r1, #2
strb r0, [r1, r5]
@@ -45365,52 +45365,52 @@ _021ED6B4:
add r0, r4, #0
mov r1, #0xc
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #9]
add r0, r4, #0
mov r1, #0x79
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #8]
add r0, r4, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #7]
add r0, r4, #0
mov r1, #0x99
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #0xa]
add r0, r4, #0
mov r1, #0x6e
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #5]
ldr r2, [sp, #0x10]
add r0, r4, #0
mov r1, #0x90
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #3]
add r0, r4, #0
mov r1, #7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x2c]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #4]
ldr r1, _021ED93C ; =0x000001EA
@@ -45420,7 +45420,7 @@ _021ED6B4:
add r0, r4, #0
mov r1, #0x97
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0
mov r0, #2
mov r1, #1
@@ -45460,13 +45460,13 @@ _021ED7A2:
add r0, r6, #0
add r1, #0x36
add r2, r7, r2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r1, r5, #0
add r2, sp, #0x30
add r0, r6, #0
add r1, #0x3a
add r2, r2, r5
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x79
add r2, sp, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0xb
add r2, #3
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x1c
mov r1, #0x78
add r0, sp, #0x18
@@ -45507,118 +45507,118 @@ _021ED7CE:
add r0, r6, #0
mov r1, #9
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x20
add r0, r6, #0
mov r1, #0x99
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0x6e
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r2, [sp, #0x10]
add r0, r6, #0
mov r1, #0x90
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x9c
add r2, #3
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #7
add r2, sp, #0x2c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0x1c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #0x97
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strh r0, [r1, #0xc]
add r0, r4, #0
mov r1, #0x91
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #2]
add r0, r4, #0
mov r1, #0x92
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #1]
add r0, r4, #0
mov r1, #0x93
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1]
add r0, r6, #0
mov r1, #0x97
add r2, sp, #0x24
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x91
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x92
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x93
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #0x98
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strh r0, [r1, #0xc]
add r0, r4, #0
mov r1, #0x94
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #2]
add r0, r4, #0
mov r1, #0x95
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1, #1]
add r0, r4, #0
mov r1, #0x96
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x18
strb r0, [r1]
add r0, r6, #0
mov r1, #0x98
add r2, sp, #0x24
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x94
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x95
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x96
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
bl FUN_02069B88
@@ -45649,11 +45649,11 @@ MOD05_021ED940: ; 0x021ED940
add r0, r4, #0
mov r1, #0x4c
add r2, #3
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #5
add r2, r5, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
add r1, r5, #0
@@ -45662,21 +45662,21 @@ MOD05_021ED940: ; 0x021ED940
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x4d
add r2, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x9a
add r2, #1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl FUN_02066ED8
add sp, #0x1c
@@ -58115,13 +58115,13 @@ MOD05_021F38CC: ; 0x021F38CC
mov r1, #0
add r2, r1, #0
add r5, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0
mov r1, #0x46
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58130,7 +58130,7 @@ MOD05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x47
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58139,7 +58139,7 @@ MOD05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x48
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58148,7 +58148,7 @@ MOD05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x49
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58156,7 +58156,7 @@ MOD05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x4a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58164,7 +58164,7 @@ MOD05_021F38CC: ; 0x021F38CC
add r0, r5, #0
mov r1, #0x4b
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0xf
and r0, r1
lsl r0, r0, #0x10
@@ -58279,7 +58279,7 @@ MOD05_021F3A18: ; 0x021F3A18
mov r1, #5
mov r2, #0
str r0, [sp]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r0, [sp]
@@ -58444,7 +58444,7 @@ MOD05_021F3B7C: ; 0x021F3B7C
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index a6a14d1d..529aeb97 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4804,7 +4804,7 @@ _0223BA42:
str r1, [sp, #0x34]
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x24
strb r0, [r1, #0x18]
_0223BA8C:
@@ -5586,7 +5586,7 @@ _0223C0CE:
str r1, [sp, #0x2c]
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x20
strb r0, [r1, #0x14]
_0223C118:
@@ -6400,7 +6400,7 @@ MOD06_0223C738: ; 0x0223C738
add r4, r1, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
cmp r1, #0xe0
@@ -6464,7 +6464,7 @@ _0223C7AC:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x19
bl _u32_div_f
lsl r0, r1, #0x18
@@ -6588,7 +6588,7 @@ _0223C8A6:
ldr r0, [sp, #0x44]
mov r1, #0x6f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x24]
@@ -6722,7 +6722,7 @@ _0223C9BE:
ldr r0, [sp, #0x28]
mov r1, #0x6f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r6, r0, #0x18
cmp r6, #1
@@ -6752,7 +6752,7 @@ _0223C9E4:
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -7488,7 +7488,7 @@ _0223CF96:
add r0, r1, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #5
@@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [r6, #8]
add r1, r4, #0
bl FUN_0206B900
@@ -7782,7 +7782,7 @@ _0223D1DA:
add r0, r6, #0
mov r1, #5
add r2, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0223D270 ; =0x000001A6
cmp r0, r1
bne _0223D208
@@ -7839,7 +7839,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@@ -7919,14 +7919,14 @@ MOD06_0223D2DC: ; 0x0223D2DC
mov r1, #0x4c
mov r2, #0
add r4, r3, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0223D302
mov r2, #0
add r0, r7, #0
mov r1, #0xa
strb r2, [r4, #0xd]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
b _0223D308
_0223D302:
mov r0, #1
@@ -19758,19 +19758,19 @@ _02243312:
mov r1, #5
mov r2, #0
str r0, [sp, #0xc]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0xc]
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0224336E
add r0, r5, #0
@@ -20287,12 +20287,12 @@ _02243726:
add r7, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x2e]
add r0, r7, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x36]
add r0, r4, #1
lsl r0, r0, #0x10
@@ -20338,12 +20338,12 @@ _0224379C:
lsl r6, r5, #1
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, r6]
ldr r0, [sp, #8]
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r7, r6]
cmp r5, #0
beq _022437FA
@@ -21457,13 +21457,13 @@ _02243FFA:
add r1, r6, #0
mov r2, #0
str r0, [sp, #4]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02244024
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -21522,7 +21522,7 @@ MOD06_0224406C: ; 0x0224406C
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r1, [r1]
@@ -21537,7 +21537,7 @@ MOD06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #0x70
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
lsl r0, r0, #0x10
ldrh r2, [r1]
@@ -21552,7 +21552,7 @@ MOD06_0224406C: ; 0x0224406C
strh r1, [r0]
add r0, r5, #0
mov r1, #6
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
mov r4, #0
strh r0, [r1, #2]
@@ -21567,13 +21567,13 @@ _022440D0:
add r0, r5, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
strh r0, [r6, #4]
add r0, r5, #0
add r1, #0x3e
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #4]
lsl r0, r7
ldrb r1, [r1]
@@ -21588,25 +21588,25 @@ _022440D0:
add r0, r5, #0
mov r1, #0xc
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
mov r2, #0
strb r0, [r1, #0x1f]
add r0, r5, #0
mov r1, #7
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
str r0, [r1, #0xc]
mov r1, #0
add r0, r5, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
mov r2, #0
str r0, [r1, #0x10]
add r0, r5, #0
mov r1, #0xae
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
mov r4, #0
str r0, [r1, #0x14]
@@ -21616,7 +21616,7 @@ _0224413C:
add r0, r5, #0
add r1, #0xd
add r2, r6, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
add r1, r1, r4
add r4, r4, #1
@@ -21626,14 +21626,14 @@ _0224413C:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
mov r2, #0
add r1, #0x20
strb r0, [r1]
add r0, r5, #0
mov r1, #9
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp]
ldr r2, [sp]
add r1, #0x21
@@ -21642,7 +21642,7 @@ _0224413C:
add r0, r5, #0
mov r1, #0x74
str r2, [sp]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
mov r1, #6
add r2, r6, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@@ -21950,19 +21950,19 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #8
strb r0, [r1]
add r1, r4, #0
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@@ -22052,7 +22052,7 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
@@ -22063,13 +22063,13 @@ _022444FC:
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
bl FUN_02066ED8
add sp, #0x10
@@ -22157,20 +22157,20 @@ _022445A6:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x32
bls _022445E8
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x32
bl GetMonExpByLevel
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl FUN_02066ED8
_022445E8:
@@ -22348,7 +22348,7 @@ _0224471C:
bl FUN_0206B9B0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x21
lsl r1, r1, #6
strh r0, [r5, r1]
@@ -26833,7 +26833,7 @@ MOD06_0224690C: ; 0x0224690C
str r0, [r4]
ldr r0, [r4, #0x5c]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_02005578
@@ -28745,7 +28745,7 @@ _022477A8:
mov r1, #0
add r0, r6, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp]
mov r0, #0
str r0, [sp, #4]
@@ -30769,7 +30769,7 @@ MOD06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
add r0, r7, #0
bl MOD06_02248810
@@ -30779,13 +30779,13 @@ MOD06_02248724: ; 0x02248724
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r0, [sp]
@@ -31018,7 +31018,7 @@ MOD06_0224891C: ; 0x0224891C
mov r1, #0xa0
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
ldr r0, [r5, #0x10]
str r0, [sp]
@@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x2c]
bl FUN_02034824
add r3, r0, #0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 8cccb236..7fbc2c22 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -2333,13 +2333,13 @@ _0221312A:
mov r1, #5
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022131B0
add r0, r7, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _022131B0
add r0, r7, #0
@@ -3686,7 +3686,7 @@ _02213C2E:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x86
lsl r1, r1, #2
strh r0, [r7, r1]
@@ -3702,52 +3702,52 @@ _02213C2E:
add r5, r0, r1
add r0, r4, #0
mov r1, #0x4c
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02213D18 ; =0x00000223
mov r2, #0
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa2
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02213D1C ; =0x0000021A
mov r2, #0
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa3
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x87
lsl r1, r1, #2
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x22
lsl r1, r1, #4
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02213D20 ; =0x0000021E
mov r2, #0
strh r0, [r5, r1]
add r0, r4, #0
mov r1, #0xa1
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x89
lsl r1, r1, #2
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02213D24 ; =0x00000225
mov r2, #0
strb r0, [r5, r1]
add r0, r4, #0
mov r1, #0xaf
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #1
bne _02213CE8
mov r1, #0
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 9a66c27d..6c672cb0 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -45038,7 +45038,7 @@ MOD08_02228244: ; 0x02228244
str r0, [r2]
ldr r0, [r4, #0xc]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x9c
str r0, [r1]
@@ -45067,7 +45067,7 @@ _02228272:
_02228290:
ldr r0, [r4, #0xc]
mov r1, #0x9a
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, #0x98
str r0, [r4]
pop {r4, pc}
@@ -45080,7 +45080,7 @@ _0222829E:
add r4, #0xa0
mov r1, #0xaa
add r2, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
pop {r4, pc}
thumb_func_start MOD08_022282B4
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index f03d3e57..a5b5560b 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -576,7 +576,7 @@ _022122BA:
add r0, r5, r1
ldr r0, [r0, #4]
mov r1, #0xa2
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x20]
ldrb r1, [r4, #0x11]
mov r0, #0x50
@@ -1630,7 +1630,7 @@ _02212B0A:
ldr r0, [r0, #4]
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r7, #4
strh r0, [r4, r1]
mov r2, #2
@@ -1686,7 +1686,7 @@ _02212BAA:
add r0, r4, r0
ldr r0, [r0, #4]
mov r1, #0xa2
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02212C84 ; =0x0000207E
mov r2, #4
strh r0, [r4, r1]
@@ -1841,7 +1841,7 @@ _02212CD0:
add r1, r7, #0
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x82
lsl r1, r1, #6
strh r0, [r4, r1]
@@ -2441,7 +2441,7 @@ _022131E2:
str r0, [r4, #4]
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #8]
ldrh r0, [r4, #8]
cmp r0, #0
@@ -2457,54 +2457,54 @@ _0221320C:
add r4, r0, r5
ldr r0, [r4, #4]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xa]
ldr r0, [r4, #4]
mov r1, #0xa5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xc]
ldr r0, [r4, #4]
mov r1, #0xa6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xe]
ldr r0, [r4, #4]
mov r1, #0xa7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x10]
ldr r0, [r4, #4]
mov r1, #0xa8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x12]
ldr r0, [r4, #4]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x14]
ldr r0, [r4, #4]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x16]
ldr r0, [r4, #4]
mov r1, #0xb0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #0x18]
ldr r0, [r4, #4]
mov r1, #0xb1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r6, [sp]
strb r0, [r4, #0x19]
ldr r0, [r4, #4]
add r6, #0x1a
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldrb r1, [r6, r5]
mov r2, #0x7f
lsl r0, r0, #0x18
@@ -2517,7 +2517,7 @@ _0221320C:
ldr r0, [r4, #4]
mov r1, #0xaf
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #1
ldrb r1, [r6, r5]
bne _022132BC
@@ -2557,7 +2557,7 @@ _022132C2:
ldr r0, [r4, #4]
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1f
@@ -2570,17 +2570,17 @@ _022132C2:
ldr r0, [r4, #4]
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x1c]
ldr r0, [r4, #4]
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x1e]
ldr r0, [r4, #4]
mov r1, #8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r6, [sp]
str r0, [r4, #0x20]
add r6, #0x1a
@@ -2610,49 +2610,49 @@ _02213366:
ldr r0, [r4, #4]
mov r1, #0x13
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x2c
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x14
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x2d
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x15
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x2e
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x16
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x2f
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x17
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x30
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0xa1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r1, #0x31
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, #0x32
strb r0, [r4]
ldr r1, [sp]
@@ -2670,7 +2670,7 @@ _022133E4:
ldr r0, [r6, #4]
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0xc]
strh r0, [r7, r1]
add r0, r1, #0
@@ -2681,13 +2681,13 @@ _022133E4:
ldr r0, [r6, #4]
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #2]
add r1, r4, #0
ldr r0, [r6, #4]
add r1, #0x3e
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #3]
ldrh r0, [r5]
ldrb r1, [r5, #3]
@@ -8336,7 +8336,7 @@ MOD09_02216378: ; 0x02216378
mov r1, #0xa2
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index c1216663..55c064d7 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -1685,7 +1685,7 @@ _0222E4AC:
bl MOD11_02230014
mov r1, #0x9a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
ldr r1, [r6, #0x34]
add r0, r5, #0
@@ -2024,19 +2024,19 @@ _0222E76C:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222E79E
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E79E
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E7AA
_0222E79E:
@@ -2129,19 +2129,19 @@ _0222E848:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222E87A
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E87A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E886
_0222E87A:
@@ -2255,38 +2255,38 @@ _0222E938:
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E9B8
b _0222E9AC
_0222E984:
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222E9B8
_0222E9AC:
@@ -2355,19 +2355,19 @@ _0222EA22:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EA54
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EA54
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EA60
_0222EA54:
@@ -2457,19 +2457,19 @@ _0222EAEE:
bne _0222EB2E
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EB56
ldr r0, [sp, #0x38]
@@ -2479,19 +2479,19 @@ _0222EAEE:
_0222EB2E:
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EB64
_0222EB56:
@@ -2582,19 +2582,19 @@ _0222EBF6:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EC28
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EC28
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EC34
_0222EC28:
@@ -2707,38 +2707,38 @@ _0222ECE0:
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222ED60
b _0222ED54
_0222ED2C:
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222ED60
_0222ED54:
@@ -2810,19 +2810,19 @@ _0222EDD2:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222EE04
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EE04
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222EE10
_0222EE04:
@@ -2865,7 +2865,7 @@ _0222EE3E:
add r2, r4, #0
mov r1, #0x8f
add r2, #0xf4
- bl FUN_020671BC
+ bl GetMonDataEncrypted
_0222EE5A:
ldr r1, [r4, #0x2c]
mov r0, #1
@@ -5703,7 +5703,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #7
str r0, [sp, #0x20]
tst r1, r0
@@ -5714,7 +5714,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@@ -5765,7 +5765,7 @@ _02230478:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0223068C ; =0x00000F88
str r0, [sp, #0x20]
tst r1, r0
@@ -5776,7 +5776,7 @@ _02230478:
str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@@ -5813,7 +5813,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x10
str r0, [sp, #0x20]
tst r1, r0
@@ -5824,7 +5824,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@@ -5861,7 +5861,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x20
str r0, [sp, #0x20]
tst r1, r0
@@ -5872,7 +5872,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@@ -5909,7 +5909,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x40
str r0, [sp, #0x20]
tst r1, r0
@@ -5920,7 +5920,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@@ -6300,13 +6300,13 @@ _022308C4:
ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _0223095A
add r1, r4, #0
@@ -6371,13 +6371,13 @@ _0223097E:
ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _022309F2
add r1, r4, #0
@@ -6448,7 +6448,7 @@ _02230A0C:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02230A42
mov r0, #1
@@ -6458,7 +6458,7 @@ _02230A36:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x20]
_02230A42:
ldr r0, [sp, #0x20]
@@ -6467,12 +6467,12 @@ _02230A42:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r4, r0
beq _02230B14
ldr r0, [sp, #0x38]
@@ -6491,14 +6491,14 @@ _02230A42:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x20]
b _02230AC2
_02230A8C:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsr r0, r0, #1
str r0, [sp, #0x20]
bne _02230AC2
@@ -6509,7 +6509,7 @@ _02230AA2:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x19
mul r1, r0
add r0, r1, #0
@@ -6572,7 +6572,7 @@ _02230B14:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x64
bhs _02230B4A
ldr r0, [sp, #0x14]
@@ -6597,13 +6597,13 @@ _02230B4A:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x64
blo _02230B8E
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xc8
bhs _02230B8E
ldr r0, [sp, #0x14]
@@ -6628,7 +6628,7 @@ _02230B8E:
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xc8
blo _02230BC4
ldr r0, [sp, #0x14]
@@ -6649,7 +6649,7 @@ _02230BC4:
ldr r0, [sp, #0x18]
mov r1, #0x9a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xb
bne _02230BE0
ldr r0, [sp, #8]
@@ -6659,7 +6659,7 @@ _02230BE0:
ldr r0, [sp, #0x18]
mov r1, #0x97
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
ldr r0, [sp, #4]
bl MOD11_022302B0
@@ -6672,7 +6672,7 @@ _02230BFC:
ldr r0, [sp, #0x18]
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x20]
ldr r0, [sp, #0x38]
mov r1, #1
@@ -7102,7 +7102,7 @@ _02230EE4:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #0x67
@@ -7152,7 +7152,7 @@ _02230F4E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02230F58:
add r0, r5, #0
mov r1, #0
@@ -8141,7 +8141,7 @@ _02231606:
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x67
lsl r1, r1, #2
cmp r0, r1
@@ -12589,13 +12589,13 @@ _02233950:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022339B4
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022339B4
add r0, r4, #0
@@ -12616,7 +12616,7 @@ _02233994:
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r5, #0
@@ -18484,19 +18484,19 @@ _02236794:
mov r1, #5
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022367C8
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _022367C8
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022367C8
add r7, r7, #1
@@ -18537,19 +18537,19 @@ _022367EA:
add r1, r7, #0
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022367EA
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #1
beq _022367EA
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022367EA
ldr r0, [sp]
@@ -20636,26 +20636,26 @@ _022378A2:
beq _02237900
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _022378F8
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02237900
_022378F8:
@@ -20672,17 +20672,17 @@ _02237900:
add r4, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #4]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
@@ -20818,26 +20818,26 @@ _02237A2A:
beq _02237A9A
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _02237A7C
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02237A9A
_02237A7C:
@@ -21174,13 +21174,13 @@ _02237D16:
mov r1, #0xad
mov r2, #0
str r0, [sp, #8]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02237D7E
ldr r0, [sp, #8]
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02237DBC ; =0x000001EE
cmp r0, r1
beq _02237D7E
@@ -21190,7 +21190,7 @@ _02237D4E:
ldr r0, [sp, #8]
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@@ -23876,20 +23876,20 @@ _02239222:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #4]
@@ -23915,7 +23915,7 @@ _02239222:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
sub r0, r0, #1
mov r1, #0xa
bl _u32_div_f
@@ -23939,7 +23939,7 @@ _022392AA:
add r0, r4, #0
mov r1, #6
add r2, r5, r2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _022392EC
_022392C4:
cmp r5, #0x62
@@ -23954,7 +23954,7 @@ _022392C4:
add r0, r4, #0
mov r1, #6
add r2, r2, r3
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
b _022392EC
_022392E2:
add r1, r1, #1
@@ -23979,7 +23979,7 @@ _022392EC:
mov r1, #0xa0
str r2, [sp, #0xc]
mov r5, #0xa
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
cmp r1, #0xa
@@ -24010,7 +24010,7 @@ _0223932E:
add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02239350:
ldr r0, [sp]
mov r1, #0
@@ -25362,20 +25362,20 @@ _02239E2A:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02239E5C
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239E5C
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r5, r0
_02239E5C:
add r0, r7, #0
@@ -25411,19 +25411,19 @@ _02239E90:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02239EC0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, r7
beq _02239EC0
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r5, r0
_02239EC0:
ldr r0, [sp, #8]
@@ -25458,20 +25458,20 @@ _02239EF8:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02239F2A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239F2A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r5, r0
_02239F2A:
add r0, r7, #0
@@ -25807,12 +25807,12 @@ MOD11_0223A178: ; 0x0223A178
add r6, r0, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp]
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
ldr r0, _0223A210 ; =0x00002D67
add r1, r5, r4
@@ -26642,7 +26642,7 @@ _0223A7D6:
mov r1, #6
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@@ -26746,7 +26746,7 @@ _0223A8B0:
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@@ -26768,7 +26768,7 @@ _0223A8B0:
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0223A90E
ldr r1, [r4, #4]
@@ -26794,7 +26794,7 @@ _0223A90E:
ldr r2, [sp, #0x34]
add r0, r6, #0
mov r1, #0xa2
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0223A928
b _0223AA34
@@ -26802,7 +26802,7 @@ _0223A928:
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x64
beq _0223AA34
ldr r0, [r4, #4]
@@ -26861,7 +26861,7 @@ _0223A994:
add r0, r6, #0
mov r1, #0xc
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0223ABAC ; =0x020ECAC4
ldrb r1, [r1]
cmp r1, r0
@@ -26888,7 +26888,7 @@ _0223A9D6:
add r0, r6, #0
mov r1, #8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x48]
add r0, r6, #0
bl FUN_02068734
@@ -26914,7 +26914,7 @@ _0223AA0C:
add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@@ -27062,7 +27062,7 @@ _0223AB22:
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x30]
mov r0, #5
mov r1, #0x18
@@ -27082,7 +27082,7 @@ _0223AB58:
ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x4c]
lsl r2, r1, #2
ldr r1, [sp, #0x2c]
@@ -27324,7 +27324,7 @@ _0223AD30:
ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x28]
lsl r2, r5, #2
ldr r1, [r1, r2]
@@ -27390,7 +27390,7 @@ _0223ADEC:
strb r0, [r5, #1]
add r0, r6, #0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xb4]
mov r0, #3
str r0, [sp, #0xcc]
@@ -27838,7 +27838,7 @@ _0223B192:
add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xb8]
ldr r0, [r4]
bl MOD11_02230E54
@@ -27897,7 +27897,7 @@ _0223B1F6:
add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@@ -27992,7 +27992,7 @@ MOD11_0223B2DC: ; 0x0223B2DC
mov r1, #6
add r2, r4, #0
str r0, [sp, #0x14]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@@ -28015,7 +28015,7 @@ _0223B328:
ldr r0, [sp, #0x14]
add r1, #0xd
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0xc]
strb r0, [r1]
add r0, r1, #0
@@ -28183,7 +28183,7 @@ _0223B45A:
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@@ -28638,7 +28638,7 @@ _0223B83C:
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
ldr r0, [r4]
bl MOD11_02231668
@@ -29020,7 +29020,7 @@ _0223BB76:
mov r1, #5
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0
ldr r0, [r4]
bl MOD11_02230E18
@@ -29058,7 +29058,7 @@ _0223BBEE:
add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #8]
ldr r0, [r4]
bl MOD11_02230290
@@ -29066,7 +29066,7 @@ _0223BBEE:
add r0, r6, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x10]
ldr r0, _0223BF18 ; =0x020FA5FC
add r1, r5, #0
@@ -29102,7 +29102,7 @@ _0223BC38:
bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0223BC62:
add r0, r5, #0
bl FUN_02077AC4
@@ -29204,13 +29204,13 @@ _0223BD3E:
add r0, r6, #0
add r1, #0x42
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r5, #0
str r0, [sp, #0x2c]
add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@@ -31430,7 +31430,7 @@ MOD11_0223CDC4: ; 0x0223CDC4
ldr r0, [sp, #0x18]
mov r1, #0xaf
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0223CF26
mov r0, #2
@@ -31439,7 +31439,7 @@ _0223CF26:
ldr r0, [sp, #0x18]
mov r1, #0x6f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
_0223CF30:
cmp r0, #0
bne _0223CF42
@@ -31472,7 +31472,7 @@ _0223CF5C:
ldr r0, [sp, #0x18]
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -41623,20 +41623,20 @@ _02241DFE:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02241E3E
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241E3E
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02241E3E
ldr r2, [sp, #8]
@@ -41710,20 +41710,20 @@ _02241EB4:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02241EE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241EE6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r7, r0
_02241EE6:
add r0, r6, #0
@@ -41915,20 +41915,20 @@ _02242056:
mov r1, #0xad
mov r2, #0
add r5, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02242088
add r0, r5, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242088
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r7, r0
_02242088:
add r0, r6, #0
@@ -41995,20 +41995,20 @@ _022420FE:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02242130
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242130
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r5, r0
_02242130:
add r0, r7, #0
@@ -42030,19 +42030,19 @@ _0224214A:
mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0224217A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, r7
beq _0224217A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r5, r0
_0224217A:
ldr r0, [sp, #0x18]
@@ -42099,20 +42099,20 @@ _022421DC:
mov r1, #0xad
mov r2, #0
add r5, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0224220E
add r0, r5, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _0224220E
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r7, r0
_0224220E:
add r0, r6, #0
@@ -43364,41 +43364,41 @@ MOD11_02242B78: ; 0x02242B78
mov r1, #5
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x18]
mov r2, #0
strh r0, [r1, r5]
add r0, r4, #0
mov r1, #0xa4
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242F4C ; =0x00002D42
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242F50 ; =0x00002D44
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242F54 ; =0x00002D46
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242F58 ; =0x00002D48
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r7, r5
ldr r2, _02242F5C ; =0x00002D4A
str r1, [sp, #0xc]
@@ -43412,7 +43412,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp, #0x14]
ldr r1, _02242F60 ; =0x00002D4C
strh r0, [r2, r1]
@@ -43420,7 +43420,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp, #0x10]
ldr r1, _02242F64 ; =0x00002D6C
strb r0, [r2, r1]
@@ -43428,7 +43428,7 @@ _02242C02:
add r0, r4, #0
add r1, #0x3e
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp, #0x10]
ldr r1, _02242F68 ; =0x00002D70
add r6, r6, #1
@@ -43447,7 +43447,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x46
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r6, r5]
mov r2, #0x1f
bic r1, r2
@@ -43458,7 +43458,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x47
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F6C ; =0xFFFFFC1F
@@ -43469,7 +43469,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x48
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F70 ; =0xFFFF83FF
@@ -43480,7 +43480,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x49
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F74 ; =0xFFF07FFF
@@ -43491,7 +43491,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F78 ; =0xFE0FFFFF
@@ -43502,7 +43502,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4b
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F7C ; =0xC1FFFFFF
@@ -43513,7 +43513,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [r6, r5]
ldr r1, _02242F80 ; =0xBFFFFFFF
lsl r0, r0, #0x1f
@@ -43524,7 +43524,7 @@ _02242C02:
add r0, r4, #0
mov r1, #0x4d
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [r6, r5]
ldr r1, _02242F84 ; =0x7FFFFFFF
lsl r0, r0, #0x1f
@@ -43598,14 +43598,14 @@ _02242D2E:
add r0, r4, #0
mov r1, #0xb0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FA0 ; =0x00002D64
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xb1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FA4 ; =0x00002D65
add r2, r7, r5
strb r0, [r2, r1]
@@ -43637,7 +43637,7 @@ _02242D2E:
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldrb r1, [r6, r5]
mov r2, #0x1f
lsl r0, r0, #0x18
@@ -43670,14 +43670,14 @@ _02242E24:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FAC ; =0x00002D67
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FB0 ; =0x00002DAC
add r2, r7, r5
str r0, [r2, r1]
@@ -43688,7 +43688,7 @@ _02242E24:
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, r5]
_02242E58:
ldr r0, [sp, #4]
@@ -43698,56 +43698,56 @@ _02242E58:
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FB4 ; =0x00002D74
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FB8 ; =0x00002D75
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FBC ; =0x00002D8C
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FC0 ; =0x00002D90
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FC4 ; =0x00002DA4
add r2, r7, r6
str r0, [r2, r1]
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FC8 ; =0x00002DA8
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FCC ; =0x00002DB4
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x1c]
lsl r0, r0, #0x18
lsr r0, r0, #0x18
@@ -43762,7 +43762,7 @@ _02242E58:
strb r1, [r0, r5]
add r0, r4, #0
mov r1, #0x9a
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _02242FD0 ; =0x00002DBF
add r2, r7, r6
strb r0, [r2, r1]
@@ -43788,13 +43788,13 @@ _02242E58:
add r2, r7, r2
mov r1, #0x74
add r2, r2, r6
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, _02242FDC ; =0x00002D94
add r0, r4, #0
add r2, r7, r2
mov r1, #0x8f
add r2, r2, r6
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r0, _02242FE0 ; =0x00002DBC
b _02242FE4
.align 2, 0
@@ -43906,7 +43906,7 @@ MOD11_02243054: ; 0x02243054
mov r1, #0xa4
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43915,7 +43915,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43924,7 +43924,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43933,7 +43933,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43942,7 +43942,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43951,7 +43951,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43960,7 +43960,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43969,7 +43969,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43978,7 +43978,7 @@ MOD11_02243054: ; 0x02243054
add r0, r6, #0
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -44016,21 +44016,21 @@ _02243142:
add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _022431CC ; =0x00002D4C
mov r2, #0
strh r0, [r7, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3a
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _022431D0 ; =0x00002D6C
mov r2, #0
strb r0, [r5, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3e
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _022431D4 ; =0x00002D70
strb r0, [r5, r1]
_02243186:
@@ -44042,7 +44042,7 @@ _02243186:
add r0, r6, #0
mov r1, #8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -48649,7 +48649,7 @@ _022453A4:
bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022453BA
add r6, r6, #1
@@ -48706,7 +48706,7 @@ _02245418:
bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0224542E
add r6, r6, #1
@@ -52136,19 +52136,19 @@ _02246E76:
mov r1, #5
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02246EB6
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02246EB6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02246EB6
ldr r0, [sp, #0xc]
@@ -60443,7 +60443,7 @@ MOD11_0224AD38: ; 0x0224AD38
add r0, r6, #0
mov r1, #0x9a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
b _0224AD7A
_0224AD76:
@@ -60552,17 +60552,17 @@ MOD11_0224AE14: ; 0x0224AE14
add r0, r5, #0
mov r1, #0x8f
add r2, sp, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r5, #0
mov r1, #7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r6, r0
bne _0224AE72
add r0, r5, #0
mov r1, #0x9c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
bne _0224AE72
add r0, r4, #0
@@ -64908,13 +64908,13 @@ _0224CEE2:
add r0, r7, #0
add r1, #0x36
add r2, r5, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_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 FUN_02067830
+ bl SetBoxMonDataEncrypted
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@@ -65054,7 +65054,7 @@ _0224D00A:
_0224D024:
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
_0224D02C:
ldrh r1, [r4, #2]
cmp r1, #0xd7
@@ -65066,7 +65066,7 @@ _0224D038:
add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@@ -65596,13 +65596,13 @@ _0224D466:
mov r1, #5
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0224D4B4
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0224D4B4
ldr r0, [sp]
@@ -65613,7 +65613,7 @@ _0224D466:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #8]
add r0, r1, r0
str r0, [sp, #8]
@@ -65622,7 +65622,7 @@ _0224D4A8:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r7, r0
_0224D4B4:
add r0, r6, #0
@@ -74596,7 +74596,7 @@ _02251CEC:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r4, #8]
mov r2, #0
ldr r1, [r1, #4]
@@ -74605,7 +74605,7 @@ _02251CEC:
str r0, [r5, #0x28]
add r0, r6, #0
mov r1, #0xa3
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r5, #0x2c]
ldr r0, [r4, #8]
mov r1, #0x9f
@@ -74614,7 +74614,7 @@ _02251CEC:
ldrh r0, [r0, #0x20]
str r0, [r5, #0x30]
add r0, r6, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02251D72
add r0, r5, #0
@@ -74735,7 +74735,7 @@ _02251E2E:
bl MOD11_02230014
mov r1, #0x9f
add r2, r5, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02251E6A
ldr r0, [sp, #0x10]
@@ -75527,7 +75527,7 @@ _022524D0:
bl MOD11_02230014
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022524F2
ldrb r0, [r7, #0xc]
@@ -81046,12 +81046,12 @@ MOD11_02255034: ; 0x02255034
add r6, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
mov r0, #0xc
add r2, sp, #0x14
@@ -81287,7 +81287,7 @@ _0225523A:
mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255298
ldr r1, _02255500 ; =0x000001EE
@@ -81296,13 +81296,13 @@ _0225523A:
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255280
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0225527A
mov r0, #3
@@ -81388,7 +81388,7 @@ _02255304:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255350
ldr r1, _02255500 ; =0x000001EE
@@ -81397,13 +81397,13 @@ _02255304:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0225534A
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255344
mov r0, #3
@@ -81464,7 +81464,7 @@ _022553A0:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022553EC
ldr r1, _02255500 ; =0x000001EE
@@ -81473,13 +81473,13 @@ _022553A0:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022553E6
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022553E0
mov r0, #3
@@ -81530,7 +81530,7 @@ _02255428:
mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255474
ldr r1, _02255500 ; =0x000001EE
@@ -81539,13 +81539,13 @@ _02255428:
add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0225546E
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02255468
mov r0, #3
@@ -82376,12 +82376,12 @@ MOD11_02255A8C: ; 0x02255A8C
add r4, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
mov r0, #0x18
add r2, sp, #0xc
@@ -82480,12 +82480,12 @@ MOD11_02255B68: ; 0x02255B68
add r6, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
mov r1, #0x19
add r0, sp, #0xc
@@ -83105,12 +83105,12 @@ MOD11_02256020: ; 0x02256020
add r6, r0, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
mov r0, #0x26
add r2, sp, #0x10
@@ -84470,7 +84470,7 @@ _02256A80:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x14]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256AD2
ldr r1, _02256C04 ; =0x000001EE
@@ -84479,13 +84479,13 @@ _02256A80:
ldr r0, [sp, #0x14]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256ACA
ldr r0, [sp, #0x14]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256AC2
add r1, r5, r4
@@ -84535,7 +84535,7 @@ _02256B02:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x18]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256B54
ldr r1, _02256C04 ; =0x000001EE
@@ -84544,13 +84544,13 @@ _02256B02:
ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256B4C
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256B44
add r1, r5, r4
@@ -84611,7 +84611,7 @@ _02256B9A:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256BEC
ldr r1, _02256C04 ; =0x000001EE
@@ -84620,13 +84620,13 @@ _02256B9A:
ldr r0, [sp, #0x1c]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256BE4
ldr r0, [sp, #0x1c]
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02256BDC
add r1, r5, r4
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 09561820..d77621d5 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -217,7 +217,7 @@ _0222D7BC:
ldr r0, [r1, r0]
add r1, r6, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5]
add r6, r6, #1
add r5, r5, #2
@@ -975,7 +975,7 @@ _0222DE9E:
ldr r0, [r1, r0]
add r1, r4, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222DEBE
mov r1, #0xb
@@ -5972,7 +5972,7 @@ _0223072E:
mov r1, #5
ldr r0, [r0, r6]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
bl MOD12_0223EE70
add r1, r5, r4
add r4, r4, #1
@@ -7750,7 +7750,7 @@ _0223151C:
ldr r0, [r4]
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r6, #0x64
add r5, r0, #0
add r0, r6, #0
@@ -7777,17 +7777,17 @@ _0223154E:
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@@ -7812,17 +7812,17 @@ _02231594:
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@@ -7847,17 +7847,17 @@ _022315DA:
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x14
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
add r0, #0xa1
@@ -7882,17 +7882,17 @@ _02231620:
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x15
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
add r0, #0xa2
@@ -7917,17 +7917,17 @@ _02231666:
ldr r0, [r4]
mov r1, #0x17
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0x16
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
mov r1, #0x13
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
add r0, #0xa0
@@ -7954,7 +7954,7 @@ _022316B2:
ldr r0, [r4]
mov r1, #0x18
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #8]
add r1, r1, r7
add r1, r0, r1
@@ -8951,7 +8951,7 @@ _02231E5E:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r1, r4, #1
add r2, sp, #0x3c
strh r0, [r2, r1]
@@ -9369,7 +9369,7 @@ _022321A6:
ldr r0, [r1, r0]
add r1, r5, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022321C8
ldr r0, _0223220C ; =0x000002E1
@@ -10201,7 +10201,7 @@ _022327EC:
ldr r0, [r0, r1]
add r1, r6, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5]
add r6, r6, #1
add r5, r5, #2
@@ -11076,7 +11076,7 @@ _02232EB2:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r2, r4, #1
add r1, sp, #0x10
strh r0, [r1, r2]
@@ -12221,7 +12221,7 @@ _022336D4:
mov r1, #5
ldr r0, [r0, r4]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
bl MOD08_0222A6C8
cmp r0, #1
bne _02233750
@@ -12296,7 +12296,7 @@ _0223377C:
ldr r0, [r0]
mov r2, #0
ldr r0, [r0, r4]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
bl MOD08_0222A6C8
cmp r0, #1
bne _022337E6
@@ -15395,7 +15395,7 @@ MOD12_02235038: ; 0x02235038
ldr r0, [r1, r0]
ldr r2, [sp, #0x30]
mov r1, #0x76
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r5]
ldr r0, _022350E8 ; =0x00000123
ldrb r0, [r1, r0]
@@ -16862,12 +16862,12 @@ _02235B9C:
ldr r0, [r6, r5]
mov r1, #0xb0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
ldr r0, [r6, r5]
mov r1, #0xb1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, #7
beq _02235BBC
cmp r0, #7
@@ -18438,7 +18438,7 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
ldr r0, [r4]
mov r2, #0
@@ -18447,7 +18447,7 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #0x6f
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
ldr r0, [r4]
ldr r1, [r0, #0xc]
@@ -18463,7 +18463,7 @@ _02236736:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #0x70
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x1c]
ldr r0, [r4]
ldr r1, [r0, #0xc]
@@ -18472,7 +18472,7 @@ _02236736:
ldr r0, [r1, r0]
mov r1, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
ldr r0, [r4]
lsl r5, r5, #2
@@ -18480,14 +18480,14 @@ _02236736:
mov r1, #5
ldr r0, [r0, r5]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x18]
ldr r0, [r4]
mov r1, #0x6f
ldr r0, [r0, #0xc]
mov r2, #0
ldr r0, [r0, r5]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x14]
ldr r0, [r4]
ldr r0, [r0, #0xc]
@@ -18499,14 +18499,14 @@ _02236736:
ldr r0, [r0, #0xc]
mov r2, #0
ldr r0, [r0, r5]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xc]
ldr r0, [r4]
mov r1, #0
ldr r0, [r0, #0xc]
add r2, r1, #0
ldr r0, [r0, r5]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #4]
mov r2, #0x47
mov r0, #0
@@ -19010,7 +19010,7 @@ _02236BD0:
lsl r0, r0, #2
ldr r0, [r2, r0]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x10]
ldr r0, _02236CF0 ; =0x000005DD
bl FUN_020054C8
@@ -23971,7 +23971,7 @@ _02239080:
ldr r0, [r0, r1]
add r1, r4, #0
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5]
mov r0, #0x23
lsl r0, r0, #4
@@ -27801,7 +27801,7 @@ _0223AC68:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
mov r0, #0x7f
str r0, [sp]
@@ -43888,7 +43888,7 @@ _022428E6:
str r0, [sp, #0x10]
ldr r0, [r1, r0]
mov r1, #0x76
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r5, #1
lsl r0, r0, #4
str r0, [sp, #0x14]
@@ -47346,7 +47346,7 @@ _022443A4:
lsl r0, r0, #2
ldr r0, [r1, r0]
mov r1, #5
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
mov r0, #0x7f
str r0, [sp]
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 8f67a51e..c0d531a8 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -4718,13 +4718,13 @@ _021D9B9E:
add r0, r4, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _021D9BD2
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021D9BD2
add r5, r5, #1
@@ -9378,112 +9378,112 @@ _021DC034:
ldr r0, [r5, r0]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xa]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa4
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xc]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xe]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x10]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa8
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x12]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0xa6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x14]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x13
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x16]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x14
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x18]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x15
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x1a]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x16
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x1c]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x17
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x1e]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x20]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x37
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x22]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x38
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x24]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x39
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x26]
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #7]
mov r0, #0x1a
lsl r0, r0, #4
@@ -10230,7 +10230,7 @@ _021DC5C4:
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
pop {r4, r5, r6, pc}
thumb_func_start MOD14_021DC5D0
@@ -10251,7 +10251,7 @@ _021DC5EC:
ldr r0, [r5, #8]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
pop {r4, r5, r6, pc}
thumb_func_start MOD14_021DC5F8
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index e5ec6c9f..22511fc3 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -51043,7 +51043,7 @@ MOD16_021EEFA4: ; 0x021EEFA4
ldr r0, [r4, #0x10]
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x6f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -55028,19 +55028,19 @@ _021F0E68:
beq _021F0EB6
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F0EB6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F0EB6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F0ECC ; =0x000001EE
cmp r0, r1
beq _021F0EB6
@@ -55578,26 +55578,26 @@ _021F128E:
beq _021F12EA
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F12EA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F12EA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F1300 ; =0x000001EE
cmp r0, r1
beq _021F12EA
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x10]
tst r0, r1
beq _021F12EA
@@ -55693,26 +55693,26 @@ _021F1382:
beq _021F13DE
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F13DE
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F13DE
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F13F4 ; =0x000001EE
cmp r0, r1
beq _021F13DE
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x10]
tst r0, r1
bne _021F13DE
@@ -57075,12 +57075,12 @@ _021F1E2C:
beq _021F1E66
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
ldr r0, [sp, #0xc]
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _021F1E66
ldr r0, [sp]
@@ -57149,13 +57149,13 @@ _021F1ED6:
add r0, r5, #0
add r1, #0x3a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
add r6, r0, #0
add r0, r5, #0
add r1, #0x42
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r6, r0
beq _021F1EFE
ldr r0, [sp, #4]
@@ -57555,19 +57555,19 @@ _021F21D8:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F22A0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F22A0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F22C0 ; =0x000001EE
cmp r0, r1
beq _021F22A0
@@ -57579,7 +57579,7 @@ _021F221E:
add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5]
add r4, r4, #1
add r5, r5, #2
@@ -57592,7 +57592,7 @@ _021F2238:
add r0, r6, #0
add r1, #0x46
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4]
add r5, r5, #1
add r4, r4, #1
@@ -57601,12 +57601,12 @@ _021F2238:
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
add r0, r6, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x44
str r1, [sp]
lsl r1, r4, #0x10
@@ -60065,7 +60065,7 @@ _021F3486:
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r6, #0
@@ -60078,7 +60078,7 @@ _021F34A2:
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r6, #0
@@ -60166,32 +60166,32 @@ _021F3530:
add r0, r4, #0
mov r1, #0x4b
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0
add r0, r4, #0
mov r1, #0x4a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
add r0, r4, #0
mov r1, #0x49
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r4, #0
mov r1, #0x48
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #4]
add r0, r4, #0
mov r1, #0x46
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0x47
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
lsl r2, r6, #0x1f
lsl r0, r5, #0x1f
@@ -60398,19 +60398,19 @@ _021F36EC:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F37DE
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F37DE
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F3804 ; =0x000001EE
cmp r0, r1
beq _021F37DE
@@ -60426,7 +60426,7 @@ _021F3730:
add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x1c]
@@ -60444,7 +60444,7 @@ _021F3730:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x30]
add r0, r5, #0
add r1, r4, #0
@@ -60700,19 +60700,19 @@ _021F3956:
mov r1, #0xa2
mov r2, #0
str r0, [sp, #0x50]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F39BC
ldr r0, [sp, #0x50]
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F39BC
ldr r0, [sp, #0x50]
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F3B84 ; =0x000001EE
cmp r0, r1
beq _021F39BC
@@ -60750,7 +60750,7 @@ _021F39C2:
ldr r0, [sp, #0x50]
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
ldr r0, [sp, #0x14]
@@ -60780,7 +60780,7 @@ _021F39F2:
ldr r0, [sp, #0x50]
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x70]
add r0, r5, #0
add r1, r6, #0
@@ -60844,7 +60844,7 @@ _021F3A7E:
ldr r0, [sp, #0x50]
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x80]
add r0, r5, #0
add r1, r4, #0
@@ -60934,19 +60934,19 @@ _021F3B3C:
mov r1, #0xa2
mov r2, #0
str r0, [sp, #0x20]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F3BBE
ldr r0, [sp, #0x20]
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F3BBE
ldr r0, [sp, #0x20]
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F3B84 ; =0x000001EE
cmp r0, r1
beq _021F3BBE
@@ -60993,7 +60993,7 @@ _021F3BC4:
ldr r0, [sp, #0x20]
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
ldr r0, [sp, #0x14]
@@ -61023,7 +61023,7 @@ _021F3BF4:
ldr r0, [sp, #0x20]
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x90]
add r0, r5, #0
add r1, r6, #0
@@ -61089,7 +61089,7 @@ _021F3C82:
ldr r0, [sp, #0x20]
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0xa0]
add r0, r5, #0
add r1, r4, #0
@@ -61455,19 +61455,19 @@ _021F3F62:
mov r1, #0xa2
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F3FE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F3FE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F3FFC ; =0x000001EE
cmp r0, r1
beq _021F3FE6
@@ -61490,7 +61490,7 @@ _021F3F62:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
ldr r0, [sp, #0x10]
@@ -61608,19 +61608,19 @@ _021F4094:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F40FA
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F40FA
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F4254 ; =0x000001EE
cmp r0, r1
beq _021F40FA
@@ -61669,12 +61669,12 @@ _021F40FC:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x40]
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r5, #0
@@ -61685,12 +61685,12 @@ _021F40FC:
add r0, r6, #0
mov r1, #0xb0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
mov r1, #0xb1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x40]
ldr r2, [sp, #0x38]
str r1, [sp]
@@ -61715,7 +61715,7 @@ _021F4182:
add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x20]
@@ -61733,7 +61733,7 @@ _021F4182:
add r0, r6, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F425C ; =0x0000306C
str r0, [sp, #0x4c]
ldrh r1, [r4, r1]
@@ -62080,19 +62080,19 @@ _021F445C:
mov r1, #0xa2
mov r2, #0
add r4, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F44BA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F44BA
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F4598 ; =0x000001EE
cmp r0, r1
beq _021F44BA
@@ -62308,7 +62308,7 @@ _021F462E:
bl MOD11_02230014
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F4664
ldr r0, _021F4694 ; =0x0000219C
@@ -62420,7 +62420,7 @@ _021F4704:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x68]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
beq _021F47E0
@@ -62430,7 +62430,7 @@ _021F4704:
ldr r0, [sp, #0x68]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F47E0
add r0, r4, #0
@@ -62477,14 +62477,14 @@ _021F4704:
ldr r0, [sp, #0x68]
mov r1, #0xb0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x58]
ldr r0, [sp, #0x68]
mov r1, #0xb1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x54]
@@ -62542,7 +62542,7 @@ _021F480E:
add r0, r4, #0
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x3c]
@@ -62560,7 +62560,7 @@ _021F480E:
add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x70]
add r0, r5, #0
add r1, r6, #0
@@ -62648,7 +62648,7 @@ _021F48E0:
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
beq _021F4900
@@ -62661,7 +62661,7 @@ _021F4902:
ldr r0, [sp, #0x1c]
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F4A06
ldr r0, _021F4A20 ; =0x0000219C
@@ -62703,7 +62703,7 @@ _021F4954:
ldr r0, [sp, #0x1c]
add r1, #0x36
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x8c]
@@ -62876,19 +62876,19 @@ _021F4AA8:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F4AE6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021F4AE6
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _021F4D70 ; =0x000001EE
cmp r0, r1
beq _021F4AE6
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 633c2690..ab858387 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -8856,7 +8856,7 @@ MOD17_021DB700: ; 0x021DB700
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
mov r2, #2
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 0a04d74a..6cfd48bd 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -313,27 +313,27 @@ _02254A62:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #8]
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0xa]
add r0, r4, #0
mov r1, #0xa3
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0xc]
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0xe]
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02254ABC
mov r0, #1
@@ -345,12 +345,12 @@ _02254ABE:
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x12]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r5, #0x13]
add r0, r4, #0
add r1, r7, #0
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index a839daf7..89222d17 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -86,18 +86,18 @@ _022548D6:
mov r1, #0x4c
mov r2, #0
add r5, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02254962
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0xc]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x10]
add r0, r5, #0
bl FUN_0206B688
@@ -105,7 +105,7 @@ _022548D6:
add r0, r5, #0
mov r1, #9
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
bl MOD28_0225498C
cmp r0, #6
bhi _02254944
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 42fc9155..0f1fecfb 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -85,12 +85,12 @@ _022548CC:
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x1c]
add r0, r7, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r5, #0x28]
ldr r0, [sp, #4]
str r7, [r4, #0x48]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 095e72dc..6b14026a 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -225,13 +225,13 @@ _02211FA2:
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _02211FC8
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02211FC8
add r5, r5, #1
@@ -2005,13 +2005,13 @@ _02212E52:
mov r1, #5
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r5, #4]
mov r2, #0
strh r0, [r1, r4]
add r0, r7, #0
mov r1, #6
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [r5, #4]
add r6, r6, #1
add r1, r1, r4
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 44336f0b..33be95e4 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -2218,17 +2218,17 @@ _0222E5EC:
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x10]
add r0, r7, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x14]
add r0, r7, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r0, #0
ldr r0, [sp, #0x10]
ldr r2, [sp, #0x14]
@@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0xc
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0222EC80:
cmp r7, #0xff
beq _0222EC9A
@@ -3017,7 +3017,7 @@ _0222EC80:
add r0, r1, r0
ldr r0, [r0, #4]
mov r1, #0xa1
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_0222EC9A:
add r2, r5, #4
ldr r1, [r2, r6]
@@ -4492,7 +4492,7 @@ _0222F83E:
mov r1, #0x4c
add r0, r7, #0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222F85C
ldr r1, _0222F86C ; =0x00000428
@@ -5701,7 +5701,7 @@ MOD62_022301AC: ; 0x022301AC
mov r1, #5
ldr r0, [r5, r0]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
ldr r0, _02230214 ; =0x00000428
mov r1, #2
@@ -5749,7 +5749,7 @@ MOD62_0223021C: ; 0x0223021C
mov r1, #5
ldr r0, [r5, r0]
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r4, r0, #0
ldr r0, _02230268 ; =0x00000428
ldr r0, [r5, r0]
@@ -6199,7 +6199,7 @@ _0223059A:
str r0, [sp, #0x9c]
ldr r0, _02230724 ; =0x00000428
ldr r0, [r4, r0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x8c]
add r0, sp, #0x7c
bl MOD08_02229918
@@ -6235,12 +6235,12 @@ _022305E2:
mov r1, #0xa1
ldr r0, [r4, r0]
add r2, sp, #0x18
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, _02230724 ; =0x00000428
mov r1, #0xaa
ldr r0, [r4, r0]
add r2, sp, #0x64
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x35
add r1, sp, #0x58
bl MOD08_02228218
@@ -6396,7 +6396,7 @@ _0223072C:
str r0, [sp, #0x50]
ldr r0, [r4, r1]
mov r1, #0x9a
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [sp, #0x40]
add r0, sp, #0x30
bl MOD08_02229918
@@ -6531,7 +6531,7 @@ _02230860:
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_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 FUN_02067830
+ bl SetBoxMonDataEncrypted
_02230D5C:
mov r0, #0xff
str r0, [r4, r6]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index 1b712f1c..22b307e2 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -3372,7 +3372,7 @@ MOD65_021D8F34: ; 0x021D8F34
str r0, [r4, #0x30]
ldr r0, [r4, #0x10]
ldr r0, [r0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x34]
ldr r0, [r4, #0x10]
ldr r0, [r0]
@@ -3402,7 +3402,7 @@ MOD65_021D8F34: ; 0x021D8F34
ldr r2, [r4, #0x3c]
ldr r0, [r0]
mov r1, #0x76
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, r4, #0
ldr r0, [r4, #0x10]
add r1, #0x36
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 5ab71cc1..f12e6191 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -64,7 +64,7 @@ _0222D63A:
bl FUN_0206B9B0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222D65E
ldr r0, [r4, #4]
@@ -1233,14 +1233,14 @@ _0222DF98:
ldr r0, [sp, #0x2c]
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x81
lsl r1, r1, #2
str r0, [r5, r1]
mov r1, #0
ldr r0, [sp, #0x2c]
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r4, [sp]
str r0, [sp, #4]
mov r0, #1
@@ -1268,7 +1268,7 @@ _0222DF98:
mov r1, #0
ldr r0, [sp, #0x2c]
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r4, [sp]
str r0, [sp, #4]
mov r0, #1
@@ -2418,7 +2418,7 @@ _0222E982:
ldr r0, [r5, #0x24]
mov r1, #0x98
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
ldr r0, [r5, #0x14]
mov r1, #0
@@ -2480,7 +2480,7 @@ _0222E9FC:
ldr r0, [r4, #0x24]
ldr r2, [r4, #0x1c]
mov r1, #0x76
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0
mov r1, #0x48
bl MOD69_0222E89C
@@ -4042,7 +4042,7 @@ MOD69_0222F6C4: ; 0x0222F6C4
add r0, r4, #0
mov r1, #0x79
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
sub r1, r0, #1
cmp r1, #2
bhi _0222F6E8
@@ -4063,7 +4063,7 @@ _0222F6FA:
add r0, r4, #0
mov r1, #0x6e
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _0222F70C
mov r5, #6
@@ -4075,7 +4075,7 @@ _0222F70C:
add r0, r4, #0
mov r1, #7
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
beq _0222F726
mov r5, #2
@@ -4089,7 +4089,7 @@ _0222F726:
add r0, r4, #0
ldr r2, [r5, r2]
mov r1, #0x90
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, _0222F788 ; =0x00001B54
ldr r0, [r5, r1]
add r1, r1, #4
@@ -4103,7 +4103,7 @@ _0222F750:
add r0, r4, #0
mov r1, #0x98
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r1, #0x7d
lsl r1, r1, #4
cmp r0, r1
@@ -4114,7 +4114,7 @@ _0222F766:
add r0, r4, #0
mov r1, #0x92
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222F778
mov r5, #0
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index b27fc3c8..8138a765 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -1562,7 +1562,7 @@ _021D80F4:
ldr r0, [r7, r0]
ldr r2, [sp, #0x1c]
mov r1, #0x70
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 92db112b..aea60f8b 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -1348,37 +1348,37 @@ MOD71_0222E118: ; 0x0222E118
add r0, r5, #0
mov r1, #0x9a
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #4]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #6]
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strb r0, [r4, #5]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #8]
add r0, r5, #0
mov r1, #0xa1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
str r0, [r4, #0xc]
add r0, r5, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
add r0, r5, #0
add r1, r7, #0
@@ -2647,12 +2647,12 @@ MOD71_0222EBFC: ; 0x0222EBFC
mov r1, #0
add r0, r6, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r7, r0, #0
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0
str r3, [sp]
mov r1, #0xa
@@ -2697,7 +2697,7 @@ MOD71_0222EC5C: ; 0x0222EC5C
bl FUN_0206B9B0
mov r1, #0x76
add r2, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r5, #0
mov r1, #0
bl FUN_02019620
@@ -2731,7 +2731,7 @@ _0222ECB6:
bl FUN_0206B9B0
mov r1, #0x4d
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _0222ECCE
mov r0, #2
@@ -2932,7 +2932,7 @@ _0222EE14:
bl FUN_0206B9B0
mov r1, #0xa0
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #1
@@ -2978,7 +2978,7 @@ _0222EEA6:
bl FUN_0206B9B0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, #0x20
lsl r0, r0, #0x10
lsl r4, r5, #4
@@ -6338,7 +6338,7 @@ MOD71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
bne _02230A40
mov r1, #0x46
@@ -6347,7 +6347,7 @@ MOD71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
_02230A40:
bl FUN_02031190
bl FUN_0202DFA4
@@ -6427,7 +6427,7 @@ MOD71_02230AE4: ; 0x02230AE4
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r5, #0
bl FUN_0202398C
add r7, r0, #0
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index 45716ea0..ba2092da 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -801,7 +801,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [r4]
mov r1, #0
strb r1, [r0, #0x16]
@@ -2028,7 +2028,7 @@ MOD76_021D8524: ; 0x021D8524
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r3, pc}
@@ -2131,7 +2131,7 @@ _021D85EC:
ldr r0, [r0]
add r1, #0x36
add r2, r6, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _021D8608
add r0, r4, #1
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 61091d0c..ba3c09fe 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -5058,12 +5058,12 @@ MOD80_0222FD88: ; 0x0222FD88
mov r1, #0
add r0, r5, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0
str r3, [sp]
mov r1, #0xa
@@ -9979,7 +9979,7 @@ _022325CE:
bl FUN_0206B9B0
mov r1, #0xa1
add r2, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022325FE
mov r0, #0xe
@@ -10219,7 +10219,7 @@ _022327CE:
bl FUN_0206B9B0
mov r1, #0xa1
add r2, r4, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
beq _022327FE
mov r0, #0xb
@@ -11076,7 +11076,7 @@ _02232E4A:
ldr r0, [sp, #0x24]
mov r1, #0xa1
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0
ldr r0, _02232F90 ; =0x00000E54
beq _02232EB4
@@ -11524,7 +11524,7 @@ MOD80_022331F8: ; 0x022331F8
push {r3, lr}
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_0206EA98
@@ -16152,7 +16152,7 @@ MOD80_022355F0: ; 0x022355F0
mov r1, #6
mov r2, #0
add r6, r3, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #0x20]
@@ -16175,7 +16175,7 @@ _02235624:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
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 FUN_02067830
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x20]
cmp r0, #0x12
bne _02235706
@@ -16364,7 +16364,7 @@ MOD80_022357A0: ; 0x022357A0
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r0, r4, #0
bl FUN_020689E0
add r3, r0, #0
@@ -17434,7 +17434,7 @@ _02235FDE:
mov r1, #6
mov r2, #0
add r7, r0, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r3, r0, #0
add r0, sp, #0x30
lsl r3, r3, #0x10
@@ -17502,30 +17502,30 @@ _02236068:
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0
ldr r0, [sp, #0x20]
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _022360B6
mov r1, #0
add r0, r7, #0
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r5, r0, #0
mov r1, #0
ldr r0, [sp, #0x20]
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02236126
_022360B6:
add r0, r7, #0
mov r1, #6
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r3, r0, #0
add r0, sp, #0x2c
lsl r3, r3, #0x10
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 400b4083..e63eedb4 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -23908,7 +23908,7 @@ MOD83_02238F94: ; 0x02238F94
mov r1, #0
ldr r0, [sp, #0x20]
add r2, r1, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
mov r3, #0
str r3, [sp]
mov r1, #0xa
@@ -24027,12 +24027,12 @@ _022390C2:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r6, r0, #0
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r2, r0, #0
mov r0, #0xe9
lsl r0, r0, #4
diff --git a/include/pokemon.h b/include/pokemon.h
index a0e70dc1..3eb7cfdd 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -7,6 +7,68 @@
#include "constants/species.h"
+// TODO: Identify the rest of these
+enum BaseStat {
+ BASE_HP = 0,
+ BASE_ATK,
+ BASE_DEF,
+ BASE_SPEED,
+ BASE_SPATK,
+ BASE_SPDEF,
+ BASE_TYPE1,
+ BASE_TYPE2,
+ BASE_CATCH_RATE,
+ BASE_EXP_YIELD,
+ BASE_HP_YIELD,
+ BASE_ATK_YIELD,
+ BASE_DEF_YIELD,
+ 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_ABILITY_2,
+};
+
+struct BaseStats {
+ u8 hp;
+ u8 atk;
+ u8 def;
+ u8 speed;
+ u8 spatk;
+ u8 spdef;
+ u8 types[2];
+ u8 catchRate;
+ u8 expYield;
+ u16 hp_yield:2;
+ u16 atk_yield:2;
+ u16 def_yield:2;
+ u16 speed_yield:2;
+ u16 spatk_yield:2;
+ u16 spdef_yield:2;
+ u16 unkB_4:2;
+ u16 padding_B_6:2;
+ u16 unkC;
+ u16 unkE;
+ u8 genderRatio;
+ u8 unk11;
+ u8 friendship;
+ u8 growthRate;
+ u8 unk14;
+ u8 unk15;
+ u8 abilities[2];
+ u8 unk18;
+ u8 unk19_0:7;
+ u8 unk19_7:1;
+ u8 padding_1A[2];
+ u32 unk1C;
+ u32 unk20;
+ u32 unk24;
+ u32 unk28;
+};
+
typedef enum {
EGG = 0,
EVENT = 0,
@@ -188,7 +250,7 @@ typedef union {
PokemonDataBlockD blockD;
} PokemonDataBlock;
-struct PokemonData {
+struct BoxPokemon {
u32 personalityValue;
u16 Unused; // Might be used for validity checks
u16 checksum; // Stored checksum of pokemon
@@ -198,6 +260,17 @@ struct PokemonData {
PokemonDataBlock block4;
};
+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];
+};
+
int GetMonBaseStat_HandleFormeConversion(int species, int form, int stat_id);
int GetMonBaseStat(int species, int stat_id);
int GetMonExpByLevel(int species, int level);