diff options
Diffstat (limited to 'arm9/asm')
44 files changed, 652 insertions, 652 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 |