diff options
Diffstat (limited to 'arm9/asm/unk_020842DC.s')
| -rw-r--r-- | arm9/asm/unk_020842DC.s | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s index 17aec9b7..b4f2fa48 100644 --- a/arm9/asm/unk_020842DC.s +++ b/arm9/asm/unk_020842DC.s @@ -28,7 +28,7 @@ _02084308: add r0, r6, #0x0 mov r1, #0x9f mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0xf @@ -103,7 +103,7 @@ _020843AA: add r0, r6, #0x0 mov r1, #0xa2 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x17 @@ -139,7 +139,7 @@ _020843EA: add r0, r6, #0x0 mov r1, #0xa3 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r5, r0 bhs _02084414 add r0, r4, #0x0 @@ -156,7 +156,7 @@ _02084414: add r0, r6, #0x0 mov r1, #0xa0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x64 bhs _0208443A add r0, r4, #0x0 @@ -175,7 +175,7 @@ _0208443A: ldr r3, [sp, #0x4] add r1, r6, #0x0 mov r2, #0x3 - bl FUN_02069168 + bl GetMonEvolution cmp r0, #0x0 beq _02084464 add r0, r4, #0x0 @@ -199,14 +199,14 @@ _0208447C: add r0, r6, #0x0 add r1, #0x3e mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x3 bhs _020844B2 add r1, r7, #0x0 add r0, r6, #0x0 add r1, #0x36 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 mov r1, #0x0 @@ -260,37 +260,37 @@ _02084502: add r0, r6, #0x0 mov r1, #0xd mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0xe mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x14] add r0, r6, #0x0 mov r1, #0xf mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x10] add r0, r6, #0x0 mov r1, #0x10 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0xc] add r0, r6, #0x0 mov r1, #0x11 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x8] add r0, r6, #0x0 mov r1, #0x12 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r7, r0, #0x0 add r0, r6, #0x0 mov r1, #0x5 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x49 lsl r1, r1, #0x2 cmp r0, r1 @@ -616,7 +616,7 @@ FUN_020847F8: ; 0x020847F8 add r5, r1, #0x0 add r1, r2, #0x0 add r4, r3, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r3, [sp, #0x10] add r1, r5, #0x0 add r2, r4, #0x0 @@ -652,7 +652,7 @@ _02084840: mov r1, #0x9f add r2, r6, #0x0 add r7, r6, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x50] str r0, [sp, #0x54] add r0, r4, #0x0 @@ -717,18 +717,18 @@ _020848C0: add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x54 - bl SetMonDataEncrypted + bl SetMonData mov r6, #0x1 _020848D4: add r0, r5, #0x0 mov r1, #0xa2 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x50] add r0, r5, #0x0 mov r1, #0xa3 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x54] add r0, r4, #0x0 mov r1, #0x17 @@ -786,7 +786,7 @@ _0208495C: add r0, r5, #0x0 mov r1, #0xa0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x58] add r0, r4, #0x0 mov r1, #0x19 @@ -797,20 +797,20 @@ _0208495C: cmp r0, #0x64 bge _020849B2 add r0, r5, #0x0 - bl CalcMonExpToNextLevelEncrypted + bl CalcMonExpToNextLevel add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x8 - bl AddMonPartyStatEncrypted + bl AddMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats ldr r0, [sp, #0x50] cmp r0, #0x0 bne _020849B0 add r0, r5, #0x0 mov r1, #0xa3 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r2, r0, #0x0 ldr r3, [sp, #0x54] ldr r1, [sp, #0x50] @@ -915,37 +915,37 @@ _02084A66: add r0, r5, #0x0 mov r1, #0xd mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x50] add r0, r5, #0x0 mov r1, #0xe mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x54] add r0, r5, #0x0 mov r1, #0xf mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x58] add r0, r5, #0x0 mov r1, #0x10 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x5c] add r0, r5, #0x0 mov r1, #0x11 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x60] add r0, r5, #0x0 mov r1, #0x12 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x64] add r0, r5, #0x0 mov r1, #0x5 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData mov r1, #0x49 lsl r1, r1, #0x2 cmp r0, r1 @@ -985,9 +985,9 @@ _02084A66: add r0, r5, #0x0 mov r1, #0xd add r2, sp, #0x50 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084B18: ldr r0, [sp, #0x6c] @@ -1030,9 +1030,9 @@ _02084B20: add r0, r5, #0x0 mov r1, #0xe add r2, sp, #0x54 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084B78: ldr r0, [sp, #0x6c] @@ -1075,9 +1075,9 @@ _02084B80: add r0, r5, #0x0 mov r1, #0xf add r2, sp, #0x58 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084BD8: ldr r0, [sp, #0x6c] @@ -1120,9 +1120,9 @@ _02084BE0: add r0, r5, #0x0 mov r1, #0x10 add r2, sp, #0x5c - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084C38: ldr r0, [sp, #0x6c] @@ -1165,9 +1165,9 @@ _02084C40: add r0, r5, #0x0 mov r1, #0x11 add r2, sp, #0x60 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084C98: ldr r0, [sp, #0x6c] @@ -1210,9 +1210,9 @@ _02084CA0: add r0, r5, #0x0 mov r1, #0x12 add r2, sp, #0x64 - bl SetMonDataEncrypted + bl SetMonData add r0, r5, #0x0 - bl UpdateMonLevelAndRecalcStats + bl CalcMonLevelAndStats mov r6, #0x1 _02084CF8: ldr r0, [sp, #0x6c] @@ -1233,7 +1233,7 @@ _02084D14: add r0, r5, #0x0 mov r1, #0x9 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x50] cmp r0, #0x64 bge _02084D54 @@ -1320,7 +1320,7 @@ FUN_02084DD0: ; 0x02084DD0 add r5, r1, #0x0 add r1, r2, #0x0 add r4, r3, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r1, [sp, #0x14] add r3, sp, #0x0 str r1, [sp, #0x0] @@ -1338,7 +1338,7 @@ FUN_02084DF0: ; 0x02084DF0 add r1, #0x36 mov r2, #0x0 add r5, r0, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r7, r0, #0x10 bne _02084E08 @@ -1349,14 +1349,14 @@ _02084E08: add r0, r5, #0x0 add r1, #0x3a mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 add r6, #0x3e lsr r4, r0, #0x18 add r0, r5, #0x0 add r1, r6, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x18 lsr r1, r0, #0x18 add r0, r7, #0x0 @@ -1382,7 +1382,7 @@ FUN_02084E40: ; 0x02084E40 add r1, #0x36 mov r2, #0x0 add r6, r0, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r7, r0, #0x10 bne _02084E5E @@ -1397,14 +1397,14 @@ _02084E5E: ldr r1, [sp, #0x0] add r0, r6, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x4 strb r0, [r1, #0x0] add r5, #0x3e add r0, r6, #0x0 add r1, r5, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, r0, #0x0 lsl r1, r1, #0x18 add r0, r7, #0x0 @@ -1429,7 +1429,7 @@ _02084EA8: ldr r1, [sp, #0x0] add r0, r6, #0x0 add r2, sp, #0x4 - bl SetMonDataEncrypted + bl SetMonData add sp, #0x8 mov r0, #0x1 pop {r3-r7, pc} @@ -1450,7 +1450,7 @@ FUN_02084EC0: ; 0x02084EC0 mov r2, #0x0 add r5, r0, #0x0 str r1, [sp, #0x0] - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x8 strb r0, [r1, #0x0] ldrb r0, [r1, #0x0] @@ -1464,7 +1464,7 @@ _02084EE6: add r0, r5, #0x0 add r1, #0x36 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 mov r1, #0x0 @@ -1480,7 +1480,7 @@ _02084F08: add r0, r5, #0x0 add r1, r4, #0x0 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData add r1, sp, #0x8 strb r0, [r1, #0x1] ldrb r1, [r1, #0x0] @@ -1511,12 +1511,12 @@ _02084F34: ldr r1, [sp, #0x0] add r0, r5, #0x0 add r2, sp, #0x8 - bl SetMonDataEncrypted + bl SetMonData add r2, sp, #0x8 add r0, r5, #0x0 add r1, r4, #0x0 add r2, #0x1 - bl SetMonDataEncrypted + bl SetMonData mov r0, #0x1 add sp, #0xc pop {r4-r7, pc} @@ -1556,7 +1556,7 @@ _02084F96: _02084F98: mov r1, #0xa2 add r2, sp, #0xc - bl SetMonDataEncrypted + bl SetMonData pop {r3} pop {r3} add sp, #0x10 @@ -1621,7 +1621,7 @@ FUN_02085000: ; 0x02085000 add r4, r1, #0x0 mov r1, #0x9 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0xff blt _02085014 mov r0, #0x0 @@ -1723,7 +1723,7 @@ _020850BE: add r0, r5, #0x0 mov r1, #0x6 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData lsl r0, r0, #0x10 ldr r2, [sp, #0x20] lsr r0, r0, #0x10 @@ -1741,7 +1741,7 @@ _020850EC: add r0, r5, #0x0 mov r1, #0x9a mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0xb bne _02085100 ldr r0, [sp, #0x18] @@ -1751,7 +1751,7 @@ _02085100: add r0, r5, #0x0 mov r1, #0x97 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r6, r0 bne _02085114 ldr r0, [sp, #0x18] @@ -1775,7 +1775,7 @@ _0208512C: add r0, r5, #0x0 mov r1, #0x9 add r2, sp, #0x18 - bl SetMonDataEncrypted + bl SetMonData mov r0, #0x1 pop {r4-r6} pop {r3} @@ -1787,7 +1787,7 @@ FUN_02085140: ; 0x02085140 push {r4-r7, lr} sub sp, #0xc str r0, [sp, #0x0] - bl FUN_0206B9AC + bl GetPartyCount mov r7, #0x0 str r0, [sp, #0x4] cmp r0, #0x0 @@ -1796,28 +1796,28 @@ FUN_02085140: ; 0x02085140 _02085154: ldr r0, [sp, #0x0] add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xab mov r2, #0x0 add r5, r0, #0x0 - bl GetMonDataEncrypted + bl GetMonData cmp r0, #0x0 beq _020851AC add r0, r5, #0x0 mov r1, #0xa3 mov r2, #0x0 - bl GetMonDataEncrypted + bl GetMonData str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0xa2 add r2, sp, #0x8 - bl SetMonDataEncrypted + bl SetMonData mov r0, #0x0 str r0, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x9f add r2, sp, #0x8 - bl SetMonDataEncrypted + bl SetMonData mov r4, #0x0 _02085190: add r0, r5, #0x0 |