decompile more pokemon functions

1 files changed, 20 insertions, 20 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 7cf87e636..bdc8d88bb 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -22892,7 +22892,7 @@ _08085D7C: .4byte 0x0202eec8
 	thumb_func_start sub_8085D80
 sub_8085D80: @ 8085D80
 	push {r4,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -23074,7 +23074,7 @@ _08085ED0: .4byte sub_8085DC4
 	thumb_func_start sub_8085ED4
 sub_8085ED4: @ 8085ED4
 	push {r4,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -57979,7 +57979,7 @@ _080973AC:
 	.4byte _0809743E
 	.4byte _0809745C
 _080973C4:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x6
@@ -59028,7 +59028,7 @@ _08097C98:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097CB0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, _08097CB8
 	strb r0, [r1]
 	ldr r0, _08097CBC
@@ -59163,7 +59163,7 @@ _08097DB8:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097DD0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, _08097DD8
 	strb r0, [r1]
 	ldr r0, _08097DDC
@@ -65660,7 +65660,7 @@ sub_809B068: @ 809B068
 	.align 2, 0
 _0809B078: .4byte 0x020384e6
 _0809B07C:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0x5
@@ -87452,7 +87452,7 @@ sub_80A5B78: @ 80A5B78
 	beq _080A5BF2
 	movs r0, 0x5
 	bl audio_play
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A5BB4
@@ -88137,7 +88137,7 @@ _080A6108:
 	lsrs r5, r0, 24
 	cmp r5, 0
 	bne _080A6168
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A6128
@@ -120942,7 +120942,7 @@ pokemon_store: @ 80B5FEC
 	ldrb r0, [r4, 0x1]
 	cmp r0, 0x2
 	bne _080B6038
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x5
@@ -152215,7 +152215,7 @@ sub_80C5374: @ 80C5374
 	add r2, sp, 0x10
 	bl SetMonData
 	adds r0, r6, 0
-	bl pokemon_catch
+	bl GiveMonToPlayer
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r5, 0
@@ -152259,7 +152259,7 @@ sub_80C53F8: @ 80C53F8
 	movs r1, 0x2D
 	bl SetMonData
 	mov r0, sp
-	bl pokemon_catch
+	bl GiveMonToPlayer
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x68
@@ -152576,7 +152576,7 @@ _080C5654:
 	adds r4, 0x64
 	cmp r5, r6
 	ble _080C5654
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	add sp, 0x134
 	pop {r4-r7}
 	pop {r0}
@@ -232067,7 +232067,7 @@ sub_80EBC10: @ 80EBC10
 	ldr r1, _080EBC7C
 	movs r0, 0x14
 	strh r0, [r1]
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r2, _080EBC80
 	ldr r1, _080EBC84
 	adds r3, r2, r1
@@ -305887,7 +305887,7 @@ sub_810F694: @ 810F694
 	bl sub_8109E50
 	lsls r0, 16
 	lsrs r6, r0, 16
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
@@ -306141,7 +306141,7 @@ _0810F878:
 	thumb_func_start sub_810F87C
 sub_810F87C: @ 810F87C
 	push {r4-r6,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r5, 0
@@ -311528,7 +311528,7 @@ _08112354:
 	bl SetMonData
 	adds r0, r5, 0
 	bl CalculateMonStats
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, _081123F4
 	adds r4, r6, r7
 	lsls r4, 3
@@ -352217,7 +352217,7 @@ _081266C6:
 	bl sub_80A2D88
 _081266E4:
 	bl party_compaction
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, _0812670C
 	ldr r1, _08126710
 	bl StringExpandPlaceholders
@@ -385288,7 +385288,7 @@ _08136404:
 	ldr r1, _08136434
 	movs r0, 0x14
 	strh r0, [r1]
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, _08136438
 	ldr r4, [r1]
 	ldr r2, _0813643C
@@ -395467,7 +395467,7 @@ sub_813B630: @ 813B630
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _0813B648
@@ -419479,7 +419479,7 @@ sub_8147478: @ 8147478
 	ldr r1, _081474B8
 	cmp r0, r1
 	bne _081474C0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, _081474BC
 	ldrb r1, [r0]
 	movs r0, 0x64