summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-14 17:03:39 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-14 17:03:39 -0400
commit8ce183851366b01c1bda5b2272f95e27ae7ef2fd (patch)
tree8c6b0b3f57b1f8449012c637297559866ce3eec7 /arm9/modules
parent654acf33f071db80179fa556097f5663ca4dc311 (diff)
through FUN_02069CF4
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s34
-rw-r--r--arm9/modules/06/asm/module_06.s36
-rw-r--r--arm9/modules/07/asm/module_07.s12
-rw-r--r--arm9/modules/09/asm/module_09.s16
-rw-r--r--arm9/modules/11/asm/module_11.s216
-rw-r--r--arm9/modules/14/asm/module_14.s36
-rw-r--r--arm9/modules/16/asm/module_16.s12
-rw-r--r--arm9/modules/27/asm/module_27.s4
-rw-r--r--arm9/modules/28/asm/module_28.s4
-rw-r--r--arm9/modules/39/asm/module_39.s4
-rw-r--r--arm9/modules/56/asm/module_56.s8
-rw-r--r--arm9/modules/69/asm/module_69.s8
-rw-r--r--arm9/modules/71/asm/module_71.s76
-rw-r--r--arm9/modules/80/asm/module_80.s34
14 files changed, 250 insertions, 250 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index b5f89157..a05f9c76 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3279,7 +3279,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
add r7, r0, #0
mov r4, #0
cmp r7, #0
@@ -3287,7 +3287,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
_021D8FF6:
add r0, r6, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
add r2, r5, #0
bl MonApplyFriendshipMod
@@ -32853,7 +32853,7 @@ MOD05_021E72E8: ; 0x021E72E8
add r4, r1, #0
bl FUN_0206BB1C
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
pop {r4, pc}
.balign 4, 0
@@ -43117,7 +43117,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
add r6, r0, #0
str r1, [sp]
add r7, r3, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
add r0, r5, #0
bl FUN_02023C80
@@ -44679,7 +44679,7 @@ _021ED168:
MOD05_021ED190: ; 0x021ED190
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
add r6, r0, #0
mov r4, #0
cmp r6, #0
@@ -44688,7 +44688,7 @@ MOD05_021ED190: ; 0x021ED190
_021ED1A2:
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r7, #0
mov r2, #0
bl GetMonData
@@ -44696,7 +44696,7 @@ _021ED1A2:
bne _021ED1D6
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa
mov r2, #0
bl GetMonData
@@ -45017,13 +45017,13 @@ _021ED3F8:
add r6, r0, #0
add r0, r7, #0
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
bls _021ED490
_021ED430:
add r0, r7, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
@@ -45064,7 +45064,7 @@ _021ED47E:
_021ED484:
add r0, r7, #0
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blo _021ED430
_021ED490:
@@ -45078,7 +45078,7 @@ _021ED498: .word 0x0000FFFF
MOD05_021ED49C: ; 0x021ED49C
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
add r6, r0, #0
mov r5, #0
cmp r6, #0
@@ -45086,7 +45086,7 @@ MOD05_021ED49C: ; 0x021ED49C
_021ED4AC:
add r0, r7, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
@@ -45222,7 +45222,7 @@ _021ED5B4:
MOD05_021ED5C4: ; 0x021ED5C4
push {r3, r4, r5, lr}
add r5, r2, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
bl FUN_020690E4
add r2, r0, #0
@@ -58275,7 +58275,7 @@ MOD05_021F3A18: ; 0x021F3A18
add r5, r1, #0
bl FUN_0206BB1C
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
str r0, [sp]
@@ -58344,7 +58344,7 @@ MOD05_021F3AB4: ; 0x021F3AB4
add r5, r1, #0
bl FUN_0206BB1C
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl MOD05_021F38CC
add r1, sp, #0
strh r0, [r1]
@@ -58440,7 +58440,7 @@ MOD05_021F3B7C: ; 0x021F3B7C
add r7, r1, #0
bl FUN_0206BB1C
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -62943,7 +62943,7 @@ _021F5CBA:
bne _021F5D10
ldr r0, [r0, #8]
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r2, [r5, #4]
add r3, r0, #0
lsl r2, r2, #0x10
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index a857283f..a7f8e367 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4786,7 +4786,7 @@ _0223BA42:
add r4, r0, #0
add r0, r7, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x20]
ldr r1, [sp, #0x20]
add r0, r5, #0
@@ -5130,7 +5130,7 @@ _0223BD2E:
ldr r0, [r0, #0xc]
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x14]
ldr r0, [sp, #8]
ldr r1, [sp, #0x14]
@@ -5312,7 +5312,7 @@ _0223BEA4:
add r4, r0, #0
add r0, r6, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
add r0, r5, #0
@@ -5568,7 +5568,7 @@ _0223C0CE:
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x1c]
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
@@ -7118,7 +7118,7 @@ MOD06_0223CCDC: ; 0x0223CCDC
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0xc]
ldr r1, [sp, #0xc]
add r0, r5, #0
@@ -7194,7 +7194,7 @@ MOD06_0223CD7C: ; 0x0223CD7C
add r6, r3, #0
bl FUN_0206BB1C
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
add r0, r5, #0
add r1, r4, #0
@@ -19735,7 +19735,7 @@ MOD06_022432E4: ; 0x022432E4
add r0, r1, #0
bl FUN_0206BB1C
str r0, [sp, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r1, r0, #0x18
str r1, [sp, #8]
@@ -19754,7 +19754,7 @@ _02243308:
_02243312:
ldr r0, [sp, #4]
add r1, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
str r0, [sp, #0xc]
@@ -20281,7 +20281,7 @@ _02243726:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
lsl r1, r4, #1
add r6, r5, r1
add r7, r0, #0
@@ -20333,7 +20333,7 @@ _0224379C:
add r1, r1, r5
add r1, #0x2a
ldrb r1, [r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #8]
lsl r6, r5, #1
mov r1, #5
@@ -20579,7 +20579,7 @@ _0224394A:
bne _0224396C
add r5, #0x2a
ldrb r1, [r5]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -20589,7 +20589,7 @@ _0224394A:
_0224396C:
add r5, #0x2a
ldrb r1, [r5]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -21453,7 +21453,7 @@ _02243FFA:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r6, #0
mov r2, #0
str r0, [sp, #4]
@@ -21673,7 +21673,7 @@ _022441B8:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r5, #0
bl MOD06_0224406C
@@ -22151,7 +22151,7 @@ _022445A6:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r4, #0
bl FUN_02069B88
add r0, r4, #0
@@ -22345,7 +22345,7 @@ _0224471C:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
bl GetMonData
@@ -30761,7 +30761,7 @@ MOD06_02248724: ; 0x02248724
ldr r0, [r1, #8]
str r1, [sp]
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r6, r0, #0
ldr r0, [r5, #0xc]
bl FUN_0202A9B0
@@ -31014,7 +31014,7 @@ MOD06_0224891C: ; 0x0224891C
add r4, r3, #0
bl FUN_0206BB1C
add r1, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa0
mov r2, #0
add r7, r0, #0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 5f048017..c9c4dd87 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -2305,7 +2305,7 @@ MOD07_02213104: ; 0x02213104
str r1, [sp]
str r2, [sp, #4]
add r7, r3, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #8]
@@ -2329,7 +2329,7 @@ _0221312A:
bls _022131B0
ldr r0, [sp]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r7, r0, #0
@@ -3643,7 +3643,7 @@ MOD07_02213BEC: ; 0x02213BEC
add r0, r1, #0
str r1, [sp]
add r5, r2, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
@@ -3672,7 +3672,7 @@ _02213C0C:
_02213C2E:
ldr r0, [sp]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x18
add r2, r6, #0
mul r2, r1
@@ -4488,13 +4488,13 @@ MOD07_0221428C: ; 0x0221428C
bhs _022142B4
ldr r0, [r0, #4]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x18]
b _022142BE
_022142B4:
ldr r0, [r0, #0xc]
sub r1, r4, #3
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [sp, #0x18]
_022142BE:
add r1, r4, #0
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 26c682ce..50557058 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2423,7 +2423,7 @@ MOD09_022131C8: ; 0x022131C8
ldr r0, [sp]
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
bgt _022131E2
b _02213476
@@ -2437,7 +2437,7 @@ _022131E2:
ldr r0, [r0]
ldr r1, [sp, #8]
ldr r0, [r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [r4, #4]
mov r1, #5
mov r2, #0
@@ -2724,7 +2724,7 @@ _0221345A:
ldr r0, [sp]
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
ldr r1, [sp, #8]
cmp r1, r0
bge _02213476
@@ -6734,7 +6734,7 @@ MOD09_022155D0: ; 0x022155D0
ldr r0, [r5]
mov r4, #0
ldr r0, [r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02215656
add r0, r4, #0
@@ -6788,7 +6788,7 @@ _0221563E:
add r7, #0x50
ldr r0, [r0]
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _022155EE
_02215656:
@@ -10495,7 +10495,7 @@ MOD09_02217580: ; 0x02217580
ldr r0, [r5]
mov r4, #0
ldr r0, [r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022175D8
add r7, r5, #4
@@ -10528,7 +10528,7 @@ _022175C6:
lsr r4, r0, #0x10
ldr r0, [r5]
ldr r0, [r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02217594
_022175D8:
@@ -13506,7 +13506,7 @@ _02218DF2:
bl MOD11_02230290
add r4, r0, #0
add r0, r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
bne _02218E32
add r0, r4, #0
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 2a3e4f64..5558b99a 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -213,7 +213,7 @@ _0222D752:
bl FUN_0201681C
ldr r0, [r5, #4]
ldr r1, [sp, #0x24]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
mov r0, #0x5a
lsl r0, r0, #2
@@ -1141,7 +1141,7 @@ MOD11_0222DFA4: ; 0x0222DFA4
beq _0222DFE4
ldr r0, [r4, #0x6c]
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r4, #0
bl MOD11_02230FA8
@@ -2014,13 +2014,13 @@ _0222E734:
_0222E760:
ldr r0, [r7, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222E7AA
_0222E76C:
ldr r0, [r7, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2042,7 +2042,7 @@ _0222E76C:
_0222E79E:
ldr r0, [r7, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222E76C
_0222E7AA:
@@ -2119,13 +2119,13 @@ _0222E810:
_0222E83C:
ldr r0, [r7, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222E886
_0222E848:
ldr r0, [r7, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2147,7 +2147,7 @@ _0222E848:
_0222E87A:
ldr r0, [r7, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222E848
_0222E886:
@@ -2234,13 +2234,13 @@ _0222E920:
add r7, r4, r0
ldr r0, [r7, #0x68]
mov r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222E9B8
_0222E938:
ldr r0, [r7, #0x68]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r1, [sp, #0x14]
add r5, r0, #0
cmp r1, #1
@@ -2292,7 +2292,7 @@ _0222E984:
_0222E9AC:
ldr r0, [r7, #0x68]
add r6, r6, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
blt _0222E938
_0222E9B8:
@@ -2345,13 +2345,13 @@ _0222EA0C:
bl FUN_0206BAD0
ldr r0, [r7, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222EA60
_0222EA22:
ldr r0, [r7, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2373,7 +2373,7 @@ _0222EA22:
_0222EA54:
ldr r0, [r7, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222EA22
_0222EA60:
@@ -2572,13 +2572,13 @@ _0222EBC6:
_0222EBEA:
ldr r0, [r7, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222EC34
_0222EBF6:
ldr r0, [r7, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2600,7 +2600,7 @@ _0222EBF6:
_0222EC28:
ldr r0, [r7, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222EBF6
_0222EC34:
@@ -2686,13 +2686,13 @@ _0222ECC8:
add r7, r4, r0
ldr r0, [r7, #0x68]
mov r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222ED60
_0222ECE0:
ldr r0, [r7, #0x68]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r1, [sp, #0x20]
add r5, r0, #0
cmp r1, #1
@@ -2744,7 +2744,7 @@ _0222ED2C:
_0222ED54:
ldr r0, [r7, #0x68]
add r6, r6, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
blt _0222ECE0
_0222ED60:
@@ -2800,13 +2800,13 @@ _0222EDBC:
bl FUN_0206BAD0
ldr r0, [r7, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222EE10
_0222EDD2:
ldr r0, [r7, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2828,7 +2828,7 @@ _0222EDD2:
_0222EE04:
ldr r0, [r7, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222EDD2
_0222EE10:
@@ -2861,7 +2861,7 @@ _0222EE3E:
beq _0222EE5A
ldr r0, [r4, #0x6c]
mov r1, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r2, r4, #0
mov r1, #0x8f
add r2, #0xf4
@@ -2885,7 +2885,7 @@ _0222EE5A:
_0222EE7C:
ldr r0, [r4, #0x68]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222EEAC
ldr r6, _0222EEEC ; =0x00002404
@@ -2893,7 +2893,7 @@ _0222EE7C:
_0222EE8C:
ldr r0, [r4, #0x68]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r2, [r4, r6]
add r1, r7, #0
lsl r2, r2, #0x10
@@ -2901,13 +2901,13 @@ _0222EE8C:
bl MonApplyFriendshipMod
ldr r0, [r4, #0x68]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222EE8C
_0222EEAC:
ldr r0, [r4, #0x70]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222EEDC
ldr r6, _0222EEEC ; =0x00002404
@@ -2915,7 +2915,7 @@ _0222EEAC:
_0222EEBC:
ldr r0, [r4, #0x70]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r2, [r4, r6]
add r1, r7, #0
lsl r2, r2, #0x10
@@ -2923,7 +2923,7 @@ _0222EEBC:
bl MonApplyFriendshipMod
ldr r0, [r4, #0x70]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222EEBC
_0222EEDC:
@@ -5057,7 +5057,7 @@ _0222FFE6:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
- bl FUN_0206B9AC
+ bl GetPartyCount
pop {r3, r4, r5, pc}
_0222FFF2:
ldr r1, [r5, #0x2c]
@@ -5068,13 +5068,13 @@ _0222FFF2:
lsr r0, r0, #0x1d
add r0, r5, r0
ldr r0, [r0, #0x68]
- bl FUN_0206B9AC
+ bl GetPartyCount
pop {r3, r4, r5, pc}
_02230008:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
- bl FUN_0206B9AC
+ bl GetPartyCount
pop {r3, r4, r5, pc}
thumb_func_start MOD11_02230014
@@ -5099,7 +5099,7 @@ _02230034:
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
pop {r4, r5, r6, pc}
_02230042:
ldr r1, [r5, #0x2c]
@@ -5111,14 +5111,14 @@ _02230042:
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
pop {r4, r5, r6, pc}
_0223005A:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
pop {r4, r5, r6, pc}
thumb_func_start MOD11_02230068
@@ -6901,7 +6901,7 @@ _02230D9C:
cmp r1, #6
bge _02230DC4
ldr r0, [r5, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r3, #0x59
str r7, [sp]
lsl r3, r3, #2
@@ -12578,7 +12578,7 @@ _02233938:
add r4, r0, #0
add r0, r7, #0
bl MOD11_0222FF88
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022339C6
_02233950:
@@ -12632,7 +12632,7 @@ _022339B4:
mov r1, #0
add r4, r4, #1
bl MOD11_0222FF88
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02233950
_022339C6:
@@ -18480,7 +18480,7 @@ _0223678C:
_02236794:
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
@@ -18533,7 +18533,7 @@ _022367EA:
beq _022367EA
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r7, #0
mov r2, #0
add r4, r0, #0
@@ -25352,13 +25352,13 @@ _02239DFA:
bl MOD11_0222FF7C
add r0, r7, #0
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02239E68
_02239E2A:
add r0, r7, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -25380,7 +25380,7 @@ _02239E2A:
_02239E5C:
add r0, r7, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02239E2A
_02239E68:
@@ -25400,14 +25400,14 @@ _02239E76:
_02239E82:
ldr r0, [sp, #8]
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02239ECC
ldr r7, _02239F48 ; =0x000001EE
_02239E90:
ldr r0, [sp, #8]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -25428,7 +25428,7 @@ _02239E90:
_02239EC0:
ldr r0, [sp, #8]
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02239E90
_02239ECC:
@@ -25448,13 +25448,13 @@ _02239EDA:
bl MOD11_0222FF7C
add r0, r7, #0
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02239F36
_02239EF8:
add r0, r7, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -25476,7 +25476,7 @@ _02239EF8:
_02239F2A:
add r0, r7, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02239EF8
_02239F36:
@@ -27988,7 +27988,7 @@ MOD11_0223B2DC: ; 0x0223B2DC
add r7, r0, #0
ldr r0, [sp]
ldr r1, [sp, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #6
add r2, r4, #0
str r0, [sp, #0x14]
@@ -41607,7 +41607,7 @@ _02241DD2:
bl MOD11_0222FF7C
add r0, r6, #0
add r5, r7, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02241E4A
ldr r0, [sp, #0x2c]
@@ -41619,7 +41619,7 @@ _02241DD2:
_02241DFE:
add r0, r6, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -41648,7 +41648,7 @@ _02241DFE:
_02241E3E:
add r0, r6, #0
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _02241DFE
_02241E4A:
@@ -41700,13 +41700,13 @@ _02241E8A:
bl MOD11_0222FF7C
add r0, r6, #0
add r5, r7, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02241EF2
_02241EB4:
add r0, r6, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -41728,7 +41728,7 @@ _02241EB4:
_02241EE6:
add r0, r6, #0
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _02241EB4
_02241EF2:
@@ -41905,13 +41905,13 @@ _0224200C:
bl MOD11_0222FF7C
add r0, r6, #0
add r4, r7, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02242094
_02242056:
add r0, r6, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r5, r0, #0
@@ -41933,7 +41933,7 @@ _02242056:
_02242088:
add r0, r6, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02242056
_02242094:
@@ -41985,13 +41985,13 @@ _022420CA:
str r0, [sp, #0x14]
add r0, r7, #0
add r4, r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0224213C
_022420FE:
add r0, r7, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -42013,20 +42013,20 @@ _022420FE:
_02242130:
add r0, r7, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _022420FE
_0224213C:
ldr r0, [sp, #0x18]
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02242186
ldr r7, _02242340 ; =0x000001EE
_0224214A:
ldr r0, [sp, #0x18]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -42047,7 +42047,7 @@ _0224214A:
_0224217A:
ldr r0, [sp, #0x18]
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _0224214A
_02242186:
@@ -42089,13 +42089,13 @@ _022421B0:
str r0, [sp, #0x10]
add r0, r6, #0
add r4, r7, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0224221A
_022421DC:
add r0, r6, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r5, r0, #0
@@ -42117,7 +42117,7 @@ _022421DC:
_0224220E:
add r0, r6, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _022421DC
_0224221A:
@@ -48640,13 +48640,13 @@ _02245384:
mov r6, #0
add r5, r0, #0
add r4, r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022453C6
_022453A4:
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
@@ -48656,7 +48656,7 @@ _022453A4:
_022453BA:
add r0, r5, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _022453A4
_022453C6:
@@ -48697,13 +48697,13 @@ _022453F8:
mov r6, #0
add r5, r0, #0
add r4, r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0224543A
_02245418:
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
@@ -48713,7 +48713,7 @@ _02245418:
_0224542E:
add r0, r5, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _02245418
_0224543A:
@@ -52132,7 +52132,7 @@ _02246E72:
_02246E76:
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
@@ -65586,13 +65586,13 @@ _0224D452:
bl MOD11_0222FF88
add r6, r0, #0
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0224D4C0
_0224D466:
add r0, r6, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
@@ -65627,7 +65627,7 @@ _0224D4A8:
_0224D4B4:
add r0, r6, #0
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0224D466
_0224D4C0:
@@ -73750,7 +73750,7 @@ _02251662:
bl FUN_0206B8CC
ldr r0, [sp, #0x14]
mov r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022516B0
mov r0, #6
@@ -73775,7 +73775,7 @@ _02251680:
strb r0, [r1]
ldr r0, [sp, #0x14]
add r6, r6, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
blt _02251680
_022516B0:
@@ -75168,7 +75168,7 @@ _022521DC:
ldr r0, [r4, #4]
add r1, r6, #0
ldr r0, [r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x1c]
bl FUN_02069B88
@@ -75208,7 +75208,7 @@ _02252232:
ldr r0, [r4, #4]
ldr r1, [sp, #0xc]
ldr r0, [r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x20]
bl FUN_02069B88
@@ -75279,7 +75279,7 @@ _022522C4:
bl MOD11_0222FF88
str r0, [sp, #0x10]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0225230E
mov r0, #6
@@ -75302,7 +75302,7 @@ _022522E2:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _022522E2
_0225230E:
@@ -75514,7 +75514,7 @@ _0225249A:
bl MOD11_0222FF88
str r0, [sp, #8]
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022524FE
ldr r0, [sp, #4]
@@ -75539,7 +75539,7 @@ _022524D0:
_022524F2:
ldr r0, [sp, #8]
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _022524D0
_022524FE:
@@ -81265,7 +81265,7 @@ _02255210:
bl MOD11_0222FF88
str r0, [sp, #0x24]
mov r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _022552A6
mov r0, #6
@@ -81283,7 +81283,7 @@ _0225523A:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x24]
ldrb r1, [r7, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -81331,7 +81331,7 @@ _02255298:
ldr r0, [sp, #0x24]
add r7, r7, #1
add r6, r6, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
blt _0225523A
_022552A6:
@@ -81371,7 +81371,7 @@ _022552E2:
bl MOD11_0222FF88
str r0, [sp, #0x10]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0225535E
add r1, r4, #0
@@ -81384,7 +81384,7 @@ _02255304:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x10]
ldrb r1, [r6, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -81422,7 +81422,7 @@ _02255350:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _02255304
_0225535E:
@@ -81446,7 +81446,7 @@ _0225537C:
bl MOD11_0222FF88
str r0, [sp, #0x14]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02255482
add r1, r4, #0
@@ -81460,7 +81460,7 @@ _022553A0:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x14]
ldrb r1, [r6, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -81498,7 +81498,7 @@ _022553EC:
ldr r0, [sp, #0x14]
add r6, r6, #1
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _022553A0
b _02255482
@@ -81513,7 +81513,7 @@ _022553FC:
bl MOD11_0222FF88
str r0, [sp, #0x18]
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02255482
add r1, r4, #0
@@ -81526,7 +81526,7 @@ _02255428:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x18]
ldrb r1, [r6, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -81564,7 +81564,7 @@ _02255474:
ldr r0, [sp, #0x18]
add r6, r6, #1
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _02255428
_02255482:
@@ -84454,7 +84454,7 @@ _02256A60:
mov r4, #0
str r0, [sp, #0x10]
add r7, r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02256AE0
mov r0, #6
@@ -84466,7 +84466,7 @@ _02256A80:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #0x10]
ldrb r1, [r6, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x14]
@@ -84507,7 +84507,7 @@ _02256AD2:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r7, r7, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r7, r0
blt _02256A80
_02256AE0:
@@ -84517,7 +84517,7 @@ _02256AE0:
str r0, [sp, #8]
mov r4, #3
mov r6, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
bgt _02256AF8
b _02256BFA
@@ -84531,7 +84531,7 @@ _02256B02:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #8]
ldrb r1, [r7, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x18]
@@ -84572,7 +84572,7 @@ _02256B54:
ldr r0, [sp, #8]
add r7, r7, #1
add r6, r6, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
blt _02256B02
add sp, #0x20
@@ -84595,7 +84595,7 @@ _02256B7A:
mov r4, #0
str r0, [sp, #0xc]
add r7, r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _02256BFA
ldr r0, [sp, #0x38]
@@ -84607,7 +84607,7 @@ _02256B9A:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #0xc]
ldrb r1, [r6, r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
@@ -84648,7 +84648,7 @@ _02256BEC:
ldr r0, [sp, #0xc]
add r6, r6, #1
add r7, r7, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r7, r0
blt _02256B9A
_02256BFA:
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index e0034fd2..191de449 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -1905,7 +1905,7 @@ _021D8476:
add r0, #0x19
strb r2, [r4, r0]
ldr r0, [r4, r1]
- bl FUN_0206B9AC
+ bl GetPartyCount
ldr r1, _021D8504 ; =0x0000013F
strb r0, [r4, r1]
add r0, r4, #0
@@ -4031,7 +4031,7 @@ _021D95CA:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
sub r0, r0, #1
cmp r6, r0
beq _021D9610
@@ -4238,7 +4238,7 @@ _021D979C:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #6
beq _021D97F2
mov r0, #0x45
@@ -4699,7 +4699,7 @@ MOD14_021D9B84: ; 0x021D9B84
lsl r1, r1, #2
str r0, [sp]
ldr r0, [r0, r1]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r6, #0
add r5, r6, #0
str r0, [sp, #4]
@@ -4711,7 +4711,7 @@ _021D9B9E:
lsl r0, r0, #2
ldr r0, [r1, r0]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
bl AcquireMonLock
add r7, r0, #0
@@ -5351,7 +5351,7 @@ _021DA0A4:
_021DA0AE:
add r0, r1, #0
ldr r0, [r0, #0x18]
- bl FUN_0206B9AC
+ bl GetPartyCount
str r0, [sp, #0x10]
mov r0, #0
str r0, [sp, #8]
@@ -5362,7 +5362,7 @@ _021DA0C2:
ldr r0, [sp, #4]
ldr r1, [sp, #8]
ldr r0, [r0, #0x18]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r4, _021DA164 ; =0x021E6224
ldr r5, [sp, #4]
add r7, r0, #0
@@ -8416,7 +8416,7 @@ MOD14_021DB8D0: ; 0x021DB8D0
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
strb r0, [r4, #8]
mov r0, #8
ldrsb r0, [r4, r0]
@@ -8495,14 +8495,14 @@ _021DB96C:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r6, r0
bge _021DB98E
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
str r0, [r4]
b _021DB998
_021DB98E:
@@ -8896,13 +8896,13 @@ _021DBC70:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r1, r0, #0
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
sub r1, r1, #1
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
_021DBC8A:
add r0, r7, #0
@@ -23402,7 +23402,7 @@ MOD14_021E2C7C: ; 0x021E2C7C
add r6, r0, #0
ldr r0, [r6, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r1, r6, #0
add r1, #0x28
ldrb r4, [r1]
@@ -23570,7 +23570,7 @@ MOD14_021E2DB4: ; 0x021E2DB4
add r5, r0, #0
ldr r0, [r5, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
sub r4, r0, #1
add r0, r5, #0
add r0, #0x28
@@ -23975,7 +23975,7 @@ MOD14_021E30C0: ; 0x021E30C0
str r1, [sp]
ldr r0, [r0, #4]
str r2, [sp, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
sub r6, r0, #1
add r4, r5, #0
mov r0, #0x34
@@ -24281,7 +24281,7 @@ _021E330E:
ldr r0, [sp, #0x24]
ldr r0, [r0, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r4, #0
str r0, [sp, #0x20]
cmp r0, #0
@@ -24299,7 +24299,7 @@ _021E3330:
add r1, r4, #0
ldr r0, [r0, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
mov r0, #1
str r0, [sp]
@@ -24347,7 +24347,7 @@ MOD14_021E3390: ; 0x021E3390
add r7, r0, #0
ldr r0, [r7, #0xc]
ldr r0, [r0, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r6, #0
str r0, [sp]
cmp r0, #0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index dfa30774..0dae9777 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -55018,7 +55018,7 @@ _021F0E5A:
_021F0E68:
ldr r0, [sp, #0xc]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r1, [sp, #8]
add r6, r0, #0
cmp r4, r1
@@ -55568,7 +55568,7 @@ _021F1276:
_021F128E:
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r1, [sp, #8]
add r4, r0, #0
cmp r5, r1
@@ -55683,7 +55683,7 @@ _021F136A:
_021F1382:
ldr r0, [sp, #0x14]
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
ldr r1, [sp, #8]
add r4, r0, #0
cmp r5, r1
@@ -62866,13 +62866,13 @@ _021F4A94:
bl MOD11_0222FF88
add r7, r0, #0
mov r5, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _021F4AF2
_021F4AA8:
add r0, r7, #0
add r1, r5, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
@@ -62900,7 +62900,7 @@ _021F4AA8:
_021F4AE6:
add r0, r7, #0
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _021F4AA8
_021F4AF2:
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index ee9a4bd1..7bd6fc00 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -293,7 +293,7 @@ MOD27_02254A48: ; 0x02254A48
str r0, [sp]
add r0, r1, #0
str r1, [sp, #4]
- bl FUN_0206B9AC
+ bl GetPartyCount
ldr r1, [sp]
mov r6, #0
str r0, [r1]
@@ -303,7 +303,7 @@ MOD27_02254A48: ; 0x02254A48
_02254A62:
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
bl AcquireMonLock
add r7, r0, #0
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index e4a0b678..2ba07ed6 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -73,7 +73,7 @@ MOD28_0225489C: ; 0x0225489C
mov r1, #0
str r0, [sp, #4]
str r1, [sp]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r6, #0
str r0, [r7, #4]
cmp r0, #0
@@ -82,7 +82,7 @@ MOD28_0225489C: ; 0x0225489C
_022548D6:
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4c
mov r2, #0
add r5, r0, #0
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 863492a4..f7c09bfc 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -63,7 +63,7 @@ MOD39_0225489C: ; 0x0225489C
bl MOD20_02252C40
bl FUN_0206BB1C
str r0, [sp, #0x10]
- bl FUN_0206B9AC
+ bl GetPartyCount
ldr r1, [sp, #4]
mov r6, #0
add r1, #0x34
@@ -78,7 +78,7 @@ MOD39_0225489C: ; 0x0225489C
_022548CC:
ldr r0, [sp, #0x10]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r7, r0, #0
bl FUN_0206B688
str r0, [r4, #4]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index a4bf2048..ee020bca 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -212,7 +212,7 @@ MOD56_02211F88: ; 0x02211F88
ldr r0, [r0]
bl FUN_0206BB1C
str r0, [sp]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r5, #0
add r7, r0, #0
add r4, r5, #0
@@ -221,7 +221,7 @@ MOD56_02211F88: ; 0x02211F88
_02211FA2:
ldr r0, [sp]
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
@@ -1992,7 +1992,7 @@ MOD56_02212E0C: ; 0x02212E0C
bl FUN_02029AFC
str r0, [sp, #8]
ldr r0, [sp, #0xc]
- bl FUN_0206B9AC
+ bl GetPartyCount
mov r6, #0
str r0, [sp, #4]
cmp r0, #0
@@ -2001,7 +2001,7 @@ MOD56_02212E0C: ; 0x02212E0C
_02212E52:
ldr r0, [sp, #0xc]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #5
mov r2, #0
add r7, r0, #0
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 32eb8847..bdd1afca 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,7 +61,7 @@ _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 GetMonData
@@ -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
@@ -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
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 606353f1..a480a3f6 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -420,11 +420,11 @@ MOD71_0222D93C: ; 0x0222D93C
bl MOD71_0222DB94
ldr r0, _0222D9B8 ; =0x00002218
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r4, r0, #0
ldr r0, _0222D9BC ; =0x0000221C
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r2, r0, #0
mov r0, #0x5d
lsl r0, r0, #2
@@ -644,13 +644,13 @@ MOD71_0222DB5C: ; 0x0222DB5C
add r0, r5, #0
add r6, r2, #0
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222DB92
_0222DB70:
add r0, r5, #0
add r1, r4, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
add r2, r0, #0
add r0, r7, #0
@@ -658,7 +658,7 @@ _0222DB70:
bl FUN_0200ACF8
add r0, r5, #0
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _0222DB70
_0222DB92:
@@ -676,7 +676,7 @@ MOD71_0222DB94: ; 0x0222DB94
str r3, [sp, #0x10]
ldr r6, [sp, #0x28]
mov r4, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222DBE6
add r7, r6, #1
@@ -701,7 +701,7 @@ _0222DBB0:
ldr r0, [sp, #0x10]
add r5, #0x10
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _0222DBB0
_0222DBE6:
@@ -718,7 +718,7 @@ MOD71_0222DBEC: ; 0x0222DBEC
str r1, [sp, #0xc]
str r2, [sp, #0x20]
mov r7, #0
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
bgt _0222DC02
b _0222DD10
@@ -847,7 +847,7 @@ _0222DCE2:
_0222DD02:
ldr r0, [sp, #8]
add r7, r7, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r7, r0
bge _0222DD10
b _0222DC0C
@@ -1086,7 +1086,7 @@ _0222DED6:
blt _0222DED6
ldr r0, _0222E0F8 ; =0x00002218
ldr r0, [r4, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222DF12
mov r0, #0x69
@@ -1097,20 +1097,20 @@ _0222DEF4:
ldr r0, _0222E0F8 ; =0x00002218
add r1, r5, #0
ldr r0, [r4, r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r6, #0
bl MOD71_0222E118
ldr r0, [r4, r7]
add r6, #0x10
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222DEF4
_0222DF12:
ldr r0, _0222E0FC ; =0x0000221C
mov r5, #0
ldr r0, [r4, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222DF48
mov r0, #0x69
@@ -1121,14 +1121,14 @@ _0222DF28:
ldr r0, _0222E0FC ; =0x0000221C
add r1, r5, #0
ldr r0, [r4, r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r5, #6
lsl r1, r1, #4
add r1, r6, r1
bl MOD71_0222E118
ldr r0, [r4, r7]
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222DF28
_0222DF48:
@@ -1233,7 +1233,7 @@ _0222E010:
ldr r0, _0222E0F8 ; =0x00002218
mov r1, #0
ldr r0, [r4, r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r2, #0x7f
ldr r3, _0222E104 ; =0x000020F0
lsl r2, r2, #4
@@ -1412,7 +1412,7 @@ MOD71_0222E1A0: ; 0x0222E1A0
ldr r0, _0222E20C ; =0x0000221C
add r7, r1, #0
ldr r0, [r5, r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r6, r0, #0
add r0, r4, #0
mov r1, #6
@@ -1473,7 +1473,7 @@ MOD71_0222E224: ; 0x0222E224
bge _0222E29E
ldr r0, _0222E2BC ; =0x00002218
ldr r0, [r5, r0]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r4, r0, #0
add r0, r5, #0
add r0, #0x88
@@ -1675,7 +1675,7 @@ MOD71_0222E3D4: ; 0x0222E3D4
ldr r0, _0222E42C ; =0x00002218
mov r4, #0
ldr r0, [r6, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222E402
ldr r7, _0222E42C ; =0x00002218
@@ -1688,14 +1688,14 @@ _0222E3EA:
ldr r0, [r6, r7]
add r5, r5, #4
add r4, r4, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r4, r0
blt _0222E3EA
_0222E402:
ldr r0, _0222E430 ; =0x0000221C
mov r5, #0
ldr r0, [r6, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r0, #0
ble _0222E42A
ldr r7, _0222E430 ; =0x0000221C
@@ -1707,7 +1707,7 @@ _0222E414:
ldr r0, [r6, r7]
add r4, r4, #4
add r5, r5, #1
- bl FUN_0206B9AC
+ bl GetPartyCount
cmp r5, r0
blt _0222E414
_0222E42A:
@@ -2694,7 +2694,7 @@ MOD71_0222EC5C: ; 0x0222EC5C
add r4, r0, #0
add r0, r6, #0
add r1, r7, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x76
add r2, r4, #0
bl GetMonData
@@ -2728,7 +2728,7 @@ MOD71_0222ECA8: ; 0x0222ECA8
_0222ECB6:
add r0, r1, #0
add r1, r2, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0x4d
mov r2, #0
bl GetMonData
@@ -2753,7 +2753,7 @@ MOD71_0222ECD4: ; 0x0222ECD4
str r2, [sp, #8]
str r3, [sp, #0xc]
ldr r4, [sp, #0x50]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #2
bl FUN_02068E14
str r0, [sp, #0x10]
@@ -2929,7 +2929,7 @@ _0222EE14:
bl MOD71_02230EFC
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa0
mov r2, #0
bl GetMonData
@@ -2975,7 +2975,7 @@ _0222EEA6:
bl MOD71_02230EFC
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #6
mov r2, #0
bl GetMonData
@@ -3864,7 +3864,7 @@ MOD71_0222F59C: ; 0x0222F59C
str r0, [r5, #0xc]
ldr r0, [r5, #8]
ldr r0, [r0, #8]
- bl FUN_0206B9AC
+ bl GetPartyCount
strb r0, [r5, #0x1f]
mov r0, #0
str r0, [r5, #0x34]
@@ -3880,7 +3880,7 @@ _0222F5CC:
ldr r1, [r5, r0]
str r1, [r5, #0xc]
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
strb r0, [r5, #0x1f]
bl FUN_02031190
mov r2, #1
@@ -4875,7 +4875,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
add r1, #0x88
ldr r0, [r4, r0]
ldr r1, [r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -5694,7 +5694,7 @@ MOD71_022304AC: ; 0x022304AC
add r1, #0x88
ldr r0, [r4, r0]
ldr r1, [r1]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -5708,7 +5708,7 @@ MOD71_022304AC: ; 0x022304AC
ldr r1, [r1]
ldr r0, [r4, r0]
sub r1, r1, #6
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -6121,7 +6121,7 @@ MOD71_02230810: ; 0x02230810
ldr r1, [r1]
ldr r0, [r4, r0]
sub r1, r1, #6
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
bl FUN_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -6327,12 +6327,12 @@ MOD71_022309E8: ; 0x022309E8
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r7, #0
bl FUN_02069B88
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r4, #0
bl FUN_02069B88
add r0, r4, #0
@@ -6387,13 +6387,13 @@ _02230A98:
bl FUN_0202C144
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r4, #0
bl FUN_02069B88
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
add r1, r0, #0
add r0, r7, #0
bl FUN_02069B88
@@ -6538,7 +6538,7 @@ MOD71_02230BC4: ; 0x02230BC4
ldr r0, _02230C00 ; =0x00002218
mov r4, #0
ldr r0, [r5, r0]
- bl FUN_0206B9AC
+ bl GetPartyCount
add r3, r4, #0
cmp r0, #0
ble _02230BF0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 71ef95f1..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
@@ -9976,7 +9976,7 @@ _022325CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
@@ -10216,7 +10216,7 @@ _022327CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
- bl FUN_0206B9B0
+ bl GetPartyMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-06-26 23:00:59 +0000