diff options
Diffstat (limited to 'arm9/modules')
24 files changed, 822 insertions, 822 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 9a62ca73..442a394e 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -27440,12 +27440,12 @@ _021E4980: add r0, r7, #0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 ldr r0, [sp] mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x55 lsl r1, r1, #2 ldr r1, [r5, r1] @@ -43049,7 +43049,7 @@ _021EC46E: bl FUN_02023C7C add r1, r7, #0 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021EC48C add r0, r4, #1 @@ -43081,7 +43081,7 @@ _021EC4AA: bl FUN_02023C7C add r1, r6, #0 add r2, r7, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _021EC4C6 add r0, r4, #0 @@ -43103,7 +43103,7 @@ MOD05_021EC4DC: ; 0x021EC4DC push {r3, lr} mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FUN_0206EA98 @@ -43131,7 +43131,7 @@ MOD05_021EC4F0: ; 0x021EC4F0 add r0, r4, #0 mov r1, #0x74 add r2, sp, #0xc - bl GetMonDataEncrypted + bl GetMonData add r0, r4, #0 bl FUN_020690E4 bl MOD05_021EC4DC @@ -43142,7 +43142,7 @@ MOD05_021EC4F0: ; 0x021EC4F0 add r2, r0, #0 add r0, r4, #0 mov r1, #0xa9 - bl GetMonDataEncrypted + bl GetMonData _021EC544: ldr r1, [sp, #4] add r0, r4, #0 @@ -43211,13 +43211,13 @@ MOD05_021EC5B0: ; 0x021EC5B0 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _021EC600 add r0, r7, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021EC600 add r0, r5, #0 @@ -43275,7 +43275,7 @@ _021EC64E: blt _021EC616 _021EC658: add r0, r5, #0 - bl CalcMonStats + bl CalcMonLevelAndStats add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -43304,7 +43304,7 @@ MOD05_021EC668: ; 0x021EC668 add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r7, r0, #0x10 add r0, r5, #0 @@ -43313,13 +43313,13 @@ MOD05_021EC668: ; 0x021EC668 add r0, r4, #0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x64 beq _021EC6E0 add r0, r4, #0 mov r1, #8 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] add r0, r6, #0 bl FUN_02023C84 @@ -43329,7 +43329,7 @@ MOD05_021EC668: ; 0x021EC668 str r0, [sp, #8] add r0, r4, #0 mov r1, #8 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 bl MOD05_021EC604 _021EC6E0: @@ -43342,7 +43342,7 @@ _021EC6E0: add r2, r0, #0 add r0, r4, #0 mov r1, #0xa9 - bl SetMonDataEncrypted + bl SetMonData _021EC6FA: ldr r0, [sp] add r1, r4, #0 @@ -43394,7 +43394,7 @@ MOD05_021EC744: ; 0x021EC744 add r0, r4, #0 mov r1, #8 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp] add r0, r0, r5 str r0, [sp] @@ -43525,7 +43525,7 @@ MOD05_021EC864: ; 0x021EC864 bl FUN_02023C7C mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021EC888 add r0, r4, #0 @@ -43581,7 +43581,7 @@ _021EC8D8: ldr r0, [r4] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [r5] cmp r0, #0x84 bne _021EC8EC @@ -43612,7 +43612,7 @@ _021EC90E: add r0, sp, #4 ldr r0, [r0, r1] mov r1, #6 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0xe5 bne _021EC938 bl rand_LC @@ -43652,7 +43652,7 @@ _021EC960: bl MOD05_021EC458 add r1, r5, #0 add r2, r1, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData bl GetNatureFromPersonality mov r7, #0x96 add r6, r0, #0 @@ -43791,62 +43791,62 @@ _021ECA60: ; jump table _021ECA6C: mov r1, #0x46 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x46 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData b _021ECAEE _021ECA82: mov r1, #0x47 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x47 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData b _021ECAEE _021ECA98: mov r1, #0x48 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x48 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData b _021ECAEE _021ECAAE: mov r1, #0x49 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x49 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData b _021ECAEE _021ECAC4: mov r1, #0x4a mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x4a add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData b _021ECAEE _021ECADA: mov r1, #0x4b mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r6] add r0, r4, #0 mov r1, #0x4b add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData _021ECAEE: add r0, r5, #1 lsl r0, r0, #0x18 @@ -43864,7 +43864,7 @@ MOD05_021ECAFC: ; 0x021ECAFC mov r1, #5 add r2, r4, #0 add r6, r4, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r2, r0, #0x10 ldr r0, _021ECB60 ; =0x00004E20 @@ -43935,14 +43935,14 @@ MOD05_021ECB6C: ; 0x021ECB6C add r0, r7, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x18] add r0, r7, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0xc] @@ -43965,13 +43965,13 @@ _021ECBC0: ldr r0, [sp] add r1, r6, #0 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, [sp, #0x20] mov r2, #0 str r0, [r4, r1] ldr r0, [sp, #4] add r1, r6, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, [sp, #0x10] str r0, [r1, #0x20] add r0, r5, #1 @@ -44218,13 +44218,13 @@ _021ECDAE: ldr r0, [sp] mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r4, r0, #0x10 ldr r0, [sp, #4] mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r2, r0, #0x10 mov r0, #6 @@ -44258,12 +44258,12 @@ MOD05_021ECDF4: ; 0x021ECDF4 ldr r0, [sp] mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r5, r0, #0 ldr r0, [sp, #4] mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r5, #0xec beq _021ECE20 cmp r0, #0xec @@ -44301,7 +44301,7 @@ _021ECE56: ldr r0, [r7, r6] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r1, r4, #1 add r2, sp, #0xc strh r0, [r2, r1] @@ -44424,16 +44424,16 @@ MOD05_021ECF14: ; 0x021ECF14 add r0, r5, #0 mov r1, #0x9a add r2, sp, #0x14 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 mov r1, #9 add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x10 add r0, r5, #0 mov r1, #0x9b add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r0, sp, #0x30 ldrb r0, [r0, #8] cmp r0, #0 @@ -44441,7 +44441,7 @@ MOD05_021ECF14: ; 0x021ECF14 add r0, r5, #0 mov r1, #0x97 add r2, sp, #0x38 - bl SetMonDataEncrypted + bl SetMonData _021ECF7E: add r2, sp, #0x10 mov r1, #1 @@ -44450,7 +44450,7 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x4c add r2, #1 - bl SetMonDataEncrypted + bl SetMonData ldr r0, _021ED008 ; =0x000001EE mov r1, #4 bl FUN_0200AA50 @@ -44458,7 +44458,7 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x76 add r2, r6, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 bl FUN_02021A20 ldr r0, [sp, #0x40] @@ -44477,15 +44477,15 @@ _021ECF7E: add r0, r5, #0 mov r1, #0x90 add r2, r6, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 mov r1, #7 add r2, sp, #0x1c - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 mov r1, #0x9c add r2, sp, #0x18 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 bl FUN_02021A20 _021ECFEE: @@ -44562,20 +44562,20 @@ _021ED05E: add r0, r7, #0 mov r1, #0x9a add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r0, r7, #0 mov r1, #9 add r2, sp, #0x14 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x14 add r0, r7, #0 mov r1, #0x9b add r2, #1 - bl SetMonDataEncrypted + bl SetMonData add r0, r7, #0 mov r1, #0x70 add r2, sp, #0x30 - bl SetMonDataEncrypted + bl SetMonData ldr r0, _021ED0C8 ; =0x000001EE mov r1, #4 bl FUN_0200AA50 @@ -44583,7 +44583,7 @@ _021ED05E: add r0, r7, #0 mov r1, #0x76 add r2, r4, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 bl FUN_02021A20 add sp, #0x18 @@ -44617,7 +44617,7 @@ MOD05_021ED0CC: ; 0x021ED0CC bl MOD05_021EC458 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -44664,7 +44664,7 @@ _021ED168: add r0, r4, #0 mov r1, #0x4c add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #4] add r1, r4, #0 bl FUN_0206B900 @@ -44691,7 +44691,7 @@ _021ED1A2: bl FUN_0206B9B0 add r1, r7, #0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _021ED1D6 add r0, r5, #0 @@ -44699,7 +44699,7 @@ _021ED1A2: bl FUN_0206B9B0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r0, #0x28 @@ -44765,18 +44765,18 @@ _021ED228: ldr r0, [r5] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4] ldr r0, [r5] mov r1, #7 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, [sp] str r0, [r1] mov r1, #0 ldr r0, [r5] add r2, r1, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, r0, #0 ldrh r0, [r4] bl GetGenderBySpeciesAndPersonality @@ -44956,7 +44956,7 @@ _021ED38E: ldr r0, [r5] mov r1, #0xab mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021ED3AC ldr r0, [sp] @@ -45027,19 +45027,19 @@ _021ED430: mov r1, #0x4c mov r2, #0 add r4, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021ED484 add r0, r4, #0 mov r1, #3 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _021ED484 add r0, r4, #0 mov r1, #9 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x10] cmp r0, #0 beq _021ED47E @@ -45055,7 +45055,7 @@ _021ED472: add r0, r4, #0 mov r1, #9 add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData b _021ED484 _021ED47E: add sp, #0x14 @@ -45090,13 +45090,13 @@ _021ED4AC: mov r1, #0x4c mov r2, #0 add r4, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021ED4D4 add r0, r4, #0 mov r1, #9 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _021ED4D4 add r0, r4, #0 @@ -45120,7 +45120,7 @@ MOD05_021ED4E0: ; 0x021ED4E0 ldr r0, [sp] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021ED50E ldr r2, [sp] @@ -45135,7 +45135,7 @@ _021ED50E: ldr r0, [sp, #4] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021ED526 ldr r2, [sp, #4] @@ -45186,7 +45186,7 @@ MOD05_021ED52C: ; 0x021ED52C add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #2 @@ -45194,7 +45194,7 @@ MOD05_021ED52C: ; 0x021ED52C add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r0, #0x1d @@ -45205,7 +45205,7 @@ _021ED5A4: add r0, r5, #0 mov r1, #0x4d mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _021ED5B4 mov r4, #2 @@ -45232,7 +45232,7 @@ MOD05_021ED5C4: ; 0x021ED5C4 add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r3, r4, r5, pc} @@ -45316,7 +45316,7 @@ MOD05_021ED650: ; 0x021ED650 add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x14] @@ -45327,14 +45327,14 @@ _021ED67C: add r0, r4, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r1, r5, #1 strh r0, [r7, r1] add r1, r5, #0 add r0, r4, #0 add r1, #0x3a mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x30 strb r0, [r1, r5] add r0, r5, #1 @@ -45345,7 +45345,7 @@ _021ED67C: mov r1, #0 add r0, r4, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 mov r5, #0 _021ED6B4: @@ -45353,7 +45353,7 @@ _021ED6B4: add r0, r4, #0 add r1, #0x46 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x24 add r1, #2 strb r0, [r1, r5] @@ -45365,52 +45365,52 @@ _021ED6B4: add r0, r4, #0 mov r1, #0xc mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #9] add r0, r4, #0 mov r1, #0x79 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #8] add r0, r4, #0 mov r1, #0xb mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #7] add r0, r4, #0 mov r1, #0x99 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #0xa] add r0, r4, #0 mov r1, #0x6e mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #5] ldr r2, [sp, #0x10] add r0, r4, #0 mov r1, #0x90 - bl GetMonDataEncrypted + bl GetMonData add r0, r4, #0 mov r1, #0x9c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #3] add r0, r4, #0 mov r1, #7 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x2c] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #4] ldr r1, _021ED93C ; =0x000001EA @@ -45420,7 +45420,7 @@ _021ED6B4: add r0, r4, #0 mov r1, #0x97 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0 mov r0, #2 mov r1, #1 @@ -45460,13 +45460,13 @@ _021ED7A2: add r0, r6, #0 add r1, #0x36 add r2, r7, r2 - bl SetMonDataEncrypted + bl SetMonData add r1, r5, #0 add r2, sp, #0x30 add r0, r6, #0 add r1, #0x3a add r2, r2, r5 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -45480,7 +45480,7 @@ _021ED7CE: add r0, r6, #0 add r1, #0x46 add r2, r7, r5 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -45490,16 +45490,16 @@ _021ED7CE: add r0, r6, #0 mov r1, #0xc add r2, #1 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 mov r1, #0x79 add r2, sp, #0x20 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x1c add r0, r6, #0 mov r1, #0xb add r2, #3 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x1c mov r1, #0x78 add r0, sp, #0x18 @@ -45507,118 +45507,118 @@ _021ED7CE: add r0, r6, #0 mov r1, #9 add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x20 add r0, r6, #0 mov r1, #0x99 add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x1c add r0, r6, #0 mov r1, #0x6e add r2, #1 - bl SetMonDataEncrypted + bl SetMonData ldr r2, [sp, #0x10] add r0, r6, #0 mov r1, #0x90 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x9c add r2, #3 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 mov r1, #7 add r2, sp, #0x2c - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 mov r1, #0x70 add r2, sp, #0x1c - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #0x97 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strh r0, [r1, #0xc] add r0, r4, #0 mov r1, #0x91 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #2] add r0, r4, #0 mov r1, #0x92 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #1] add r0, r4, #0 mov r1, #0x93 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1] add r0, r6, #0 mov r1, #0x97 add r2, sp, #0x24 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x91 add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x92 add r2, #1 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 mov r1, #0x93 add r2, sp, #0x18 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #0x98 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strh r0, [r1, #0xc] add r0, r4, #0 mov r1, #0x94 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #2] add r0, r4, #0 mov r1, #0x95 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1, #1] add r0, r4, #0 mov r1, #0x96 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x18 strb r0, [r1] add r0, r6, #0 mov r1, #0x98 add r2, sp, #0x24 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x94 add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x18 add r0, r6, #0 mov r1, #0x95 add r2, #1 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 mov r1, #0x96 add r2, sp, #0x18 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 add r1, r4, #0 bl FUN_02069B88 @@ -45649,11 +45649,11 @@ MOD05_021ED940: ; 0x021ED940 add r0, r4, #0 mov r1, #0x4c add r2, #3 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #5 add r2, r5, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 add r1, r5, #0 @@ -45662,23 +45662,23 @@ MOD05_021ED940: ; 0x021ED940 add r0, r4, #0 mov r1, #0x74 add r2, sp, #4 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0 add r0, r4, #0 mov r1, #0x4d add r2, #2 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0 add r0, r4, #0 mov r1, #0x9a add r2, #1 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #0x9b add r2, sp, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 - bl CalcMonStats + bl CalcMonLevelAndStats add sp, #0x1c pop {r4, r5, pc} .balign 4, 0 @@ -58115,13 +58115,13 @@ MOD05_021F38CC: ; 0x021F38CC mov r1, #0 add r2, r1, #0 add r5, r0, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r5, #0 mov r1, #0x46 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58130,7 +58130,7 @@ MOD05_021F38CC: ; 0x021F38CC add r0, r5, #0 mov r1, #0x47 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58139,7 +58139,7 @@ MOD05_021F38CC: ; 0x021F38CC add r0, r5, #0 mov r1, #0x48 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58148,7 +58148,7 @@ MOD05_021F38CC: ; 0x021F38CC add r0, r5, #0 mov r1, #0x49 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58156,7 +58156,7 @@ MOD05_021F38CC: ; 0x021F38CC add r0, r5, #0 mov r1, #0x4a mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58164,7 +58164,7 @@ MOD05_021F38CC: ; 0x021F38CC add r0, r5, #0 mov r1, #0x4b mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0xf and r0, r1 lsl r0, r0, #0x10 @@ -58279,7 +58279,7 @@ MOD05_021F3A18: ; 0x021F3A18 mov r1, #5 mov r2, #0 str r0, [sp] - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r5, r0, #0x10 ldr r0, [sp] @@ -58444,7 +58444,7 @@ MOD05_021F3B7C: ; 0x021F3B7C mov r1, #5 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r6, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index c4c4559d..a857283f 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4804,7 +4804,7 @@ _0223BA42: str r1, [sp, #0x34] mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x24 strb r0, [r1, #0x18] _0223BA8C: @@ -5586,7 +5586,7 @@ _0223C0CE: str r1, [sp, #0x2c] mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x20 strb r0, [r1, #0x14] _0223C118: @@ -6400,7 +6400,7 @@ MOD06_0223C738: ; 0x0223C738 add r4, r1, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 cmp r1, #0xe0 @@ -6464,7 +6464,7 @@ _0223C7AC: mov r1, #0 add r0, r4, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x19 bl _u32_div_f lsl r0, r1, #0x18 @@ -6588,7 +6588,7 @@ _0223C8A6: ldr r0, [sp, #0x44] mov r1, #0x6f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x24] @@ -6607,7 +6607,7 @@ _0223C8D2: cmp r4, #0 bne _0223C8E0 ldr r0, [sp, #0x44] - bl GetMonNatureEncrypted + bl GetMonNature str r0, [sp, #0x20] mov r7, #1 _0223C8E0: @@ -6722,7 +6722,7 @@ _0223C9BE: ldr r0, [sp, #0x28] mov r1, #0x6f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r6, r0, #0x18 cmp r6, #1 @@ -6752,7 +6752,7 @@ _0223C9E4: add r0, r4, #0 mov r1, #7 add r2, r5, #0 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #0x10] ldr r3, [sp, #0x2c] add r1, r5, #0 @@ -6779,7 +6779,7 @@ _0223CA28: add r0, r4, #0 mov r1, #7 add r2, r5, #0 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #0x10] ldr r3, [sp, #0x2c] add r1, r5, #0 @@ -7488,7 +7488,7 @@ _0223CF96: add r0, r1, #0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r0, #5 @@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044 add r0, r4, #0 mov r1, #7 add r2, sp, #0x30 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #0x9f add r2, sp, #0x14 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 mov r1, #0xa2 add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [r6, #8] add r1, r4, #0 bl FUN_0206B900 @@ -7782,7 +7782,7 @@ _0223D1DA: add r0, r6, #0 mov r1, #5 add r2, r4, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0223D270 ; =0x000001A6 cmp r0, r1 bne _0223D208 @@ -7839,7 +7839,7 @@ _0223D24E: add r0, r6, #0 mov r1, #0x70 add r2, sp, #8 - bl SetMonDataEncrypted + bl SetMonData _0223D25C: ldr r0, [sp] add r1, r6, #0 @@ -7919,14 +7919,14 @@ MOD06_0223D2DC: ; 0x0223D2DC mov r1, #0x4c mov r2, #0 add r4, r3, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0223D302 mov r2, #0 add r0, r7, #0 mov r1, #0xa strb r2, [r4, #0xd] - bl GetMonDataEncrypted + bl GetMonData b _0223D308 _0223D302: mov r0, #1 @@ -19758,19 +19758,19 @@ _02243312: mov r1, #5 mov r2, #0 str r0, [sp, #0xc] - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r5, r0, #0x10 ldr r0, [sp, #0xc] mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r6, r0, #0x10 ldr r0, [sp, #0xc] mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0224336E add r0, r5, #0 @@ -20287,12 +20287,12 @@ _02243726: add r7, r0, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r6, #0x2e] add r0, r7, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r6, #0x36] add r0, r4, #1 lsl r0, r0, #0x10 @@ -20338,12 +20338,12 @@ _0224379C: lsl r6, r5, #1 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, r6] ldr r0, [sp, #8] mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r7, r6] cmp r5, #0 beq _022437FA @@ -21457,13 +21457,13 @@ _02243FFA: add r1, r6, #0 mov r2, #0 str r0, [sp, #4] - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _02244024 ldr r0, [sp, #4] add r1, r6, #0 add r2, sp, #8 - bl SetMonDataEncrypted + bl SetMonData add r0, r7, #1 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -21522,7 +21522,7 @@ MOD06_0224406C: ; 0x0224406C add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] lsl r0, r0, #0x10 ldrh r1, [r1] @@ -21537,7 +21537,7 @@ MOD06_0224406C: ; 0x0224406C strh r1, [r0] add r0, r5, #0 mov r1, #0x70 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] lsl r0, r0, #0x10 ldrh r2, [r1] @@ -21552,7 +21552,7 @@ MOD06_0224406C: ; 0x0224406C strh r1, [r0] add r0, r5, #0 mov r1, #6 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] mov r4, #0 strh r0, [r1, #2] @@ -21567,13 +21567,13 @@ _022440D0: add r0, r5, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r4, #0 strh r0, [r6, #4] add r0, r5, #0 add r1, #0x3e mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #4] lsl r0, r7 ldrb r1, [r1] @@ -21588,25 +21588,25 @@ _022440D0: add r0, r5, #0 mov r1, #0xc mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] mov r2, #0 strb r0, [r1, #0x1f] add r0, r5, #0 mov r1, #7 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] str r0, [r1, #0xc] mov r1, #0 add r0, r5, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] mov r2, #0 str r0, [r1, #0x10] add r0, r5, #0 mov r1, #0xae - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] mov r4, #0 str r0, [r1, #0x14] @@ -21616,7 +21616,7 @@ _0224413C: add r0, r5, #0 add r1, #0xd add r2, r6, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] add r1, r1, r4 add r4, r4, #1 @@ -21626,14 +21626,14 @@ _0224413C: add r0, r5, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] mov r2, #0 add r1, #0x20 strb r0, [r1] add r0, r5, #0 mov r1, #9 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp] ldr r2, [sp] add r1, #0x21 @@ -21642,7 +21642,7 @@ _0224413C: add r0, r5, #0 mov r1, #0x74 str r2, [sp] - bl GetMonDataEncrypted + bl GetMonData add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388 strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x70 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 mov r1, #6 add r2, r6, #2 - bl SetMonDataEncrypted + bl SetMonData mov r4, #0 str r6, [sp, #4] add r7, r4, #0 @@ -21937,7 +21937,7 @@ _022443D4: add r1, r4, #0 add r0, r5, #0 add r1, #0x36 - bl SetMonDataEncrypted + bl SetMonData ldrb r0, [r6, #0x1e] add r2, sp, #8 add r2, #1 @@ -21950,19 +21950,19 @@ _022443D4: add r1, r4, #0 add r0, r5, #0 add r1, #0x3e - bl SetMonDataEncrypted + bl SetMonData add r1, r4, #0 add r0, r5, #0 add r1, #0x42 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #8 strb r0, [r1] add r1, r4, #0 add r0, r5, #0 add r1, #0x3a add r2, sp, #8 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #4] add r4, r4, #1 add r0, r0, #2 @@ -21975,7 +21975,7 @@ _022443D4: str r0, [sp, #0xc] add r0, r5, #0 add r2, sp, #0xc - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x18] add r0, sp, #8 @@ -21983,7 +21983,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xd - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x19] add r0, sp, #8 @@ -21991,7 +21991,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xe - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x1a] add r0, sp, #8 @@ -21999,7 +21999,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0xf - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x1b] add r0, sp, #8 @@ -22007,7 +22007,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x10 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x1c] add r0, sp, #8 @@ -22015,7 +22015,7 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x11 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #8 ldrb r1, [r6, #0x1d] add r0, sp, #8 @@ -22023,17 +22023,17 @@ _022443D4: strb r1, [r0, #1] add r0, r5, #0 mov r1, #0x12 - bl SetMonDataEncrypted + bl SetMonData add r2, r6, #0 add r0, r5, #0 mov r1, #0xa add r2, #0x20 - bl SetMonDataEncrypted + bl SetMonData add r2, r6, #0 add r0, r5, #0 mov r1, #9 add r2, #0x21 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [r6, #0x14] lsl r0, r0, #1 lsr r0, r0, #0x1f @@ -22052,7 +22052,7 @@ _022443D4: add r0, r5, #0 mov r1, #0x76 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r7, #0 bl FUN_02021A20 add r0, r4, #0 @@ -22063,15 +22063,15 @@ _022444FC: add r0, r5, #0 mov r1, #0x74 add r2, #0x22 - bl SetMonDataEncrypted + bl SetMonData _02244508: add r6, #0x1f add r0, r5, #0 mov r1, #0xc add r2, r6, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 - bl CalcMonStats + bl CalcMonLevelAndStats add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -22157,22 +22157,22 @@ _022445A6: add r0, r4, #0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x32 bls _022445E8 add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x32 bl GetMonExpBySpeciesAndLevel str r0, [sp, #8] add r0, r4, #0 mov r1, #8 add r2, sp, #8 - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 - bl CalcMonStats + bl CalcMonLevelAndStats _022445E8: add r0, r7, #0 add r1, r4, #0 @@ -22348,7 +22348,7 @@ _0224471C: bl FUN_0206B9B0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x21 lsl r1, r1, #6 strh r0, [r5, r1] @@ -26833,7 +26833,7 @@ MOD06_0224690C: ; 0x0224690C str r0, [r4] ldr r0, [r4, #0x5c] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FUN_02005578 @@ -28745,7 +28745,7 @@ _022477A8: mov r1, #0 add r0, r6, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp] mov r0, #0 str r0, [sp, #4] @@ -30769,7 +30769,7 @@ MOD06_02248724: ; 0x02248724 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 add r0, r7, #0 bl MOD06_02248810 @@ -30779,13 +30779,13 @@ MOD06_02248724: ; 0x02248724 add r0, r6, #0 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r6, #0 mov r1, #0x9f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r6, r0, #0x18 ldr r0, [sp] @@ -31018,7 +31018,7 @@ MOD06_0224891C: ; 0x0224891C mov r1, #0xa0 mov r2, #0 add r7, r0, #0 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x10] str r0, [sp] @@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x76 add r2, r7, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r7, #0 bl FUN_02021A20 mov r1, #1 @@ -31123,66 +31123,66 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x4d add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0 mov r1, #0x46 add r2, r4, #4 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x47 add r2, #8 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x48 add r2, #0xc - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x49 add r2, #0x10 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x4a add r2, #0x14 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x4b add r2, #0x18 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x13 add r2, #0x24 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x14 add r2, #0x28 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x15 add r2, #0x2c - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x16 add r2, #0x30 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #0x17 add r2, #0x34 - bl SetMonDataEncrypted + bl SetMonData add r2, r4, #0 add r0, r5, #0 mov r1, #6 add r2, #0x3c - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #0x28] add r1, r6, #4 bl MOD06_022489AC @@ -31190,19 +31190,19 @@ MOD06_022489D4: ; 0x022489D4 add r0, r5, #0 mov r1, #0x90 add r2, r6, #0 - bl SetMonDataEncrypted + bl SetMonData add r0, r6, #0 bl FUN_02021A20 add r2, r4, #0 add r0, r5, #0 mov r1, #0x9c add r2, #0x40 - bl SetMonDataEncrypted + bl SetMonData add r4, #0x48 add r0, r5, #0 mov r1, #0xc add r2, r4, #0 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #0x2c] bl FUN_02034824 add r3, r0, #0 @@ -31213,7 +31213,7 @@ MOD06_022489D4: ; 0x022489D4 mov r2, #1 bl FUN_0208089C add r0, r5, #0 - bl CalcMonStats + bl CalcMonLevelAndStats add r0, r5, #0 bl MonIsShiny cmp r0, #0 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index cb716405..116ffbed 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2333,13 +2333,13 @@ _0221312A: mov r1, #5 mov r2, #0 add r7, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _022131B0 add r0, r7, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _022131B0 add r0, r7, #0 @@ -3686,7 +3686,7 @@ _02213C2E: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x86 lsl r1, r1, #2 strh r0, [r7, r1] @@ -3702,52 +3702,52 @@ _02213C2E: add r5, r0, r1 add r0, r4, #0 mov r1, #0x4c - bl GetMonDataEncrypted + bl GetMonData ldr r1, _02213D18 ; =0x00000223 mov r2, #0 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0xa2 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _02213D1C ; =0x0000021A mov r2, #0 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa3 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x87 lsl r1, r1, #2 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x22 lsl r1, r1, #4 strb r0, [r5, r1] add r0, r4, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _02213D20 ; =0x0000021E mov r2, #0 strh r0, [r5, r1] add r0, r4, #0 mov r1, #0xa1 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x89 lsl r1, r1, #2 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _02213D24 ; =0x00000225 mov r2, #0 strb r0, [r5, r1] add r0, r4, #0 mov r1, #0xaf - bl GetMonDataEncrypted + bl GetMonData cmp r0, #1 bne _02213CE8 mov r1, #0 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 6c672cb0..e09211f8 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -45038,7 +45038,7 @@ MOD08_02228244: ; 0x02228244 str r0, [r2]
ldr r0, [r4, #0xc]
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x9c
str r0, [r1]
@@ -45067,7 +45067,7 @@ _02228272: _02228290:
ldr r0, [r4, #0xc]
mov r1, #0x9a
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, #0x98
str r0, [r4]
pop {r4, pc}
@@ -45080,7 +45080,7 @@ _0222829E: add r4, #0xa0
mov r1, #0xaa
add r2, r4, #0
- bl GetMonDataEncrypted
+ bl GetMonData
pop {r4, pc}
thumb_func_start MOD08_022282B4
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 69df6bf9..6312dd4f 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -576,7 +576,7 @@ _022122BA: add r0, r5, r1
ldr r0, [r0, #4]
mov r1, #0xa2
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x20]
ldrb r1, [r4, #0x11]
mov r0, #0x50
@@ -1630,7 +1630,7 @@ _02212B0A: ldr r0, [r0, #4]
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r7, #4
strh r0, [r4, r1]
mov r2, #2
@@ -1686,7 +1686,7 @@ _02212BAA: add r0, r4, r0
ldr r0, [r0, #4]
mov r1, #0xa2
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02212C84 ; =0x0000207E
mov r2, #4
strh r0, [r4, r1]
@@ -1841,7 +1841,7 @@ _02212CD0: add r1, r7, #0
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x82
lsl r1, r1, #6
strh r0, [r4, r1]
@@ -2441,7 +2441,7 @@ _022131E2: str r0, [r4, #4]
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #8]
ldrh r0, [r4, #8]
cmp r0, #0
@@ -2457,54 +2457,54 @@ _0221320C: add r4, r0, r5
ldr r0, [r4, #4]
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0xa]
ldr r0, [r4, #4]
mov r1, #0xa5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0xc]
ldr r0, [r4, #4]
mov r1, #0xa6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0xe]
ldr r0, [r4, #4]
mov r1, #0xa7
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x10]
ldr r0, [r4, #4]
mov r1, #0xa8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x12]
ldr r0, [r4, #4]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x14]
ldr r0, [r4, #4]
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x16]
ldr r0, [r4, #4]
mov r1, #0xb0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strb r0, [r4, #0x18]
ldr r0, [r4, #4]
mov r1, #0xb1
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r6, [sp]
strb r0, [r4, #0x19]
ldr r0, [r4, #4]
add r6, #0x1a
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldrb r1, [r6, r5]
mov r2, #0x7f
lsl r0, r0, #0x18
@@ -2517,7 +2517,7 @@ _0221320C: ldr r0, [r4, #4]
mov r1, #0xaf
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #1
ldrb r1, [r6, r5]
bne _022132BC
@@ -2557,7 +2557,7 @@ _022132C2: ldr r0, [r4, #4]
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1f
@@ -2570,17 +2570,17 @@ _022132C2: ldr r0, [r4, #4]
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x1c]
ldr r0, [r4, #4]
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r4, #0x1e]
ldr r0, [r4, #4]
mov r1, #8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r6, [sp]
str r0, [r4, #0x20]
add r6, #0x1a
@@ -2610,49 +2610,49 @@ _02213366: ldr r0, [r4, #4]
mov r1, #0x13
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x2c
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x14
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x2d
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x15
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x2e
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x16
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x2f
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x17
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x30
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0xa1
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r4, #0
add r1, #0x31
strb r0, [r1]
ldr r0, [r4, #4]
mov r1, #0x70
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, #0x32
strb r0, [r4]
ldr r1, [sp]
@@ -2670,7 +2670,7 @@ _022133E4: ldr r0, [r6, #4]
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0xc]
strh r0, [r7, r1]
add r0, r1, #0
@@ -2681,13 +2681,13 @@ _022133E4: ldr r0, [r6, #4]
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strb r0, [r5, #2]
add r1, r4, #0
ldr r0, [r6, #4]
add r1, #0x3e
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strb r0, [r5, #3]
ldrh r0, [r5]
ldrb r1, [r5, #3]
@@ -8336,7 +8336,7 @@ MOD09_02216378: ; 0x02216378 mov r1, #0xa2
mov r2, #0
add r7, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index dba629d4..ab76b727 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -1685,7 +1685,7 @@ _0222E4AC: bl MOD11_02230014
mov r1, #0x9a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r2, r0, #0
ldr r1, [r6, #0x34]
add r0, r5, #0
@@ -2024,19 +2024,19 @@ _0222E76C: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222E79E
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E79E
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E7AA
_0222E79E:
@@ -2129,19 +2129,19 @@ _0222E848: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222E87A
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E87A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E886
_0222E87A:
@@ -2255,38 +2255,38 @@ _0222E938: add r0, r5, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E9B8
b _0222E9AC
_0222E984:
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222E9AC
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E9AC
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222E9B8
_0222E9AC:
@@ -2355,19 +2355,19 @@ _0222EA22: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EA54
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EA54
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EA60
_0222EA54:
@@ -2457,19 +2457,19 @@ _0222EAEE: bne _0222EB2E
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EB56
ldr r0, [sp, #0x38]
@@ -2479,19 +2479,19 @@ _0222EAEE: _0222EB2E:
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EB56
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EB56
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EB64
_0222EB56:
@@ -2582,19 +2582,19 @@ _0222EBF6: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EC28
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EC28
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EC34
_0222EC28:
@@ -2707,38 +2707,38 @@ _0222ECE0: add r0, r5, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222ED60
b _0222ED54
_0222ED2C:
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222ED54
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222ED54
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222ED60
_0222ED54:
@@ -2810,19 +2810,19 @@ _0222EDD2: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0222EE04
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EE04
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222EE10
_0222EE04:
@@ -2865,7 +2865,7 @@ _0222EE3E: add r2, r4, #0
mov r1, #0x8f
add r2, #0xf4
- bl GetMonDataEncrypted
+ bl GetMonData
_0222EE5A:
ldr r1, [r4, #0x2c]
mov r0, #1
@@ -5703,7 +5703,7 @@ _022303E4: ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #7
str r0, [sp, #0x20]
tst r1, r0
@@ -5714,7 +5714,7 @@ _022303E4: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@@ -5765,7 +5765,7 @@ _02230478: ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _0223068C ; =0x00000F88
str r0, [sp, #0x20]
tst r1, r0
@@ -5776,7 +5776,7 @@ _02230478: str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@@ -5813,7 +5813,7 @@ _022304DC: ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x10
str r0, [sp, #0x20]
tst r1, r0
@@ -5824,7 +5824,7 @@ _022304DC: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@@ -5861,7 +5861,7 @@ _02230540: ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x20
str r0, [sp, #0x20]
tst r1, r0
@@ -5872,7 +5872,7 @@ _02230540: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@@ -5909,7 +5909,7 @@ _022305A4: ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x40
str r0, [sp, #0x20]
tst r1, r0
@@ -5920,7 +5920,7 @@ _022305A4: ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@@ -6300,13 +6300,13 @@ _022308C4: ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r7, r0
beq _0223095A
add r1, r4, #0
@@ -6371,13 +6371,13 @@ _0223097E: ldr r0, [sp, #0x18]
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r0, #0
add r1, r4, #0
ldr r0, [sp, #0x18]
add r1, #0x42
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r7, r0
beq _022309F2
add r1, r4, #0
@@ -6448,7 +6448,7 @@ _02230A0C: ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _02230A42
mov r0, #1
@@ -6458,7 +6458,7 @@ _02230A36: ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x20]
_02230A42:
ldr r0, [sp, #0x20]
@@ -6467,12 +6467,12 @@ _02230A42: ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r4, r0
beq _02230B14
ldr r0, [sp, #0x38]
@@ -6491,14 +6491,14 @@ _02230A42: ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x20]
b _02230AC2
_02230A8C:
ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsr r0, r0, #1
str r0, [sp, #0x20]
bne _02230AC2
@@ -6509,7 +6509,7 @@ _02230AA2: ldr r0, [sp, #0x18]
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x19
mul r1, r0
add r0, r1, #0
@@ -6572,7 +6572,7 @@ _02230B14: ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x64
bhs _02230B4A
ldr r0, [sp, #0x14]
@@ -6597,13 +6597,13 @@ _02230B4A: ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x64
blo _02230B8E
ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0xc8
bhs _02230B8E
ldr r0, [sp, #0x14]
@@ -6628,7 +6628,7 @@ _02230B8E: ldr r0, [sp, #0x18]
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0xc8
blo _02230BC4
ldr r0, [sp, #0x14]
@@ -6649,7 +6649,7 @@ _02230BC4: ldr r0, [sp, #0x18]
mov r1, #0x9a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0xb
bne _02230BE0
ldr r0, [sp, #8]
@@ -6659,7 +6659,7 @@ _02230BE0: ldr r0, [sp, #0x18]
mov r1, #0x97
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0
ldr r0, [sp, #4]
bl MOD11_022302B0
@@ -6672,7 +6672,7 @@ _02230BFC: ldr r0, [sp, #0x18]
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x20]
ldr r0, [sp, #0x38]
mov r1, #1
@@ -7102,7 +7102,7 @@ _02230EE4: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
mov r0, #0x67
@@ -7152,7 +7152,7 @@ _02230F4E: add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
- bl SetMonDataEncrypted
+ bl SetMonData
_02230F58:
add r0, r5, #0
mov r1, #0
@@ -8141,7 +8141,7 @@ _02231606: add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
mov r1, #0x67
lsl r1, r1, #2
cmp r0, r1
@@ -12589,13 +12589,13 @@ _02233950: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022339B4
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022339B4
add r0, r4, #0
@@ -12616,7 +12616,7 @@ _02233994: add r0, r6, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r5, #0
@@ -18484,19 +18484,19 @@ _02236794: mov r1, #5
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022367C8
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _022367C8
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022367C8
add r7, r7, #1
@@ -18537,19 +18537,19 @@ _022367EA: add r1, r7, #0
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022367EA
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #1
beq _022367EA
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022367EA
ldr r0, [sp]
@@ -20636,26 +20636,26 @@ _022378A2: beq _02237900
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022378F8
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _022378F8
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02237900
_022378F8:
@@ -20672,17 +20672,17 @@ _02237900: add r4, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #4]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r6, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
@@ -20818,26 +20818,26 @@ _02237A2A: beq _02237A9A
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02237A7C
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02237AAC ; =0x000001EE
cmp r0, r1
beq _02237A7C
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02237A9A
_02237A7C:
@@ -21174,13 +21174,13 @@ _02237D16: mov r1, #0xad
mov r2, #0
str r0, [sp, #8]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02237D7E
ldr r0, [sp, #8]
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02237DBC ; =0x000001EE
cmp r0, r1
beq _02237D7E
@@ -21190,7 +21190,7 @@ _02237D4E: ldr r0, [sp, #8]
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@@ -23876,20 +23876,20 @@ _02239222: mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #4]
@@ -23915,7 +23915,7 @@ _02239222: add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
sub r0, r0, #1
mov r1, #0xa
bl _u32_div_f
@@ -23939,7 +23939,7 @@ _022392AA: add r0, r4, #0
mov r1, #6
add r2, r5, r2
- bl SetMonDataEncrypted
+ bl SetMonData
b _022392EC
_022392C4:
cmp r5, #0x62
@@ -23954,7 +23954,7 @@ _022392C4: add r0, r4, #0
mov r1, #6
add r2, r2, r3
- bl SetMonDataEncrypted
+ bl SetMonData
b _022392EC
_022392E2:
add r1, r1, #1
@@ -23979,7 +23979,7 @@ _022392EC: mov r1, #0xa0
str r2, [sp, #0xc]
mov r5, #0xa
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x18
lsr r1, r0, #0x18
cmp r1, #0xa
@@ -24010,7 +24010,7 @@ _0223932E: add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
- bl SetMonDataEncrypted
+ bl SetMonData
_02239350:
ldr r0, [sp]
mov r1, #0
@@ -25362,20 +25362,20 @@ _02239E2A: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02239E5C
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239E5C
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r5, r0
_02239E5C:
add r0, r7, #0
@@ -25411,19 +25411,19 @@ _02239E90: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02239EC0
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, r7
beq _02239EC0
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r5, r0
_02239EC0:
ldr r0, [sp, #8]
@@ -25458,20 +25458,20 @@ _02239EF8: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02239F2A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02239F48 ; =0x000001EE
cmp r0, r1
beq _02239F2A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r5, r0
_02239F2A:
add r0, r7, #0
@@ -25807,12 +25807,12 @@ MOD11_0223A178: ; 0x0223A178 add r6, r0, #0
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp]
add r0, r6, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r2, r0, #0
ldr r0, _0223A210 ; =0x00002D67
add r1, r5, r4
@@ -26642,7 +26642,7 @@ _0223A7D6: mov r1, #6
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@@ -26746,7 +26746,7 @@ _0223A8B0: add r0, r6, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #1
@@ -26768,7 +26768,7 @@ _0223A8B0: add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0223A90E
ldr r1, [r4, #4]
@@ -26794,7 +26794,7 @@ _0223A90E: ldr r2, [sp, #0x34]
add r0, r6, #0
mov r1, #0xa2
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0223A928
b _0223AA34
@@ -26802,7 +26802,7 @@ _0223A928: add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0x64
beq _0223AA34
ldr r0, [r4, #4]
@@ -26861,7 +26861,7 @@ _0223A994: add r0, r6, #0
mov r1, #0xc
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _0223ABAC ; =0x020ECAC4
ldrb r1, [r1]
cmp r1, r0
@@ -26888,7 +26888,7 @@ _0223A9D6: add r0, r6, #0
mov r1, #8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x48]
add r0, r6, #0
bl GetMonBaseExperienceAtCurrentLevel
@@ -26914,7 +26914,7 @@ _0223AA0C: add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@@ -27062,7 +27062,7 @@ _0223AB22: add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x30]
mov r0, #5
mov r1, #0x18
@@ -27082,7 +27082,7 @@ _0223AB58: ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0x4c]
lsl r2, r1, #2
ldr r1, [sp, #0x2c]
@@ -27101,7 +27101,7 @@ _0223AB58: lsr r2, r2, #0x10
bl MonApplyFriendshipModEncrypted
add r0, r6, #0
- bl CalcMonStatsMaybeEncrypted
+ bl CalcMonStats
ldr r1, [r4, #4]
ldr r0, _0223ABB0 ; =0x0000219C
b _0223ABBC
@@ -27324,7 +27324,7 @@ _0223AD30: ldr r1, [r1, r2]
add r0, r6, #0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0x28]
lsl r2, r5, #2
ldr r1, [r1, r2]
@@ -27390,7 +27390,7 @@ _0223ADEC: strb r0, [r5, #1]
add r0, r6, #0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0xb4]
mov r0, #3
str r0, [sp, #0xcc]
@@ -27838,7 +27838,7 @@ _0223B192: add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0xb8]
ldr r0, [r4]
bl MOD11_02230E54
@@ -27897,7 +27897,7 @@ _0223B1F6: add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@@ -27992,7 +27992,7 @@ MOD11_0223B2DC: ; 0x0223B2DC mov r1, #6
add r2, r4, #0
str r0, [sp, #0x14]
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r6, #0
@@ -28015,7 +28015,7 @@ _0223B328: ldr r0, [sp, #0x14]
add r1, #0xd
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0xc]
strb r0, [r1]
add r0, r1, #0
@@ -28183,7 +28183,7 @@ _0223B45A: str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@@ -28638,7 +28638,7 @@ _0223B83C: add r0, r6, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r0, #0
ldr r0, [r4]
bl MOD11_02231668
@@ -29020,7 +29020,7 @@ _0223BB76: mov r1, #5
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r0, #0
ldr r0, [r4]
bl MOD11_02230E18
@@ -29058,7 +29058,7 @@ _0223BBEE: add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [r5, #8]
ldr r0, [r4]
bl MOD11_02230290
@@ -29066,7 +29066,7 @@ _0223BBEE: add r0, r6, #0
mov r1, #0x6f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [r5, #0x10]
ldr r0, _0223BF18 ; =0x020FA5FC
add r1, r5, #0
@@ -29102,7 +29102,7 @@ _0223BC38: bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
- bl SetMonDataEncrypted
+ bl SetMonData
_0223BC62:
add r0, r5, #0
bl FUN_02077AC4
@@ -29204,13 +29204,13 @@ _0223BD3E: add r0, r6, #0
add r1, #0x42
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r5, #0
str r0, [sp, #0x2c]
add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
- bl SetMonDataEncrypted
+ bl SetMonData
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@@ -31430,7 +31430,7 @@ MOD11_0223CDC4: ; 0x0223CDC4 ldr r0, [sp, #0x18]
mov r1, #0xaf
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0223CF26
mov r0, #2
@@ -31439,7 +31439,7 @@ _0223CF26: ldr r0, [sp, #0x18]
mov r1, #0x6f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
_0223CF30:
cmp r0, #0
bne _0223CF42
@@ -31472,7 +31472,7 @@ _0223CF5C: ldr r0, [sp, #0x18]
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -41623,20 +41623,20 @@ _02241DFE: mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02241E3E
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241E3E
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02241E3E
ldr r2, [sp, #8]
@@ -41710,20 +41710,20 @@ _02241EB4: mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02241EE6
add r0, r4, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02241FCC ; =0x000001EE
cmp r0, r1
beq _02241EE6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r7, r0
_02241EE6:
add r0, r6, #0
@@ -41915,20 +41915,20 @@ _02242056: mov r1, #0xad
mov r2, #0
add r5, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02242088
add r0, r5, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242088
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r7, r0
_02242088:
add r0, r6, #0
@@ -41995,20 +41995,20 @@ _022420FE: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02242130
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _02242130
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r5, r0
_02242130:
add r0, r7, #0
@@ -42030,19 +42030,19 @@ _0224214A: mov r1, #0xad
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0224217A
add r0, r6, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, r7
beq _0224217A
add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r5, r5, r0
_0224217A:
ldr r0, [sp, #0x18]
@@ -42099,20 +42099,20 @@ _022421DC: mov r1, #0xad
mov r2, #0
add r5, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0224220E
add r0, r5, #0
mov r1, #0xad
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242340 ; =0x000001EE
cmp r0, r1
beq _0224220E
add r0, r5, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r7, r0
_0224220E:
add r0, r6, #0
@@ -43364,41 +43364,41 @@ MOD11_02242B78: ; 0x02242B78 mov r1, #5
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0x18]
mov r2, #0
strh r0, [r1, r5]
add r0, r4, #0
mov r1, #0xa4
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242F4C ; =0x00002D42
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242F50 ; =0x00002D44
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242F54 ; =0x00002D46
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa7
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242F58 ; =0x00002D48
add r2, r7, r5
strh r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r1, r7, r5
ldr r2, _02242F5C ; =0x00002D4A
str r1, [sp, #0xc]
@@ -43412,7 +43412,7 @@ _02242C02: add r0, r4, #0
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp, #0x14]
ldr r1, _02242F60 ; =0x00002D4C
strh r0, [r2, r1]
@@ -43420,7 +43420,7 @@ _02242C02: add r0, r4, #0
add r1, #0x3a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp, #0x10]
ldr r1, _02242F64 ; =0x00002D6C
strb r0, [r2, r1]
@@ -43428,7 +43428,7 @@ _02242C02: add r0, r4, #0
add r1, #0x3e
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp, #0x10]
ldr r1, _02242F68 ; =0x00002D70
add r6, r6, #1
@@ -43447,7 +43447,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x46
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [r6, r5]
mov r2, #0x1f
bic r1, r2
@@ -43458,7 +43458,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x47
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F6C ; =0xFFFFFC1F
@@ -43469,7 +43469,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x48
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F70 ; =0xFFFF83FF
@@ -43480,7 +43480,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x49
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F74 ; =0xFFF07FFF
@@ -43491,7 +43491,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x4a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F78 ; =0xFE0FFFFF
@@ -43502,7 +43502,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x4b
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
lsl r0, r0, #0x1b
ldr r2, [r6, r5]
ldr r1, _02242F7C ; =0xC1FFFFFF
@@ -43513,7 +43513,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [r6, r5]
ldr r1, _02242F80 ; =0xBFFFFFFF
lsl r0, r0, #0x1f
@@ -43524,7 +43524,7 @@ _02242C02: add r0, r4, #0
mov r1, #0x4d
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [r6, r5]
ldr r1, _02242F84 ; =0x7FFFFFFF
lsl r0, r0, #0x1f
@@ -43598,14 +43598,14 @@ _02242D2E: add r0, r4, #0
mov r1, #0xb0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FA0 ; =0x00002D64
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xb1
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FA4 ; =0x00002D65
add r2, r7, r5
strb r0, [r2, r1]
@@ -43637,7 +43637,7 @@ _02242D2E: add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldrb r1, [r6, r5]
mov r2, #0x1f
lsl r0, r0, #0x18
@@ -43670,14 +43670,14 @@ _02242E24: add r0, r4, #0
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FAC ; =0x00002D67
add r2, r7, r5
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FB0 ; =0x00002DAC
add r2, r7, r5
str r0, [r2, r1]
@@ -43688,7 +43688,7 @@ _02242E24: add r0, r4, #0
mov r1, #6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
strh r0, [r6, r5]
_02242E58:
ldr r0, [sp, #4]
@@ -43698,56 +43698,56 @@ _02242E58: add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FB4 ; =0x00002D74
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FB8 ; =0x00002D75
add r2, r7, r6
strb r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FBC ; =0x00002D8C
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FC0 ; =0x00002D90
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FC4 ; =0x00002DA4
add r2, r7, r6
str r0, [r2, r1]
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FC8 ; =0x00002DA8
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #7
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FCC ; =0x00002DB4
add r2, r7, r6
str r0, [r2, r1]
add r0, r4, #0
mov r1, #0x9c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #0x1c]
lsl r0, r0, #0x18
lsr r0, r0, #0x18
@@ -43762,7 +43762,7 @@ _02242E58: strb r1, [r0, r5]
add r0, r4, #0
mov r1, #0x9a
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _02242FD0 ; =0x00002DBF
add r2, r7, r6
strb r0, [r2, r1]
@@ -43788,13 +43788,13 @@ _02242E58: add r2, r7, r2
mov r1, #0x74
add r2, r2, r6
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, _02242FDC ; =0x00002D94
add r0, r4, #0
add r2, r7, r2
mov r1, #0x8f
add r2, r2, r6
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r0, _02242FE0 ; =0x00002DBC
b _02242FE4
.align 2, 0
@@ -43906,7 +43906,7 @@ MOD11_02243054: ; 0x02243054 mov r1, #0xa4
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43915,7 +43915,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43924,7 +43924,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa6
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43933,7 +43933,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa7
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43942,7 +43942,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43951,7 +43951,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43960,7 +43960,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #9
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43969,7 +43969,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -43978,7 +43978,7 @@ MOD11_02243054: ; 0x02243054 add r0, r6, #0
mov r1, #0xa3
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -44016,21 +44016,21 @@ _02243142: add r0, r6, #0
add r1, #0x36
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _022431CC ; =0x00002D4C
mov r2, #0
strh r0, [r7, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3a
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _022431D0 ; =0x00002D6C
mov r2, #0
strb r0, [r5, r1]
add r1, r4, #0
add r0, r6, #0
add r1, #0x3e
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, _022431D4 ; =0x00002D70
strb r0, [r5, r1]
_02243186:
@@ -44042,7 +44042,7 @@ _02243186: add r0, r6, #0
mov r1, #8
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r2, [sp]
ldr r1, [sp, #4]
add r2, r2, r1
@@ -48649,7 +48649,7 @@ _022453A4: bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022453BA
add r6, r6, #1
@@ -48706,7 +48706,7 @@ _02245418: bl FUN_0206B9B0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0224542E
add r6, r6, #1
@@ -52136,19 +52136,19 @@ _02246E76: mov r1, #5
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02246EB6
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _02246EB6
add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02246EB6
ldr r0, [sp, #0xc]
@@ -60443,7 +60443,7 @@ MOD11_0224AD38: ; 0x0224AD38 add r0, r6, #0
mov r1, #0x9a
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r2, r0, #0
b _0224AD7A
_0224AD76:
@@ -60552,17 +60552,17 @@ MOD11_0224AE14: ; 0x0224AE14 add r0, r5, #0
mov r1, #0x8f
add r2, sp, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r0, r5, #0
mov r1, #7
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r6, r0
bne _0224AE72
add r0, r5, #0
mov r1, #0x9c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r7, r0
bne _0224AE72
add r0, r4, #0
@@ -64908,13 +64908,13 @@ _0224CEE2: add r0, r7, #0
add r1, #0x36
add r2, r5, #0
- bl SetMonDataEncrypted
+ bl SetMonData
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
- bl SetMonDataEncrypted
+ bl SetMonData
_0224CF0C:
add r4, r4, #1
add r5, r5, #2
@@ -64932,16 +64932,16 @@ _0224CF14: add r0, r7, #0
mov r1, #6
add r2, #0xc
- bl SetMonDataEncrypted
+ bl SetMonData
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
- bl SetMonDataEncrypted
+ bl SetMonData
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
- bl SetMonDataEncrypted
+ bl SetMonData
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@@ -65054,7 +65054,7 @@ _0224D00A: _0224D024:
mov r1, #0xa
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
_0224D02C:
ldrh r1, [r4, #2]
cmp r1, #0xd7
@@ -65066,7 +65066,7 @@ _0224D038: add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
- bl SetMonDataEncrypted
+ bl SetMonData
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@@ -65596,13 +65596,13 @@ _0224D466: mov r1, #5
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0224D4B4
add r0, r4, #0
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0224D4B4
ldr r0, [sp]
@@ -65613,7 +65613,7 @@ _0224D466: add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [sp, #8]
add r0, r1, r0
str r0, [sp, #8]
@@ -65622,7 +65622,7 @@ _0224D4A8: add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r7, r0
_0224D4B4:
add r0, r6, #0
@@ -74596,7 +74596,7 @@ _02251CEC: mov r1, #0xa2
mov r2, #0
add r6, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
ldr r1, [r4, #8]
mov r2, #0
ldr r1, [r1, #4]
@@ -74605,7 +74605,7 @@ _02251CEC: str r0, [r5, #0x28]
add r0, r6, #0
mov r1, #0xa3
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [r5, #0x2c]
ldr r0, [r4, #8]
mov r1, #0x9f
@@ -74614,7 +74614,7 @@ _02251CEC: ldrh r0, [r0, #0x20]
str r0, [r5, #0x30]
add r0, r6, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _02251D72
add r0, r5, #0
@@ -74735,7 +74735,7 @@ _02251E2E: bl MOD11_02230014
mov r1, #0x9f
add r2, r5, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _02251E6A
ldr r0, [sp, #0x10]
@@ -75527,7 +75527,7 @@ _022524D0: bl MOD11_02230014
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022524F2
ldrb r0, [r7, #0xc]
@@ -81046,12 +81046,12 @@ MOD11_02255034: ; 0x02255034 add r6, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0xc]
mov r0, #0xc
add r2, sp, #0x14
@@ -81287,7 +81287,7 @@ _0225523A: mov r1, #0xad
mov r2, #0
add r4, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255298
ldr r1, _02255500 ; =0x000001EE
@@ -81296,13 +81296,13 @@ _0225523A: add r0, r4, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255280
add r0, r4, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0225527A
mov r0, #3
@@ -81388,7 +81388,7 @@ _02255304: mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255350
ldr r1, _02255500 ; =0x000001EE
@@ -81397,13 +81397,13 @@ _02255304: add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0225534A
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255344
mov r0, #3
@@ -81464,7 +81464,7 @@ _022553A0: mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022553EC
ldr r1, _02255500 ; =0x000001EE
@@ -81473,13 +81473,13 @@ _022553A0: add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022553E6
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022553E0
mov r0, #3
@@ -81530,7 +81530,7 @@ _02255428: mov r1, #0xad
mov r2, #0
add r7, r0, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255474
ldr r1, _02255500 ; =0x000001EE
@@ -81539,13 +81539,13 @@ _02255428: add r0, r7, #0
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _0225546E
add r0, r7, #0
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02255468
mov r0, #3
@@ -82376,12 +82376,12 @@ MOD11_02255A8C: ; 0x02255A8C add r4, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r0, #0
add r0, r4, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r6, r0, #0
mov r0, #0x18
add r2, sp, #0xc
@@ -82480,12 +82480,12 @@ MOD11_02255B68: ; 0x02255B68 add r6, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r7, r0, #0
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
add r6, r0, #0
mov r1, #0x19
add r0, sp, #0xc
@@ -83105,12 +83105,12 @@ MOD11_02256020: ; 0x02256020 add r6, r0, #0
mov r1, #5
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #0xc]
add r0, r6, #0
mov r1, #0xa0
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
str r0, [sp, #8]
mov r0, #0x26
add r2, sp, #0x10
@@ -84470,7 +84470,7 @@ _02256A80: mov r1, #0xad
mov r2, #0
str r0, [sp, #0x14]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256AD2
ldr r1, _02256C04 ; =0x000001EE
@@ -84479,13 +84479,13 @@ _02256A80: ldr r0, [sp, #0x14]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256ACA
ldr r0, [sp, #0x14]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256AC2
add r1, r5, r4
@@ -84535,7 +84535,7 @@ _02256B02: mov r1, #0xad
mov r2, #0
str r0, [sp, #0x18]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256B54
ldr r1, _02256C04 ; =0x000001EE
@@ -84544,13 +84544,13 @@ _02256B02: ldr r0, [sp, #0x18]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256B4C
ldr r0, [sp, #0x18]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256B44
add r1, r5, r4
@@ -84611,7 +84611,7 @@ _02256B9A: mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256BEC
ldr r1, _02256C04 ; =0x000001EE
@@ -84620,13 +84620,13 @@ _02256B9A: ldr r0, [sp, #0x1c]
mov r1, #0xa2
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256BE4
ldr r0, [sp, #0x1c]
mov r1, #0x9f
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _02256BDC
add r1, r5, r4
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 68dae7ae..6862284e 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -217,7 +217,7 @@ _0222D7BC: ldr r0, [r1, r0] add r1, r6, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5] add r6, r6, #1 add r5, r5, #2 @@ -975,7 +975,7 @@ _0222DE9E: ldr r0, [r1, r0] add r1, r4, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _0222DEBE mov r1, #0xb @@ -5972,7 +5972,7 @@ _0223072E: mov r1, #5 ldr r0, [r0, r6] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData bl MOD12_0223EE70 add r1, r5, r4 add r4, r4, #1 @@ -7750,7 +7750,7 @@ _0223151C: ldr r0, [r4] mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r6, #0x64 add r5, r0, #0 add r0, r6, #0 @@ -7777,17 +7777,17 @@ _0223154E: ldr r0, [r4] mov r1, #0x13 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0x17 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] mov r1, #0x14 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 add r0, #0xa0 @@ -7812,17 +7812,17 @@ _02231594: ldr r0, [r4] mov r1, #0x14 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0x13 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] mov r1, #0x15 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 add r0, #0xa0 @@ -7847,17 +7847,17 @@ _022315DA: ldr r0, [r4] mov r1, #0x15 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0x14 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] mov r1, #0x16 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 add r0, #0xa1 @@ -7882,17 +7882,17 @@ _02231620: ldr r0, [r4] mov r1, #0x16 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0x15 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] mov r1, #0x17 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 add r0, #0xa2 @@ -7917,17 +7917,17 @@ _02231666: ldr r0, [r4] mov r1, #0x17 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0x16 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] mov r1, #0x13 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 add r0, #0xa0 @@ -7954,7 +7954,7 @@ _022316B2: ldr r0, [r4] mov r1, #0x18 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #8] add r1, r1, r7 add r1, r0, r1 @@ -8951,7 +8951,7 @@ _02231E5E: ldr r0, [r0, r1] add r1, r4, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData lsl r1, r4, #1 add r2, sp, #0x3c strh r0, [r2, r1] @@ -9369,7 +9369,7 @@ _022321A6: ldr r0, [r1, r0] add r1, r5, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _022321C8 ldr r0, _0223220C ; =0x000002E1 @@ -10201,7 +10201,7 @@ _022327EC: ldr r0, [r0, r1] add r1, r6, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5] add r6, r6, #1 add r5, r5, #2 @@ -11076,7 +11076,7 @@ _02232EB2: ldr r0, [r0, r1] add r1, r4, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData lsl r2, r4, #1 add r1, sp, #0x10 strh r0, [r1, r2] @@ -12221,7 +12221,7 @@ _022336D4: mov r1, #5 ldr r0, [r0, r4] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData bl MOD08_0222A6C8 cmp r0, #1 bne _02233750 @@ -12296,7 +12296,7 @@ _0223377C: ldr r0, [r0] mov r2, #0 ldr r0, [r0, r4] - bl GetMonDataEncrypted + bl GetMonData bl MOD08_0222A6C8 cmp r0, #1 bne _022337E6 @@ -15395,7 +15395,7 @@ MOD12_02235038: ; 0x02235038 ldr r0, [r1, r0] ldr r2, [sp, #0x30] mov r1, #0x76 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [r5] ldr r0, _022350E8 ; =0x00000123 ldrb r0, [r1, r0] @@ -16862,12 +16862,12 @@ _02235B9C: ldr r0, [r6, r5] mov r1, #0xb0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 ldr r0, [r6, r5] mov r1, #0xb1 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r7, #7 beq _02235BBC cmp r0, #7 @@ -18438,7 +18438,7 @@ _02236736: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #5 - bl GetMonDataEncrypted + bl GetMonData add r6, r0, #0 ldr r0, [r4] mov r2, #0 @@ -18447,7 +18447,7 @@ _02236736: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #0x6f - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 ldr r0, [r4] ldr r1, [r0, #0xc] @@ -18463,7 +18463,7 @@ _02236736: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #0x70 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x1c] ldr r0, [r4] ldr r1, [r0, #0xc] @@ -18472,7 +18472,7 @@ _02236736: ldr r0, [r1, r0] mov r1, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] ldr r0, [r4] lsl r5, r5, #2 @@ -18480,14 +18480,14 @@ _02236736: mov r1, #5 ldr r0, [r0, r5] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x18] ldr r0, [r4] mov r1, #0x6f ldr r0, [r0, #0xc] mov r2, #0 ldr r0, [r0, r5] - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x14] ldr r0, [r4] ldr r0, [r0, #0xc] @@ -18499,14 +18499,14 @@ _02236736: ldr r0, [r0, #0xc] mov r2, #0 ldr r0, [r0, r5] - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] ldr r0, [r4] mov r1, #0 ldr r0, [r0, #0xc] add r2, r1, #0 ldr r0, [r0, r5] - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #4] mov r2, #0x47 mov r0, #0 @@ -19010,7 +19010,7 @@ _02236BD0: lsl r0, r0, #2 ldr r0, [r2, r0] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x10] ldr r0, _02236CF0 ; =0x000005DD bl FUN_020054C8 @@ -23971,7 +23971,7 @@ _02239080: ldr r0, [r0, r1] add r1, r4, #0 add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5] mov r0, #0x23 lsl r0, r0, #4 @@ -27801,7 +27801,7 @@ _0223AC68: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #5 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0 mov r0, #0x7f str r0, [sp] @@ -43888,7 +43888,7 @@ _022428E6: str r0, [sp, #0x10] ldr r0, [r1, r0] mov r1, #0x76 - bl GetMonDataEncrypted + bl GetMonData add r0, r5, #1 lsl r0, r0, #4 str r0, [sp, #0x14] @@ -47346,7 +47346,7 @@ _022443A4: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #5 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0 mov r0, #0x7f str r0, [sp] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 8fe02035..7b09367a 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -3868,7 +3868,7 @@ _021D9488: bl FUN_0206B5E4 mov r1, #0xab mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021D94AE mov r0, #0 @@ -4718,13 +4718,13 @@ _021D9B9E: add r0, r4, #0 mov r1, #0xac mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _021D9BD2 add r0, r4, #0 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021D9BD2 add r5, r5, #1 @@ -5301,7 +5301,7 @@ _021DA042: mov r1, #0xab mov r2, #0 add r7, r0, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DA080 ldr r4, _021DA164 ; =0x021E6224 @@ -5460,7 +5460,7 @@ MOD14_021DA168: ; 0x021DA168 add r0, r5, #0 mov r1, #0xac mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _021DA1A8 mov r4, #0 @@ -5470,7 +5470,7 @@ _021DA18C: add r0, r5, #0 add r1, #0x36 add r2, r7, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r6, r0 bne _021DA1A2 mov r0, #1 @@ -8518,7 +8518,7 @@ _021DB998: beq _021DB9C4 mov r1, #0xab mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DB9C4 mov r0, #1 @@ -8739,7 +8739,7 @@ _021DBB36: mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DBB86 ldr r0, [sp, #0x20] @@ -9195,12 +9195,12 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #4] add r0, r5, #0 mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #6] mov r0, #0x47 lsl r0, r0, #2 @@ -9212,7 +9212,7 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #0xac mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r4, #0xf] ldrh r0, [r4, #4] mov r1, #9 @@ -9221,7 +9221,7 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #8 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r2, r0, #0 ldrh r1, [r4, #4] add r0, r7, #0 @@ -9230,17 +9230,17 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #0xb mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r4, #0xb] add r0, r5, #0 mov r1, #0xb0 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r4, #0xc] add r0, r5, #0 mov r1, #0xb1 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strb r0, [r4, #0xd] ldrb r0, [r4, #0xf] cmp r0, #0 @@ -9248,13 +9248,13 @@ MOD14_021DBEAC: ; 0x021DBEAC add r0, r5, #0 mov r1, #0xaf mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DBF68 mov r1, #0 add r0, r5, #0 add r2, r1, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r2, r0, #0 ldrh r1, [r4, #4] add r0, r7, #0 @@ -9268,7 +9268,7 @@ _021DBF6C: ldr r2, [r4, #0x14] add r0, r5, #0 mov r1, #0x76 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldrb r0, [r4, #0xf] cmp r0, #0 bne _021DBF8C @@ -9302,7 +9302,7 @@ _021DBFAA: bl FUN_0200A8E0 _021DBFB8: add r0, r5, #0 - bl GetBoxMonNatureEncrypted + bl GetBoxMonNature add r1, r0, #0 mov r0, #0x65 lsl r0, r0, #2 @@ -9312,7 +9312,7 @@ _021DBFB8: add r0, r5, #0 mov r1, #0xa mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, r0, #0 mov r0, #0x66 lsl r0, r0, #2 @@ -9378,112 +9378,112 @@ _021DC034: ldr r0, [r5, r0] mov r1, #0xa3 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0xa] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0xa4 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0xc] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0xa5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0xe] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0xa7 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x10] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0xa8 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x12] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0xa6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x14] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x13 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x16] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x14 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x18] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x15 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x1a] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x16 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x1c] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x17 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x1e] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x20] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x37 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x22] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x38 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x24] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x39 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x26] mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r4, #7] mov r0, #0x1a lsl r0, r0, #4 @@ -9628,7 +9628,7 @@ _021DC254: ldr r0, [r4] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, _021DC274 ; =0x000001ED cmp r0, r1 bne _021DC26A @@ -10215,7 +10215,7 @@ MOD14_021DC58C: ; 0x021DC58C ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData pop {r4, r5, r6, pc} _021DC5B2: ldrb r0, [r5, #0x1f] @@ -10224,13 +10224,13 @@ _021DC5B2: ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData pop {r4, r5, r6, pc} _021DC5C4: ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl GetMonDataEncrypted + bl GetMonData pop {r4, r5, r6, pc} thumb_func_start MOD14_021DC5D0 @@ -10245,13 +10245,13 @@ MOD14_021DC5D0: ; 0x021DC5D0 ldr r0, [r5, #0x4c] add r1, r4, #0 add r2, r6, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData pop {r4, r5, r6, pc} _021DC5EC: ldr r0, [r5, #8] add r1, r4, #0 add r2, r6, #0 - bl GetMonDataEncrypted + bl GetMonData pop {r4, r5, r6, pc} thumb_func_start MOD14_021DC5F8 @@ -14333,7 +14333,7 @@ _021DE5FE: mov r1, #0xab mov r2, #0 str r0, [sp, #0x34] - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DE64E add r0, r4, #0 @@ -14434,7 +14434,7 @@ _021DE6D0: mov r1, #5 mov r2, #0 add r7, r0, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DE70A ldr r1, _021DE724 ; =0x00005814 @@ -14908,7 +14908,7 @@ _021DEA70: mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DEB02 ldrb r1, [r5, #2] @@ -15025,7 +15025,7 @@ _021DEB5C: mov r1, #5 mov r2, #0 str r0, [sp, #0x2c] - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _021DEBA0 add r0, r4, #0 @@ -18877,21 +18877,21 @@ MOD14_021E0940: ; 0x021E0940 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x18] add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x14] add r0, r6, #0 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r7, r0, #0x18 add r0, r6, #0 @@ -18905,12 +18905,12 @@ MOD14_021E0940: ; 0x021E0940 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #0x30] add r0, r6, #0 mov r1, #0xb mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #0x2e] add r0, r4, #4 bl FUN_020B1A24 @@ -18992,14 +18992,14 @@ MOD14_021E0A60: ; 0x021E0A60 add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x10] add r0, r6, #0 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0xc] @@ -19023,12 +19023,12 @@ MOD14_021E0A60: ; 0x021E0A60 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #0x30] add r0, r6, #0 mov r1, #0xb mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r4, #0x2e] add r0, r4, #4 bl FUN_020B1A24 @@ -21826,19 +21826,19 @@ _021E204A: add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r7, r0, #0 beq _021E20C8 add r0, r5, #0 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _021E209A add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 add r0, r7, #0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 3191e90c..dfa30774 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -51043,7 +51043,7 @@ MOD16_021EEFA4: ; 0x021EEFA4 ldr r0, [r4, #0x10] mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x6f lsl r1, r1, #2 str r0, [r5, r1] @@ -55028,19 +55028,19 @@ _021F0E68: beq _021F0EB6 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F0EB6 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F0EB6 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F0ECC ; =0x000001EE cmp r0, r1 beq _021F0EB6 @@ -55578,26 +55578,26 @@ _021F128E: beq _021F12EA mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F12EA add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F12EA add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F1300 ; =0x000001EE cmp r0, r1 beq _021F12EA add r0, r4, #0 mov r1, #0x9f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #0x10] tst r0, r1 beq _021F12EA @@ -55693,26 +55693,26 @@ _021F1382: beq _021F13DE mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F13DE add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F13DE add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F13F4 ; =0x000001EE cmp r0, r1 beq _021F13DE add r0, r4, #0 mov r1, #0x9f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #0x10] tst r0, r1 bne _021F13DE @@ -57075,12 +57075,12 @@ _021F1E2C: beq _021F1E66 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 ldr r0, [sp, #0xc] mov r1, #0xa3 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r7, r0 beq _021F1E66 ldr r0, [sp] @@ -57149,13 +57149,13 @@ _021F1ED6: add r0, r5, #0 add r1, #0x3a mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r4, #0 add r6, r0, #0 add r0, r5, #0 add r1, #0x42 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r6, r0 beq _021F1EFE ldr r0, [sp, #4] @@ -57555,19 +57555,19 @@ _021F21D8: mov r1, #0xa2 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F22A0 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F22A0 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F22C0 ; =0x000001EE cmp r0, r1 beq _021F22A0 @@ -57579,7 +57579,7 @@ _021F221E: add r0, r6, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5] add r4, r4, #1 add r5, r5, #2 @@ -57592,7 +57592,7 @@ _021F2238: add r0, r6, #0 add r1, #0x46 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r4] add r5, r5, #1 add r4, r4, #1 @@ -57601,12 +57601,12 @@ _021F2238: add r0, r6, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r4, r0, #0 add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x44 str r1, [sp] lsl r1, r4, #0x10 @@ -60065,7 +60065,7 @@ _021F3486: add r0, r4, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 lsl r1, r1, #0x10 add r0, r6, #0 @@ -60078,7 +60078,7 @@ _021F34A2: add r0, r4, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 lsl r1, r1, #0x10 add r0, r6, #0 @@ -60166,32 +60166,32 @@ _021F3530: add r0, r4, #0 mov r1, #0x4b mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0 add r0, r4, #0 mov r1, #0x4a mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r6, r0, #0 add r0, r4, #0 mov r1, #0x49 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r4, #0 mov r1, #0x48 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #4] add r0, r4, #0 mov r1, #0x46 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #8] add r0, r4, #0 mov r1, #0x47 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 lsl r2, r6, #0x1f lsl r0, r5, #0x1f @@ -60398,19 +60398,19 @@ _021F36EC: mov r1, #0xa2 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F37DE add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F37DE add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F3804 ; =0x000001EE cmp r0, r1 beq _021F37DE @@ -60426,7 +60426,7 @@ _021F3730: add r0, r6, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x1c] @@ -60444,7 +60444,7 @@ _021F3730: add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x30] add r0, r5, #0 add r1, r4, #0 @@ -60700,19 +60700,19 @@ _021F3956: mov r1, #0xa2 mov r2, #0 str r0, [sp, #0x50] - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F39BC ldr r0, [sp, #0x50] mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F39BC ldr r0, [sp, #0x50] mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F3B84 ; =0x000001EE cmp r0, r1 beq _021F39BC @@ -60750,7 +60750,7 @@ _021F39C2: ldr r0, [sp, #0x50] add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r7, r0, #0x10 ldr r0, [sp, #0x14] @@ -60780,7 +60780,7 @@ _021F39F2: ldr r0, [sp, #0x50] mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x70] add r0, r5, #0 add r1, r6, #0 @@ -60844,7 +60844,7 @@ _021F3A7E: ldr r0, [sp, #0x50] mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x80] add r0, r5, #0 add r1, r4, #0 @@ -60934,19 +60934,19 @@ _021F3B3C: mov r1, #0xa2 mov r2, #0 str r0, [sp, #0x20] - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F3BBE ldr r0, [sp, #0x20] mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F3BBE ldr r0, [sp, #0x20] mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F3B84 ; =0x000001EE cmp r0, r1 beq _021F3BBE @@ -60993,7 +60993,7 @@ _021F3BC4: ldr r0, [sp, #0x20] add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r7, r0, #0x10 ldr r0, [sp, #0x14] @@ -61023,7 +61023,7 @@ _021F3BF4: ldr r0, [sp, #0x20] mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x90] add r0, r5, #0 add r1, r6, #0 @@ -61089,7 +61089,7 @@ _021F3C82: ldr r0, [sp, #0x20] mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xa0] add r0, r5, #0 add r1, r4, #0 @@ -61455,19 +61455,19 @@ _021F3F62: mov r1, #0xa2 mov r2, #0 add r4, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F3FE6 add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F3FE6 add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F3FFC ; =0x000001EE cmp r0, r1 beq _021F3FE6 @@ -61490,7 +61490,7 @@ _021F3F62: add r0, r4, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r1, r0, #0x18 ldr r0, [sp, #0x10] @@ -61608,19 +61608,19 @@ _021F4094: mov r1, #0xa2 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F40FA add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F40FA add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F4254 ; =0x000001EE cmp r0, r1 beq _021F40FA @@ -61669,12 +61669,12 @@ _021F40FC: add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x40] add r0, r6, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 lsl r1, r1, #0x10 add r0, r5, #0 @@ -61685,12 +61685,12 @@ _021F40FC: add r0, r6, #0 mov r1, #0xb0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 mov r1, #0xb1 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [sp, #0x40] ldr r2, [sp, #0x38] str r1, [sp] @@ -61715,7 +61715,7 @@ _021F4182: add r0, r6, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x20] @@ -61733,7 +61733,7 @@ _021F4182: add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F425C ; =0x0000306C str r0, [sp, #0x4c] ldrh r1, [r4, r1] @@ -62080,19 +62080,19 @@ _021F445C: mov r1, #0xa2 mov r2, #0 add r4, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F44BA add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F44BA add r0, r4, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F4598 ; =0x000001EE cmp r0, r1 beq _021F44BA @@ -62308,7 +62308,7 @@ _021F462E: bl MOD11_02230014 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F4664 ldr r0, _021F4694 ; =0x0000219C @@ -62420,7 +62420,7 @@ _021F4704: mov r1, #0xad mov r2, #0 str r0, [sp, #0x68] - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 beq _021F47E0 @@ -62430,7 +62430,7 @@ _021F4704: ldr r0, [sp, #0x68] mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F47E0 add r0, r4, #0 @@ -62477,14 +62477,14 @@ _021F4704: ldr r0, [sp, #0x68] mov r1, #0xb0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x58] ldr r0, [sp, #0x68] mov r1, #0xb1 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x54] @@ -62542,7 +62542,7 @@ _021F480E: add r0, r4, #0 add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x3c] @@ -62560,7 +62560,7 @@ _021F480E: add r0, r4, #0 mov r1, #0xa mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x70] add r0, r5, #0 add r1, r6, #0 @@ -62648,7 +62648,7 @@ _021F48E0: mov r1, #0xad mov r2, #0 str r0, [sp, #0x1c] - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 beq _021F4900 @@ -62661,7 +62661,7 @@ _021F4902: ldr r0, [sp, #0x1c] mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F4A06 ldr r0, _021F4A20 ; =0x0000219C @@ -62703,7 +62703,7 @@ _021F4954: ldr r0, [sp, #0x1c] add r1, #0x36 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x8c] @@ -62876,19 +62876,19 @@ _021F4AA8: mov r1, #0xa2 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F4AE6 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021F4AE6 add r0, r6, #0 mov r1, #0xad mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _021F4D70 ; =0x000001EE cmp r0, r1 beq _021F4AE6 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 4f74dada..a9ad0efd 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -8856,7 +8856,7 @@ MOD17_021DB700: ; 0x021DB700 add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r0, r6, #0 add r1, r4, #0 mov r2, #2 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 8b3921cf..58b7d707 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -313,27 +313,27 @@ _02254A62: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #8] add r0, r4, #0 mov r1, #0xa2 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0xa] add r0, r4, #0 mov r1, #0xa3 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0xc] add r0, r4, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0xe] add r0, r4, #0 mov r1, #0x9f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _02254ABC mov r0, #1 @@ -345,12 +345,12 @@ _02254ABE: add r0, r4, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r5, #0x12] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r5, #0x13] add r0, r4, #0 add r1, r7, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 89222d17..e4a0b678 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -86,18 +86,18 @@ _022548D6: mov r1, #0x4c mov r2, #0 add r5, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _02254962 add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0xc] add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x10] add r0, r5, #0 bl FUN_0206B688 @@ -105,7 +105,7 @@ _022548D6: add r0, r5, #0 mov r1, #9 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData bl MOD28_0225498C cmp r0, #6 bhi _02254944 diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index d24971d9..5ef1d37f 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -338,12 +338,12 @@ _02254A7A: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r6, #0x1c] add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r6, #0x20] ldr r0, [sp, #8] bl MOD05_021EC7B4 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 0f1fecfb..863492a4 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -85,12 +85,12 @@ _022548CC: add r0, r7, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x1c] add r0, r7, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r5, #0x28] ldr r0, [sp, #4] str r7, [r4, #0x48] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 3abecf47..a4bf2048 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -225,13 +225,13 @@ _02211FA2: mov r1, #0xa2 mov r2, #0 add r6, r0, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _02211FC8 add r0, r6, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _02211FC8 add r5, r5, #1 @@ -2005,13 +2005,13 @@ _02212E52: mov r1, #5 mov r2, #0 add r7, r0, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [r5, #4] mov r2, #0 strh r0, [r1, r4] add r0, r7, #0 mov r1, #6 - bl GetMonDataEncrypted + bl GetMonData ldr r1, [r5, #4] add r6, r6, #1 add r1, r1, r4 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 6fff3ef5..b187276b 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -2218,17 +2218,17 @@ _0222E5EC: add r0, r7, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x10] add r0, r7, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x14] add r0, r7, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0 ldr r0, [sp, #0x10] ldr r2, [sp, #0x14] @@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54 ldr r0, [r0, #4] mov r1, #0xa1 add r2, sp, #0xc - bl SetMonDataEncrypted + bl SetMonData _0222EC80: cmp r7, #0xff beq _0222EC9A @@ -3017,7 +3017,7 @@ _0222EC80: add r0, r1, r0 ldr r0, [r0, #4] mov r1, #0xa1 - bl SetMonDataEncrypted + bl SetMonData _0222EC9A: add r2, r5, #4 ldr r1, [r2, r6] @@ -4492,7 +4492,7 @@ _0222F83E: mov r1, #0x4c add r0, r7, #0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0222F85C ldr r1, _0222F86C ; =0x00000428 @@ -5701,7 +5701,7 @@ MOD62_022301AC: ; 0x022301AC mov r1, #5 ldr r0, [r5, r0] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r4, r0, #0 ldr r0, _02230214 ; =0x00000428 mov r1, #2 @@ -5749,11 +5749,11 @@ MOD62_0223021C: ; 0x0223021C mov r1, #5 ldr r0, [r5, r0] mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r4, r0, #0 ldr r0, _02230268 ; =0x00000428 ldr r0, [r5, r0] - bl GetMonNatureEncrypted + bl GetMonNature add r6, r0, #0 mov r0, #0x6a lsl r0, r0, #2 @@ -6199,7 +6199,7 @@ _0223059A: str r0, [sp, #0x9c] ldr r0, _02230724 ; =0x00000428 ldr r0, [r4, r0] - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x8c] add r0, sp, #0x7c bl MOD08_02229918 @@ -6235,12 +6235,12 @@ _022305E2: mov r1, #0xa1 ldr r0, [r4, r0] add r2, sp, #0x18 - bl SetMonDataEncrypted + bl SetMonData ldr r0, _02230724 ; =0x00000428 mov r1, #0xaa ldr r0, [r4, r0] add r2, sp, #0x64 - bl SetMonDataEncrypted + bl SetMonData mov r0, #0x35 add r1, sp, #0x58 bl MOD08_02228218 @@ -6396,7 +6396,7 @@ _0223072C: str r0, [sp, #0x50] ldr r0, [r4, r1] mov r1, #0x9a - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x40] add r0, sp, #0x30 bl MOD08_02229918 @@ -6531,7 +6531,7 @@ _02230860: add r2, r0, #0 add r0, r5, #0 mov r1, #0xaa - bl SetMonDataEncrypted + bl SetMonData _022308A8: mov r0, #0xf5 mov r1, #8 @@ -7091,7 +7091,7 @@ MOD62_02230D38: ; 0x02230D38 ldr r0, [r0, #4] mov r1, #0xa1 add r2, sp, #0 - bl SetMonDataEncrypted + bl SetMonData _02230D5C: mov r0, #0xff str r0, [r4, r6] diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 20b90cb6..c62ef6e6 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -3372,7 +3372,7 @@ MOD65_021D8F34: ; 0x021D8F34 str r0, [r4, #0x30] ldr r0, [r4, #0x10] ldr r0, [r0] - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #0x34] ldr r0, [r4, #0x10] ldr r0, [r0] @@ -3382,7 +3382,7 @@ MOD65_021D8F34: ; 0x021D8F34 strb r0, [r1] ldr r0, [r4, #0x10] ldr r0, [r0] - bl GetMonNatureEncrypted + bl GetMonNature add r1, r4, #0 add r1, #0x36 strb r0, [r1] @@ -3402,7 +3402,7 @@ MOD65_021D8F34: ; 0x021D8F34 ldr r2, [r4, #0x3c] ldr r0, [r0] mov r1, #0x76 - bl GetMonDataEncrypted + bl GetMonData add r1, r4, #0 ldr r0, [r4, #0x10] add r1, #0x36 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index c0a49cfe..2e724605 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -64,7 +64,7 @@ _0222D63A: bl FUN_0206B9B0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0222D65E ldr r0, [r4, #4] @@ -1233,14 +1233,14 @@ _0222DF98: ldr r0, [sp, #0x2c] mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x81 lsl r1, r1, #2 str r0, [r5, r1] mov r1, #0 ldr r0, [sp, #0x2c] add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData str r4, [sp] str r0, [sp, #4] mov r0, #1 @@ -1268,7 +1268,7 @@ _0222DF98: mov r1, #0 ldr r0, [sp, #0x2c] add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData str r4, [sp] str r0, [sp, #4] mov r0, #1 @@ -2418,7 +2418,7 @@ _0222E982: ldr r0, [r5, #0x24] mov r1, #0x98 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x14] mov r1, #0 @@ -2480,7 +2480,7 @@ _0222E9FC: ldr r0, [r4, #0x24] ldr r2, [r4, #0x1c] mov r1, #0x76 - bl GetMonDataEncrypted + bl GetMonData add r0, r4, #0 mov r1, #0x48 bl MOD69_0222E89C @@ -4042,7 +4042,7 @@ MOD69_0222F6C4: ; 0x0222F6C4 add r0, r4, #0 mov r1, #0x79 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData sub r1, r0, #1 cmp r1, #2 bhi _0222F6E8 @@ -4063,7 +4063,7 @@ _0222F6FA: add r0, r4, #0 mov r1, #0x6e mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _0222F70C mov r5, #6 @@ -4075,7 +4075,7 @@ _0222F70C: add r0, r4, #0 mov r1, #7 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r7, r0 beq _0222F726 mov r5, #2 @@ -4089,7 +4089,7 @@ _0222F726: add r0, r4, #0 ldr r2, [r5, r2] mov r1, #0x90 - bl GetMonDataEncrypted + bl GetMonData ldr r1, _0222F788 ; =0x00001B54 ldr r0, [r5, r1] add r1, r1, #4 @@ -4103,7 +4103,7 @@ _0222F750: add r0, r4, #0 mov r1, #0x98 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x7d lsl r1, r1, #4 cmp r0, r1 @@ -4114,7 +4114,7 @@ _0222F766: add r0, r4, #0 mov r1, #0x92 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0222F778 mov r5, #0 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index ec5af814..6ab711fd 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -1562,7 +1562,7 @@ _021D80F4: ldr r0, [r7, r0] ldr r2, [sp, #0x1c] mov r1, #0x70 - bl SetMonDataEncrypted + bl SetMonData mov r1, #0x66 lsl r1, r1, #2 ldr r1, [r7, r1] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index a6e576b3..3e877d49 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1348,37 +1348,37 @@ MOD71_0222E118: ; 0x0222E118 add r0, r5, #0 mov r1, #0x9a mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r4, #4] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4] add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r4, #6] add r0, r5, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strb r0, [r4, #5] add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData strh r0, [r4, #8] add r0, r5, #0 mov r1, #0xa1 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData str r0, [r4, #0xc] add r0, r5, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r6, r0, #0 add r0, r5, #0 add r1, r7, #0 @@ -2647,12 +2647,12 @@ MOD71_0222EBFC: ; 0x0222EBFC mov r1, #0 add r0, r6, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0 add r0, r6, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r3, #0 str r3, [sp] mov r1, #0xa @@ -2697,7 +2697,7 @@ MOD71_0222EC5C: ; 0x0222EC5C bl FUN_0206B9B0 mov r1, #0x76 add r2, r4, #0 - bl GetMonDataEncrypted + bl GetMonData add r0, r5, #0 mov r1, #0 bl FUN_02019620 @@ -2731,7 +2731,7 @@ _0222ECB6: bl FUN_0206B9B0 mov r1, #0x4d mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _0222ECCE mov r0, #2 @@ -2932,7 +2932,7 @@ _0222EE14: bl FUN_0206B9B0 mov r1, #0xa0 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r1, r0, #0x10 mov r0, #1 @@ -2978,7 +2978,7 @@ _0222EEA6: bl FUN_0206B9B0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r5, #0x20 lsl r0, r0, #0x10 lsl r4, r5, #4 @@ -6338,7 +6338,7 @@ MOD71_022309E8: ; 0x022309E8 add r0, r4, #0 mov r1, #0x4c mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 bne _02230A40 mov r1, #0x46 @@ -6347,7 +6347,7 @@ MOD71_022309E8: ; 0x022309E8 add r0, r4, #0 mov r1, #9 add r2, sp, #0x10 - bl SetMonDataEncrypted + bl SetMonData _02230A40: bl FUN_02031190 bl FUN_0202DFA4 @@ -6427,7 +6427,7 @@ MOD71_02230AE4: ; 0x02230AE4 add r0, r4, #0 mov r1, #0x74 add r2, sp, #4 - bl GetMonDataEncrypted + bl GetMonData add r0, r5, #0 bl FUN_0202398C add r7, r0, #0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 6f7aff75..e40f2c19 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -801,7 +801,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x36 - bl SetMonDataEncrypted + bl SetMonData mov r0, #0 str r0, [sp] ldr r1, [r4] @@ -809,7 +809,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x3e - bl SetMonDataEncrypted + bl SetMonData add r0, r4, #0 bl MOD76_021D8514 mov r1, #0 @@ -820,7 +820,7 @@ MOD76_021D7B2C: ; 0x021D7B2C ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x3a - bl SetMonDataEncrypted + bl SetMonData ldr r0, [r4] mov r1, #0 strb r1, [r0, #0x16] @@ -2028,7 +2028,7 @@ MOD76_021D8524: ; 0x021D8524 ldr r0, [r1] ldrb r1, [r1, #0x17] add r1, #0x36 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r3, pc} @@ -2131,7 +2131,7 @@ _021D85EC: ldr r0, [r0] add r1, #0x36 add r2, r6, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _021D8608 add r0, r4, #1 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index ca042f7e..4762946f 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -4855,7 +4855,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 ldr r0, [sp, #0x48] ldr r2, [sp, #0x1c] mov r1, #0x76 - bl GetBoxMonDataEncrypted + bl GetBoxMonData mov r2, #0 ldrsh r0, [r4, r2] mov r1, #6 @@ -4866,7 +4866,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 mov r0, #3 ldrsb r4, [r4, r0] ldr r0, [sp, #0x48] - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x30] add r0, r5, #0 mov r1, #0x46 @@ -5058,12 +5058,12 @@ MOD80_0222FD88: ; 0x0222FD88 mov r1, #0 add r0, r5, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData add r6, r0, #0 add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData mov r3, #0 str r3, [sp] mov r1, #0xa @@ -9979,7 +9979,7 @@ _022325CE: bl FUN_0206B9B0 mov r1, #0xa1 add r2, r4, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _022325FE mov r0, #0xe @@ -10219,7 +10219,7 @@ _022327CE: bl FUN_0206B9B0 mov r1, #0xa1 add r2, r4, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 beq _022327FE mov r0, #0xb @@ -10836,34 +10836,34 @@ MOD80_02232C88: ; 0x02232C88 add r0, r5, #0 mov r1, #0xab mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x1c] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r6] add r0, r5, #0 mov r1, #0x70 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x10] add r0, r5, #0 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x14] add r0, r5, #0 mov r1, #6 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x18] ldrh r0, [r6] mov r1, #0x6f mov r2, #0 strh r0, [r4] add r0, r5, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r0, r0, #1 strb r0, [r4, #2] ldr r0, [sp, #0x14] @@ -11076,7 +11076,7 @@ _02232E4A: ldr r0, [sp, #0x24] mov r1, #0xa1 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0 ldr r0, _02232F90 ; =0x00000E54 beq _02232EB4 @@ -11274,7 +11274,7 @@ _02233028: ldrh r1, [r5] add r0, r7, #0 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r6, r6, #1 add r4, r4, r0 add r5, r5, #2 @@ -11305,7 +11305,7 @@ MOD80_02233054: ; 0x02233054 _02233062: mov r1, #0xab mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _02233072 mov r0, #0 @@ -11314,7 +11314,7 @@ _02233072: add r0, r4, #0 mov r1, #0xac mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 beq _02233084 mov r0, #2 @@ -11386,13 +11386,13 @@ MOD80_022330E4: ; 0x022330E4 mov r1, #5 mov r2, #0 add r5, r0, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, sp, #0 strh r0, [r1] add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, r0, #1 add r0, sp, #0 strb r1, [r0, #2] @@ -11418,7 +11418,7 @@ MOD80_0223311C: ; 0x0223311C ldr r0, [r0] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, sp, #0 strh r0, [r1, #6] add r0, r5, #0 @@ -11426,7 +11426,7 @@ MOD80_0223311C: ; 0x0223311C ldr r0, [r0] mov r1, #0x6f mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, r0, #1 add r0, sp, #0 strb r1, [r0, #8] @@ -11459,13 +11459,13 @@ MOD80_0223311C: ; 0x0223311C mov r1, #5 mov r2, #0 add r5, r0, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, sp, #0 strh r0, [r1] add r0, r5, #0 mov r1, #0x6f mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r0, r0, #1 add r1, sp, #0 strb r0, [r1, #2] @@ -11524,7 +11524,7 @@ MOD80_022331F8: ; 0x022331F8 push {r3, lr} mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FUN_0206EA98 @@ -13374,11 +13374,11 @@ MOD80_022340DC: ; 0x022340DC ldr r0, [sp, #0xc] ldr r2, [sp, #0x18] mov r1, #0x76 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r0, [sp, #0xc] mov r1, #0x6f mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r6, r0, #1 ldr r0, [sp, #0xc] bl CalcBoxMonLevelEncrypted @@ -13467,7 +13467,7 @@ _022341CA: ldr r0, [sp, #0xc] mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData strh r0, [r7] ldr r0, [sp, #0x10] strb r6, [r7, #2] @@ -16152,7 +16152,7 @@ MOD80_022355F0: ; 0x022355F0 mov r1, #6 mov r2, #0 add r6, r3, #0 - bl GetMonDataEncrypted + bl GetMonData ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #0x20] @@ -16175,7 +16175,7 @@ _02235624: add r0, r4, #0 mov r1, #9 add r2, sp, #0 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [r5] ldr r0, [r0] bl MOD80_02235754 @@ -16258,7 +16258,7 @@ _022356D2: add r0, r4, #0 mov r1, #9 add r2, sp, #0 - bl SetMonDataEncrypted + bl SetMonData ldr r0, [sp, #0x20] cmp r0, #0x12 bne _02235706 @@ -16364,7 +16364,7 @@ MOD80_022357A0: ; 0x022357A0 add r0, r4, #0 mov r1, #0x74 add r2, sp, #4 - bl GetMonDataEncrypted + bl GetMonData add r0, r4, #0 bl GetMonGenderEncrypted add r3, r0, #0 @@ -17434,7 +17434,7 @@ _02235FDE: mov r1, #6 mov r2, #0 add r7, r0, #0 - bl GetMonDataEncrypted + bl GetMonData add r3, r0, #0 add r0, sp, #0x30 lsl r3, r3, #0x10 @@ -17502,30 +17502,30 @@ _02236068: add r0, r7, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0 ldr r0, [sp, #0x20] mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r5, r0 bne _022360B6 mov r1, #0 add r0, r7, #0 add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0 mov r1, #0 ldr r0, [sp, #0x20] add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData cmp r5, r0 beq _02236126 _022360B6: add r0, r7, #0 mov r1, #6 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r3, r0, #0 add r0, sp, #0x2c lsl r3, r3, #0x10 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 87239548..abe12301 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -136,7 +136,7 @@ _02237F22: mov r1, #5 ldr r0, [r0] mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData mov r1, #0x53 lsl r1, r1, #2 strh r0, [r4, r1] @@ -144,7 +144,7 @@ _02237F22: mov r1, #5 ldr r0, [r0, #4] mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, _02237FD8 ; =0x0000014E strh r0, [r4, r1] mov r0, #0 @@ -197,7 +197,7 @@ MOD81_02237FE8: ; 0x02237FE8 push {r3, lr} mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData mov r1, #0x1c bl GetMonBaseStat cmp r0, #0 @@ -1008,12 +1008,12 @@ _02238610: mov r1, #0 add r0, r4, #0 add r2, r1, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData str r0, [sp, #0x1c] add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 ldr r1, [sp, #0x58] lsr r0, r0, #0x10 @@ -2514,7 +2514,7 @@ _02239138: bl MOD81_02238818 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _0223918A ldr r0, [r4, #0x10] @@ -9501,7 +9501,7 @@ _0223C8D6: bl MOD81_02238820 mov r1, #0x4c mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0 bne _0223C902 ldr r0, [r4] diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 922e6bb5..21f1b081 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -21809,7 +21809,7 @@ MOD83_02237F04: ; 0x02237F04 add r0, r1, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, #0 @@ -22095,7 +22095,7 @@ _0223815E: add r0, r4, #0 add r1, #0x42 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData add r1, r5, #0 str r0, [sp, #8] add r0, r4, #0 @@ -22406,7 +22406,7 @@ _02238332: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData cmp r0, #0xc9 bne _022384AE mov r1, #0 @@ -22441,7 +22441,7 @@ _022384AE: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetBoxMonDataEncrypted + bl GetBoxMonData ldr r1, _022385F0 ; =0x00000182 cmp r0, r1 bne _022384FE @@ -23908,7 +23908,7 @@ MOD83_02238F94: ; 0x02238F94 mov r1, #0 ldr r0, [sp, #0x20] add r2, r1, #0 - bl GetMonDataEncrypted + bl GetMonData mov r3, #0 str r3, [sp] mov r1, #0xa @@ -24027,12 +24027,12 @@ _022390C2: add r0, r4, #0 mov r1, #5 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r6, r0, #0 add r0, r4, #0 mov r1, #0x70 mov r2, #0 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0 mov r0, #0xe9 lsl r0, r0, #4 |