5% wooo

11 files changed, 23 insertions, 1076 deletions

diff --git a/asm/code_800B5F0.s b/asm/code_800B5F0.s
index b30e371..fd2f643 100644
--- a/asm/code_800B5F0.s
+++ b/asm/code_800B5F0.s
@@ -429,226 +429,4 @@ _0800BA54: .4byte gUnknown_202D648
 _0800BA58: .4byte 0x04000004
 	thumb_func_end VCountIntr
 
-	thumb_func_start sub_800BA5C
-sub_800BA5C:
-	push {r4,lr}
-	ldr r4, _0800BAA4
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0800BA72
-	ldr r1, _0800BAA8
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	bl xxx_update_bg_sound_input
-_0800BA72:
-	movs r0, 0x1
-	strb r0, [r4]
-	ldr r1, _0800BAAC
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _0800BAA8
-	movs r0, 0
-	str r0, [r1]
-	bl nullsub_25
-	ldr r1, _0800BAB0
-_0800BA88:
-	ldrh r0, [r1]
-	cmp r0, 0x9F
-	bhi _0800BA88
-	ldr r1, _0800BAB4
-	movs r0, 0x1
-	strb r0, [r1]
-	bl VBlankIntrWait
-	bl nullsub_18
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800BAA4: .4byte gUnknown_203B09A
-_0800BAA8: .4byte gUnknown_203B09C
-_0800BAAC: .4byte gUnknown_203B09B
-_0800BAB0: .4byte 0x04000006
-_0800BAB4: .4byte gUnknown_203B099
-	thumb_func_end sub_800BA5C
-
-	thumb_func_start xxx_update_bg_sound_input
-xxx_update_bg_sound_input:
-	push {r4,r5,lr}
-	ldr r1, _0800BACC
-	ldrb r4, [r1]
-	cmp r4, 0
-	beq _0800BAD4
-	ldr r1, _0800BAD0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	b _0800BAFE
-	.align 2, 0
-_0800BACC: .4byte gUnknown_203B09B
-_0800BAD0: .4byte gUnknown_203B09C
-_0800BAD4:
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, _0800BB04
-	strb r4, [r0]
-	ldr r0, _0800BB08
-	str r4, [r0]
-	bl UpdateBGControlRegisters
-	ldr r5, _0800BB0C
-	ldrb r0, [r5]
-	cmp r0, 0
-	beq _0800BAF0
-	bl UpdateSound
-_0800BAF0:
-	bl UpdateInput
-	strb r4, [r5]
-	ldr r0, _0800BB10
-	ldr r1, _0800BB14
-	ldr r1, [r1]
-	str r1, [r0]
-_0800BAFE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800BB04: .4byte gUnknown_203B09A
-_0800BB08: .4byte gUnknown_203B09C
-_0800BB0C: .4byte gUnknown_203B099
-_0800BB10: .4byte gUnknown_203B0A4
-_0800BB14: .4byte gUnknown_203B0A0
-	thumb_func_end xxx_update_bg_sound_input
-
-	thumb_func_start Timer3Intr
-Timer3Intr:
-	push {lr}
-	ldr r0, _0800BB30
-	ldr r0, [r0, 0x10]
-	cmp r0, 0
-	beq _0800BB26
-	bl _call_via_r0
-_0800BB26:
-	movs r0, 0x40
-	bl SetInterruptFlag
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800BB30: .4byte gUnknown_202D5F0
-	thumb_func_end Timer3Intr
-
-	thumb_func_start sub_800BB34
-sub_800BB34:
-	ldr r0, _0800BB3C
-	ldr r0, [r0]
-	bx lr
-	.align 2, 0
-_0800BB3C: .4byte gUnknown_203B0A0
-	thumb_func_end sub_800BB34
-
-	thumb_func_start nullsub_178
-nullsub_178:
-	bx lr
-	thumb_func_end nullsub_178
-
-	thumb_func_start sub_800BB44
-sub_800BB44:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	ldr r2, _0800BBF0
-	ldrh r0, [r2]
-	ldr r1, _0800BBF4
-	cmp r0, r1
-	beq _0800BB60
-_0800BB5A:
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _0800BB5A
-_0800BB60:
-	bl DisableInterrupts
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	ldr r1, _0800BBF8
-_0800BB6C:
-	ldrh r0, [r1]
-	cmp r0, 0x9F
-	bls _0800BB6C
-	movs r0, 0x80
-	lsls r0, 19
-	mov r9, r0
-	ldrh r1, [r0]
-	mov r8, r1
-	movs r0, 0x80
-	mov r2, r9
-	strh r0, [r2]
-	movs r7, 0xA0
-	lsls r7, 19
-	ldr r1, _0800BBFC
-	adds r0, r1, 0
-	strh r0, [r7]
-	ldr r5, _0800BC00
-	ldrh r4, [r5]
-	movs r2, 0xC0
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r5]
-	ldr r0, _0800BC04
-	mov r10, r0
-	ldr r1, _0800BC08
-	adds r0, r1, 0
-	mov r2, r10
-	strh r0, [r2]
-	ldr r6, _0800BC0C
-	movs r0, 0x1
-	strh r0, [r6]
-	bl SoundBiasReset
-	swi 0x3
-	bl SoundBiasSet
-	movs r0, 0
-	strh r0, [r6]
-	strh r4, [r5]
-	mov r1, r10
-	strh r0, [r1]
-	mov r1, r8
-	mov r2, r9
-	strh r1, [r2]
-	strh r0, [r7]
-	ldr r2, [sp]
-	cmp r2, 0
-	beq _0800BBD0
-	bl EnableInterrupts
-_0800BBD0:
-	ldr r2, _0800BBF0
-	ldrh r0, [r2]
-	ldr r1, _0800BBF4
-	cmp r0, r1
-	beq _0800BBE0
-_0800BBDA:
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _0800BBDA
-_0800BBE0:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800BBF0: .4byte 0x04000130
-_0800BBF4: .4byte 0x000003ff
-_0800BBF8: .4byte 0x04000006
-_0800BBFC: .4byte 0x00007fff
-_0800BC00: .4byte 0x04000200
-_0800BC04: .4byte 0x04000132
-_0800BC08: .4byte 0x00008304
-_0800BC0C: .4byte 0x04000208
-	thumb_func_end sub_800BB44
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 90b3ebd..c430037 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -5,178 +5,6 @@
 
 	.text
 
