summaryrefslogtreecommitdiff
path: root/arm9/modules/69/asm/module_69.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/69/asm/module_69.s')
-rw-r--r--arm9/modules/69/asm/module_69.s60
1 files changed, 30 insertions, 30 deletions
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index c0a49cfe..a5103ad4 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -50,7 +50,7 @@ MOD69_0222D5C0: ; 0x0222D5C0
str r0, [r4, #4]
ldr r0, [r4, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r6, r0, #0
mov r5, #0
cmp r6, #0
@@ -61,10 +61,10 @@ _0222D63A:
ldr r0, [r4, #0xc]
add r1, r5, #0
ldr r0, [r0, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
bne _0222D65E
ldr r0, [r4, #4]
@@ -1224,7 +1224,7 @@ _0222DF98:
lsl r1, r1, #2
ldr r0, [r0, #4]
ldr r1, [r5, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x2c]
ldr r1, [sp, #0x2c]
add r0, sp, #0xc4
@@ -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
@@ -2281,7 +2281,7 @@ _0222E860:
lsl r1, r1, #2
ldr r0, [r0, #4]
ldr r1, [r2, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [r4, #0x24]
ldr r0, [r5, #0xc]
mov r2, #0
@@ -2360,7 +2360,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
mov r1, #0
bl FUN_0200AC60
ldr r0, [r4, #0x24]
- bl CalcMonLevelEncrypted
+ bl CalcMonLevel
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -2370,7 +2370,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
mov r3, #3
bl FUN_0200AD38
ldr r0, [r4, #0x24]
- bl GetMonGenderEncrypted
+ bl GetMonGender
cmp r0, #0
beq _0222E93C
cmp 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
@@ -3422,10 +3422,10 @@ MOD69_0222F1B0: ; 0x0222F1B0
mov r0, #0x3f
bl AllocFromHeap
str r0, [sp, #0x28]
- bl rand_LC
+ bl LCRandom
str r0, [sp, #0x20]
ldr r0, _0222F348 ; =0x00003594
- bl seedr_LC
+ bl SetLCRNGSeed
mov r0, #0
ldr r4, [sp, #0x28]
str r0, [sp, #0x24]
@@ -3458,7 +3458,7 @@ _0222F1EE:
mov r0, #0
str r0, [sp, #0x1c]
_0222F206:
- bl rand_LC
+ bl LCRandom
lsr r2, r0, #0x1f
lsl r1, r0, #0x13
sub r1, r1, r2
@@ -3471,7 +3471,7 @@ _0222F206:
lsl r0, r0, #0x10
asr r0, r0, #0x10
str r0, [sp, #8]
- bl rand_LC
+ bl LCRandom
lsr r2, r0, #0x1f
lsl r1, r0, #0x13
sub r1, r1, r2
@@ -3484,7 +3484,7 @@ _0222F206:
lsl r0, r0, #0x10
asr r0, r0, #0x10
str r0, [sp, #4]
- bl rand_LC
+ bl LCRandom
mov r1, #0x29
lsl r1, r1, #4
bl _s32_div_f
@@ -3517,7 +3517,7 @@ _0222F25C:
strh r0, [r4, #0x28]
strh r0, [r4, #0x2a]
strh r0, [r4, #0x2c]
- bl rand_LC
+ bl LCRandom
lsr r1, r0, #0x1f
lsl r2, r0, #0x17
sub r2, r2, r1
@@ -3528,7 +3528,7 @@ _0222F25C:
lsl r0, r0, #8
add r0, r1, r0
strh r0, [r4, #0x2e]
- bl rand_LC
+ bl LCRandom
lsr r1, r0, #0x1f
lsl r2, r0, #0x17
sub r2, r2, r1
@@ -3539,7 +3539,7 @@ _0222F25C:
lsl r0, r0, #8
add r0, r1, r0
strh r0, [r4, #0x30]
- bl rand_LC
+ bl LCRandom
lsr r1, r0, #0x1f
lsl r2, r0, #0x17
sub r2, r2, r1
@@ -3557,7 +3557,7 @@ _0222F25C:
add r6, r6, #6
cmp r7, #4
blt _0222F25C
- bl rand_LC
+ bl LCRandom
mov r1, #7
and r0, r1
sub r5, r0, #1
@@ -3594,7 +3594,7 @@ _0222F2FA:
b _0222F1EE
_0222F320:
ldr r0, [sp, #0x20]
- bl seedr_LC
+ bl SetLCRNGSeed
ldr r0, [sp, #0x28]
mov r2, #0
str r2, [r0]
@@ -4037,12 +4037,12 @@ MOD69_0222F6C4: ; 0x0222F6C4
add r5, r0, #0
add r0, r4, #0
add r6, r2, #0
- bl TryDecryptMon
+ bl AcquireMonLock
str r0, [sp]
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
@@ -4124,7 +4124,7 @@ _0222F778:
_0222F77A:
ldr r1, [sp]
add r0, r4, #0
- bl TryEncryptMon
+ bl ReleaseMonLock
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
nop
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 18:18:51 +0000