Merge pull request #255 from DizzyEggg/decomp_record_mixing

Fix pika's Record Mixing PR
Also closes #107.

asm/battle_tower.s

@@ -3746,7 +3746,7 @@ _08163FF4:
 	ldr r0, [r6]
 	ldr r1, =0x0000064c
 	adds r0, r1
-	bl sub_8164F70
+	bl CalcEmeraldBattleTowerChecksum
 	bl sub_8163E90
 	pop {r3,r4}
 	mov r8, r3
@@ -5484,8 +5484,8 @@ _08164F52:
 	.pool
 	thumb_func_end sub_8164ED8
 
-	thumb_func_start sub_8164F70
-sub_8164F70: @ 8164F70
+	thumb_func_start CalcEmeraldBattleTowerChecksum
+CalcEmeraldBattleTowerChecksum: @ 8164F70
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r2, 0xE8
@@ -5504,7 +5504,7 @@ _08164F7E:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8164F70
+	thumb_func_end CalcEmeraldBattleTowerChecksum
 
 	thumb_func_start sub_8164F94
 sub_8164F94: @ 8164F94
@@ -6750,7 +6750,7 @@ _08165988:
 	ldr r1, [sp, 0x10]
 	bl CpuSet
 	adds r0, r5, 0
-	bl sub_8164F70
+	bl CalcEmeraldBattleTowerChecksum
 	movs r0, 0x1
 _081659BE:
 	add sp, 0x14

asm/cable_club.s

@@ -795,7 +795,7 @@ sub_80B2A08: @ 80B2A08
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bne _080B2A38
-	bl sub_800A064
+	bl Link_AnyPartnersPlayingRubyOrSapphire
 	cmp r0, 0
 	bne _080B2A4A
 	bl sub_800AC34

asm/fldeff_80F9BCC.s

@@ -2431,8 +2431,8 @@ sub_80FAFF8: @ 80FAFF8
 	.pool
 	thumb_func_end sub_80FAFF8
 
-	thumb_func_start sub_80FB00C
-sub_80FB00C: @ 80FB00C
+	thumb_func_start CreateRecordMixingSprite
+CreateRecordMixingSprite: @ 80FB00C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0858E864
 	bl LoadSpritePalette
@@ -2478,10 +2478,10 @@ _080FB06E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80FB00C
+	thumb_func_end CreateRecordMixingSprite
 
-	thumb_func_start sub_80FB074
-sub_80FB074: @ 80FB074
+	thumb_func_start DestroyRecordMixingSprite
+DestroyRecordMixingSprite: @ 80FB074
 	push {r4-r7,lr}
 	ldr r4, =gSprites
 	adds r7, r4, 0
@@ -2509,6 +2509,6 @@ _080FB098:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80FB074
+	thumb_func_end DestroyRecordMixingSprite
 
 	.align 2, 0 @ Don't pad with nop.

asm/rom_8011DC0.s

@@ -4,7 +4,7 @@
 	.syntax unified
 
 	.text
-
+	
 	thumb_func_start nullsub_89
 nullsub_89: @ 80124E8
 	bx lr