decomp calc dmg and clean up battle ai

asm/battle_3.s

@@ -4237,7 +4237,7 @@ _0804207C:
 	adds r0, r1, 0
 	movs r2, 0x1
 	movs r3, 0
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldr r1, =gBattleMoveDamage
 	str r0, [r1]
 	ldr r0, =gProtectStructs
@@ -11133,7 +11133,7 @@ _08045F8C:
 	adds r0, r1, 0
 	movs r2, 0x1
 	movs r3, 0
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldr r1, =gBattleMoveDamage
 	str r0, [r1]
 	ldr r1, =gBankTarget

asm/battle_4.s

@@ -1572,7 +1572,7 @@ atk05_damagecalc1: @ 8046D8C
 	str r4, [sp, 0x8]
 	ldrb r4, [r5]
 	str r4, [sp, 0xC]
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldr r4, =gBattleMoveDamage
 	ldr r1, =gCritMultiplier
 	ldrb r1, [r1]
@@ -1670,7 +1670,7 @@ sub_8046E7C: @ 8046E7C
 	str r4, [sp, 0x4]
 	str r7, [sp, 0x8]
 	str r5, [sp, 0xC]
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldr r4, =gBattleMoveDamage
 	movs r1, 0
 	strh r1, [r6]
@@ -18750,7 +18750,7 @@ _0805035C:
 	cmp r0, 0
 	beq _080503CC
 	movs r0, 0x1
-	bl sub_8069DEC
+	bl CountAliveMonsInBattle
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x2
@@ -19329,7 +19329,7 @@ _08050828:
 	str r4, [sp, 0x8]
 	ldrb r4, [r5]
 	str r4, [sp, 0xC]
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldrb r2, [r6]
 	lsls r1, r2, 3
 	subs r1, r2
@@ -21033,7 +21033,7 @@ _080516A4:
 	cmp r0, 0
 	beq _08051714
 	movs r0, 0x1
-	bl sub_8069DEC
+	bl CountAliveMonsInBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -26497,7 +26497,7 @@ _080545DC:
 	str r4, [sp, 0x8]
 	ldrb r4, [r6]
 	str r4, [sp, 0xC]
-	bl sub_806957C
+	bl CalculateBaseDamage
 	ldrb r1, [r6]
 	lsls r1, 2
 	mov r2, r8

asm/battle_controller_player.s

@@ -991,7 +991,7 @@ _08057D24:
 	cmp r0, 0
 	bne _08057D5A
 	movs r0, 0
-	bl sub_8069DEC
+	bl CountAliveMonsInBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/pokemon_2.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8069DEC
-sub_8069DEC: @ 8069DEC
+	thumb_func_start CountAliveMonsInBattle
+CountAliveMonsInBattle: @ 8069DEC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -115,10 +115,10 @@ _08069EC2:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_8069DEC
+	thumb_func_end CountAliveMonsInBattle
 
-	thumb_func_start sub_8069ED8
-sub_8069ED8: @ 8069ED8
+	thumb_func_start ShouldGetStatBadgeBoost
+ShouldGetStatBadgeBoost: @ 8069ED8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -162,7 +162,7 @@ _08069F2E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8069ED8
+	thumb_func_end ShouldGetStatBadgeBoost
 
 	thumb_func_start sub_8069F34
 sub_8069F34: @ 8069F34
@@ -186,7 +186,7 @@ sub_8069F34: @ 8069F34
 	.pool
 _08069F5C:
 	movs r0, 0
-	bl sub_8069DEC
+	bl CountAliveMonsInBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/rom_8034C54.s

@@ -14889,7 +14889,7 @@ _0803CFDC:
 	adds r4, r0, r1
 	ldrh r0, [r4, 0x6]
 	muls r3, r0
-	ldr r2, =gUnknown_08329D2E
+	ldr r2, =gStatStageRatios
 	movs r1, 0x1B
 	ldrsb r1, [r4, r1]
 	lsls r1, 1
@@ -14993,7 +14993,7 @@ _0803D0B8:
 	ldrh r0, [r4, 0x6]
 	adds r3, r0, 0
 	muls r3, r7
-	ldr r2, =gUnknown_08329D2E
+	ldr r2, =gStatStageRatios
 	movs r1, 0x1B
 	ldrsb r1, [r4, r1]
 	lsls r1, 1

asm/rom_817C95C.s

@@ -4443,7 +4443,7 @@ _0817EFC2:
 	mov r6, r9
 	ldrb r4, [r6]
 	str r4, [sp, 0xC]
-	bl sub_806957C
+	bl CalculateBaseDamage
 	adds r3, r0, 0
 	ldr r4, =gBattleMoveDamage
 	str r3, [r4]