more battle 4

asm/battle_2.s

@@ -6492,7 +6492,7 @@ _0803A0AE:
 	lsrs r0, 31
 	movs r1, 0
 	strb r0, [r3, 0x1D]
-	ldr r0, =gUnknown_02024212
+	ldr r0, =gMultiHitCounter
 	strb r1, [r0]
 	ldr r0, =gBattleOutcome
 	strb r1, [r0]
@@ -13676,7 +13676,7 @@ _0803E110:
 	strb r2, [r0]
 	ldr r0, =gBattleMoveFlags
 	strb r2, [r0]
-	ldr r0, =gUnknown_02024212
+	ldr r0, =gMultiHitCounter
 	strb r2, [r0]
 	ldr r0, =gBattleCommunication
 	strb r2, [r0, 0x6]
@@ -15619,8 +15619,8 @@ bsC_8016D70: @ 803F300
 	.pool
 	thumb_func_end bsC_8016D70
 
-	thumb_func_start get_battle_side_of_something
-get_battle_side_of_something: @ 803F3CC
+	thumb_func_start GetBattleBank
+GetBattleBank: @ 803F3CC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -15696,7 +15696,7 @@ _0803F472:
 _0803F47A:
 	pop {r1}
 	bx r1
-	thumb_func_end get_battle_side_of_something
+	thumb_func_end GetBattleBank
 
 	thumb_func_start PressurePPLose
 PressurePPLose: @ 803F480

asm/battle_9.s

@@ -114,7 +114,7 @@ _08062CBA:
 	ldrh r1, [r4]
 	mov r3, r9
 	ldrb r2, [r3]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r1, r0, 24
 	movs r0, 0x2
@@ -246,7 +246,7 @@ _08062DE0:
 	beq _08062E1E
 	ldrh r1, [r5]
 	ldrb r2, [r7]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r1, r0, 24
 	movs r0, 0x2
@@ -741,7 +741,7 @@ _0806320A:
 	ldrh r1, [r5]
 	mov r3, r8
 	ldrb r2, [r3]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r1, r0, 24
 	movs r0, 0x2
@@ -815,7 +815,7 @@ _080632AE:
 	ldrh r1, [r5]
 	mov r3, r8
 	ldrb r2, [r3]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r1, r0, 24
 	movs r0, 0x2
@@ -1126,7 +1126,7 @@ _08063564:
 	adds r0, r1
 	ldrh r0, [r0]
 	adds r1, r4, 0
-	bl ai_rate_move
+	bl AI_TypeCalc
 	ldr r1, [sp]
 	ands r1, r0
 	cmp r1, 0
@@ -1161,7 +1161,7 @@ _080635A2:
 	beq _080635DE
 	ldrh r1, [r5]
 	ldrb r2, [r7]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r1, r0, 24
 	movs r0, 0x2
@@ -1688,7 +1688,7 @@ sub_8063A08: @ 8063A08
 	lsrs r2, 24
 	mov r8, r2
 	movs r7, 0
-	ldr r0, =gUnknown_0831ACE8
+	ldr r0, =gTypeEffectiveness
 	mov r10, r0
 	ldrb r0, [r0]
 	cmp r0, 0xFF

asm/battle_frontier_1.s

@@ -2599,10 +2599,10 @@ _0818FFFC:
 	b _081900A4
 	.pool
 _0819002C:
-	ldr r0, =gUnknown_0831ACE8
+	ldr r0, =gTypeEffectiveness
 	adds r1, r6, r0
 	ldrb r0, [r1]
-	ldr r7, =gUnknown_0831ACE8
+	ldr r7, =gTypeEffectiveness
 	cmp r0, 0xFF
 	beq _081900A4
 	adds r4, r1, 0
@@ -2657,7 +2657,7 @@ _08190088:
 _08190096:
 	adds r4, 0x3
 	adds r6, 0x3
-	ldr r1, =gUnknown_0831ACE8
+	ldr r1, =gTypeEffectiveness
 	adds r0, r6, r1
 	ldrb r0, [r0]
 	cmp r0, 0xFF
@@ -10109,7 +10109,7 @@ _08194074:
 	lsls r0, r4, 1
 	add r0, r10
 	ldrh r0, [r0]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r0, 0x6

asm/rom3.s

@@ -2465,8 +2465,8 @@ _08033AF2:
 	.pool
 	thumb_func_end sub_8033AC4
 
-	thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
-dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
+	thumb_func_start EmitMoveAnimation
+EmitMoveAnimation: @ 8033B0C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -2568,7 +2568,7 @@ _08033BB6:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
+	thumb_func_end EmitMoveAnimation
 
 	thumb_func_start dp01_build_cmdbuf_x10_TODO
 dp01_build_cmdbuf_x10_TODO: @ 8033BE4
@@ -2938,8 +2938,8 @@ dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC
 	.pool
 	thumb_func_end dp01_build_cmdbuf_x17_17_17_17
 
-	thumb_func_start dp01_build_cmdbuf_x18_0_aa_health_bar_update
-dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
+	thumb_func_start EmitHealthBarUpdate
+EmitHealthBarUpdate: @ 8033EFC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2965,7 +2965,7 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x18_0_aa_health_bar_update
+	thumb_func_end EmitHealthBarUpdate
 
 	thumb_func_start dp01_build_cmdbuf_x19_a_bb
 dp01_build_cmdbuf_x19_a_bb: @ 8033F34