diff options
Diffstat (limited to 'arm9/asm')
69 files changed, 853 insertions, 826 deletions
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s index f58ad635..3bfbd197 100644 --- a/arm9/asm/pokemon.s +++ b/arm9/asm/pokemon.s @@ -7,23 +7,23 @@ .section .rodata - .global UNK_020F7ECC -UNK_020F7ECC: ; 0x020F7ECC + .global sItemOdds +sItemOdds: ; 0x020F7ECC .short 0x002D, 0x005F .short 0x0014, 0x0050 - .global UNK_020F7ED4 -UNK_020F7ED4: ; 0x020F7ED4 - .byte 0x05, 0x03, 0x02 - .byte 0x05, 0x03, 0x02 - .byte 0x01, 0x01, 0x00 - .byte 0x03, 0x02, 0x01 - .byte 0x01, 0x01, 0x00 - .byte 0x01, 0x01, 0x01 - .byte 0xFF, 0xFF, 0xFF - .byte 0xFB, 0xFB, 0xF6 - .byte 0xFB, 0xFB, 0xF6 - .byte 0x03, 0x02, 0x01 + .global sFriendshipModTable +sFriendshipModTable: ; 0x020F7ED4 + .byte 5, 3, 2 + .byte 5, 3, 2 + .byte 1, 1, 0 + .byte 3, 2, 1 + .byte 1, 1, 0 + .byte 1, 1, 1 + .byte -1, -1, -1 + .byte -5, -5, -10 + .byte -5, -5, -10 + .byte 3, 2, 1 .global sLegendaryMonsList sLegendaryMonsList: ; 0x020F7EF2 @@ -74,8 +74,8 @@ UNK_020F7F16: ; 0x020F7F16 .byte 0, -1, 0, 1, 0 .byte 0, 0, 0, 0, 0 - .global UNK_020F7F93 -UNK_020F7F93: ; 0x020F7F93 + .global sNatureStatMods +sNatureStatMods: ; 0x020F7F93 .byte 0, 0, 0, 0, 0 .byte 1, -1, 0, 0, 0 .byte 1, 0, -1, 0, 0 @@ -104,8 +104,8 @@ UNK_020F7F93: ; 0x020F7F93 .section .data - .global UNK_02105FC8 -UNK_02105FC8: ; 0x02105FC8 + .global __local_str_poketool_personal_pms_narc +__local_str_poketool_personal_pms_narc: ; 0x02105FC8 .asciz "poketool/personal/pms.narc" .section .bss @@ -128,16 +128,16 @@ ZeroMonData: ; 0x02066978 ldrh r2, [r4, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment add r0, r4, #0x0 ldr r2, [r4, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment pop {r4, pc} - thumb_func_start FUN_020669A0 -FUN_020669A0: ; 0x020669A0 + thumb_func_start WipeBoxMonDataAndEncrypt +WipeBoxMonDataAndEncrypt: ; 0x020669A0 push {r4, lr} add r4, r0, #0x0 mov r0, #0x0 @@ -148,16 +148,16 @@ FUN_020669A0: ; 0x020669A0 ldrh r2, [r4, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment pop {r4, pc} - thumb_func_start FUN_020669BC -FUN_020669BC: ; 0x020669BC + thumb_func_start SizeOfStructPokemon +SizeOfStructPokemon: ; 0x020669BC mov r0, #0xec bx lr - thumb_func_start FUN_020669C0 -FUN_020669C0: ; 0x020669C0 + thumb_func_start AllocMonZeroed +AllocMonZeroed: ; 0x020669C0 push {r4, lr} mov r1, #0xec bl AllocFromHeap @@ -167,8 +167,8 @@ FUN_020669C0: ; 0x020669C0 pop {r4, pc} .balign 4 - thumb_func_start FUN_020669D4 -FUN_020669D4: ; 0x020669D4 + thumb_func_start TryDecryptMon +TryDecryptMon: ; 0x020669D4 push {r3-r5, lr} add r5, r0, #0x0 ldrh r0, [r5, #0x4] @@ -196,19 +196,19 @@ _020669EE: ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment _02066A1A: add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02066A20 -FUN_02066A20: ; 0x02066A20 + thumb_func_start TryEncryptMon +TryEncryptMon: ; 0x02066A20 push {r3-r5, lr} add r5, r0, #0x0 ldrh r2, [r5, #0x4] @@ -231,23 +231,23 @@ FUN_02066A20: ; 0x02066A20 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _02066A68: add r0, r4, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02066A6C -FUN_02066A6C: ; 0x02066A6C + thumb_func_start TryDecryptBoxMon +TryDecryptBoxMon: ; 0x02066A6C push {r4, lr} add r2, r0, #0x0 ldrh r1, [r2, #0x4] @@ -263,14 +263,14 @@ FUN_02066A6C: ; 0x02066A6C add r0, #0x8 mov r1, #0x80 mov r4, #0x1 - bl DecryptMon + bl MonDecryptSegment _02066A8E: add r0, r4, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02066A94 -FUN_02066A94: ; 0x02066A94 + thumb_func_start TryEncryptBoxMon +TryEncryptBoxMon: ; 0x02066A94 push {r3-r5, lr} add r5, r0, #0x0 ldrh r2, [r5, #0x4] @@ -288,13 +288,13 @@ FUN_02066A94: ; 0x02066A94 add r0, #0x8 mov r1, #0x80 mov r4, #0x1 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _02066AC8: add r0, r4, #0x0 pop {r3-r5, pc} @@ -325,23 +325,23 @@ CreateMon: ; 0x02066ACC add r0, #0x88 mov r1, #0x64 mov r2, #0x0 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 mov r1, #0xa0 add r2, sp, #0x48 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 bl FUN_020256BC add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xa9 add r2, r4, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 bl FreeToHeap mov r0, #0x0 @@ -349,7 +349,7 @@ CreateMon: ; 0x02066ACC add r0, r5, #0x0 mov r1, #0xa1 add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add r1, sp, #0x14 mov r2, #0x18 @@ -357,9 +357,9 @@ CreateMon: ; 0x02066ACC add r0, r5, #0x0 mov r1, #0xaa add r2, sp, #0x14 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0x2c pop {r3-r6} pop {r3} @@ -372,9 +372,9 @@ CreateBoxMon: ; 0x02066B64 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r5, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x0] ldr r0, [sp, #0x30] cmp r0, #0x0 @@ -389,7 +389,7 @@ _02066B8E: add r0, r5, #0x0 mov r1, #0x0 add r2, sp, #0x34 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r0, [sp, #0x38] cmp r0, #0x2 bne _02066BD6 @@ -429,19 +429,19 @@ _02066BDE: add r0, r5, #0x0 mov r1, #0x7 add r2, sp, #0x3c - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r2, _02066D88 ; =gGameLanguage add r0, r5, #0x0 mov r1, #0xc - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x5 add r2, sp, #0x24 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0xb2 mov r2, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r0, [sp, #0x24] ldr r1, [sp, #0x28] bl GetMonExpByLevel @@ -449,7 +449,7 @@ _02066BDE: add r0, r5, #0x0 mov r1, #0x8 add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r0, [sp, #0x24] mov r1, #0x14 bl GetMonBaseStat @@ -457,48 +457,48 @@ _02066BDE: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x9b add r2, sp, #0x28 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r2, _02066D8C ; =gGameVersion add r0, r5, #0x0 mov r1, #0x79 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x4 str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x9a add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r0, [sp, #0x2c] cmp r0, #0x20 bge _02066C94 add r0, r5, #0x0 mov r1, #0x46 add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x47 add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x48 add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x49 add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x4a add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x4b add r2, sp, #0x2c - bl FUN_02067960 + bl SetBoxMonDataEncrypted b _02066D18 _02066C94: bl rand_LC @@ -509,7 +509,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x46 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x3e ldr r1, [sp, #0x8] lsl r0, r0, #0x4 @@ -519,7 +519,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x47 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x1f ldr r1, [sp, #0x8] lsl r0, r0, #0xa @@ -529,7 +529,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x48 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted bl rand_LC mov r1, #0x1f str r0, [sp, #0x8] @@ -538,7 +538,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x49 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x3e ldr r1, [sp, #0x8] lsl r0, r0, #0x4 @@ -548,7 +548,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x4a add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x1f ldr r1, [sp, #0x8] lsl r0, r0, #0xa @@ -558,7 +558,7 @@ _02066C94: add r0, r5, #0x0 mov r1, #0x4b add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _02066D18: ldr r0, [sp, #0x24] mov r1, #0x18 @@ -577,32 +577,32 @@ _02066D18: add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted b _02066D5A _02066D44: add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted b _02066D5A _02066D50: add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _02066D5A: add r0, r5, #0x0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x6f add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 - bl FUN_020695F4 + bl InitBoxMonMoveset ldr r1, [sp, #0x0] add r0, r5, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0xc pop {r4-r7} pop {r3} @@ -647,8 +647,8 @@ _02066D9E: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02066DD4 -FUN_02066DD4: ; 0x02066DD4 + thumb_func_start CreateMonWithNatureGenderLetter +CreateMonWithNatureGenderLetter: ; 0x02066DD4 push {r4-r7, lr} sub sp, #0x24 str r1, [sp, #0x14] @@ -698,7 +698,7 @@ _02066DF4: bne _02066DF4 ldr r0, [sp, #0x14] add r1, r4, #0x0 - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality cmp r6, r0 bne _02066DF4 ldr r0, [sp, #0x20] @@ -769,41 +769,41 @@ FUN_02066EA4: ; 0x02066EA4 add r0, r4, #0x0 mov r1, #0xae add r2, sp, #0x24 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0x10 pop {r4} pop {r3} add sp, #0x10 bx r3 - thumb_func_start FUN_02066ED8 -FUN_02066ED8: ; 0x02066ED8 + thumb_func_start UpdateMonLevelAndRecalcStats +UpdateMonLevelAndRecalcStats: ; 0x02066ED8 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_020669D4 + bl TryDecryptMon add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020687C0 + bl CalcMonLevelEncrypted str r0, [sp, #0x0] add r0, r5, #0x0 mov r1, #0xa0 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066F04 + bl CalcMonStatsMaybeEncrypted add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_02066A20 + bl TryEncryptMon pop {r3-r5, pc} - thumb_func_start FUN_02066F04 -FUN_02066F04: ; 0x02066F04 + thumb_func_start CalcMonStatsMaybeEncrypted +CalcMonStatsMaybeEncrypted: ; 0x02066F04 push {r3-r7, lr} sub sp, #0x58 add r5, r0, #0x0 - bl FUN_020669D4 + bl TryDecryptMon str r0, [sp, #0x0] add r0, r5, #0x0 mov r1, #0xa0 @@ -897,7 +897,7 @@ FUN_02066F04: ; 0x02066F04 ldr r1, [sp, #0x38] add r0, r7, #0x0 add r2, r6, #0x0 - bl LoadMonBaseStats_HandleUnownOrArceus + bl LoadMonBaseStats_HandleAlternateForme mov r0, #0x49 lsl r0, r0, #0x2 cmp r7, r0 @@ -926,7 +926,7 @@ _0206701E: add r0, r5, #0x0 mov r1, #0xa3 add r2, sp, #0x50 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x14] asr r0, r0, #0x1 lsr r1, r0, #0x1e @@ -944,17 +944,17 @@ _0206701E: add r0, r0, #0x5 str r0, [sp, #0x4c] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x4c] mov r2, #0x1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02068894 + bl ApplyNatureModToStat str r0, [sp, #0x4c] add r0, r5, #0x0 mov r1, #0xa4 add r2, sp, #0x4c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x10] asr r0, r0, #0x1 lsr r1, r0, #0x1e @@ -972,17 +972,17 @@ _0206701E: add r0, r0, #0x5 str r0, [sp, #0x48] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x48] mov r2, #0x2 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02068894 + bl ApplyNatureModToStat str r0, [sp, #0x48] add r0, r5, #0x0 mov r1, #0xa5 add r2, sp, #0x48 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0xc] asr r0, r0, #0x1 lsr r1, r0, #0x1e @@ -1000,17 +1000,17 @@ _0206701E: add r0, r0, #0x5 str r0, [sp, #0x44] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x44] mov r2, #0x3 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02068894 + bl ApplyNatureModToStat str r0, [sp, #0x44] add r0, r5, #0x0 mov r1, #0xa6 add r2, sp, #0x44 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x8] asr r0, r0, #0x1 lsr r1, r0, #0x1e @@ -1028,17 +1028,17 @@ _0206701E: add r0, r0, #0x5 str r0, [sp, #0x40] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x40] mov r2, #0x4 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02068894 + bl ApplyNatureModToStat str r0, [sp, #0x40] add r0, r5, #0x0 mov r1, #0xa7 add r2, sp, #0x40 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x4] asr r0, r0, #0x1 lsr r1, r0, #0x1e @@ -1056,17 +1056,17 @@ _0206701E: add r0, r0, #0x5 str r0, [sp, #0x3c] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x3c] mov r2, #0x5 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02068894 + bl ApplyNatureModToStat str r0, [sp, #0x3c] add r0, r5, #0x0 mov r1, #0xa8 add r2, sp, #0x3c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 bl FreeToHeap ldr r1, [sp, #0x54] @@ -1103,11 +1103,11 @@ _020671A0: add r0, r5, #0x0 mov r1, #0xa2 add r2, sp, #0x54 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _020671B0: ldr r1, [sp, #0x0] add r0, r5, #0x0 - bl FUN_02066A20 + bl TryEncryptMon add sp, #0x58 pop {r3-r7, pc} @@ -1125,16 +1125,16 @@ GetMonDataEncrypted: ; 0x020671BC ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum ldrh r1, [r5, #0x6] cmp r0, r1 beq _02067204 @@ -1160,12 +1160,12 @@ _02067204: ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _02067230: add r0, r4, #0x0 pop {r4-r6, pc} @@ -1252,8 +1252,8 @@ _020672B6: bl GetBoxMonData pop {r3, pc} - thumb_func_start FUN_020672BC -FUN_020672BC: ; 0x020672BC + thumb_func_start GetBoxMonDataEncrypted +GetBoxMonDataEncrypted: ; 0x020672BC push {r4-r6, lr} add r5, r0, #0x0 ldrh r0, [r5, #0x4] @@ -1266,11 +1266,11 @@ FUN_020672BC: ; 0x020672BC add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum ldrh r1, [r5, #0x6] cmp r0, r1 beq _020672F8 @@ -1296,7 +1296,7 @@ _020672F8: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _02067318: add r0, r4, #0x0 pop {r4-r6, pc} @@ -1314,24 +1314,28 @@ GetBoxMonData: ; 0x0206731C add r2, r4, #0x0 bl GetSubstruct add r5, r0, #0x0 + ldr r0, [sp, #0x0] mov r2, #0x1 add r1, r0, #0x0 ldr r1, [r1, #0x0] bl GetSubstruct add r6, r0, #0x0 + ldr r0, [sp, #0x0] mov r2, #0x2 add r1, r0, #0x0 ldr r1, [r1, #0x0] bl GetSubstruct add r7, r0, #0x0 + ldr r0, [sp, #0x0] mov r2, #0x3 add r1, r0, #0x0 ldr r1, [r1, #0x0] bl GetSubstruct add r1, r0, #0x0 + ldr r0, [sp, #0x4] cmp r0, #0xb2 bls _02067366 @@ -1589,7 +1593,7 @@ _0206753C: _02067540: ldrh r0, [r5, #0x0] ldr r1, [r5, #0x8] - bl CalcMonLevel + bl CalcLevelBySpeciesAndExp add r4, r0, #0x0 b _0206781A _0206754C: @@ -1808,7 +1812,7 @@ _0206769C: ldr r0, _02067824 ; =SPECIES_MANAPHY_EGG ldr r2, [sp, #0x8] add r1, r4, #0x0 - bl FUN_0200A99C + bl GetSpeciesName b _0206781A _020676B2: ldr r1, [sp, #0x8] @@ -2011,7 +2015,7 @@ _02067810: ldrh r0, [r5, #0x0] ldr r2, [sp, #0x8] add r1, r4, #0x0 - bl FUN_0200A99C + bl GetSpeciesName _0206781A: add r0, r4, #0x0 add sp, #0xc @@ -2022,8 +2026,8 @@ _02067824: .word SPECIES_MANAPHY_EGG _02067828: .word 0x0000FFFF _0206782C: .word SPECIES_ARCEUS - thumb_func_start SetBoxMonDataEncrypted -SetBoxMonDataEncrypted: ; 0x02067830 + thumb_func_start SetMonDataEncrypted +SetMonDataEncrypted: ; 0x02067830 push {r4-r6, lr} add r5, r0, #0x0 ldrh r0, [r5, #0x4] @@ -2036,16 +2040,16 @@ SetBoxMonDataEncrypted: ; 0x02067830 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum ldrh r1, [r5, #0x6] cmp r0, r1 beq _02067886 @@ -2061,7 +2065,7 @@ _02067870: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment pop {r4-r6, pc} _02067886: add r0, r5, #0x0 @@ -2076,17 +2080,17 @@ _02067886: ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _020678BC: pop {r4-r6, pc} .balign 4 @@ -2185,8 +2189,8 @@ _02067958: bl SetBoxMonData pop {r3, pc} - thumb_func_start FUN_02067960 -FUN_02067960: ; 0x02067960 + thumb_func_start SetBoxMonDataEncrypted +SetBoxMonDataEncrypted: ; 0x02067960 push {r4-r6, lr} add r5, r0, #0x0 ldrh r0, [r5, #0x4] @@ -2199,11 +2203,11 @@ FUN_02067960: ; 0x02067960 add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum ldrh r1, [r5, #0x6] cmp r0, r1 beq _020679AA @@ -2219,7 +2223,7 @@ _02067994: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment pop {r4-r6, pc} _020679AA: add r0, r5, #0x0 @@ -2233,13 +2237,13 @@ _020679AA: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _020679D4: pop {r4-r6, pc} .balign 4 @@ -2828,7 +2832,7 @@ _02067E0E: ldrh r0, [r7, #0x0] mov r1, #0x0 add r2, sp, #0x34 - bl FUN_0200A99C + bl GetSpeciesName add r0, sp, #0x34 add r1, r4, #0x0 bl StringNotEqual @@ -2855,7 +2859,7 @@ _02067E40: add r2, sp, #0x1c mov r1, #0x0 add r2, #0x2 - bl FUN_0200A99C + bl GetSpeciesName add r0, r4, #0x0 add r1, sp, #0x8 mov r2, #0xb @@ -3097,8 +3101,8 @@ _0206800C: .word 0xC1FFFFFF _02068010: .word 0xBFFFFFFF _02068014: .word 0x7FFFFFFF - thumb_func_start FUN_02068018 -FUN_02068018: ; 0x02068018 + thumb_func_start AddMonPartyStatEncrypted +AddMonPartyStatEncrypted: ; 0x02068018 push {r4-r6, lr} add r5, r0, #0x0 ldrh r0, [r5, #0x4] @@ -3111,16 +3115,16 @@ FUN_02068018: ; 0x02068018 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum ldrh r1, [r5, #0x6] cmp r0, r1 beq _02068066 @@ -3132,13 +3136,13 @@ _02068058: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment pop {r4-r6, pc} _02068066: add r0, r5, #0x0 add r1, r4, #0x0 add r2, r6, #0x0 - bl FUN_020680A0 + bl AddMonPartyStat ldrh r0, [r5, #0x4] lsl r0, r0, #0x1f lsr r0, r0, #0x1f @@ -3147,23 +3151,23 @@ _02068066: ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment _0206809C: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_020680A0 -FUN_020680A0: ; 0x020680A0 + thumb_func_start AddMonPartyStat +AddMonPartyStat: ; 0x020680A0 push {r3, lr} add r3, r1, #0x0 sub r3, #0x9f @@ -3784,7 +3788,7 @@ AllocAndLoadMonPersonal: ; 0x0206851C add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_0206A370 + bl LoadMonPersonal add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 @@ -4008,7 +4012,7 @@ GetMonBaseStat: ; 0x02068678 FUN_02068698: ; 0x02068698 push {r3-r7, lr} add r5, r0, #0x0 - bl FUN_020669D4 + bl TryDecryptMon str r0, [sp, #0x0] add r0, r5, #0x0 mov r1, #0x5 @@ -4037,7 +4041,7 @@ FUN_02068698: ; 0x02068698 add r7, r0, #0x0 ldr r1, [sp, #0x0] add r0, r5, #0x0 - bl FUN_02066A20 + bl TryEncryptMon sub r1, r7, r4 mov r0, #0x64 mul r0, r1 @@ -4047,31 +4051,31 @@ FUN_02068698: ; 0x02068698 lsr r0, r0, #0x18 pop {r3-r7, pc} - thumb_func_start FUN_020686F8 -FUN_020686F8: ; 0x020686F8 - ldr r3, _020686FC ; =FUN_02068700 + thumb_func_start CalcMonExpToNextLevelEncrypted +CalcMonExpToNextLevelEncrypted: ; 0x020686F8 + ldr r3, _020686FC ; =CalcBoxMonExpToNextLevelEncrypted bx r3 .balign 4 -_020686FC: .word FUN_02068700 +_020686FC: .word CalcBoxMonExpToNextLevelEncrypted - thumb_func_start FUN_02068700 -FUN_02068700: ; 0x02068700 + thumb_func_start CalcBoxMonExpToNextLevelEncrypted +CalcBoxMonExpToNextLevelEncrypted: ; 0x02068700 push {r4-r6, lr} mov r1, #0x5 mov r2, #0x0 add r4, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r6, r0, #0x10 add r0, r4, #0x0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted add r0, r0, #0x1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, #0x0 mov r1, #0x8 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r4, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 @@ -4152,41 +4156,41 @@ _0206879E: add r0, r5, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_020687C0 -FUN_020687C0: ; 0x020687C0 - ldr r3, _020687C4 ; =FUN_020687C8 + thumb_func_start CalcMonLevelEncrypted +CalcMonLevelEncrypted: ; 0x020687C0 + ldr r3, _020687C4 ; =CalcBoxMonLevelEncrypted bx r3 .balign 4 -_020687C4: .word FUN_020687C8 +_020687C4: .word CalcBoxMonLevelEncrypted - thumb_func_start FUN_020687C8 -FUN_020687C8: ; 0x020687C8 + thumb_func_start CalcBoxMonLevelEncrypted +CalcBoxMonLevelEncrypted: ; 0x020687C8 push {r3-r7, lr} add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x8 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r7, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon lsl r0, r4, #0x10 lsr r0, r0, #0x10 add r1, r7, #0x0 - bl CalcMonLevel + bl CalcLevelBySpeciesAndExp pop {r3-r7, pc} .balign 4 - thumb_func_start CalcMonLevel -CalcMonLevel: ; 0x02068800 + thumb_func_start CalcLevelBySpeciesAndExp +CalcLevelBySpeciesAndExp: ; 0x02068800 push {r4-r6, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -4195,7 +4199,7 @@ CalcMonLevel: ; 0x02068800 add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl CalcMonLevelInternal + bl CalcLevelBySpeciesAndExp_PreloadedPersonal add r4, r0, #0x0 add r0, r6, #0x0 bl FreeMonPersonal @@ -4203,8 +4207,8 @@ CalcMonLevel: ; 0x02068800 pop {r4-r6, pc} .balign 4 - thumb_func_start CalcMonLevelInternal -CalcMonLevelInternal: ; 0x02068824 + thumb_func_start CalcLevelBySpeciesAndExp_PreloadedPersonal +CalcLevelBySpeciesAndExp_PreloadedPersonal: ; 0x02068824 push {r4, lr} mov r1, #0x15 add r4, r2, #0x0 @@ -4228,27 +4232,27 @@ _02068846: _0206884C: .word UNK_021C5AC0 _02068850: .word UNK_021C5AC0 + 4 - thumb_func_start FUN_02068854 -FUN_02068854: ; 0x02068854 - ldr r3, _02068858 ; =FUN_0206885C + thumb_func_start GetMonNatureEncrypted +GetMonNatureEncrypted: ; 0x02068854 + ldr r3, _02068858 ; =GetBoxMonNatureEncrypted bx r3 .balign 4 -_02068858: .word FUN_0206885C +_02068858: .word GetBoxMonNatureEncrypted - thumb_func_start FUN_0206885C -FUN_0206885C: ; 0x0206885C + thumb_func_start GetBoxMonNatureEncrypted +GetBoxMonNatureEncrypted: ; 0x0206885C push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon mov r1, #0x0 add r4, r0, #0x0 add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add r0, r6, #0x0 bl GetNatureFromPersonality pop {r4-r6, pc} @@ -4264,8 +4268,8 @@ GetNatureFromPersonality: ; 0x02068884 pop {r3, pc} .balign 4 - thumb_func_start FUN_02068894 -FUN_02068894: ; 0x02068894 + thumb_func_start ApplyNatureModToStat +ApplyNatureModToStat: ; 0x02068894 push {r3, lr} cmp r2, #0x1 blo _0206889E @@ -4277,7 +4281,7 @@ _0206889E: _020688A2: lsl r3, r0, #0x2 add r3, r0, r3 - ldr r0, _020688E4 ; =UNK_020F7F93 + ldr r0, _020688E4 ; =sNatureStatMods sub r2, r2, #0x1 add r0, r0, r3 ldrsb r2, [r2, r0] @@ -4287,21 +4291,21 @@ _020688A2: beq _020688CE cmp r2, #0x1 bne _020688E0 - mov r0, #0x6e + mov r0, #110 mul r0, r1 lsl r0, r0, #0x10 lsr r0, r0, #0x10 - mov r1, #0x64 + mov r1, #100 bl _s32_div_f lsl r0, r0, #0x10 lsr r1, r0, #0x10 b _020688E0 _020688CE: - mov r0, #0x5a + mov r0, #90 mul r0, r1 lsl r0, r0, #0x10 lsr r0, r0, #0x10 - mov r1, #0x64 + mov r1, #100 bl _s32_div_f lsl r0, r0, #0x10 lsr r1, r0, #0x10 @@ -4309,10 +4313,10 @@ _020688E0: add r0, r1, #0x0 pop {r3, pc} .balign 4 -_020688E4: .word UNK_020F7F93 +_020688E4: .word sNatureStatMods - thumb_func_start FUN_020688E8 -FUN_020688E8: ; 0x020688E8 + thumb_func_start MonApplyFriendshipModEncrypted +MonApplyFriendshipModEncrypted: ; 0x020688E8 push {r3-r7, lr} sub sp, #0x8 add r6, r1, #0x0 @@ -4369,7 +4373,7 @@ _0206894E: _02068958: lsl r0, r6, #0x1 add r1, r6, r0 - ldr r0, _020689DC ; =UNK_020F7ED4 + ldr r0, _020689DC ; =sFriendshipModTable add r0, r0, r1 ldrsb r4, [r4, r0] cmp r4, #0x0 @@ -4429,49 +4433,49 @@ _020689CA: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _020689D4: add sp, #0x8 pop {r3-r7, pc} .balign 4 _020689D8: .word SPECIES_EGG -_020689DC: .word UNK_020F7ED4 +_020689DC: .word sFriendshipModTable - thumb_func_start FUN_020689E0 -FUN_020689E0: ; 0x020689E0 - ldr r3, _020689E4 ; =FUN_020689E8 + thumb_func_start GetMonGenderEncrypted +GetMonGenderEncrypted: ; 0x020689E0 + ldr r3, _020689E4 ; =GetBoxMonGenderEncrypted bx r3 .balign 4 -_020689E4: .word FUN_020689E8 +_020689E4: .word GetBoxMonGenderEncrypted - thumb_func_start FUN_020689E8 -FUN_020689E8: ; 0x020689E8 + thumb_func_start GetBoxMonGenderEncrypted +GetBoxMonGenderEncrypted: ; 0x020689E8 push {r3-r7, lr} add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 mov r1, #0x0 lsr r4, r0, #0x10 add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r7, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add r0, r4, #0x0 add r1, r7, #0x0 - bl FUN_02068A20 + bl GetGenderBySpeciesAndPersonality pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02068A20 -FUN_02068A20: ; 0x02068A20 + thumb_func_start GetGenderBySpeciesAndPersonality +GetGenderBySpeciesAndPersonality: ; 0x02068A20 push {r4-r6, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -4480,7 +4484,7 @@ FUN_02068A20: ; 0x02068A20 add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_02068A44 + bl GetGenderBySpeciesAndPersonality_PreloadedPersonal add r4, r0, #0x0 add r0, r6, #0x0 bl FreeMonPersonal @@ -4488,8 +4492,8 @@ FUN_02068A20: ; 0x02068A20 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_02068A44 -FUN_02068A44: ; 0x02068A44 + thumb_func_start GetGenderBySpeciesAndPersonality_PreloadedPersonal +GetGenderBySpeciesAndPersonality_PreloadedPersonal: ; 0x02068A44 push {r4, lr} mov r1, #0x12 add r4, r2, #0x0 @@ -4539,12 +4543,12 @@ FUN_02068A88: ; 0x02068A88 mov r1, #0x7 mov r2, #0x0 add r5, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x0 add r4, r0, #0x0 add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02068AAC @@ -4662,16 +4666,16 @@ FUN_02068B70: ; 0x02068B70 str r0, [sp, #0xc] add r0, r5, #0x0 str r2, [sp, #0x10] - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x18] add r0, r5, #0x0 mov r1, #0xad mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted str r0, [sp, #0x14] add r0, r5, #0x0 bl FUN_02068A88 @@ -4679,7 +4683,7 @@ FUN_02068B70: ; 0x02068B70 add r7, r0, #0x0 add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 ldr r0, _02068BF8 ; =SPECIES_EGG cmp r4, r0 @@ -4687,7 +4691,7 @@ FUN_02068B70: ; 0x02068B70 add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _02068BFC ; =0x000001EA cmp r0, r1 bne _02068BC6 @@ -4700,7 +4704,7 @@ _02068BCA: add r0, r5, #0x0 mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 _02068BD8: @@ -4714,7 +4718,7 @@ _02068BD8: bl FUN_02068C00 ldr r1, [sp, #0x18] add r0, r5, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x1c pop {r4-r7, pc} nop @@ -5040,16 +5044,16 @@ FUN_02068E1C: ; 0x02068E1C mov r1, #0xad mov r2, #0x0 add r5, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted mov r1, #0x0 str r0, [sp, #0x4] add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 ldr r0, _02068E80 ; =SPECIES_EGG cmp r4, r0 @@ -5057,7 +5061,7 @@ FUN_02068E1C: ; 0x02068E1C add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _02068E84 ; =0x000001EA cmp r0, r1 bne _02068E5E @@ -5070,7 +5074,7 @@ _02068E62: add r0, r5, #0x0 mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r3, r0, #0x18 _02068E70: @@ -5434,7 +5438,7 @@ FUN_020690D4: ; 0x020690D4 push {r3, lr} mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r0, r0, #0x18 pop {r3, pc} @@ -5479,7 +5483,7 @@ FUN_020690E8: ; 0x020690E8 add r0, r4, #0x0 mov r1, #0x8 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02069138: add r0, sp, #0x0 ldrb r1, [r0, #0x0] @@ -5497,7 +5501,7 @@ _02069146: add r0, r4, #0x0 mov r1, #0xa0 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x8 mov r0, #0x1 pop {r3-r5, pc} @@ -6045,7 +6049,7 @@ ReadFromPersonalPmsNarc: ; 0x02069558 _0206956E: add r0, sp, #0x4 bl FS_InitFile - ldr r1, _020695A4 ; =UNK_02105FC8 + ldr r1, _020695A4 ; =__local_str_poketool_personal_pms_narc add r0, sp, #0x4 bl FS_OpenFile add r0, sp, #0x4 @@ -6064,7 +6068,7 @@ _0206956E: pop {r3-r4, pc} nop _020695A0: .word SPECIES_EGG -_020695A4: .word UNK_02105FC8 +_020695A4: .word __local_str_poketool_personal_pms_narc thumb_func_start GetEggSpecies GetEggSpecies: ; 0x020695A8 @@ -6112,8 +6116,8 @@ _020695EC: nop _020695F0: .word SPECIES_ROSELIA - thumb_func_start FUN_020695F4 -FUN_020695F4: ; 0x020695F4 + thumb_func_start InitBoxMonMoveset +InitBoxMonMoveset: ; 0x020695F4 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -6122,27 +6126,27 @@ FUN_020695F4: ; 0x020695F4 bl AllocFromHeap str r0, [sp, #0x0] add r0, r5, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0x4] add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r7, r0, #0x0 add r0, r5, #0x0 - bl FUN_020687C8 + bl CalcBoxMonLevelEncrypted lsl r0, r0, #0x18 lsr r6, r0, #0x18 ldr r2, [sp, #0x0] add r0, r4, #0x0 add r1, r7, #0x0 - bl FUN_02069F9C + bl LoadWotbl_HandleAlternateForme ldr r0, [sp, #0x0] ldrh r1, [r0, #0x0] ldr r0, _02069690 ; =0x0000FFFF @@ -6181,7 +6185,7 @@ _0206967C: bl FreeToHeap ldr r1, [sp, #0x4] add r0, r5, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x8 pop {r3-r7, pc} nop @@ -6205,7 +6209,7 @@ FUN_020696A8: ; 0x020696A8 ldr r1, _02069700 ; =0x0000FFFF add r6, r0, #0x0 str r1, [sp, #0x4] - bl FUN_02066A6C + bl TryDecryptBoxMon mov r4, #0x0 str r0, [sp, #0x0] add r7, r4, #0x0 @@ -6214,7 +6218,7 @@ _020696BE: add r0, r6, #0x0 add r1, #0x36 add r2, r7, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 bne _020696E0 @@ -6238,7 +6242,7 @@ _020696EA: _020696F0: ldr r1, [sp, #0x0] add r0, r6, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r0, [sp, #0x4] add sp, #0x8 pop {r3-r7, pc} @@ -6261,7 +6265,7 @@ FUN_02069718: ; 0x02069718 sub sp, #0x20 add r5, r0, #0x0 str r1, [sp, #0x0] - bl FUN_02066A6C + bl TryDecryptBoxMon str r0, [sp, #0xc] add r0, sp, #0x18 mov r4, #0x0 @@ -6273,20 +6277,20 @@ _02069730: add r0, r5, #0x0 add r1, #0x37 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, [sp, #0x4] mov r2, #0x0 strh r0, [r1, #0x0] add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3b - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r4, #0x0 strb r0, [r7, #0x0] add r0, r5, #0x0 add r1, #0x3f mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted strb r0, [r6, #0x0] ldr r0, [sp, #0x4] add r4, r4, #0x1 @@ -6315,17 +6319,17 @@ _0206978A: ldr r2, [sp, #0x8] add r0, r5, #0x0 add r1, #0x36 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3a add r2, r7, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3e add r2, r6, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r0, [sp, #0x8] add r4, r4, #0x1 add r0, r0, #0x2 @@ -6336,7 +6340,7 @@ _0206978A: blt _0206978A ldr r1, [sp, #0xc] add r0, r5, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x20 pop {r3-r7, pc} .balign 4 @@ -6357,12 +6361,12 @@ FUN_020697D4: ; 0x020697D4 add r1, #0x36 add r2, sp, #0x14 add r5, r0, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3e mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r1, r0, #0x18 add r0, sp, #0x10 @@ -6374,7 +6378,7 @@ FUN_020697D4: ; 0x020697D4 add r0, r5, #0x0 add r1, r4, #0x0 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted pop {r3-r5} pop {r3} add sp, #0x10 @@ -6414,7 +6418,7 @@ FUN_02069818: ; 0x02069818 ldr r0, [sp, #0x4] ldr r1, [sp, #0xc] add r2, r4, #0x0 - bl FUN_02069F9C + bl LoadWotbl_HandleAlternateForme ldr r0, [r5, #0x0] lsl r0, r0, #0x1 ldrh r2, [r4, r0] @@ -6495,42 +6499,42 @@ FUN_020698E8: ; 0x020698E8 add r1, #0x36 mov r2, #0x0 add r5, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strh r0, [r1, #0x4] add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3a mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strb r0, [r1, #0x2] add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3e mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strb r0, [r1, #0x0] add r1, r6, #0x0 add r0, r5, #0x0 add r1, #0x36 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strh r0, [r1, #0x6] add r1, r6, #0x0 add r0, r5, #0x0 add r1, #0x3a mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strb r0, [r1, #0x3] add r1, r6, #0x0 add r0, r5, #0x0 add r1, #0x3e mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, sp, #0x0 strb r0, [r1, #0x1] add r1, r4, #0x0 @@ -6538,35 +6542,35 @@ FUN_020698E8: ; 0x020698E8 add r0, r5, #0x0 add r1, #0x36 add r2, #0x2 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r4, #0x0 add r2, sp, #0x0 add r0, r5, #0x0 add r1, #0x3a add r2, #0x3 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r4, #0x3e add r2, sp, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 add r2, #0x1 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r6, #0x0 add r0, r5, #0x0 add r1, #0x36 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r6, #0x0 add r2, sp, #0x0 add r0, r5, #0x0 add r1, #0x3a add r2, #0x2 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r6, #0x3e add r0, r5, #0x0 add r1, r6, #0x0 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x8 pop {r4-r6, pc} .balign 4 @@ -6604,18 +6608,18 @@ _020699B2: add r0, r5, #0x0 add r1, #0x36 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r1, r4, #0x0 add r2, sp, #0x0 add r0, r5, #0x0 add r1, #0x3a add r2, #0x1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x3e add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r4, r4, #0x1 cmp r4, #0x3 blo _020699B2 @@ -6629,16 +6633,16 @@ _02069A0A: add r0, r5, #0x0 mov r1, #0x39 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x0 add r0, r5, #0x0 mov r1, #0x3d add r2, #0x1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 mov r1, #0x41 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted pop {r3-r7, pc} thumb_func_start FUN_02069A38 @@ -6696,28 +6700,28 @@ _02069A8E: add r0, r4, #0x0 mov r1, #0x9f add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 mov r1, #0xa2 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 mov r1, #0xa3 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 bl FUN_020256BC add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0xa9 add r2, r5, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FreeToHeap add r0, r4, #0x0 mov r1, #0xa1 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add r1, sp, #0x4 mov r2, #0x18 @@ -6725,9 +6729,9 @@ _02069A8E: add r0, r4, #0x0 mov r1, #0xaa add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add sp, #0x1c pop {r4-r5, pc} @@ -6872,7 +6876,7 @@ FUN_02069BD0: ; 0x02069BD0 add r4, r1, #0x0 mov r1, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r4, #0x0 bl FUN_02069BE4 pop {r4, pc} @@ -6904,7 +6908,7 @@ FUN_02069BFC: ; 0x02069BFC add r0, r4, #0x0 add r1, r7, #0x0 add r2, r6, #0x0 - bl FUN_02069F9C + bl LoadWotbl_HandleAlternateForme ldrh r1, [r6, #0x0] ldr r0, _02069C44 ; =0x0000FFFF mov r4, #0x0 @@ -7008,7 +7012,7 @@ _02069CD0: strb r0, [r1, #0x0] add r0, r4, #0x0 mov r1, #0x99 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02069CF2: pop {r3-r7, pc} @@ -7115,7 +7119,7 @@ _02069DB0: add r0, r7, #0x0 mov r1, #0x99 add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02069DBA: ldr r0, [sp, #0x4] add r6, r6, #0x1 @@ -7179,7 +7183,7 @@ _02069DEC: add r0, r6, #0x0 mov r1, #0x99 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _02069E40: ldr r0, [sp, #0x0] cmp r4, r0 @@ -7197,7 +7201,7 @@ _02069E40: add r0, r6, #0x0 mov r1, #0x99 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r4, r4, #0x1 _02069E6A: add r4, r4, #0x1 @@ -7219,7 +7223,7 @@ FUN_02069E7C: ; 0x02069E7C push {r3, lr} mov r1, #0x99 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0xf tst r0, r1 beq _02069E90 @@ -7241,7 +7245,7 @@ FUN_02069E9C: ; 0x02069E9C push {r3, lr} mov r1, #0x99 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r0, #0xf @@ -7274,17 +7278,17 @@ FUN_02069ECC: ; 0x02069ECC add r5, r0, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xa mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0x6 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _02069F20 ; =SPECIES_ARCEUS cmp r4, r1 bne _02069F1C @@ -7302,7 +7306,7 @@ FUN_02069ECC: ; 0x02069ECC add r0, r5, #0x0 mov r1, #0x70 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _02069F1C: add sp, #0x4 pop {r3-r6, pc} @@ -7390,8 +7394,8 @@ _02069F96: bx lr .balign 4 - thumb_func_start FUN_02069F9C -FUN_02069F9C: ; 0x02069F9C + thumb_func_start LoadWotbl_HandleAlternateForme +LoadWotbl_HandleAlternateForme: ; 0x02069F9C push {r4, lr} add r4, r2, #0x0 bl ResolveMonForme @@ -7471,13 +7475,13 @@ FUN_0206A014: ; 0x0206A014 add r0, r5, #0x0 mov r1, #0xa2 add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0206A050: add sp, #0xc pop {r3-r6, pc} @@ -7495,15 +7499,15 @@ FUN_0206A054: ; 0x0206A054 ldr r2, _0206A090 ; =gGameVersion add r0, r4, #0x0 mov r1, #0x79 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x9a add r2, sp, #0x18 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x9d add r2, sp, #0x20 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x4 pop {r3-r4} pop {r3} @@ -7560,16 +7564,16 @@ FUN_0206A094: ; 0x0206A094 add r0, r5, #0x0 mov r1, #0x6 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x8 pop {r3-r7, pc} _0206A104: - ldr r0, _0206A134 ; =UNK_020F7ECC + ldr r0, _0206A134 ; =sItemOdds lsl r1, r7, #0x2 ldrh r0, [r0, r1] cmp r4, r0 blo _0206A12E - ldr r0, _0206A138 ; =UNK_020F7ECC + 2 + ldr r0, _0206A138 ; =sItemOdds + 2 ldrh r0, [r0, r1] cmp r4, r0 add r2, sp, #0x4 @@ -7577,19 +7581,19 @@ _0206A104: add r0, r5, #0x0 mov r1, #0x6 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x8 pop {r3-r7, pc} _0206A126: add r0, r5, #0x0 mov r1, #0x6 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0206A12E: add sp, #0x8 pop {r3-r7, pc} nop -_0206A134: .word UNK_020F7ECC -_0206A138: .word UNK_020F7ECC + 2 +_0206A134: .word sItemOdds +_0206A138: .word sItemOdds + 2 thumb_func_start FUN_0206A13C FUN_0206A13C: ; 0x0206A13C @@ -7605,13 +7609,13 @@ FUN_0206A144: ; 0x0206A144 mov r1, #0xad mov r2, #0x0 add r5, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0x0 mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #0x0 add r0, r4, #0x0 add r2, r6, #0x0 @@ -7682,17 +7686,17 @@ FUN_0206A1CC: ; 0x0206A1CC push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted mov r1, #0x0 add r4, r0, #0x0 add r0, r5, #0x0 add r2, r1, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 add r0, r4, #0x0 mov r1, #0x18 @@ -7710,23 +7714,23 @@ FUN_0206A1CC: ; 0x0206A1CC add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted b _0206A230 _0206A21A: add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted b _0206A230 _0206A226: add r0, r5, #0x0 mov r1, #0xa add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _0206A230: add r0, r5, #0x0 add r1, r7, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x8 pop {r3-r7, pc} @@ -7737,7 +7741,7 @@ FUN_0206A23C: ; 0x0206A23C add r5, r0, #0x0 mov r0, #0x0 str r1, [sp, #0x0] - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x4] ldr r1, [sp, #0x4] add r0, r5, #0x0 @@ -7787,17 +7791,17 @@ FUN_0206A23C: ; 0x0206A23C ldrh r2, [r2, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl DecryptMon + bl MonDecryptSegment add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl DecryptMon + bl MonDecryptSegment ldr r0, [sp, #0x0] str r0, [r5, #0x0] ldr r2, [sp, #0xc] @@ -7854,25 +7858,25 @@ _0206A32E: add r0, r5, #0x0 add r0, #0x8 mov r1, #0x80 - bl FUN_0206A3F8 + bl CalcMonChecksum strh r0, [r5, #0x6] add r0, r5, #0x0 ldrh r2, [r5, #0x6] add r0, #0x8 mov r1, #0x80 - bl EncryptMon + bl MonEncryptSegment add r0, r5, #0x0 ldr r2, [r5, #0x0] add r0, #0x88 mov r1, #0x64 - bl EncryptMon + bl MonEncryptSegment ldr r0, [sp, #0x4] bl FreeToHeap add sp, #0x1c pop {r4-r7, pc} - thumb_func_start FUN_0206A370 -FUN_0206A370: ; 0x0206A370 + thumb_func_start LoadMonPersonal +LoadMonPersonal: ; 0x0206A370 ldr r3, _0206A37C ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 @@ -7881,8 +7885,8 @@ FUN_0206A370: ; 0x0206A370 nop _0206A37C: .word ReadWholeNarcMemberByIdPair - thumb_func_start LoadMonBaseStats_HandleUnownOrArceus -LoadMonBaseStats_HandleUnownOrArceus: ; 0x0206A380 + thumb_func_start LoadMonBaseStats_HandleAlternateForme +LoadMonBaseStats_HandleAlternateForme: ; 0x0206A380 push {r4, lr} add r4, r2, #0x0 bl ResolveMonForme @@ -7902,8 +7906,8 @@ LoadMonEvolutionTable: ; 0x0206A394 nop _0206A3A0: .word ReadWholeNarcMemberByIdPair - thumb_func_start EncryptMon -EncryptMon: ; 0x0206A3A4 + thumb_func_start MonEncryptSegment +MonEncryptSegment: ; 0x0206A3A4 push {r0-r3} push {r3-r7, lr} add r5, r0, #0x0 @@ -7928,12 +7932,12 @@ _0206A3C6: bx r3 .balign 4 - thumb_func_start DecryptMon -DecryptMon: ; 0x0206A3D0 - ldr r3, _0206A3D4 ; =EncryptMon + thumb_func_start MonDecryptSegment +MonDecryptSegment: ; 0x0206A3D0 + ldr r3, _0206A3D4 ; =MonEncryptSegment bx r3 .balign 4 -_0206A3D4: .word EncryptMon +_0206A3D4: .word MonEncryptSegment thumb_func_start MonEncryptionLCRNG MonEncryptionLCRNG: ; 0x0206A3D8 @@ -7952,8 +7956,8 @@ MonEncryptionLCRNG: ; 0x0206A3D8 _0206A3F0: .word 0x41C64E6D _0206A3F4: .word 0x00006073 - thumb_func_start FUN_0206A3F8 -FUN_0206A3F8: ; 0x0206A3F8 + thumb_func_start CalcMonChecksum +CalcMonChecksum: ; 0x0206A3F8 push {r3-r4} mov r3, #0x0 add r2, r3, #0x0 @@ -8881,7 +8885,7 @@ FUN_0206A9AC: ; 0x0206A9AC add r0, r5, #0x0 mov r1, #0x7 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x4] add r0, r4, #0x0 bl FUN_020239CC @@ -8889,7 +8893,7 @@ FUN_0206A9AC: ; 0x0206A9AC add r0, r5, #0x0 mov r1, #0x9c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0xc] add r0, r4, #0x0 add r1, r6, #0x0 @@ -8903,7 +8907,7 @@ FUN_0206A9AC: ; 0x0206A9AC mov r1, #0x90 add r2, r6, #0x0 mov r4, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, [sp, #0x0] ldr r0, [sp, #0x4] cmp r1, r0 @@ -8995,12 +8999,12 @@ FUN_0206AA84: ; 0x0206AA84 add r0, r4, #0x0 mov r1, #0xa1 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x0 add r0, r4, #0x0 mov r1, #0xaa add r2, #0x1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x1c pop {r3-r4, pc} @@ -9009,7 +9013,7 @@ FUN_0206AAB4: ; 0x0206AAB4 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon mov r4, #0x0 str r0, [sp, #0x0] add r7, r4, #0x0 @@ -9019,27 +9023,27 @@ _0206AAC6: add r0, r5, #0x0 add r1, #0x36 add r2, r7, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0206AAF0 add r1, r4, #0x0 add r0, r5, #0x0 add r1, #0x42 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r4, #0x0 strb r0, [r6, #0x0] add r0, r5, #0x0 add r1, #0x3a add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _0206AAF0: add r4, r4, #0x1 cmp r4, #0x4 blt _0206AAC6 ldr r1, [sp, #0x0] add r0, r5, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x8 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index f3f565d9..275875f4 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -938,14 +938,14 @@ FUN_0203A04C: ; 0x0203A04C mov r1, #0x1a add r2, r5, #0x0 mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 bl MOD05_021E2C24 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x0 pop {r4-r6, pc} @@ -973,7 +973,7 @@ FUN_0203A098: ; 0x0203A098 mov r1, #0x1a add r2, r5, #0x0 mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -983,7 +983,7 @@ FUN_0203A098: ; 0x0203A098 mov r3, #0x1 bl MOD05_021E2BD0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r1, _0203A0F8 ; =FUN_0203A2F0 add r0, r4, #0x0 bl SetupNativeScript @@ -1090,7 +1090,7 @@ _0203A1AA: mov r0, #0x1 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -1100,7 +1100,7 @@ _0203A1AA: mov r3, #0x1 bl MOD05_021E2BD0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData b _0203A1F4 _0203A1E2: mov r2, #0x6 @@ -10474,7 +10474,7 @@ FUN_0203ED2C: ; 0x0203ED2C bl FUN_02024DA0 add r6, r0, #0x0 mov r0, #0x20 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 bl ZeroMonData mov r0, #0x0 @@ -10727,9 +10727,9 @@ _0203EF18: add r0, r4, #0x0 mov r1, #0x70 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add r0, r7, #0x0 add r1, r4, #0x0 bl FUN_02024AF0 @@ -12179,7 +12179,7 @@ FUN_0203FA58: ; 0x0203FA58 mov r0, #0x0 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 ldr r2, [sp, #0x4] add r0, r4, #0x0 @@ -12223,7 +12223,7 @@ _0203FB26: ldr r0, [sp, #0x0] bl FUN_02021A20 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0200AB18 mov r0, #0x0 diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 308f2afa..43e29bb0 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -391,12 +391,12 @@ _02042FE8: add r0, r4, #0x0 bl FUN_0206A23C add r0, r4, #0x0 - bl FUN_020689E0 + bl GetMonGenderEncrypted str r0, [sp, #0x30] add r0, r4, #0x0 mov r1, #0x6f add r2, sp, #0x30 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 mov r1, #0x4b mov r2, #0x0 @@ -445,7 +445,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x46 add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x3e lsl r0, r0, #0x4 and r0, r6 @@ -454,7 +454,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x47 add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1f lsl r0, r0, #0xa and r0, r6 @@ -463,7 +463,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x48 add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted bl rand_LC add r6, r0, #0x0 mov r0, #0x1f @@ -472,7 +472,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x49 add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x3e lsl r0, r0, #0x4 and r0, r6 @@ -481,7 +481,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x4a add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1f lsl r0, r0, #0xa and r0, r6 @@ -490,7 +490,7 @@ _02042FE8: add r0, r4, #0x0 mov r1, #0x4b add r2, sp, #0x34 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _020430DA: ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] @@ -621,7 +621,7 @@ _020431D4: bl FUN_020239CC str r0, [sp, #0x28] mov r0, #0x20 - bl FUN_020669C0 + bl AllocMonZeroed add r7, r0, #0x0 add r0, r4, #0x0 add r1, r7, #0x0 @@ -629,15 +629,15 @@ _020431D4: add r0, r7, #0x0 mov r1, #0x90 add r2, r5, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0x0 mov r1, #0x7 add r2, sp, #0x2c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0x0 mov r1, #0x9c add r2, sp, #0x28 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 add r4, r7, #0x0 bl FUN_02021A20 @@ -653,7 +653,7 @@ _0204322C: mov r2, #0x4 bl FUN_0208089C add r0, r4, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] bl FUN_0206BB1C diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 276ad62e..46e1fbda 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -53,7 +53,7 @@ FUN_020438D0: ; 0x020438D0 bl FUN_02022528 add r6, r0, #0x0 mov r0, #0x20 - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -95,7 +95,7 @@ FUN_02043918: ; 0x02043918 bl FUN_02022510 str r0, [sp, #0x8] mov r0, #0x20 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 add r0, r6, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 13d8bece..f52aaf69 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -193,7 +193,7 @@ FUN_02044414: ; 0x02044414 cmp r0, #0x6 bhs _02044494 mov r0, #0xb - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 bl ZeroMonData mov r0, #0x1 @@ -609,7 +609,7 @@ _020447D2: pop {r4-r6, pc} _020447F2: add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted strh r0, [r4, #0x0] mov r0, #0x0 pop {r4-r6, pc} @@ -659,7 +659,7 @@ _02044848: cmp r0, #0x0 bne _02044874 add r0, r4, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted ldr r1, [sp, #0x0] cmp r1, r0 bne _02044874 @@ -804,7 +804,7 @@ _02044994: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add sp, #0x8 pop {r3-r7, pc} @@ -853,7 +853,7 @@ _020449FA: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add sp, #0x4 pop {r3-r6, pc} @@ -1484,7 +1484,7 @@ FUN_02044F20: ; 0x02044F20 strh r2, [r1, #0x0] mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 pop {r3-r5, pc} @@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170 add r1, r0, #0x0 add r0, r5, #0x0 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 0d477bf0..7310f545 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -509,13 +509,13 @@ FUN_02040AE4: ; 0x02040AE4 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index b449fd86..bb367973 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -132,19 +132,19 @@ _02041290: mov r1, #0x5 mov r2, #0x0 add r4, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _020412E0 add r0, r4, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _020412E0 add r0, r4, #0x0 mov r1, #0x7 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r1, r0, #0x10 lsl r1, r1, #0x10 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 68b67ed7..f75ac5ce 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -582,7 +582,7 @@ FUN_020422C0: ; 0x020422C0 ldrh r0, [r0, #0x2] mov r1, #0x4 add r2, sp, #0x8 - bl FUN_0200A99C + bl GetSpeciesName mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x1 diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 40e9a53d..d2319bbb 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -768,7 +768,7 @@ FUN_020020EC: ; 0x020020EC mov r0, #0x1 mov r1, #0x1a add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r0, #0x2 add r1, r5, #0x0 @@ -785,7 +785,7 @@ FUN_020020EC: ; 0x020020EC sub r3, #0x2c bl FUN_02012880 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0x0 mov r1, #0x1 str r6, [sp, #0x14] diff --git a/arm9/asm/unk_0200A384.s b/arm9/asm/unk_0200A384.s index 482cdfd7..0584dfbf 100644 --- a/arm9/asm/unk_0200A384.s +++ b/arm9/asm/unk_0200A384.s @@ -3,22 +3,22 @@ .text - thumb_func_start FUN_0200A384 -FUN_0200A384: ; 0x0200A384 + thumb_func_start LoadSingleElementFromNarc +LoadSingleElementFromNarc: ; 0x0200A384 ldr r3, _0200A388 ; =AllocAndReadWholeNarcMemberByIdPair bx r3 .balign 4 _0200A388: .word AllocAndReadWholeNarcMemberByIdPair - thumb_func_start FUN_0200A38C -FUN_0200A38C: ; 0x0200A38C + thumb_func_start FreeMsgDataRawData +FreeMsgDataRawData: ; 0x0200A38C ldr r3, _0200A390 ; =FreeToHeap bx r3 .balign 4 _0200A390: .word FreeToHeap - thumb_func_start FUN_0200A394 -FUN_0200A394: ; 0x0200A394 + thumb_func_start DecryptMessageDirect +DecryptMessageDirect: ; 0x0200A394 push {r3-r7, lr} sub sp, #0x8 add r3, r0, #0x0 @@ -50,7 +50,7 @@ FUN_0200A394: ; 0x0200A394 add r1, r3, r2 add r0, r4, #0x0 add r2, sp, #0x0 - bl FUN_0200A4C0 + bl CopyEncryptedMessage16 ldr r2, [sp, #0x4] ldr r0, _0200A410 ; =0x00091BD3 add r1, r7, #0x0 @@ -85,8 +85,12 @@ _0200A40C: .word 0x000002FD _0200A410: .word 0x00091BD3 _0200A414: .word 0x0000493D - thumb_func_start FUN_0200A418 -FUN_0200A418: ; 0x0200A418 + thumb_func_start DecryptMessageViaNewNarcHandle +DecryptMessageViaNewNarcHandle: ; 0x0200A418 + ; r0: narc_id + ; r1: ??? + ; r2: ??? + ; r3: heap_id push {r4-r6, lr} sub sp, #0x10 add r5, r1, #0x0 @@ -167,8 +171,8 @@ _0200A4B4: .word 0x000002FD _0200A4B8: .word 0x00091BD3 _0200A4BC: .word 0x0000493D - thumb_func_start FUN_0200A4C0 -FUN_0200A4C0: ; 0x0200A4C0 + thumb_func_start CopyEncryptedMessage16 +CopyEncryptedMessage16: ; 0x0200A4C0 add r3, r0, #0x0 add r0, r1, #0x0 add r1, r3, #0x0 @@ -636,8 +640,24 @@ FUN_0200A84C: ; 0x0200A84C pop {r3, pc} .balign 4 - thumb_func_start FUN_0200A86C -FUN_0200A86C: ; 0x0200A86C +; struct MsgData +; { +; u16 unk0; +; u16 unk2; +; u16 unk4; +; u16 unk6; +; union { +; u16 * raw; +; NARC * narc; +; } data; +; }; + + thumb_func_start NewMsgDataFromNarc +NewMsgDataFromNarc: ; 0x0200A86C + ; r0: msg data type + ; r1: NARC ID + ; r2: File ID + ; r3: heap_id push {r3-r7, lr} add r5, r0, #0x0 add r6, r1, #0x0 @@ -653,7 +673,7 @@ FUN_0200A86C: ; 0x0200A86C ldr r2, [sp, #0x0] add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_0200A384 + bl LoadSingleElementFromNarc str r0, [r4, #0x8] cmp r0, #0x0 bne _0200A8AA @@ -676,8 +696,8 @@ _0200A8B4: add r0, r4, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0200A8B8 -FUN_0200A8B8: ; 0x0200A8B8 + thumb_func_start DestroyMsgData +DestroyMsgData: ; 0x0200A8B8 push {r4, lr} add r4, r0, #0x0 beq _0200A8DE @@ -689,7 +709,7 @@ FUN_0200A8B8: ; 0x0200A8B8 b _0200A8D8 _0200A8CA: ldr r0, [r4, #0x8] - bl FUN_0200A38C + bl FreeMsgDataRawData b _0200A8D8 _0200A8D2: ldr r0, [r4, #0x8] @@ -779,8 +799,8 @@ _0200A962: pop {r3, pc} .balign 4 - thumb_func_start FUN_0200A968 -FUN_0200A968: ; 0x0200A968 + thumb_func_start DecryptCopyString +DecryptCopyString: ; 0x0200A968 push {r3-r4, lr} sub sp, #0x4 add r4, r0, #0x0 @@ -794,7 +814,7 @@ FUN_0200A968: ; 0x0200A968 pop {r3-r4, pc} _0200A97E: ldr r0, [r4, #0x8] - bl FUN_0200A394 + bl DecryptMessageDirect add sp, #0x4 pop {r3-r4, pc} _0200A988: @@ -803,27 +823,30 @@ _0200A988: ldrh r0, [r4, #0x4] ldrh r1, [r4, #0x6] ldrh r3, [r4, #0x2] - bl FUN_0200A418 + bl DecryptMessageViaNewNarcHandle add sp, #0x4 pop {r3-r4, pc} .balign 4 - thumb_func_start FUN_0200A99C -FUN_0200A99C: ; 0x0200A99C + thumb_func_start GetSpeciesName +GetSpeciesName: ; 0x0200A99C + ; r0: species + ; r1: heap_id + ; r2: dest push {r4-r6, lr} add r4, r2, #0x0 add r5, r0, #0x0 add r3, r1, #0x0 ldr r2, _0200A9C0 ; =0x0000016A mov r0, #0x1 - mov r1, #0x1a - bl FUN_0200A86C + mov r1, #0x1a ; NARC_MSGDATA_MSG + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_0200A968 + bl DecryptCopyString add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _0200A9C0: .word 0x0000016A @@ -877,7 +900,7 @@ FUN_0200AA14: ; 0x0200AA14 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 beq _0200AA4C mov r0, #0x10 @@ -891,7 +914,7 @@ FUN_0200AA14: ; 0x0200AA14 bl FUN_0200A8E0 _0200AA42: add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r5, #0x0 pop {r4-r6, pc} _0200AA4C: @@ -906,14 +929,14 @@ FUN_0200AA50: ; 0x0200AA50 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 beq _0200AA76 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} _0200AA76: diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index 351b8eab..2da52f7f 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -242,7 +242,7 @@ FUN_0200AC0C: ; 0x0200AC0C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 bl FUN_020239CC @@ -265,7 +265,7 @@ _0200AC48: mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 _0200AC5C: .word 0x000001F1 @@ -280,12 +280,12 @@ FUN_0200AC60: ; 0x0200AC60 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r0, #0x0 ldr r2, [r5, #0xc] add r0, r4, #0x0 @@ -296,7 +296,7 @@ FUN_0200AC60: ; 0x0200AC60 mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} nop _0200ACA0: .word 0x0000016A @@ -309,7 +309,7 @@ FUN_0200ACA4: ; 0x0200ACA4 add r0, r2, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r2, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -326,7 +326,7 @@ FUN_0200ACC0: ; 0x0200ACC0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r2, [r5, #0xc] add r1, r6, #0x0 add r7, r0, #0x0 @@ -337,7 +337,7 @@ FUN_0200ACC0: ; 0x0200ACC0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} nop _0200ACF4: .word 0x0000016B @@ -350,7 +350,7 @@ FUN_0200ACF8: ; 0x0200ACF8 add r4, r1, #0x0 ldr r2, [r5, #0xc] mov r1, #0x76 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 @@ -367,7 +367,7 @@ FUN_0200AD18: ; 0x0200AD18 add r4, r1, #0x0 ldr r2, [r5, #0xc] mov r1, #0x90 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 @@ -406,7 +406,7 @@ FUN_0200AD5C: ; 0x0200AD5C mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AD90 ldr r2, [r5, #0xc] @@ -418,7 +418,7 @@ FUN_0200AD5C: ; 0x0200AD5C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AD90: pop {r3-r7, pc} .balign 4 @@ -434,7 +434,7 @@ FUN_0200AD94: ; 0x0200AD94 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200ADC8 ldr r2, [r5, #0xc] @@ -446,7 +446,7 @@ FUN_0200AD94: ; 0x0200AD94 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200ADC8: pop {r3-r7, pc} .balign 4 @@ -462,7 +462,7 @@ FUN_0200ADCC: ; 0x0200ADCC mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AE00 ldr r2, [r5, #0xc] @@ -474,7 +474,7 @@ FUN_0200ADCC: ; 0x0200ADCC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AE00: pop {r3-r7, pc} .balign 4 @@ -489,7 +489,7 @@ FUN_0200AE04: ; 0x0200AE04 mov r0, #0x1 mov r1, #0x1a mov r2, #0xbe - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r2, [r5, #0xc] add r1, r6, #0x0 add r7, r0, #0x0 @@ -500,7 +500,7 @@ FUN_0200AE04: ; 0x0200AE04 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 @@ -515,7 +515,7 @@ FUN_0200AE38: ; 0x0200AE38 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AE6C ldr r2, [r5, #0xc] @@ -527,7 +527,7 @@ FUN_0200AE38: ; 0x0200AE38 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AE6C: pop {r3-r7, pc} .balign 4 @@ -542,7 +542,7 @@ FUN_0200AE70: ; 0x0200AE70 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AEA2 ldr r2, [r5, #0xc] @@ -554,7 +554,7 @@ FUN_0200AE70: ; 0x0200AE70 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AEA2: pop {r3-r7, pc} .balign 4 @@ -570,7 +570,7 @@ FUN_0200AEA8: ; 0x0200AEA8 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AEDA ldr r2, [r5, #0xc] @@ -582,7 +582,7 @@ FUN_0200AEA8: ; 0x0200AEA8 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AEDA: pop {r3-r7, pc} .balign 4 @@ -598,7 +598,7 @@ FUN_0200AEE0: ; 0x0200AEE0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF12 ldr r2, [r5, #0xc] @@ -610,7 +610,7 @@ FUN_0200AEE0: ; 0x0200AEE0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF12: pop {r3-r7, pc} .balign 4 @@ -626,7 +626,7 @@ FUN_0200AF18: ; 0x0200AF18 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF4A ldr r2, [r5, #0xc] @@ -638,7 +638,7 @@ FUN_0200AF18: ; 0x0200AF18 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF4A: pop {r3-r7, pc} .balign 4 @@ -654,7 +654,7 @@ FUN_0200AF50: ; 0x0200AF50 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AF82 ldr r2, [r5, #0xc] @@ -666,7 +666,7 @@ FUN_0200AF50: ; 0x0200AF50 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AF82: pop {r3-r7, pc} .balign 4 @@ -682,7 +682,7 @@ FUN_0200AF88: ; 0x0200AF88 mov r0, #0x1 mov r1, #0x1a mov r2, #0xcd - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AFBA ldr r2, [r5, #0xc] @@ -694,7 +694,7 @@ FUN_0200AF88: ; 0x0200AF88 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AFBA: pop {r3-r7, pc} @@ -709,7 +709,7 @@ FUN_0200AFBC: ; 0x0200AFBC mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200AFF0 ldr r2, [r5, #0xc] @@ -721,7 +721,7 @@ FUN_0200AFBC: ; 0x0200AFBC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200AFF0: pop {r3-r7, pc} .balign 4 @@ -736,7 +736,7 @@ FUN_0200AFF4: ; 0x0200AFF4 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B026 ldr r2, [r5, #0xc] @@ -748,7 +748,7 @@ FUN_0200AFF4: ; 0x0200AFF4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B026: pop {r3-r7, pc} .balign 4 @@ -764,7 +764,7 @@ FUN_0200B02C: ; 0x0200B02C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B05E ldr r2, [r5, #0xc] @@ -776,7 +776,7 @@ FUN_0200B02C: ; 0x0200B02C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B05E: pop {r3-r7, pc} .balign 4 @@ -793,7 +793,7 @@ FUN_0200B064: ; 0x0200B064 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B098 ldr r2, [r5, #0xc] @@ -805,7 +805,7 @@ FUN_0200B064: ; 0x0200B064 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B098: pop {r3-r7, pc} .balign 4 @@ -820,7 +820,7 @@ FUN_0200B09C: ; 0x0200B09C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B0CE ldr r2, [r5, #0xc] @@ -832,7 +832,7 @@ FUN_0200B09C: ; 0x0200B09C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B0CE: pop {r3-r7, pc} .balign 4 @@ -849,7 +849,7 @@ FUN_0200B0D4: ; 0x0200B0D4 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B108 ldrb r1, [r4, #0x1] @@ -861,7 +861,7 @@ FUN_0200B0D4: ; 0x0200B0D4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B108: pop {r3-r7, pc} .balign 4 @@ -876,7 +876,7 @@ FUN_0200B10C: ; 0x0200B10C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B13E ldr r2, [r5, #0xc] @@ -888,7 +888,7 @@ FUN_0200B10C: ; 0x0200B10C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B13E: pop {r3-r7, pc} .balign 4 @@ -921,7 +921,7 @@ FUN_0200B164: ; 0x0200B164 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B196 ldr r2, [r5, #0xc] @@ -933,7 +933,7 @@ FUN_0200B164: ; 0x0200B164 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B196: pop {r3-r7, pc} .balign 4 @@ -949,7 +949,7 @@ FUN_0200B19C: ; 0x0200B19C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B1CE ldr r2, [r5, #0xc] @@ -961,7 +961,7 @@ FUN_0200B19C: ; 0x0200B19C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B1CE: pop {r3-r7, pc} .balign 4 @@ -977,7 +977,7 @@ FUN_0200B1D4: ; 0x0200B1D4 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B206 ldr r2, [r5, #0xc] @@ -989,7 +989,7 @@ FUN_0200B1D4: ; 0x0200B1D4 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B206: pop {r3-r7, pc} .balign 4 @@ -1006,7 +1006,7 @@ FUN_0200B20C: ; 0x0200B20C mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B240 ldr r2, [r5, #0xc] @@ -1018,7 +1018,7 @@ FUN_0200B20C: ; 0x0200B20C mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B240: pop {r3-r7, pc} .balign 4 @@ -1033,7 +1033,7 @@ FUN_0200B244: ; 0x0200B244 mov r0, #0x1 mov r1, #0x1a mov r2, #0xc2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B276 ldr r2, [r5, #0xc] @@ -1045,7 +1045,7 @@ FUN_0200B244: ; 0x0200B244 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B276: pop {r3-r7, pc} @@ -1059,7 +1059,7 @@ FUN_0200B278: ; 0x0200B278 mov r0, #0x1 mov r1, #0x1a mov r2, #0xbf - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B2AA ldr r2, [r5, #0xc] @@ -1071,7 +1071,7 @@ FUN_0200B278: ; 0x0200B278 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B2AA: pop {r3-r7, pc} @@ -1085,7 +1085,7 @@ FUN_0200B2AC: ; 0x0200B2AC mov r0, #0x1 mov r1, #0x1a mov r2, #0xbf - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B2DE ldr r2, [r5, #0xc] @@ -1097,7 +1097,7 @@ FUN_0200B2AC: ; 0x0200B2AC mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B2DE: pop {r3-r7, pc} @@ -1111,7 +1111,7 @@ FUN_0200B2E0: ; 0x0200B2E0 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B312 ldr r2, [r5, #0xc] @@ -1123,7 +1123,7 @@ FUN_0200B2E0: ; 0x0200B2E0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B312: pop {r3-r7, pc} .balign 4 @@ -1139,7 +1139,7 @@ FUN_0200B318: ; 0x0200B318 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B34A ldr r2, [r5, #0xc] @@ -1151,7 +1151,7 @@ FUN_0200B318: ; 0x0200B318 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B34A: pop {r3-r7, pc} .balign 4 @@ -1167,7 +1167,7 @@ FUN_0200B350: ; 0x0200B350 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B382 ldr r2, [r5, #0xc] @@ -1179,7 +1179,7 @@ FUN_0200B350: ; 0x0200B350 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B382: pop {r3-r7, pc} .balign 4 @@ -1196,7 +1196,7 @@ FUN_0200B388: ; 0x0200B388 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B3BC ldr r2, [r5, #0xc] @@ -1208,7 +1208,7 @@ FUN_0200B388: ; 0x0200B388 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B3BC: pop {r3-r7, pc} .balign 4 @@ -1223,7 +1223,7 @@ FUN_0200B3C0: ; 0x0200B3C0 mov r0, #0x1 mov r1, #0x1a mov r2, #0xc7 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r4, #0x0 beq _0200B3E0 @@ -1250,7 +1250,7 @@ _0200B3FA: mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 @@ -1281,7 +1281,7 @@ FUN_0200B430: ; 0x0200B430 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B462 ldr r2, [r5, #0xc] @@ -1293,7 +1293,7 @@ FUN_0200B430: ; 0x0200B430 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B462: pop {r3-r7, pc} .balign 4 @@ -1309,7 +1309,7 @@ FUN_0200B468: ; 0x0200B468 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B49A ldr r2, [r5, #0xc] @@ -1321,7 +1321,7 @@ FUN_0200B468: ; 0x0200B468 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B49A: pop {r3-r7, pc} .balign 4 @@ -1338,7 +1338,7 @@ FUN_0200B4A0: ; 0x0200B4A0 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B4D4 ldr r2, [r5, #0xc] @@ -1350,7 +1350,7 @@ FUN_0200B4A0: ; 0x0200B4A0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B4D4: pop {r3-r7, pc} .balign 4 @@ -1370,7 +1370,7 @@ FUN_0200B4D8: ; 0x0200B4D8 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B516 ldr r2, [r5, #0xc] @@ -1382,7 +1382,7 @@ FUN_0200B4D8: ; 0x0200B4D8 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B516: pop {r3-r7, pc} @@ -1411,7 +1411,7 @@ FUN_0200B534: ; 0x0200B534 mov r0, #0x1 mov r1, #0x1a mov r2, #0xa - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B566 ldr r2, [r5, #0xc] @@ -1423,7 +1423,7 @@ FUN_0200B534: ; 0x0200B534 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B566: pop {r3-r7, pc} @@ -1437,7 +1437,7 @@ FUN_0200B568: ; 0x0200B568 mov r0, #0x1 mov r1, #0x1a mov r2, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B59A ldr r2, [r5, #0xc] @@ -1449,7 +1449,7 @@ FUN_0200B568: ; 0x0200B568 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B59A: pop {r3-r7, pc} @@ -1471,7 +1471,7 @@ FUN_0200B59C: ; 0x0200B59C ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0200B61E bl FUN_0200A940 @@ -1487,16 +1487,16 @@ FUN_0200B59C: ; 0x0200B59C mov r3, #0x0 bl FUN_0200AB70 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0200B5EE: add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r2, _0200B624 ; =0x0000017E ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 beq _0200B61E ldr r2, [r5, #0xc] @@ -1508,7 +1508,7 @@ _0200B5EE: mov r3, #0x0 bl FUN_0200AB70 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B61E: pop {r3-r7, pc} .balign 4 @@ -1525,7 +1525,7 @@ FUN_0200B628: ; 0x0200B628 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B65A ldr r2, [r5, #0xc] @@ -1537,7 +1537,7 @@ FUN_0200B628: ; 0x0200B628 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B65A: pop {r3-r7, pc} .balign 4 @@ -1553,7 +1553,7 @@ FUN_0200B660: ; 0x0200B660 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B692 ldr r2, [r5, #0xc] @@ -1565,7 +1565,7 @@ FUN_0200B660: ; 0x0200B660 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B692: pop {r3-r7, pc} .balign 4 @@ -1581,7 +1581,7 @@ FUN_0200B698: ; 0x0200B698 ldr r3, [r5, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B6CA ldr r2, [r5, #0xc] @@ -1593,7 +1593,7 @@ FUN_0200B698: ; 0x0200B698 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B6CA: pop {r3-r7, pc} .balign 4 @@ -1610,7 +1610,7 @@ FUN_0200B6D0: ; 0x0200B6D0 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 beq _0200B704 ldr r2, [r5, #0xc] @@ -1622,7 +1622,7 @@ FUN_0200B6D0: ; 0x0200B6D0 mov r3, #0x0 bl FUN_0200AB70 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B704: pop {r3-r7, pc} .balign 4 @@ -1679,7 +1679,7 @@ FUN_0200B764: ; 0x0200B764 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0200B7A4 cmp r4, #0x1 @@ -1699,7 +1699,7 @@ _0200B788: mov r3, #0x0 bl FUN_0200AB70 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0200B7A4: pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02013724.s b/arm9/asm/unk_02013724.s index 83050853..66e27343 100644 --- a/arm9/asm/unk_02013724.s +++ b/arm9/asm/unk_02013724.s @@ -160,7 +160,7 @@ _02013800: ldr r2, _0201383C ; =UNK_020ED54C ldrh r2, [r2, r3] ldr r3, [sp, #0x4] - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 ldr r2, [sp, #0x0] ldr r3, [sp, #0x4] @@ -170,7 +170,7 @@ _02013800: bl FUN_0200A9C4 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0x0 bl FUN_0200AB18 add r0, r4, #0x0 diff --git a/arm9/asm/unk_020139D8.s b/arm9/asm/unk_020139D8.s index 3fbf2466..f1fafe99 100644 --- a/arm9/asm/unk_020139D8.s +++ b/arm9/asm/unk_020139D8.s @@ -115,7 +115,7 @@ _020139EA: ldrh r2, [r4, #0x0] mov r0, #0x1 add r3, r6, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x4] add r7, r7, #0x1 add r4, r4, #0x2 @@ -135,7 +135,7 @@ FUN_02013A10: ; 0x02013A10 add r5, r6, #0x0 _02013A18: ldr r0, [r5, #0x4] - bl FUN_0200A8B8 + bl DestroyMsgData add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0xb diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index 00a3066d..5ba5f631 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -33,7 +33,7 @@ FUN_02014518: ; 0x02014518 mov r0, #0x0 mov r1, #0x1a add r3, r7, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r6, #0x0] mov r4, #0x0 add r5, r6, #0x0 @@ -69,7 +69,7 @@ _0201456E: sub r4, r4, #0x1 bpl _0201456E ldr r0, [r6, #0x0] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0x0 bl FreeToHeap pop {r4-r6, pc} diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index 029709da..0a50978c 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -227,14 +227,14 @@ FUN_02023C04: ; 0x02023C04 ldr r2, _02023C3C ; =0x0000013A mov r0, #0x0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, #0x38 add r6, r0, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} _02023C2C: mov r1, #0x0 diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s index 04275173..30aa59a0 100644 --- a/arm9/asm/unk_02023C40.s +++ b/arm9/asm/unk_02023C40.s @@ -26,10 +26,10 @@ FUN_02023C48: ; 0x02023C48 lsl r2, r2, #0x4 bl memset add r0, r4, #0x0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r4, #0x0 add r0, #0xec - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt mov r0, #0x76 mov r1, #0x0 lsl r0, r0, #0x2 @@ -120,13 +120,13 @@ FUN_02023CC8: ; 0x02023CC8 add r5, r0, #0x0 mov r1, #0xc mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r5, #0xec add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xc mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r4, r0 beq _02023CEA mov r0, #0x1 @@ -187,7 +187,7 @@ _02023D38: .word 0x0000FFFF FUN_02023D3C: ; 0x02023D3C push {r4, lr} add r4, r0, #0x0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r4, #0x0 mov r1, #0x0 add r0, #0xe8 @@ -1926,7 +1926,7 @@ FUN_0202498C: ; 0x0202498C bl GetMonDataEncrypted add r7, r0, #0x0 ldr r0, [sp, #0x0] - bl FUN_020689E0 + bl GetMonGenderEncrypted add r6, r0, #0x0 ldr r1, [r5, #0x0] ldr r0, _02024AE4 ; =0xBEEFCAFE @@ -2113,7 +2113,7 @@ FUN_02024AF0: ; 0x02024AF0 bl GetMonDataEncrypted str r0, [sp, #0x4] ldr r0, [sp, #0x0] - bl FUN_020689E0 + bl GetMonGenderEncrypted add r7, r0, #0x0 ldr r1, [r4, #0x0] ldr r0, _02024C78 ; =0xBEEFCAFE diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index dd0001ea..98d65c78 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -2125,12 +2125,12 @@ _02027B9C: add r0, r4, #0x0 mov r1, #0x74 add r2, #0x12 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r5, #0x3b add r0, r4, #0x0 mov r1, #0x70 add r2, r5, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x10 pop {r3-r5, pc} nop @@ -2300,12 +2300,12 @@ FUN_02027CB8: ; 0x02027CB8 add r0, r4, #0x0 mov r1, #0x74 add r2, #0xa - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r5, #0x33 add r0, r4, #0x0 mov r1, #0x70 add r2, r5, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x10 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_0202A1E0.s b/arm9/asm/unk_0202A1E0.s index 1b3ad961..c63116ff 100644 --- a/arm9/asm/unk_0202A1E0.s +++ b/arm9/asm/unk_0202A1E0.s @@ -897,7 +897,7 @@ FUN_0202A798: ; 0x0202A798 mov r1, #0x1a mov r2, #0x11 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r1, r5, r4 add r1, #0xc8 ldrb r1, [r1, #0x0] @@ -907,9 +907,9 @@ FUN_0202A798: ; 0x0202A798 lsr r1, r1, #0x1f add r1, #0x16 add r2, #0x8 - bl FUN_0200A968 + bl DecryptCopyString ldr r0, [sp, #0x0] - bl FUN_0200A8B8 + bl DestroyMsgData b _0202A7FC _0202A7EE: add r0, r5, r4 diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s index 88a0df53..a72a3829 100644 --- a/arm9/asm/unk_0202B034.s +++ b/arm9/asm/unk_0202B034.s @@ -79,7 +79,7 @@ _0202B0BA: add r1, r7, #0x0 bl FUN_0206B9B0 add r4, r0, #0x0 - bl FUN_020669D4 + bl TryDecryptMon str r0, [sp, #0xc] add r0, r4, #0x0 mov r1, #0x4c @@ -162,7 +162,7 @@ _0202B17C: _0202B17E: ldr r1, [sp, #0xc] add r0, r4, #0x0 - bl FUN_02066A20 + bl TryEncryptMon ldr r0, [sp, #0x10] add r7, r7, #0x1 cmp r7, r0 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index 7d92eb85..e56914e2 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -170,7 +170,7 @@ _02033FA4: mov r1, #0x1a mov r2, #0xc8 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] mov r0, #0x6 lsl r0, r0, #0x6 @@ -243,7 +243,7 @@ _02033FA4: add r0, sp, #0x18 bl FUN_02019178 ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0200AB18 add r0, r6, #0x0 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index e0027d0b..18161609 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -118,7 +118,7 @@ FUN_02034188: ; 0x02034188 mov r0, #0x1 mov r1, #0x1a add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #0x6 lsl r0, r0, #0x6 @@ -191,7 +191,7 @@ _02034308: add r0, sp, #0x14 bl FUN_02019178 ldr r0, [sp, #0xc] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x0 add r1, r0, #0x0 bl FUN_0201797C diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 639703a5..74c41707 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -629,7 +629,7 @@ FUN_0203549C: ; 0x0203549C mov r0, #0x0 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] ldr r0, [sp, #0x14] mov r1, #0xb @@ -717,7 +717,7 @@ _020355BC: add r0, #0x8c str r1, [r0, #0x0] ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x24] mov r1, #0x1 str r0, [sp, #0x24] @@ -965,7 +965,7 @@ _0203576C: mov r0, #0x0 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x1c] cmp r6, #0x0 bne _020357D0 @@ -1049,7 +1049,7 @@ _0203584C: add r0, r7, #0x0 bl FUN_0200AB18 ldr r0, [sp, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData add r5, #0x10 add r0, r5, #0x0 bl FUN_02019220 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 5c30449f..1b513296 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1910,7 +1910,7 @@ _02038590: ldr r2, [r4, #0xc] mov r1, #0x75 add r2, #0x1c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted pop {r3-r5, pc} _020385A8: ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index a756552a..92eed507 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1107,7 +1107,7 @@ FUN_02038E48: ; 0x02038E48 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x78] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x7c] bl FreeToHeap add r0, r4, #0x0 @@ -1641,7 +1641,7 @@ FUN_020392B4: ; 0x020392B4 mov r1, #0x1a add r2, r4, #0x0 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x78] pop {r3-r5, pc} .balign 4 @@ -1662,7 +1662,7 @@ FUN_020392D8: ; 0x020392D8 mov r0, #0x1 mov r1, #0x1a mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x78] pop {r3-r5, pc} diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 073183fe..8944e0b3 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -196,7 +196,7 @@ FUN_02047814: ; 0x02047814 mov r0, #0x1 mov r1, #0x1a add r3, r6, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] mov r0, #0x8 add r1, r6, #0x0 @@ -220,7 +220,7 @@ FUN_02047814: ; 0x02047814 add r0, r7, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x10] bl FUN_020239CC add r2, r0, #0x0 @@ -250,7 +250,7 @@ FUN_02047814: ; 0x02047814 add r3, r6, #0x0 bl FUN_0206ED38 add r0, r6, #0x0 - bl FUN_020669C0 + bl AllocMonZeroed add r6, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_020462AC @@ -646,7 +646,7 @@ FUN_02047BC0: ; 0x02047BC0 mov r2, #0x0 bl FUN_02047A44 mov r0, #0xb - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0x0 ldr r0, [sp, #0x14] bl FUN_0206B9AC @@ -682,9 +682,9 @@ _02047C40: add r0, r5, #0x0 mov r1, #0x8 add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats _02047C82: add r0, r6, #0x0 add r1, r5, #0x0 @@ -844,7 +844,7 @@ _02047DC2: b _02047E14 _02047DD8: mov r0, #0xb - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x8] ldr r0, [r5, #0x4] add r1, r4, #0x0 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index d7391e7d..bc9fa3d7 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -85,7 +85,7 @@ _0204817A: mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #0xb bl FUN_0200AA80 @@ -225,7 +225,7 @@ _020482B2: ldr r0, [r4, #0x20] bl FUN_0200AB18 ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x8] mov r1, #0x3 bl FUN_020178A0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index dd7ef2a4..a9bc2e07 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -461,7 +461,7 @@ FUN_02048864: ; 0x02048864 mov r1, #0x1a mov r2, #0xc7 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r6, #0x2 bne _020488AC @@ -489,7 +489,7 @@ _020488AC: str r0, [r4, #0x2c] _020488B4: add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5, #0xc] bl LoadPlayerDataAddress add r2, r0, #0x0 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index a872c481..e902058a 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -1986,13 +1986,13 @@ _02049884: mov r1, #0x1a mov r2, #0xcf mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r1, #0x7c bl FUN_0200A914 str r0, [r4, #0x34] add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r1, r4, #0x0 ldr r0, [r5, #0x8] add r1, #0x24 diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index f9bf1b3c..83324f37 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -43,7 +43,7 @@ FUN_0204A048: ; 0x0204A048 bl FUN_0206BB1C str r0, [sp, #0x18] add r0, r5, #0x0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 bl ZeroMonData mov r0, #0x0 @@ -70,7 +70,7 @@ FUN_0204A048: ; 0x0204A048 add r2, sp, #0x1c str r0, [sp, #0x1c] add r0, r4, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x18] add r1, r4, #0x0 bl FUN_0206B900 @@ -100,7 +100,7 @@ FUN_0204A0C8: ; 0x0204A0C8 bl FUN_0206BB1C add r6, r0, #0x0 mov r0, #0x20 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 bl ZeroMonData ldr r0, [sp, #0x20] @@ -320,7 +320,7 @@ _0204A272: add r0, r4, #0x0 mov r1, #0x19 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0204A292: add r5, r5, #0x1 cmp r5, r6 @@ -370,7 +370,7 @@ _0204A2EA: add r0, r5, #0x0 mov r1, #0xa2 add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0xc] cmp r0, #0x1 bne _0204A306 @@ -378,7 +378,7 @@ _0204A2EA: add r0, r5, #0x0 mov r1, #0x7 add r6, r6, #0x1 - bl FUN_020688E8 + bl MonApplyFriendshipModEncrypted _0204A306: add r7, r7, #0x1 _0204A308: @@ -426,7 +426,7 @@ FUN_0204A32C: ; 0x0204A32C add r0, r4, #0x0 mov r1, #0x9f add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x4 mov r0, #0x1 pop {r3-r4, pc} diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index 5889e176..2d779ce3 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -180,7 +180,7 @@ FUN_0204BB20: ; 0x0204BB20 bl FUN_02022528 str r0, [sp, #0x4] mov r0, #0x4 - bl FUN_020669C0 + bl AllocMonZeroed ldr r5, [sp, #0x0] add r4, r0, #0x0 mov r6, #0x0 @@ -473,7 +473,7 @@ FUN_0204BD40: ; 0x0204BD40 add r5, r0, #0x0 mov r0, #0x20 add r6, r1, #0x0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02022528 diff --git a/arm9/asm/unk_0204BE14.s b/arm9/asm/unk_0204BE14.s index 794977f1..afb3bc59 100644 --- a/arm9/asm/unk_0204BE14.s +++ b/arm9/asm/unk_0204BE14.s @@ -497,7 +497,7 @@ _0204C138: add r0, r6, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r5, r4 add r1, #0xb6 strh r0, [r1, #0x0] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 037d98fd..cfaf8e37 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1313,7 +1313,7 @@ _0205188E: mov r1, #0x1a mov r2, #0x9 mov r3, #0xb - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x2c] mov r0, #0xc8 mov r1, #0xb @@ -1434,7 +1434,7 @@ _020519B0: bl FreeToHeap _020519BA: ldr r0, [r4, #0x2c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x28] bl FUN_0200AB18 ldr r0, [r4, #0xc] @@ -1680,7 +1680,7 @@ FUN_02051B68: ; 0x02051B68 mov r0, #0x1 mov r1, #0x1a mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x18] bl FUN_020690C4 str r0, [sp, #0x1c] @@ -1756,7 +1756,7 @@ _02051BD6: mov r3, #0x10 bl FUN_0201BD84 ldr r0, [sp, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData _02051C34: mov r0, #0x10 str r0, [sp, #0x0] @@ -2130,7 +2130,7 @@ _02051EF2: mov r1, #0x1a mov r2, #0x9 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #0xc8 mov r1, #0x4 @@ -2192,7 +2192,7 @@ _02051F7C: tst r0, r1 beq _0205203A ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0x18] bl FUN_0200AB18 ldr r0, [r4, #0x0] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 1cd297c6..1fed433c 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -1795,7 +1795,7 @@ FUN_02052D08: ; 0x02052D08 mov r1, #0x1a lsl r2, r2, #0x6 mov r3, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 cmp r4, #0x0 bne _02052D30 @@ -1891,7 +1891,7 @@ _02052DBA: add r0, r6, #0x0 bl FreeToHeap add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _02052DE0: add sp, #0xc pop {r4-r7, pc} diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index b644f6b3..53b84d9a 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -215,7 +215,7 @@ _020604D0: bl FUN_020238F4 str r0, [sp, #0x18] mov r0, #0x4 - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x1c] bl ZeroMonData ldr r0, [sp, #0x18] diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s index 6a271d62..013e445c 100644 --- a/arm9/asm/unk_020606B0.s +++ b/arm9/asm/unk_020606B0.s @@ -140,10 +140,10 @@ FUN_02060790: ; 0x02060790 str r5, [r4, #0x0] ldr r0, [sp, #0x0] str r6, [r4, #0x8] - bl FUN_020669C0 + bl AllocMonZeroed str r0, [r4, #0x24] ldr r0, [sp, #0x0] - bl FUN_020669C0 + bl AllocMonZeroed str r0, [r4, #0x28] ldr r1, _020607D0 ; =FUN_020606D0 add r0, r7, #0x0 diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index f655ecb9..2910f716 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -372,7 +372,7 @@ FUN_02060E70: ; 0x02060E70 mov r1, #0x4 add r2, sp, #0x8 add r6, r3, #0x0 - bl FUN_0200A99C + bl GetSpeciesName add r0, sp, #0x20 ldrb r0, [r0, #0x10] add r1, r4, #0x0 @@ -396,7 +396,7 @@ FUN_02060EA0: ; 0x02060EA0 add r0, r2, #0x0 mov r1, #0x4 add r2, sp, #0x8 - bl FUN_0200A99C + bl GetSpeciesName mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x1 @@ -479,7 +479,7 @@ FUN_02060F3C: ; 0x02060F3C mov r0, #0x0 strb r0, [r4, #0x1f] add r0, r5, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted strb r0, [r4, #0x1e] add r0, r4, #0x6 str r0, [sp, #0x0] diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index a87efb7f..ecc0c89a 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -921,7 +921,7 @@ FUN_02062C80: ; 0x02062C80 ldr r3, [r5, #0x0] mov r0, #0x0 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r5, #0x2c] ldr r2, [r5, #0x0] mov r0, #0x2 @@ -1054,7 +1054,7 @@ _02062D84: ldr r0, [r6, #0x30] bl FUN_0200AB18 ldr r0, [r6, #0x2c] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} thumb_func_start FUN_02062DB0 diff --git a/arm9/asm/unk_02064E4C.s b/arm9/asm/unk_02064E4C.s index 74f6af8a..07144d43 100644 --- a/arm9/asm/unk_02064E4C.s +++ b/arm9/asm/unk_02064E4C.s @@ -23,7 +23,7 @@ FUN_02064E60: ; 0x02064E60 ldr r2, _02064E8C ; =0x0000017E mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02034824 @@ -32,7 +32,7 @@ FUN_02064E60: ; 0x02064E60 add r2, r6, #0x0 bl FUN_02064E4C add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _02064E8C: .word 0x0000017E diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index e454991f..2aea9e30 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1855,7 +1855,7 @@ FUN_02066270: ; 0x02066270 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x43 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -1936,7 +1936,7 @@ _020662F0: mov r0, #0x43 lsl r0, r0, #0x2 ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s index 456b97f6..776bd5c3 100644 --- a/arm9/asm/unk_0206ABC4.s +++ b/arm9/asm/unk_0206ABC4.s @@ -26,7 +26,7 @@ FUN_0206ABC4: ; 0x0206ABC4 ldr r3, [sp, #0x4] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x10] add r0, r4, #0x0 bl FUN_02024EC0 @@ -94,7 +94,7 @@ _0206AC48: ldr r0, [sp, #0x0] str r1, [r0, #0x0] ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0x48 pop {r3-r7, pc} nop @@ -340,7 +340,7 @@ FUN_0206AE0C: ; 0x0206AE0C bl AllocFromHeap str r0, [sp, #0x4c] add r0, r5, #0x0 - bl FUN_020669C0 + bl AllocMonZeroed str r0, [sp, #0x40] add r0, r4, r6 ldr r0, [r0, #0x18] @@ -622,7 +622,7 @@ _0206B030: ldr r0, [sp, #0x40] mov r1, #0x6 add r2, r7, #0x6 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x34] ldr r1, [sp, #0x40] ldr r0, [r0, #0x4] @@ -709,7 +709,7 @@ _0206B0DA: ldr r0, [sp, #0x40] mov r1, #0x6 add r2, r2, #0x6 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r7, [sp, #0x3c] mov r6, #0x0 _0206B120: diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s index 2dd1244b..b6ec1416 100644 --- a/arm9/asm/unk_0206B16C.s +++ b/arm9/asm/unk_0206B16C.s @@ -28,7 +28,7 @@ _0206B188: add r5, r6, #0x0 _0206B18C: add r0, r5, #0x0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r4, r4, #0x1 add r5, #0x88 cmp r4, #0x1e @@ -62,7 +62,7 @@ _0206B1BC: mov r0, #0x1 mov r1, #0x1a mov r2, #0xe - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 beq _0206B1F8 ldr r1, _0206B208 ; =0x00011EE4 @@ -73,13 +73,13 @@ _0206B1E0: add r0, r6, #0x0 add r1, r5, #0x6 add r2, r4, #0x0 - bl FUN_0200A968 + bl DecryptCopyString add r5, r5, #0x1 add r4, #0x28 cmp r5, #0x12 blo _0206B1E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData _0206B1F8: ldr r0, [sp, #0x0] mov r1, #0x0 @@ -149,7 +149,7 @@ _0206B270: add r0, r5, #0x0 add r1, r6, #0x0 add r2, r7, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _0206B2A0 mov r0, #0x88 @@ -241,7 +241,7 @@ _0206B308: mov r0, #0x88 mul r0, r2 add r0, r1, r0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt bl FUN_02022830 pop {r3, pc} _0206B32A: @@ -274,7 +274,7 @@ _0206B350: add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _0206B364 add sp, #0x8 @@ -327,7 +327,7 @@ _0206B3A2: add r0, r1, r0 mov r1, #0xab mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _0206B3C6 ldr r0, [sp, #0x0] @@ -371,7 +371,7 @@ _0206B3F6: add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0206B406 add r6, r6, #0x1 @@ -521,7 +521,7 @@ _0206B504: add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0206B514 add r4, r4, #0x1 @@ -560,13 +560,13 @@ _0206B548: add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0206B566 add r0, r5, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _0206B566 add r4, r4, #0x1 @@ -635,7 +635,7 @@ _0206B5C4: add r0, r1, r0 ldr r2, [sp, #0x18] add r1, r7, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted bl FUN_02022830 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0206B688.s b/arm9/asm/unk_0206B688.s index 77aac714..2e4a392b 100644 --- a/arm9/asm/unk_0206B688.s +++ b/arm9/asm/unk_0206B688.s @@ -46,17 +46,17 @@ UNK_020F8074: ; 0x020F8074 FUN_0206B688: ; 0x0206B688 push {r3-r7, lr} add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r6, r0, #0x0 add r0, r5, #0x0 bl FUN_0206B754 @@ -67,7 +67,7 @@ FUN_0206B688: ; 0x0206B688 add r4, r0, #0x0 add r0, r5, #0x0 add r1, r7, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon add r0, r4, #0x0 pop {r3-r7, pc} @@ -158,7 +158,7 @@ FUN_0206B754: ; 0x0206B754 mov r1, #0xad mov r2, #0x0 add r4, r0, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r2, _0206B7B8 ; =0x0000019D cmp r0, r2 bhi _0206B784 @@ -201,7 +201,7 @@ _0206B7A4: add r0, r4, #0x0 mov r1, #0x70 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r4, pc} @@ -289,7 +289,7 @@ _0206B838: .word UNK_020F8074 FUN_0206B83C: ; 0x0206B83C push {r3-r7, lr} add r5, r0, #0x0 - bl FUN_02066A6C + bl TryDecryptBoxMon add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0206B754 @@ -297,16 +297,16 @@ FUN_0206B83C: ; 0x0206B83C add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_02066A94 + bl TryEncryptBoxMon ldr r2, [sp, #0x0] add r0, r7, #0x0 add r1, r6, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 31ad48cb..9265cbd9 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -174,7 +174,7 @@ FUN_0206C700: ; 0x0206C700 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r5, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x8] add r0, r5, #0x0 bl FUN_0200AA80 @@ -321,7 +321,7 @@ FUN_0206C92C: ; 0x0206C92C ldr r0, [r4, #0x0] bl FUN_0206DC48 ldr r0, [r4, #0x8] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] @@ -1040,11 +1040,11 @@ _0206CF7E: ldr r0, [r4, #0x28] mov r1, #0x5 add r2, #0x62 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r4, #0x28] bl FUN_0206A1C4 ldr r0, [r4, #0x28] - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats ldr r0, [r4, #0x28] bl FUN_020690E4 add r2, r0, #0x0 @@ -1117,7 +1117,7 @@ _0206CFFA: ldr r0, [r4, #0x28] mov r1, #0xb2 mov r2, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0206D05E: add r0, r4, #0x0 add r0, #0x64 @@ -1736,7 +1736,7 @@ _0206D560: ldr r0, [r4, #0x28] add r2, #0x66 add r1, #0x3e - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r1, r4, #0x0 add r2, r4, #0x0 add r1, #0x6c @@ -2092,7 +2092,7 @@ _0206D86C: b _0206D9AE _0206D86E: ldr r0, [r4, #0x5c] - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0x0 ldr r0, [r4, #0x28] add r1, r5, #0x0 @@ -2103,30 +2103,30 @@ _0206D86E: add r0, r5, #0x0 mov r1, #0x5 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x4 str r0, [sp, #0x0] add r0, r5, #0x0 mov r1, #0x9a add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 str r0, [sp, #0x0] add r0, r5, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 mov r1, #0xb add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r1, #0x19 str r1, [sp, #0x4] add r6, sp, #0x0 _0206D8BA: add r0, r5, #0x0 add r2, r6, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x4] add r1, r0, #0x1 str r1, [sp, #0x4] @@ -2138,7 +2138,7 @@ _0206D8BA: _0206D8D2: add r0, r5, #0x0 add r2, r6, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x4] add r1, r0, #0x1 str r1, [sp, #0x4] @@ -2150,7 +2150,7 @@ _0206D8D2: _0206D8EA: add r0, r5, #0x0 add r2, r6, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [sp, #0x4] add r1, r0, #0x1 str r1, [sp, #0x4] @@ -2159,28 +2159,28 @@ _0206D8EA: add r0, r5, #0x0 mov r1, #0xb2 mov r2, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 mov r1, #0x4d add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, [r4, #0x5c] bl FUN_020256BC add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0xa9 add r2, r6, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 bl FreeToHeap add r0, r5, #0x0 mov r1, #0xa1 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add r1, sp, #0x8 mov r2, #0x18 @@ -2188,11 +2188,11 @@ _0206D8EA: add r0, r5, #0x0 mov r1, #0xaa add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FUN_0206A1C4 add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats ldr r0, [r4, #0x24] add r1, r5, #0x0 bl FUN_0206B900 @@ -2225,7 +2225,7 @@ _0206D9A0: ldr r0, [r4, #0x28] mov r1, #0x6 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0206D9AE: add sp, #0x20 pop {r4-r6, pc} @@ -2572,7 +2572,7 @@ FUN_0206DC80: ; 0x0206DC80 bl FUN_020073A0 str r0, [r4, #0x1c] ldr r0, [r4, #0x5c] - bl FUN_020669C0 + bl AllocMonZeroed add r5, r0, #0x0 ldr r0, [r4, #0x28] add r1, r5, #0x0 @@ -2581,9 +2581,9 @@ FUN_0206DC80: ; 0x0206DC80 add r0, r5, #0x0 mov r1, #0x5 add r2, #0x62 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats add r0, sp, #0x10 add r1, r5, #0x0 mov r2, #0x2 diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index fc0ebdad..fb9f1e67 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -185,7 +185,7 @@ FUN_0206E3F8: ; 0x0206E3F8 mov r0, #0x0 mov r1, #0x1a mov r2, #0x7 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r0, r4, #0x0 bl FUN_0200AA80 @@ -287,7 +287,7 @@ _0206E4C0: _0206E4EA: bl FUN_0200AB18 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add sp, #0xc mov r0, #0x0 pop {r4-r7, pc} @@ -301,7 +301,7 @@ _0206E4FA: add r0, r4, #0x0 bl FUN_0200AB18 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x1 add sp, #0xc pop {r4-r7, pc} @@ -322,33 +322,33 @@ _0206E52E: mov r1, #0x1a mov r2, #0x7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r1, #0x38 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0206E54C: mov r0, #0x1 mov r1, #0x1a mov r2, #0x7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0x0 mov r1, #0x6f add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} _0206E56A: mov r0, #0x1 mov r1, #0x1a mov r2, #0xc7 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 add r0, r4, #0x0 bl FUN_0200AA80 @@ -370,6 +370,6 @@ _0206E56A: add r0, r4, #0x0 bl FUN_0200AB18 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s index 51c6ace1..e527bfb2 100644 --- a/arm9/asm/unk_0206E5B4.s +++ b/arm9/asm/unk_0206E5B4.s @@ -538,13 +538,13 @@ FUN_0206E768: ; 0x0206E768 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r4, #0x0 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 @@ -557,13 +557,13 @@ FUN_0206E790: ; 0x0206E790 ldr r2, _0206E7B4 ; =0x00000157 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 add r1, r4, #0x0 add r2, r5, #0x0 bl FUN_0200A8E0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4-r6, pc} .balign 4 _0206E7B4: .word 0x00000157 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 7f255340..2a03ef5f 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1002,7 +1002,7 @@ _0206FAFC: blo _0206FAFC ldr r0, _0206FB4C ; =0x0000069C ldr r0, [r6, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0206FB50 ; =0x00000698 ldr r0, [r6, r0] bl FUN_0200B990 @@ -1431,7 +1431,7 @@ _0206FEC2: mov r0, #0x0 mov r1, #0x1a mov r3, #0xc - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0206FF60 ; =0x0000069C mov r2, #0x0 str r0, [r6, r1] @@ -1775,7 +1775,7 @@ _0207018E: ldr r0, _020701FC ; =0x0000070E add r6, r5, r0 add r0, r7, #0x0 - bl FUN_020689E0 + bl GetMonGenderEncrypted lsl r0, r0, #0x1e ldrh r2, [r6, r4] ldr r1, _02070204 ; =0xFFFF9FFF @@ -5249,7 +5249,7 @@ _02071D14: add r2, sp, #0x0 str r1, [sp, #0x0] mov r1, #0xa2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1 pop {r3-r7, pc} _02071D30: @@ -5670,7 +5670,7 @@ FUN_02072080: ; 0x02072080 add r0, r5, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FUN_02069EC4 ldr r1, _020720D8 ; =0x00000B25 @@ -5713,7 +5713,7 @@ FUN_020720E0: ; 0x020720E0 add r0, r5, #0x0 mov r1, #0x6 add r2, sp, #0x1c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FUN_02069EC4 ldr r1, _02072138 ; =0x00000B25 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index ef8b86b1..9afd1e10 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -244,7 +244,7 @@ _02073F66: add r6, r0, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 bl FUN_02069EC4 ldr r2, _02074058 ; =0x0000069C @@ -631,7 +631,7 @@ FUN_020742A8: ; 0x020742A8 add r5, r0, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FUN_02069EC4 ldr r1, _02074330 ; =0x00000B25 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index a69191eb..7186cf11 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -3080,14 +3080,14 @@ FUN_02076F2C: ; 0x02076F2C str r0, [sp, #0x0] add r0, r4, #0x0 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 add r1, r6, #0x0 str r0, [sp, #0x0] add r0, r4, #0x0 add r1, #0x3e add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, _02076FAC ; =0x000005A4 mov r1, #0x0 ldr r0, [r5, r0] @@ -3098,7 +3098,7 @@ FUN_02076F2C: ; 0x02076F2C add r0, r4, #0x0 add r1, r6, #0x0 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r0, _02076FAC ; =0x000005A4 ldr r1, [r5, r0] ldrh r0, [r1, #0x24] @@ -3121,7 +3121,7 @@ _02076F98: add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x4 - bl FUN_020688E8 + bl MonApplyFriendshipModEncrypted _02076FA8: add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 9cb86502..11b2ded1 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -430,7 +430,7 @@ _020772FE: mov r1, #0x1a add r2, #0xb mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x5b lsl r2, r2, #0x2 str r0, [r4, r2] @@ -438,7 +438,7 @@ _020772FE: mov r1, #0x1a add r2, #0xc mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x17 lsl r2, r2, #0x4 str r0, [r4, r2] @@ -446,7 +446,7 @@ _020772FE: mov r1, #0x1a sub r2, #0x2c mov r3, #0x12 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r1, #0x5d lsl r1, r1, #0x2 str r0, [r4, r1] @@ -1071,7 +1071,7 @@ FUN_02077894: ; 0x02077894 cmp r0, #0x1 bne _020778DE mov r0, #0x12 - bl FUN_020669C0 + bl AllocMonZeroed mov r3, #0xa str r3, [sp, #0x0] str r3, [sp, #0x4] @@ -1228,15 +1228,15 @@ _02077A0C: mov r0, #0x5d lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x17 lsl r0, r0, #0x4 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x5a lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1642,7 +1642,7 @@ _02077D88: cmp r0, #0x1 bne _02077DCE mov r0, #0x12 - bl FUN_020669C0 + bl AllocMonZeroed mov r3, #0xa str r3, [sp, #0x0] str r3, [sp, #0x4] @@ -1822,7 +1822,7 @@ _02077F04: beq _02077F50 _02077F1A: mov r0, #0x12 - bl FUN_020669C0 + bl AllocMonZeroed mov r3, #0x0 str r3, [sp, #0x0] str r3, [sp, #0x4] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 3175f5f9..11d65c38 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -649,7 +649,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A250 ; =0x00000674 mov r2, #0x79 str r0, [r4, r1] @@ -657,7 +657,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A254 ; =0x00000678 mov r2, #0x0 str r0, [r4, r1] @@ -701,7 +701,7 @@ FUN_0207A1A0: ; 0x0207A1A0 mov r1, #0x1a lsl r2, r2, #0x2 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207A25C ; =0x00000688 str r0, [r4, r1] mov r0, #0x8 @@ -732,13 +732,13 @@ FUN_0207A264: ; 0x0207A264 add r4, r0, #0x0 ldr r0, _0207A2C4 ; =0x00000688 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0207A2C8 ; =0x00000678 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0207A2CC ; =0x00000674 ldr r0, [r4, r0] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x67 lsl r0, r0, #0x4 ldr r0, [r4, r0] @@ -1532,7 +1532,7 @@ _0207A896: bl FUN_0207B628 add r6, r0, #0x0 mov r0, #0x13 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -1821,7 +1821,7 @@ FUN_0207AAE0: ; 0x0207AAE0 mov r0, #0x13 add r6, r1, #0x0 add r7, r2, #0x0 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -1843,7 +1843,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r7, r0, #0x0 add r0, r6, #0x0 add r5, r2, #0x0 - bl FUN_020669D4 + bl TryDecryptMon str r0, [sp, #0x4] add r0, r6, #0x0 mov r1, #0x5 @@ -1961,7 +1961,7 @@ _0207AC16: strb r0, [r5, #0x12] _0207AC1E: add r0, r6, #0x0 - bl FUN_020689E0 + bl GetMonGenderEncrypted ldrb r1, [r5, #0x13] mov r2, #0x3 bic r1, r2 @@ -2071,7 +2071,7 @@ _0207ACB2: add r1, #0x32 strb r0, [r1, #0x0] add r0, r6, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted add r1, r5, #0x0 add r1, #0x33 strb r0, [r1, #0x0] @@ -2308,7 +2308,7 @@ _0207AF04: blo _0207AECC ldr r1, [sp, #0x4] add r0, r6, #0x0 - bl FUN_02066A20 + bl TryEncryptMon add sp, #0x8 pop {r3-r7, pc} nop @@ -3227,13 +3227,13 @@ _0207B5EC: add r0, r6, r7 mov r1, #0x5 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0207B5D0 add r0, r6, r7 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _0207B622 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 839b275b..26580e37 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1536,7 +1536,7 @@ FUN_0207E190: ; 0x0207E190 cmp r1, #0x2 bne _0207E1E8 mov r0, #0x13 - bl FUN_020669C0 + bl AllocMonZeroed add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -1782,7 +1782,7 @@ FUN_0207E200: ; 0x0207E200 mov r0, #0x1 mov r1, #0x1a mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _0207E490 ; =0x00000282 mov r2, #0x1a lsl r2, r2, #0x6 @@ -1791,7 +1791,7 @@ FUN_0207E200: ; 0x0207E200 add r5, r0, #0x0 bl FUN_0200A8E0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r1, #0x91 lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -2733,7 +2733,7 @@ _0207EC1C: mov r0, #0x1 mov r1, #0x1a mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x1a lsl r2, r2, #0x6 ldr r2, [r5, r2] @@ -2749,7 +2749,7 @@ _0207EC1C: mov r3, #0x0 bl FUN_0207D998 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -2987,7 +2987,7 @@ FUN_0207EE2C: ; 0x0207EE2C mov r1, #0x1a mov r2, #0xc5 mov r3, #0x13 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r2, #0x1a lsl r2, r2, #0x6 ldr r2, [r5, r2] @@ -3011,7 +3011,7 @@ FUN_0207EE2C: ; 0x0207EE2C add r3, r1, #0x0 bl FUN_0201BDE0 add r0, r6, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0x75 lsl r0, r0, #0x2 add r0, r5, r0 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 1baeda16..903c4d94 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -32,7 +32,7 @@ FUN_0207FD00: ; 0x0207FD00 mov r1, #0x1a lsl r2, r2, #0x2 add r3, r7, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x4] ldr r2, [r4, #0x0] mov r0, #0x9 @@ -461,7 +461,7 @@ _020800CA: ldr r0, [r4, #0x8] bl FUN_0200AB18 ldr r0, [r4, #0x4] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FreeToHeap pop {r4, pc} @@ -472,7 +472,7 @@ FUN_020800E0: ; 0x020800E0 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02068854 + bl GetMonNatureEncrypted add r4, r0, #0x0 cmp r4, #0x18 bgt _02080106 @@ -1484,7 +1484,7 @@ _020808E4: add r0, r4, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _0208090C add r0, r4, #0x0 @@ -1514,7 +1514,7 @@ _0208091E: _0208092A: mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _02080958 add r0, r4, #0x0 @@ -1575,7 +1575,7 @@ _020809B0: add r0, r4, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _020809E2 add r0, r4, #0x0 @@ -1601,7 +1601,7 @@ _020809F6: add r0, r4, #0x0 mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 bne _02080A1E add r0, r4, #0x0 @@ -1629,7 +1629,7 @@ _02080A30: _02080A38: mov r1, #0x4c mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0x0 beq _02080AE0 mov r0, #0x1 @@ -1657,39 +1657,39 @@ _02080A66: add r0, r4, #0x0 mov r1, #0x98 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x97 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x94 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x91 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x95 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x92 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x96 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x93 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _02080ACC: add r0, r4, #0x0 add r1, r5, #0x0 @@ -1723,15 +1723,15 @@ FUN_02080AE4: ; 0x02080AE4 add r0, r5, #0x0 mov r1, #0x7 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x9c add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x90 add r2, r4, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 bl FUN_02021A20 add sp, #0x8 @@ -1751,19 +1751,19 @@ FUN_02080B30: ; 0x02080B30 bne _02080B76 add r0, r5, #0x0 mov r1, #0x97 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x91 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x92 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x93 add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x10 pop {r3-r5} pop {r3} @@ -1772,19 +1772,19 @@ FUN_02080B30: ; 0x02080B30 _02080B76: add r0, r5, #0x0 mov r1, #0x98 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x94 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x95 add r2, sp, #0x4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r5, #0x0 mov r1, #0x96 add r2, sp, #0x8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x10 pop {r3-r5} pop {r3} @@ -1803,36 +1803,36 @@ FUN_02080BA8: ; 0x02080BA8 add r2, sp, #0x0 bne _02080BE0 mov r1, #0x97 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x91 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x92 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x93 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x4 pop {r3-r4, pc} _02080BE0: mov r1, #0x98 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x94 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x95 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0x0 mov r1, #0x96 add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x4 pop {r3-r4, pc} @@ -1843,12 +1843,12 @@ FUN_02080C08: ; 0x02080C08 add r4, r0, #0x0 mov r1, #0xa0 mov r2, #0x0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x9b add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add sp, #0x4 pop {r3-r4, pc} .balign 4 @@ -1860,5 +1860,5 @@ FUN_02080C28: ; 0x02080C28 str r1, [sp, #0x0] mov r1, #0x6e add r2, sp, #0x0 - bl FUN_02067960 + bl SetBoxMonDataEncrypted pop {r3, pc} diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 1cce712f..f40af68a 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -907,7 +907,7 @@ _020812B6: add r5, r4, #0x0 _020812F2: mov r0, #0x14 - bl FUN_020669C0 + bl AllocMonZeroed add r7, r7, #0x1 stmia r5!, {r0} cmp r7, #0x4 @@ -3599,7 +3599,7 @@ _020826DE: add r1, r6, #0x0 ldr r0, [r4, r0] add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _020826EA: ldr r0, _02082848 ; =0x0000198C ldr r0, [r4, r0] @@ -3748,7 +3748,7 @@ _02082820: lsl r2, r2, #0x10 mov r1, #0x9 lsr r2, r2, #0x10 - bl FUN_020688E8 + bl MonApplyFriendshipModEncrypted _0208283A: add sp, #0xc pop {r4-r7, pc} diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 591b7226..fb6f03c8 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -789,7 +789,7 @@ _02082D9A: add r0, r6, #0x0 add r1, #0x36 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r4, r4, #0x1 add r5, r5, #0x2 cmp r4, #0x4 @@ -798,7 +798,7 @@ _02082D9A: mov r0, #0x1 mov r1, #0x1a mov r2, #0xc0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldrh r1, [r7, #0x16] add r4, r0, #0x0 bl FUN_0200A914 @@ -810,17 +810,17 @@ _02082D9A: add r0, r6, #0x0 mov r1, #0x76 add r2, r5, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r2, [sp, #0x14] add r0, r6, #0x0 mov r1, #0x90 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x14] bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r2, sp, #0x1c ldrb r1, [r7, #0x1a] add r0, sp, #0x18 @@ -838,30 +838,30 @@ _02082D9A: strb r1, [r0, #0x0] add r0, r6, #0x0 mov r1, #0x13 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 mov r1, #0x14 add r2, sp, #0x1c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0x0 mov r1, #0x15 add r2, #0x3 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0x0 mov r1, #0x16 add r2, #0x2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x18 add r0, r6, #0x0 mov r1, #0x17 add r2, #0x1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 mov r1, #0x18 add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x20 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index 7f5a041a..ec1b74b2 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -284,7 +284,7 @@ FUN_02083694: ; 0x02083694 push {r3-r5, lr} add r5, r2, #0x0 add r4, r3, #0x0 - bl FUN_020669BC + bl SizeOfStructPokemon add r2, r0, #0x0 ldrb r1, [r5, r2] add r0, r5, #0x0 @@ -304,7 +304,7 @@ FUN_020836BC: ; 0x020836BC push {r3-r7, lr} add r6, r1, #0x0 add r7, r2, #0x0 - bl FUN_020669BC + bl SizeOfStructPokemon add r4, r0, #0x0 mov r0, #0x14 add r1, r4, #0x1 @@ -337,7 +337,7 @@ FUN_020836FC: ; 0x020836FC sub sp, #0x8 str r2, [sp, #0x0] str r3, [sp, #0x4] - bl FUN_020669BC + bl SizeOfStructPokemon mov r7, #0x0 ldr r4, [sp, #0x4] add r6, r0, #0x0 @@ -370,7 +370,7 @@ FUN_0208373C: ; 0x0208373C sub sp, #0x8 add r4, r0, #0x0 add r5, r1, #0x0 - bl FUN_020669BC + bl SizeOfStructPokemon add r6, r0, #0x0 lsl r0, r6, #0x2 str r0, [sp, #0x0] diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s index 659f3a36..17aec9b7 100644 --- a/arm9/asm/unk_020842DC.s +++ b/arm9/asm/unk_020842DC.s @@ -717,7 +717,7 @@ _020848C0: add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x54 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r6, #0x1 _020848D4: add r0, r5, #0x0 @@ -797,13 +797,13 @@ _0208495C: cmp r0, #0x64 bge _020849B2 add r0, r5, #0x0 - bl FUN_020686F8 + bl CalcMonExpToNextLevelEncrypted add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x8 - bl FUN_02068018 + bl AddMonPartyStatEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats ldr r0, [sp, #0x50] cmp r0, #0x0 bne _020849B0 @@ -985,9 +985,9 @@ _02084A66: add r0, r5, #0x0 mov r1, #0xd add r2, sp, #0x50 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084B18: ldr r0, [sp, #0x6c] @@ -1030,9 +1030,9 @@ _02084B20: add r0, r5, #0x0 mov r1, #0xe add r2, sp, #0x54 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084B78: ldr r0, [sp, #0x6c] @@ -1075,9 +1075,9 @@ _02084B80: add r0, r5, #0x0 mov r1, #0xf add r2, sp, #0x58 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084BD8: ldr r0, [sp, #0x6c] @@ -1120,9 +1120,9 @@ _02084BE0: add r0, r5, #0x0 mov r1, #0x10 add r2, sp, #0x5c - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084C38: ldr r0, [sp, #0x6c] @@ -1165,9 +1165,9 @@ _02084C40: add r0, r5, #0x0 mov r1, #0x11 add r2, sp, #0x60 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084C98: ldr r0, [sp, #0x6c] @@ -1210,9 +1210,9 @@ _02084CA0: add r0, r5, #0x0 mov r1, #0x12 add r2, sp, #0x64 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 - bl FUN_02066ED8 + bl UpdateMonLevelAndRecalcStats mov r6, #0x1 _02084CF8: ldr r0, [sp, #0x6c] @@ -1429,7 +1429,7 @@ _02084EA8: ldr r1, [sp, #0x0] add r0, r6, #0x0 add r2, sp, #0x4 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add sp, #0x8 mov r0, #0x1 pop {r3-r7, pc} @@ -1511,12 +1511,12 @@ _02084F34: ldr r1, [sp, #0x0] add r0, r5, #0x0 add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r2, sp, #0x8 add r0, r5, #0x0 add r1, r4, #0x0 add r2, #0x1 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1 add sp, #0xc pop {r4-r7, pc} @@ -1556,7 +1556,7 @@ _02084F96: _02084F98: mov r1, #0xa2 add r2, sp, #0xc - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted pop {r3} pop {r3} add sp, #0x10 @@ -1775,7 +1775,7 @@ _0208512C: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x18 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1 pop {r4-r6} pop {r3} @@ -1811,13 +1811,13 @@ _02085154: add r0, r5, #0x0 mov r1, #0xa2 add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x0 str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r4, #0x0 _02085190: add r0, r5, #0x0 diff --git a/arm9/asm/unk_02085258.s b/arm9/asm/unk_02085258.s index 5af55be3..ba69aea4 100644 --- a/arm9/asm/unk_02085258.s +++ b/arm9/asm/unk_02085258.s @@ -113,13 +113,13 @@ FUN_020852E8: ; 0x020852E8 add r3, r1, #0x0 mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 @@ -134,13 +134,13 @@ FUN_02085310: ; 0x02085310 mov r0, #0x1 mov r1, #0x1a lsl r2, r2, #0x2 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r5, r0, #0x0 add r1, r4, #0x0 bl FUN_0200A914 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index 76d5564d..0921775e 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -180,7 +180,7 @@ _0208561E: ldr r2, [r5, #0x14] add r0, r4, #0x0 mov r1, #0xa9 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0x1 pop {r3-r5, pc} @@ -229,11 +229,11 @@ FUN_02085644: ; 0x02085644 add r0, r5, #0x0 mov r1, #0xa9 add r2, r4, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 bl FreeToHeap add r0, r6, #0x0 @@ -262,11 +262,11 @@ _020856BC: add r0, r4, #0x0 mov r1, #0xa9 add r2, r6, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r4, #0x0 mov r1, #0x6 add r2, sp, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r7, #0x0 mov r1, #0x0 add r2, r5, #0x0 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 1a2050fe..ed131b94 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -113,7 +113,7 @@ FUN_020859C0: ; 0x020859C0 bl FUN_0200628C str r0, [r4, #0x0] mov r0, #0x35 - bl FUN_020669C0 + bl AllocMonZeroed ldr r1, _02085BA4 ; =0x00000428 mov r2, #0xff str r0, [r4, r1] @@ -675,7 +675,7 @@ _02085EA6: mov r1, #0xa1 add r2, sp, #0x8 add r5, r0, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r1, [sp, #0x8] ldr r0, [r7, #0x20] sub r1, r1, #0x1 @@ -683,7 +683,7 @@ _02085EA6: add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0xaa - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted ldr r1, [sp, #0x8] ldr r0, [r7, #0x20] sub r1, r1, #0x1 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 51a7378c..8a6d5079 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -286,7 +286,7 @@ _020862D6: add r0, r5, #0x0 mov r1, #0x4c add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted mov r0, #0xb str r0, [sp, #0x0] ldr r3, [sp, #0x4] @@ -297,7 +297,7 @@ _020862D6: add r0, r5, #0x0 mov r1, #0xb2 mov r2, #0x0 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r6, #0x0 bl FUN_020377AC ldr r1, [r4, #0xc] @@ -359,7 +359,7 @@ _02086396: ldr r0, [r4, #0xc] ldr r2, [r2, #0x18] mov r1, #0x77 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _020863A8: ldr r0, [r4, #0x8] bl FUN_02077AC4 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 73ff0ee5..83a10e29 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -572,7 +572,7 @@ FUN_020867EC: ; 0x020867EC mov r0, #0x0 mov r1, #0x1a mov r3, #0x47 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r0, #0x47 bl FUN_0200AA80 @@ -605,7 +605,7 @@ FUN_020867EC: ; 0x020867EC bl FUN_0201BD84 add r6, r0, #0x0 add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x14] @@ -664,7 +664,7 @@ FUN_02086878: ; 0x02086878 mov r0, #0x0 mov r1, #0x1a mov r3, #0x47 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r4, #0x0 _020868DE: @@ -682,7 +682,7 @@ _020868DE: cmp r4, #0x2 blt _020868DE add r0, r7, #0x0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r5, #0x44] mov r1, #0x0 str r0, [sp, #0x18] @@ -1452,7 +1452,7 @@ FUN_02086EE8: ; 0x02086EE8 add r0, r4, #0x0 mov r1, #0x4c add r2, sp, #0x10 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, sp, #0x28 add r1, r4, #0x0 mov r2, #0x2 @@ -1491,7 +1491,7 @@ FUN_02086F4C: ; 0x02086F4C add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_02068854 + bl GetMonNatureEncrypted add r6, r0, #0x0 ldr r0, [r5, #0x68] mov r1, #0x1 diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index a5a9b7c9..c3c27acb 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -704,7 +704,7 @@ FUN_0208821C: ; 0x0208821C add r6, r1, #0x0 add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02068854 + bl GetMonNatureEncrypted lsl r1, r0, #0x1 ldr r0, _02088310 ; =UNK_020FD17C ldrb r0, [r0, r1] @@ -791,7 +791,7 @@ _020882D4: add r0, r6, #0x0 add r1, #0x13 add r2, r4, r2 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted add r0, r5, #0x1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -811,7 +811,7 @@ _020882D4: add r0, r6, #0x0 mov r1, #0x9 add r2, sp, #0x8 - bl SetBoxMonDataEncrypted + bl SetMonDataEncrypted _0208830C: add sp, #0x30 pop {r3-r7, pc} diff --git a/arm9/asm/unk_02088DD8.s b/arm9/asm/unk_02088DD8.s index 0bb527c8..9e8c27a7 100644 --- a/arm9/asm/unk_02088DD8.s +++ b/arm9/asm/unk_02088DD8.s @@ -78,7 +78,7 @@ _02088E34: ldr r0, [sp, #0xc] ldr r1, [sp, #0x8] add r2, r7, #0x0 - bl FUN_02069F9C + bl LoadWotbl_HandleAlternateForme mov r2, #0x0 mov r12, r2 _02088E70: diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 1b3721af..46c25eab 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -341,7 +341,7 @@ FUN_02089734: ; 0x02089734 mov r0, #0x1 mov r1, #0x1a mov r2, #0x4 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x18] bl FUN_0201BD5C mov r0, #0x0 @@ -373,7 +373,7 @@ FUN_0208977C: ; 0x0208977C add r0, #0x1c bl FUN_02019178 ldr r0, [r4, #0x18] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 94f81187..1b59c6dc 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -280,7 +280,7 @@ FUN_02089B80: ; 0x02089B80 ldr r3, [r4, #0x0] mov r0, #0x1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x1c] bl FUN_0201BD5C mov r0, #0x0 @@ -313,7 +313,7 @@ FUN_02089BCC: ; 0x02089BCC add r0, #0x20 bl FUN_02019178 ldr r0, [r4, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index 7e3d265f..e1f4f7cb 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -117,7 +117,7 @@ FUN_02089D90: ; 0x02089D90 mov r1, #0x1a mov r2, #0x5 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 8b5b9a23..0990f54b 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -121,7 +121,7 @@ FUN_02089F24: ; 0x02089F24 mov r1, #0x1a mov r2, #0x5 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 @@ -290,7 +290,7 @@ _0208A0C8: mov r1, #0x1a mov r2, #0x6 add r3, r4, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0x0 mov r0, #0x6 lsl r0, r0, #0x6 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 34ce5c45..548990da 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -33,7 +33,7 @@ FUN_0208A338: ; 0x0208A338 mov r0, #0x1 mov r1, #0x1a mov r3, #0x20 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x20 bl FUN_02013690 @@ -81,7 +81,7 @@ FUN_0208A3C8: ; 0x0208A3C8 ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0x0 bl FUN_0208A400 add r0, r4, #0x0 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index ba1509f7..f4bc14ea 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -172,7 +172,7 @@ _0208A9C6: mov r1, #0x1a mov r2, #0xc8 mov r3, #0x0 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #0x6 lsl r0, r0, #0x6 @@ -264,7 +264,7 @@ _0208AB9C: add r0, sp, #0x14 bl FUN_02019178 ldr r0, [sp, #0xc] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [sp, #0x10] bl FreeToHeap mov r0, #0x0 |