summaryrefslogtreecommitdiff
path: root/arm9/modules/80
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/80')
-rw-r--r--arm9/modules/80/asm/module_80.s130
1 files changed, 65 insertions, 65 deletions
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index ca042f7e..2ff872c5 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -4660,7 +4660,7 @@ _0222FA26:
beq _0222FA80
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _0222FA80
ldr r0, _0222FAE4 ; =0x00000F0F
@@ -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
@@ -9976,10 +9976,10 @@ _022325CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa1
add r2, r4, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022325FE
mov r0, #0xe
@@ -10216,10 +10216,10 @@ _022327CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa1
add r2, r4, #0
- bl GetMonDataEncrypted
+ bl GetMonData
cmp r0, #0
beq _022327FE
mov r0, #0xb
@@ -10458,7 +10458,7 @@ MOD80_02232990: ; 0x02232990
beq _022329E6
ldr r0, [r4]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _022329E6
ldr r0, _02232A2C ; =0x00000F0F
@@ -10777,7 +10777,7 @@ MOD80_02232BD4: ; 0x02232BD4
MOD80_02232C2C: ; 0x02232C2C
push {r4, lr}
add r4, r1, #0
- bl CalcBoxMonLevelEncrypted
+ bl CalcBoxMonLevel
strb r0, [r4, #3]
pop {r4, pc}
thumb_func_end MOD80_02232C2C
@@ -10832,38 +10832,38 @@ MOD80_02232C88: ; 0x02232C88
add r7, r2, #0
add r6, r3, #0
ldr r4, [sp, #0x40]
- bl TryDecryptBoxMon
+ bl AcquireBoxMonLock
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]
@@ -10874,7 +10874,7 @@ MOD80_02232C88: ; 0x02232C88
_02232CF2:
add r0, r5, #0
mov r1, #1
- bl TryEncryptBoxMon
+ bl ReleaseBoxMonLock
ldr r0, [sp, #0x1c]
cmp r0, #0
beq _02232D60
@@ -11031,7 +11031,7 @@ _02232E22:
_02232E3A:
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r4, #0
str r0, [sp, #0x14]
cmp r0, #0
@@ -11040,7 +11040,7 @@ _02232E4A:
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x24]
bl FUN_020690E4
ldr r1, _02232F84 ; =0x00001004
@@ -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
@@ -11221,7 +11221,7 @@ MOD80_02232FB8: ; 0x02232FB8
cmp r0, #0
beq _02232FEA
add r0, r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
sub r0, r0, #1
cmp r4, r0
ble _02232FDC
@@ -11230,7 +11230,7 @@ MOD80_02232FB8: ; 0x02232FB8
_02232FDC:
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
pop {r3, r4, r5, r6, r7, pc}
_02232FEA:
@@ -11251,7 +11251,7 @@ MOD80_02232FF8: ; 0x02232FF8
cmp r0, #0
beq _02233014
add r0, r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #2
bge _02233014
mov r0, #0
@@ -11266,7 +11266,7 @@ MOD80_02233018: ; 0x02233018
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
mov r4, #0
- bl TryDecryptBoxMon
+ bl AcquireBoxMonLock
ldr r5, _02233050 ; =0x02237220
str r0, [sp]
add r6, r4, #0
@@ -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
@@ -11282,7 +11282,7 @@ _02233028:
blt _02233028
ldr r1, [sp]
add r0, r7, #0
- bl TryEncryptBoxMon
+ bl ReleaseBoxMonLock
cmp r4, #0
beq _0223304C
mov r0, #1
@@ -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,18 +11386,18 @@ 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]
add r0, r5, #0
- bl CalcBoxMonLevelEncrypted
+ bl CalcBoxMonLevel
add r1, sp, #0
strb r0, [r1, #3]
add r0, sp, #0
@@ -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,14 +11426,14 @@ 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]
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
- bl CalcBoxMonLevelEncrypted
+ bl CalcBoxMonLevel
add r1, sp, #0
strb r0, [r1, #9]
add r0, r4, #0
@@ -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,14 +13374,14 @@ 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
+ bl CalcBoxMonLevel
str r0, [sp, #0x10]
add r0, r4, #0
mov r1, #0x64
@@ -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]
@@ -16102,7 +16102,7 @@ _02235590:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
bl FUN_0206AA84
add r2, r5, #0
@@ -16121,7 +16121,7 @@ _02235590:
ldr r0, [r5]
ldr r1, _022355EC ; =0x000001B9
ldr r0, [r0, #8]
- bl FUN_0206BAE4
+ bl PartyHasMon
cmp r0, #0
bne _022355DC
ldr r0, [r5]
@@ -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]
@@ -16161,7 +16161,7 @@ MOD80_022355F0: ; 0x022355F0
str r0, [sp, #0x20]
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _02235624
mov r0, #0
@@ -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
@@ -16189,7 +16189,7 @@ _02235640:
bl FUN_0206B900
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r1, r5, #0
mov r2, #0x12
add r1, #0xcc
@@ -16246,7 +16246,7 @@ MOD80_022356AC: ; 0x022356AC
str r0, [sp, #0x20]
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _022356D2
mov r0, #0
@@ -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
@@ -16268,7 +16268,7 @@ _022356D2:
bl FUN_0206B900
ldr r0, [r5]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r1, r5, #0
mov r2, #0x12
add r1, #0xcc
@@ -16364,9 +16364,9 @@ MOD80_022357A0: ; 0x022357A0
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl GetMonDataEncrypted
+ bl GetMonData
add r0, r4, #0
- bl GetMonGenderEncrypted
+ bl GetMonGender
add r3, r0, #0
mov r0, #0x3e
str r0, [sp]
@@ -16395,7 +16395,7 @@ MOD80_022357DC: ; 0x022357DC
beq _022357FA
ldr r0, [r4]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _022357FA
mov r0, #2
@@ -16409,7 +16409,7 @@ _022357FA:
bne _02235816
ldr r0, [r4]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _02235816
mov r0, #1
@@ -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
@@ -17443,7 +17443,7 @@ _02235FDE:
add r1, r7, #0
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02069168
+ bl GetMonEvolution
str r0, [sp, #0x24]
cmp r0, #0
beq _02236052
@@ -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
@@ -17534,7 +17534,7 @@ _022360B6:
add r1, r7, #0
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02069168
+ bl GetMonEvolution
str r0, [sp, #0x28]
cmp r0, #0
beq _02236118
@@ -17717,7 +17717,7 @@ MOD80_02236218: ; 0x02236218
add r5, #0xd0
ldr r0, [r0, #8]
ldr r1, [r5]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r4, #0
bl FUN_02069B88
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 04:48:40 +0000