-	thumb_func_start GetKeyPress
-GetKeyPress:
-	push {lr}
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _08012ADE
-	adds r0, 0x29
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08012AB4
-	movs r0, 0x1
-	b _08012AE2
-_08012AB4:
-	adds r0, r1, 0
-	adds r0, 0x2A
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08012AC2
-	movs r0, 0x2
-	b _08012AE2
-_08012AC2:
-	adds r0, r1, 0
-	adds r0, 0x2C
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08012AD0
-	movs r0, 0x9
-	b _08012AE2
-_08012AD0:
-	adds r0, r1, 0
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08012ADE
-	movs r0, 0xA
-	b _08012AE2
-_08012ADE:
-	bl sub_8012AE8
-_08012AE2:
-	pop {r1}
-	bx r1
-	thumb_func_end GetKeyPress
-
-	thumb_func_start sub_8012AE8
-sub_8012AE8:
-	push {lr}
-	ldr r2, _08012B08
-	ldrh r1, [r2]
-	movs r3, 0x80
-	lsls r3, 1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B4A
-	ldrh r1, [r2, 0x2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B0C
-	movs r0, 0xB
-	b _08012BBE
-	.align 2, 0
-_08012B08: .4byte gRealInputs
-_08012B0C:
-	ldrh r1, [r2, 0x4]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B1A
-	movs r0, 0xC
-	b _08012BBE
-_08012B1A:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B26
-	movs r0, 0xD
-	b _08012BBE
-_08012B26:
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B32
-	movs r0, 0xE
-	b _08012BBE
-_08012B32:
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B3E
-	movs r0, 0xF
-	b _08012BBE
-_08012B3E:
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08012BBC
-	movs r0, 0x6
-	b _08012BBE
-_08012B4A:
-	ldrh r1, [r2, 0x2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B58
-	movs r0, 0x1
-	b _08012BBE
-_08012B58:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B64
-	movs r0, 0x2
-	b _08012BBE
-_08012B64:
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B70
-	movs r0, 0x3
-	b _08012BBE
-_08012B70:
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B7C
-	movs r0, 0x4
-	b _08012BBE
-_08012B7C:
-	ldrh r1, [r2, 0x4]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B8A
-	movs r0, 0x7
-	b _08012BBE
-_08012B8A:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08012B96
-	movs r0, 0x8
-	b _08012BBE
-_08012B96:
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _08012BA2
-	movs r0, 0x9
-	b _08012BBE
-_08012BA2:
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08012BAE
-	movs r0, 0xA
-	b _08012BBE
-_08012BAE:
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r1
-	cmp r0, 0
-	beq _08012BBC
-	movs r0, 0x5
-	b _08012BBE
-_08012BBC:
-	movs r0, 0
-_08012BBE:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8012AE8
-
 	thumb_func_start sub_8012BC4
 sub_8012BC4:
 	push {r4-r7,lr}
diff --git a/asm/code_801D760.s b/asm/code_801D760.s
index d74e5af..563f19a 100644
--- a/asm/code_801D760.s
+++ b/asm/code_801D760.s
@@ -14300,7 +14300,7 @@ _080249F8:
 	str r0, [r1, 0x24]
 	movs r0, 0x8
 	movs r1, 0x3C
-	bl sub_8011900
+	bl xxx_call_fade_in_new_bgm
 	ldr r0, _08024A0C
 	ldr r3, _08024A10
 	b _08024CB0
@@ -14620,7 +14620,7 @@ _08024C98: .4byte gUnknown_80DD0E0
 _08024C9C:
 	movs r0, 0x8
 	movs r1, 0x3C
-	bl sub_8011900
+	bl xxx_call_fade_in_new_bgm
 	ldr r0, _08024CBC
 	ldr r1, [r0]
 	movs r0, 0x15
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
index c37111c..b81ce2f 100644
--- a/asm/code_8040094.s
+++ b/asm/code_8040094.s
@@ -5,74 +5,6 @@
 
 	.text		
 
-	thumb_func_start sub_80400D4
-sub_80400D4:
-	push {r4,lr}
-	ldr r0, _08040114
-	ldr r4, [r0]
-	movs r0, 0xC1
-	lsls r0, 9
-	adds r3, r4, r0
-	ldr r0, [r3]
-	cmp r0, 0
-	beq _0804010C
-	cmp r0, 0x1E
-	ble _080400EC
-	movs r0, 0x1F
-_080400EC:
-	ldr r1, _08040118
-	adds r2, r4, r1
-	ldr r1, _0804011C
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r2]
-	ldr r0, [r3]
-	subs r0, 0x1
-	str r0, [r3]
-	cmp r0, 0
-	bne _0804010C
-	ldr r1, _08040120
-	adds r0, r4, r1
-	ldr r0, [r0]
-	str r0, [r3]
-_0804010C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08040114: .4byte gUnknown_203B418
-_08040118: .4byte 0x000181fc
-_0804011C: .4byte gUnknown_80F6568
-_08040120: .4byte 0x00018204
-	thumb_func_end sub_80400D4
-
-	thumb_func_start sub_8040124
-sub_8040124:
-	ldr r1, _0804012C
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0804012C: .4byte gUnknown_202EE01
-	thumb_func_end sub_8040124
-
-	thumb_func_start sub_8040130
-sub_8040130:
-	push {lr}
-	ldr r0, _08040144
-	ldr r1, _08040148
-	bl OpenFileAndGetFileDataPtr
-	ldr r1, _0804014C
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08040144: .4byte gUnknown_80F6604
-_08040148: .4byte gUnknown_83B0000
-_0804014C: .4byte gUnknown_202EE04
-	thumb_func_end sub_8040130
-
 	thumb_func_start sub_8040150
 sub_8040150:
 	push {r4-r7,lr}
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index 35b6f10..3e85d20 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -5,38 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80484E8
-sub_80484E8:
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldr r0, [r4, 0x70]
-	adds r0, 0xAC
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08048500
-	adds r0, r5, 0
-	bl sub_807A290
-	b _08048516
-_08048500:
-	ldr r0, _0804851C
-	adds r1, r4, 0
-	movs r2, 0
-	bl sub_8045B94
-	ldr r0, _08048520
-	ldr r2, [r0]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_80522F4
-_08048516:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804851C: .4byte gUnknown_202DF98
-_08048520: .4byte gUnknown_80FB580
-	thumb_func_end sub_80484E8
-
 	thumb_func_start sub_8048524
 sub_8048524:
 	push {r4-r6,lr}
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index c15397c..5cad05c 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -100060,7 +100060,7 @@ sub_8083F14:
 	thumb_func_start sub_8083F24
 sub_8083F24:
 	push {lr}
-	bl sub_800C068
+	bl GetCurrentBGSong
 	lsls r0, 16
 	lsrs r0, 16
 	pop {r1}
@@ -100189,7 +100189,7 @@ _08084018:
 	beq _08084030
 	ldr r0, _0808402C
 	ands r0, r1
-	bl sub_800BDFC
+	bl StartNewBGM
 	b _0808403A
 	.align 2, 0
 _0808402C: .4byte 0x00007fff
@@ -115935,405 +115935,4 @@ sub_808C9B0:
 	bx r0
 	thumb_func_end sub_808C9B0
 
-	thumb_func_start sub_808C9C4
-sub_808C9C4:
-	push {r4,r5,lr}
-	bl sub_8085480
-	adds r5, r0, 0
-	movs r0, 0x7
-	bl sub_8085680
-	adds r4, r0, 0
-	movs r0, 0x72
-	bl sub_8083E88
-	bl sub_80854D4
-	movs r0, 0x4
-	bl sub_8085930
-	ldr r0, _0808CA10
-	bl sub_80855E4
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8085918
-	movs r1, 0x4
-	ldrsh r0, [r5, r1]
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	subs r1, 0x3
-	bl sub_8085860
-	ldr r0, _0808CA14
-	ldr r1, _0808CA18
-	bl sub_808D8BC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CA10: .4byte sub_8086A3C
-_0808CA14: .4byte gUnknown_202E038
-_0808CA18: .4byte 0x0000014d
-	thumb_func_end sub_808C9C4
-
-	thumb_func_start sub_808CA1C
-sub_808CA1C:
-	push {r4,r5,lr}
-	movs r0, 0x7
-	bl sub_8085680
-	adds r5, r0, 0
-	bl sub_808696C
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CB44
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0x4
-	movs r2, 0x2
-	movs r3, 0x4
-	bl sub_80869E4
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CB48
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	bl sub_8086448
-	bl sub_8086598
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	bl sub_80862BC
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0x4
-	movs r2, 0x2
-	movs r3, 0
-	bl sub_80869E4
-	ldr r0, _0808CB4C
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r4, _0808CB50
-	adds r0, r4, 0
-	bl sub_8083E38
-	adds r0, r5, 0
-	movs r1, 0xA
-	movs r2, 0
-	bl sub_806CDD4
-	movs r0, 0x14
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806CE68
-	movs r0, 0x4
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r4, 0
-	bl sub_8083E38
-	adds r0, r5, 0
-	movs r1, 0xA
-	movs r2, 0
-	bl sub_806CDD4
-	movs r0, 0x14
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CB54
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	bl sub_806CDD4
-	movs r4, 0x17
-_0808CAF6:
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0x80
-	lsls r2, 1
-	bl sub_804539C
-	movs r0, 0x46
-	bl sub_803E46C
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0808CAF6
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806CE68
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	bl sub_8042B0C
-	movs r1, 0x87
-	lsls r1, 2
-	adds r0, r5, 0
-	movs r2, 0
-	bl sub_8068FE0
-	ldr r2, _0808CB58
-	ldr r1, [r2]
-	movs r0, 0x1
-	strb r0, [r1, 0x4]
-	ldr r1, [r2]
-	movs r0, 0x4
-	strb r0, [r1, 0x11]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CB44: .4byte gUnknown_8106778
-_0808CB48: .4byte gUnknown_81067BC
-_0808CB4C: .4byte gUnknown_81067E0
-_0808CB50: .4byte 0x000001c7
-_0808CB54: .4byte gUnknown_8106834
-_0808CB58: .4byte gUnknown_203B418
-	thumb_func_end sub_808CA1C
-
-	thumb_func_start sub_808CB5C
-sub_808CB5C:
-	push {r4,r5,lr}
-	bl sub_8085480
-	adds r5, r0, 0
-	movs r0, 0x7
-	bl sub_8085680
-	adds r4, r0, 0
-	movs r0, 0x72
-	bl sub_8083E88
-	bl sub_80854D4
-	movs r0, 0x4
-	bl sub_8085930
-	movs r1, 0x87
-	lsls r1, 2
-	adds r0, r4, 0
-	movs r2, 0
-	bl sub_8068FE0
-	movs r1, 0x4
-	ldrsh r0, [r5, r1]
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	bl sub_8085860
-	ldr r0, _0808CBA4
-	ldr r1, _0808CBA8
-	bl sub_808D8BC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CBA4: .4byte gUnknown_202E038
-_0808CBA8: .4byte 0x0000014d
-	thumb_func_end sub_808CB5C
-
-	thumb_func_start nullsub_101
-nullsub_101:
-	bx lr
-	thumb_func_end nullsub_101
-
-	thumb_func_start sub_808CBB0
-sub_808CBB0:
-	push {r4,r5,lr}
-	bl sub_8085480
-	adds r5, r0, 0
-	movs r0, 0x1F
-	bl sub_8085680
-	adds r4, r0, 0
-	movs r0, 0x72
-	bl sub_8083E88
-	bl sub_80854D4
-	movs r0, 0x4
-	bl sub_8085930
-	ldr r0, _0808CBFC
-	bl sub_80855E4
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8085918
-	movs r1, 0x4
-	ldrsh r0, [r5, r1]
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	subs r1, 0x3
-	bl sub_8085860
-	ldr r0, _0808CC00
-	movs r1, 0x82
-	lsls r1, 1
-	bl sub_808D8BC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CBFC: .4byte sub_8086A3C
-_0808CC00: .4byte gUnknown_202E038
-	thumb_func_end sub_808CBB0
-
-	thumb_func_start sub_808CC04
-sub_808CC04:
-	push {r4,r5,lr}
-	movs r0, 0x1F
-	bl sub_8085680
-	adds r5, r0, 0
-	bl sub_808696C
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CD2C
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0x4
-	movs r2, 0x2
-	movs r3, 0x4
-	bl sub_80869E4
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CD30
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	bl sub_8086448
-	bl sub_8086598
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	bl sub_80862BC
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0x4
-	movs r2, 0x2
-	movs r3, 0
-	bl sub_80869E4
-	ldr r0, _0808CD34
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r4, _0808CD38
-	adds r0, r4, 0
-	bl sub_8083E38
-	adds r0, r5, 0
-	movs r1, 0xA
-	movs r2, 0
-	bl sub_806CDD4
-	movs r0, 0x14
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806CE68
-	movs r0, 0x4
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r4, 0
-	bl sub_8083E38
-	adds r0, r5, 0
-	movs r1, 0xA
-	movs r2, 0
-	bl sub_806CDD4
-	movs r0, 0x14
-	movs r1, 0x46
-	bl sub_803E708
-	ldr r0, _0808CD3C
-	bl sub_8052910
-	movs r0, 0xA
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	bl sub_806CDD4
-	movs r4, 0x17
-_0808CCDE:
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0x80
-	lsls r2, 1
-	bl sub_804539C
-	movs r0, 0x46
-	bl sub_803E46C
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0808CCDE
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806CE68
-	movs r0, 0x20
-	movs r1, 0x46
-	bl sub_803E708
-	adds r0, r5, 0
-	bl sub_8042B0C
-	movs r1, 0x87
-	lsls r1, 2
-	adds r0, r5, 0
-	movs r2, 0
-	bl sub_8068FE0
-	ldr r2, _0808CD40
-	ldr r1, [r2]
-	movs r0, 0x1
-	strb r0, [r1, 0x4]
-	ldr r1, [r2]
-	movs r0, 0x4
-	strb r0, [r1, 0x11]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CD2C: .4byte gUnknown_810688C
-_0808CD30: .4byte gUnknown_81068D0
-_0808CD34: .4byte gUnknown_8106918
-_0808CD38: .4byte 0x000001c7
-_0808CD3C: .4byte gUnknown_8106934
-_0808CD40: .4byte gUnknown_203B418
-	thumb_func_end sub_808CC04
-
-	thumb_func_start sub_808CD44
-sub_808CD44:
-	push {r4,r5,lr}
-	bl sub_8085480
-	adds r5, r0, 0
-	movs r0, 0x1F
-	bl sub_8085680
-	adds r4, r0, 0
-	movs r0, 0x72
-	bl sub_8083E88
-	bl sub_80854D4
-	movs r0, 0x4
-	bl sub_8085930
-	ldr r0, _0808CD94
-	bl sub_80855E4
-	movs r1, 0x87
-	lsls r1, 2
-	adds r0, r4, 0
-	movs r2, 0
-	bl sub_8068FE0
-	movs r1, 0x4
-	ldrsh r0, [r5, r1]
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	subs r1, 0x3
-	bl sub_8085860
-	ldr r0, _0808CD98
-	movs r1, 0x82
-	lsls r1, 1
-	bl sub_808D8BC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808CD94: .4byte sub_8086A3C
-_0808CD98: .4byte gUnknown_202E038
-	thumb_func_end sub_808CD44
-
         .align 2,0 @ Don't pad with nop
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index 5a0f8ec..2473525 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -4953,7 +4953,7 @@ _0809FD20:
 	cmp r1, r0
 	beq _0809FDA0
 	adds r0, r1, 0
-	bl sub_80118F0
+	bl xxx_call_start_new_bgm
 	bl _0809EAE0
 	.align 2, 0
 _0809FD34: .4byte 0x000003e7
@@ -4978,7 +4978,7 @@ _0809FD4E:
 	add r0, sp, 0x8
 	ldrh r1, [r0, 0x2]
 	adds r0, r2, 0
-	bl sub_8011900
+	bl xxx_call_fade_in_new_bgm
 	bl _0809EAE0
 	.align 2, 0
 _0809FD68: .4byte 0x000003e7
@@ -9479,7 +9479,7 @@ _080A229E:
 	bl sub_80118C4
 	b _080A236A
 _080A22AE:
-	bl sub_800C068
+	bl GetCurrentBGSong
 	ldr r1, _080A22C4
 	strh r0, [r1]
 	lsls r0, 16
@@ -9498,7 +9498,7 @@ _080A22CC:
 	ldr r5, _080A22E0
 	cmp r0, r5
 	beq _080A236A
-	bl sub_80118F0
+	bl xxx_call_start_new_bgm
 	b _080A2312
 	.align 2, 0
 _080A22DC: .4byte gUnknown_2039DA8
@@ -9511,7 +9511,7 @@ _080A22E4:
 	beq _080A236A
 	lsls r1, r5, 16
 	lsrs r1, 16
-	bl sub_8011900
+	bl xxx_call_fade_in_new_bgm
 	strh r6, [r4]
 	b _080A1EBE
 	.align 2, 0
diff --git a/asm/event_flag.s b/asm/event_flag.s
index 3995181..a07621c 100644
--- a/asm/event_flag.s
+++ b/asm/event_flag.s
@@ -2489,80 +2489,4 @@ _080026C6:
 	bx r1
 	thumb_func_end sub_8002694
 
-	thumb_func_start sub_80026CC
-sub_80026CC:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_8002658
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFriendAreaStatus
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80026CC
-
-	thumb_func_start sub_80026E8
-sub_80026E8:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_8002658
-	lsls r0, 24
-	lsrs r0, 24
-	bl UnlockFriendArea
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80026E8
-
-	thumb_func_start sub_8002700
-sub_8002700:
-	push {lr}
-	ldr r1, _08002714
-	movs r2, 0x80
-	lsls r2, 3
-	bl MemoryCopy8
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08002714: .4byte gUnknown_2000A88
-	thumb_func_end sub_8002700
-
-	thumb_func_start sub_8002718
-sub_8002718:
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0
-	bl sub_800160C
-	ldr r0, _08002748
-	movs r2, 0x80
-	lsls r2, 3
-	adds r1, r4, 0
-	bl MemoryCopy8
-	ldr r0, [sp]
-	movs r2, 0xA
-	ldrsh r1, [r0, r2]
-	ldr r0, [sp, 0x4]
-	ldr r0, [r0]
-	cmp r1, r0
-	bne _0800274C
-	movs r0, 0x1
-	b _0800274E
-	.align 2, 0
-_08002748: .4byte gUnknown_2000A88
-_0800274C:
-	movs r0, 0
-_0800274E:
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8002718
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/fatal_system.s b/asm/fatal_system.s
deleted file mode 100644
index e4da05e..0000000
--- a/asm/fatal_system.s
+++ /dev/null
@@ -1,38 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start FatalErrorFormatMessage
-FatalErrorFormatMessage:
-	push {r0-r3}
-	push {lr}
-	sub sp, 0x100
-	ldr r1, [sp, 0x104]
-	add r2, sp, 0x108
-	mov r0, sp
-	bl vsprintf
-	add sp, 0x100
-	pop {r3}
-	add sp, 0x10
-	bx r3
-	thumb_func_end FatalErrorFormatMessage
-
-	thumb_func_start sub_8011B88
-sub_8011B88:
-	push {r0-r3}
-	push {lr}
-	sub sp, 0x100
-	ldr r1, [sp, 0x104]
-	add r2, sp, 0x108
-	mov r0, sp
-	bl vsprintf
-	add sp, 0x100
-	pop {r3}
-	add sp, 0x10
-	bx r3
-	thumb_func_end sub_8011B88
-
-        .align 2,0
diff --git a/asm/music.s b/asm/music.s
index 78ff17d..0e13f2c 100644
--- a/asm/music.s
+++ b/asm/music.s
@@ -78,9 +78,9 @@ _0800C0B4:
 _0800C0FC: .4byte 0x000003e5
 _0800C100: .4byte gUnknown_202D68E
 _0800C104: .4byte gUnknown_202D690
-_0800C108: .4byte gUnknown_202D68A
+_0800C108: .4byte gCurrentBGSong
 _0800C10C: .4byte 0x000003e7
-_0800C110: .4byte gUnknown_202D688
+_0800C110: .4byte gBGMusicPlayerState
 _0800C114: .4byte gUnknown_202D692
 _0800C118: .4byte gUnknown_202D694
 _0800C11C: .4byte gUnknown_20008F0
@@ -132,7 +132,7 @@ _0800C15E:
 	b _0800C19A
 	.align 2, 0
 _0800C17C: .4byte gUnknown_20008F0
-_0800C180: .4byte gUnknown_202D68A
+_0800C180: .4byte gCurrentBGSong
 _0800C184:
 	cmp r0, 0x7A
 	beq _0800C19A
@@ -817,7 +817,7 @@ _0800C6E4:
 	strh r0, [r4]
 	b _0800C8A2
 	.align 2, 0
-_0800C6F0: .4byte gUnknown_202D68A
+_0800C6F0: .4byte gCurrentBGSong
 _0800C6F4: .4byte 0x000003e7
 _0800C6F8: .4byte gUnknown_202D68E
 _0800C6FC: .4byte 0x000003e5
@@ -893,9 +893,9 @@ _0800C774:
 	bl m4aSongNumStart
 	b _0800C7BE
 	.align 2, 0
-_0800C794: .4byte gUnknown_202D68A
+_0800C794: .4byte gCurrentBGSong
 _0800C798: .4byte 0x000003e7
-_0800C79C: .4byte gUnknown_202D688
+_0800C79C: .4byte gBGMusicPlayerState
 _0800C7A0: .4byte gUnknown_202D694
 _0800C7A4:
 	ldr r0, _0800C7B0
@@ -917,7 +917,7 @@ _0800C7BE:
 	ldr r2, _0800C7DC
 	b _0800C84C
 	.align 2, 0
-_0800C7CC: .4byte gUnknown_202D688
+_0800C7CC: .4byte gBGMusicPlayerState
 _0800C7D0: .4byte gUnknown_20008F0
 _0800C7D4: .4byte gUnknown_202D690
 _0800C7D8: .4byte gUnknown_202D68E
@@ -948,8 +948,8 @@ _0800C80A:
 	strh r0, [r5]
 	b _0800C8A2
 	.align 2, 0
-_0800C810: .4byte gUnknown_202D688
-_0800C814: .4byte gUnknown_202D68A
+_0800C810: .4byte gBGMusicPlayerState
+_0800C814: .4byte gCurrentBGSong
 _0800C818: .4byte 0x000003e7
 _0800C81C:
 	ldr r0, _0800C834
@@ -964,7 +964,7 @@ _0800C81C:
 	bne _0800C8A2
 	b _0800C842
 	.align 2, 0
-_0800C834: .4byte gUnknown_202D68A
+_0800C834: .4byte gCurrentBGSong
 _0800C838: .4byte 0x000003e7
 _0800C83C:
 	ldr r0, _0800C854
@@ -981,8 +981,8 @@ _0800C84C:
 	b _0800C8A2
 	.align 2, 0
 _0800C854: .4byte gUnknown_20008F0
-_0800C858: .4byte gUnknown_202D688
-_0800C85C: .4byte gUnknown_202D68A
+_0800C858: .4byte gBGMusicPlayerState
+_0800C85C: .4byte gCurrentBGSong
 _0800C860: .4byte 0x000003e7
 _0800C864:
 	movs r0, 0
@@ -1008,7 +1008,7 @@ _0800C864:
 	.align 2, 0
 _0800C890: .4byte gUnknown_202D68C
 _0800C894: .4byte 0x000003e7
-_0800C898: .4byte gUnknown_202D68A
+_0800C898: .4byte gCurrentBGSong
 _0800C89C:
 	strh r0, [r5]
 	ldr r0, _0800C8C4
@@ -1033,7 +1033,7 @@ _0800C8AE:
 	beq _0800C8F0
 	b _0800C926
 	.align 2, 0
-_0800C8C4: .4byte gUnknown_202D68A
+_0800C8C4: .4byte gCurrentBGSong
 _0800C8C8: .4byte gUnknown_3000FE8
 _0800C8CC: .4byte 0x000003e5
 _0800C8D0:
diff --git a/asm/personality_test.s b/asm/personality_test.s
index 545c45a..4f4746d 100644
--- a/asm/personality_test.s
+++ b/asm/personality_test.s
@@ -5,50 +5,6 @@
 
 	.text	
 
-        thumb_func_start sub_803C190
-sub_803C190:
-	lsls r0, 24
-	ldr r1, _0803C19C
-	lsrs r0, 21
-	adds r0, r1
-	ldr r0, [r0]
-	bx lr
-	.align 2, 0
-_0803C19C: .4byte gUnknown_80EBA18
-	thumb_func_end sub_803C190
-
-	thumb_func_start sub_803C1A0
-sub_803C1A0:
-	lsls r0, 24
-	ldr r1, _0803C1B0
-	lsrs r0, 21
-	adds r1, 0x4
-	adds r0, r1
-	ldr r0, [r0]
-	bx lr
-	.align 2, 0
-_0803C1B0: .4byte gUnknown_80EBA18
-	thumb_func_end sub_803C1A0
-
-	thumb_func_start sub_803C1B4
-sub_803C1B4:
-	push {r4,lr}
-	lsls r4, r1, 24
-	lsrs r4, 24
-	bl sub_80908D8
-	cmp r4, 0x2
-	bne _0803C1C4
-	adds r0, 0x2
-_0803C1C4:
-	cmp r0, 0xF
-	ble _0803C1CA
-	movs r0, 0xF
-_0803C1CA:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_803C1B4
-
 	thumb_func_start sub_803C1D0
 sub_803C1D0:
 	push {lr}