diff options
Diffstat (limited to 'arm9/modules/83/asm/module_83.s')
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index e63eedb4..0ce9b5c7 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -969,7 +969,7 @@ MOD83_0222DD24: ; 0x0222DD24 mov r0, #1 mov r1, #0x1a mov r3, #0x51 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x24] mov r0, #0x51 bl FUN_0200AA80 @@ -1139,7 +1139,7 @@ _0222DE76: ldr r0, [sp, #0x28] bl FUN_0200AB18 ldr r0, [sp, #0x24] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #1 add sp, #0x2c pop {r4, r5, r6, r7, pc} @@ -3343,7 +3343,7 @@ MOD83_0222F074: ; 0x0222F074 ldr r3, [r5] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc add r6, r0, #0 ldr r0, [r5] bl FUN_0200AA80 @@ -3444,7 +3444,7 @@ MOD83_0222F074: ; 0x0222F074 ldr r0, [sp] bl FUN_0200AB18 add r0, r6, #0 - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0222F1A8 ; =0x00003174 add r1, r4, #0 ldr r0, [r5, r0] @@ -5821,7 +5821,7 @@ _022303CC: mov r0, #0 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc mov r6, #0 str r0, [r4, #0x10] cmp r7, #0 @@ -5838,7 +5838,7 @@ _022303EA: blt _022303EA _022303FE: ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r3, _02230460 ; =0x0223AE00 add r2, sp, #8 ldmia r3!, {r0, r1} @@ -5982,7 +5982,7 @@ MOD83_0223050C: ; 0x0223050C mov r0, #1 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x56 bl FUN_0200AA80 @@ -6027,7 +6027,7 @@ _0223057A: mov r3, #2 bl FUN_0200D0BC ldr r0, [r4, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, [r4, #0xc] bl FUN_0200AB18 mov r0, #0xff @@ -6422,7 +6422,7 @@ MOD83_0223089C: ; 0x0223089C mov r0, #1 mov r1, #0x1a mov r3, #0x56 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x56 bl FUN_0200AA80 @@ -6443,7 +6443,7 @@ MOD83_0223089C: ; 0x0223089C ldr r0, [sp, #8] bl FUN_0200AB18 add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData b _02230918 _022308F8: ldr r0, [r4, #0x6c] @@ -8160,7 +8160,7 @@ _02231718: mov r0, #0 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _022317A0 ; =0x000029A4 mov r6, #0 str r0, [r5, r1] @@ -8181,7 +8181,7 @@ _0223173A: _02231752: ldr r0, _022317A0 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r4, _022317A4 ; =0x0223AE90 add r3, sp, #4 add r2, r3, #0 @@ -8227,7 +8227,7 @@ MOD83_022317A8: ; 0x022317A8 mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc add r4, r0, #0 mov r0, #0x57 bl FUN_0200AA80 @@ -8260,7 +8260,7 @@ MOD83_022317A8: ; 0x022317A8 add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_0200AB18 add sp, #0x10 @@ -9023,7 +9023,7 @@ MOD83_02231DF0: ; 0x02231DF0 mov r0, #1 mov r1, #0x1a ldr r4, _02231F6C ; =0x0223AEB0 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02231F70 ; =0x000029A4 str r0, [r5, r1] ldr r0, [r5] @@ -9182,7 +9182,7 @@ _02231F2E: blo _02231E72 ldr r0, _02231F70 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _02231F74 ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -9256,7 +9256,7 @@ _02231FD2: mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02232090 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 @@ -9298,7 +9298,7 @@ _02231FFE: bl FUN_02021A20 ldr r0, _02232090 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _02232094 ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -11082,7 +11082,7 @@ _02232E7E: mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc str r0, [sp, #0x1c] mov r5, #0 ldr r0, [sp, #0x10] @@ -11193,7 +11193,7 @@ _02232FAE: bl FUN_020191D0 _02232FB8: ldr r0, [sp, #0x1c] - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r4, #0 bl FUN_0200AB18 add r0, r6, #0 @@ -11220,7 +11220,7 @@ MOD83_02232FE4: ; 0x02232FE4 mov r0, #1 mov r1, #0x1a mov r3, #0x57 - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r1, _02233078 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 @@ -11264,7 +11264,7 @@ MOD83_02232FE4: ; 0x02232FE4 bl FUN_02021A20 ldr r0, _02233078 ; =0x000029A4 ldr r0, [r5, r0] - bl FUN_0200A8B8 + bl DestroyMsgData ldr r0, _0223307C ; =0x000029A0 ldr r0, [r5, r0] bl FUN_0200AB18 @@ -15517,7 +15517,7 @@ _02234F8C: mov r0, #1 mov r1, #0x1a mov r3, #0x4e - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r7, [r5, #0x40] str r0, [sp, #0x14] cmp r7, #0 @@ -15558,7 +15558,7 @@ _02234FB2: bl FUN_0200AB18 _02234FF8: ldr r0, [sp, #0x14] - bl FUN_0200A8B8 + bl DestroyMsgData mov r0, #0 mvn r0, r0 str r0, [r5, #0x34] @@ -17254,7 +17254,7 @@ _02235CCA: mov r0, #1 mov r1, #0x1a mov r3, #0x4e - bl FUN_0200A86C + bl NewMsgDataFromNarc add r7, r0, #0 add r0, r4, #0 mov r1, #0xb @@ -17278,7 +17278,7 @@ _02235CCA: str r6, [sp, #0x68] bl MOD83_02234F2C add r0, r7, #0 - bl FUN_0200A8B8 + bl DestroyMsgData add r0, r6, #0 bl FUN_02021A20 add r0, r4, #0 @@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC add r1, r0, #0 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl CalcMonLevel + bl CalcLevelBySpeciesAndExp pop {r3, r4, r5, pc} thumb_func_end MOD83_02237EDC @@ -21809,7 +21809,7 @@ MOD83_02237F04: ; 0x02237F04 add r0, r1, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, #0 @@ -21864,9 +21864,9 @@ MOD83_02237F6C: ; 0x02237F6C add r4, r1, #0 add r6, r0, #0 add r0, r4, #0 - bl FUN_020669A0 + bl WipeBoxMonDataAndEncrypt add r0, r4, #0 - bl FUN_02066A6C + bl TryDecryptBoxMon mov r1, #0 str r0, [sp] add r0, r6, #0 @@ -21876,7 +21876,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #0 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0xb mov r2, #0 @@ -21887,7 +21887,7 @@ MOD83_02237F6C: ; 0x02237F6C add r0, r4, #0 mov r1, #5 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0xc mov r2, #0 @@ -21903,7 +21903,7 @@ _02237FCE: add r0, r4, #0 mov r1, #6 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #1 mov r2, #0 @@ -21912,7 +21912,7 @@ _02237FCE: add r0, r4, #0 mov r1, #7 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x19 mov r2, #0 @@ -21921,13 +21921,13 @@ _02237FCE: add r0, r4, #0 mov r1, #8 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r0, #0x46 str r0, [sp, #8] add r0, r4, #0 mov r1, #9 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 add r1, r4, #0 bl MOD83_02237F04 @@ -21935,7 +21935,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xa add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #8 mov r2, #0 @@ -21944,7 +21944,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xb add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -21953,7 +21953,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xc add r2, sp, #4 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1a mov r2, #0 @@ -21962,7 +21962,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xd add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1b mov r2, #0 @@ -21971,7 +21971,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xe add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1c mov r2, #0 @@ -21980,7 +21980,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0xf add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1d mov r2, #0 @@ -21989,7 +21989,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x10 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1e mov r2, #0 @@ -21998,7 +21998,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x11 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x1f mov r2, #0 @@ -22007,7 +22007,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x12 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x16 mov r2, #0 @@ -22016,7 +22016,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x13 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x17 mov r2, #0 @@ -22025,7 +22025,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x14 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x18 mov r2, #0 @@ -22034,7 +22034,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x15 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x21 mov r2, #0 @@ -22043,7 +22043,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x16 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2f mov r2, #0 @@ -22052,7 +22052,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x17 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x30 mov r2, #0 @@ -22061,7 +22061,7 @@ _02237FCE: add r0, r4, #0 mov r1, #0x18 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted mov r5, #0 add r7, r5, #0 _0223815E: @@ -22075,7 +22075,7 @@ _0223815E: add r0, r4, #0 add r1, #0x36 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x15 mov r2, #0 @@ -22090,18 +22090,18 @@ _0223815E: add r0, r4, #0 add r1, #0x3e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r1, r5, #0 add r0, r4, #0 add r1, #0x42 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted add r1, r5, #0 str r0, [sp, #8] add r0, r4, #0 add r1, #0x3a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 add r7, r7, #2 cmp r5, #4 @@ -22114,7 +22114,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x46 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x28 mov r2, #0 @@ -22123,7 +22123,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x47 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x29 mov r2, #0 @@ -22132,7 +22132,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x48 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2a mov r2, #0 @@ -22141,7 +22141,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x49 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2b mov r2, #0 @@ -22150,7 +22150,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2c mov r2, #0 @@ -22159,7 +22159,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x2d mov r2, #0 @@ -22168,7 +22168,7 @@ _0223815E: add r0, r4, #0 mov r1, #0x4c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x32 mov r2, #0 @@ -22186,7 +22186,7 @@ _0223826C: add r0, r4, #0 add r1, #0x4e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _0223826C @@ -22208,7 +22208,7 @@ _02238298: add r0, r4, #0 add r1, #0x52 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _02238298 @@ -22230,7 +22230,7 @@ _022382C4: add r0, r4, #0 add r1, #0x56 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _022382C4 @@ -22252,7 +22252,7 @@ _022382F0: add r0, r4, #0 add r1, #0x5a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _022382F0 @@ -22274,7 +22274,7 @@ _0223831C: add r0, r4, #0 add r1, #0x5e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r5, r5, #1 cmp r5, r7 blt _0223831C @@ -22287,7 +22287,7 @@ _02238332: add r0, r4, #0 mov r1, #0x62 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x44 mov r2, #0 @@ -22296,7 +22296,7 @@ _02238332: add r0, r4, #0 mov r1, #0x63 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x45 mov r2, #0 @@ -22305,7 +22305,7 @@ _02238332: add r0, r4, #0 mov r1, #0x64 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x46 mov r2, #0 @@ -22314,7 +22314,7 @@ _02238332: add r0, r4, #0 mov r1, #0x65 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x47 mov r2, #0 @@ -22323,7 +22323,7 @@ _02238332: add r0, r4, #0 mov r1, #0x66 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x48 mov r2, #0 @@ -22332,7 +22332,7 @@ _02238332: add r0, r4, #0 mov r1, #0x67 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x49 mov r2, #0 @@ -22341,7 +22341,7 @@ _02238332: add r0, r4, #0 mov r1, #0x68 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4a mov r2, #0 @@ -22350,7 +22350,7 @@ _02238332: add r0, r4, #0 mov r1, #0x69 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4b mov r2, #0 @@ -22359,7 +22359,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4c mov r2, #0 @@ -22368,7 +22368,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4d mov r2, #0 @@ -22377,7 +22377,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x4e mov r2, #0 @@ -22386,7 +22386,7 @@ _02238332: add r0, r4, #0 mov r1, #0x6d add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x50 mov r2, #0 @@ -22395,18 +22395,18 @@ _02238332: add r0, r4, #0 mov r1, #0x6e add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 - bl FUN_020689E8 + bl GetBoxMonGenderEncrypted str r0, [sp, #8] add r0, r4, #0 mov r1, #0x6f add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted cmp r0, #0xc9 bne _022384AE mov r1, #0 @@ -22436,12 +22436,12 @@ _02238332: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _022384AE: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl FUN_020672BC + bl GetBoxMonDataEncrypted ldr r1, _022385F0 ; =0x00000182 cmp r0, r1 bne _022384FE @@ -22481,7 +22481,7 @@ _022384F4: add r0, r4, #0 mov r1, #0x70 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _022384FE: add r0, r6, #0 mov r1, #2 @@ -22495,7 +22495,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x75 add r2, sp, #0xc - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #3 mov r2, #0 @@ -22509,7 +22509,7 @@ _022384FE: add r0, r4, #0 mov r1, #0x4d add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted _0223853E: add r0, r6, #0 mov r1, #0x25 @@ -22519,7 +22519,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x79 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #7 add r2, sp, #0x24 @@ -22532,7 +22532,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x8f add r2, sp, #0xc - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x23 mov r2, #0 @@ -22541,7 +22541,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x98 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x22 mov r2, #0 @@ -22550,7 +22550,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x99 add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x26 mov r2, #0 @@ -22559,7 +22559,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9a add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x24 mov r2, #0 @@ -22568,7 +22568,7 @@ _0223853E: add r0, r4, #0 mov r1, #0x9b add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted add r0, r6, #0 mov r1, #0x31 mov r2, #0 @@ -22577,10 +22577,10 @@ _0223853E: add r0, r4, #0 mov r1, #0x9c add r2, sp, #8 - bl FUN_02067960 + bl SetBoxMonDataEncrypted ldr r1, [sp] add r0, r4, #0 - bl FUN_02066A94 + bl TryEncryptBoxMon add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -23082,7 +23082,7 @@ _02238976: ldr r3, [r4, #4] mov r0, #1 mov r1, #0x1a - bl FUN_0200A86C + bl NewMsgDataFromNarc ldr r6, [r5, #0x14] str r0, [sp, #0x10] cmp r6, #0 @@ -23155,7 +23155,7 @@ _02238A12: bl FUN_0200AB18 _02238A24: ldr r0, [sp, #0x10] - bl FUN_0200A8B8 + bl DestroyMsgData _02238A2A: mov r0, #0xff str r0, [r5, #0x50] @@ -23885,7 +23885,7 @@ MOD83_02238F94: ; 0x02238F94 add r7, r2, #0 add r6, r3, #0 ldr r4, [sp, #0x40] - bl FUN_020689E0 + bl GetMonGenderEncrypted str r0, [sp, #0x24] ldr r0, [sp, #0x20] bl FUN_02068A80 |