decomp, label, doc, repeat

11 files changed, 77 insertions, 500 deletions

diff --git a/asm/code_2.s b/asm/code_2.s
index 4fb8c50..994f260 100644
--- a/asm/code_2.s
+++ b/asm/code_2.s
@@ -1116,7 +1116,7 @@ _08000F58:
 	ldr r0, _08000F64
 	bl sub_80121E0
 _08000F5E:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _08000F78
 	.align 2, 0
 _08000F64: .4byte 0x000f1209
diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index d6f365d..9571b63 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -5,93 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_800D16C
-sub_800D16C:
-	push {r0-r3}
-	push {lr}
-	mov r12, r4
-	ldr r4, _0800D198
-	add sp, r4
-	mov r4, r12
-	ldr r0, _0800D19C
-	add r0, sp
-	ldr r1, [r0]
-	movs r2, 0x81
-	lsls r2, 3
-	add r2, sp
-	mov r0, sp
-	bl vsprintf
-	movs r3, 0x80
-	lsls r3, 3
-	add sp, r3
-	pop {r3}
-	add sp, 0x10
-	bx r3
-	.align 2, 0
-_0800D198: .4byte 0xfffffc00
-_0800D19C: .4byte 0x00000404
-	thumb_func_end sub_800D16C
-
-	thumb_func_start sub_800D1A0
-sub_800D1A0:
-	push {r3}
-	add sp, 0x4
-	bx lr
-	thumb_func_end sub_800D1A0
-
-	thumb_func_start nullsub_183
-nullsub_183:
-	bx lr
-	thumb_func_end nullsub_183
-
-	thumb_func_start nullsub_188
-nullsub_188:
-	bx lr
-	thumb_func_end nullsub_188
-
-	thumb_func_start nullsub_184
-nullsub_184:
-	bx lr
-	thumb_func_end nullsub_184
-
-	thumb_func_start sub_800D1B4
-sub_800D1B4:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800D1B4
-
-	thumb_func_start sub_800D1B8
-sub_800D1B8:
-	adds r0, r2, 0
-	bx lr
-	thumb_func_end sub_800D1B8
-
-	thumb_func_start nullsub_187
-nullsub_187:
-	bx lr
-	thumb_func_end nullsub_187
-
-	thumb_func_start sub_800D1C0
-sub_800D1C0:
-	push {lr}
-	ldr r1, _0800D1D4
-	ldr r0, [r1]
-	cmp r0, 0x2
-	bne _0800D1D8
-	ldr r0, [r1, 0x4]
-	cmp r0, 0x2
-	bne _0800D1D8
-	movs r0, 0x1
-	b _0800D1DA
-	.align 2, 0
-_0800D1D4: .4byte gUnknown_202DB60
-_0800D1D8:
-	movs r0, 0
-_0800D1DA:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_800D1C0
-
 	thumb_func_start sub_800D1E0
 sub_800D1E0:
 	push {r4-r7,lr}
diff --git a/asm/code_80118A4.s b/asm/code_80118A4.s
deleted file mode 100644
index 06b2d1f..0000000
--- a/asm/code_80118A4.s
+++ /dev/null
@@ -1,38 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text	
-
-        @ Unused
-	thumb_func_start PrintMessageWithFuncFileLine
-PrintMessageWithFuncFileLine:
-	push {r2,r3}
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, [sp, 0x10]
-	add r2, sp, 0x14
-	bl vsprintf
-	adds r0, r4, 0
-	bl strlen
-	adds r4, r0
-	ldr r1, _08011AFC
-	ldr r2, [r5, 0x8]
-	ldr r3, [r5]
-	ldr r0, [r5, 0x4]
-	str r0, [sp]
-	adds r0, r4, 0
-	bl sprintf
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r3}
-	add sp, 0x8
-	bx r3
-	.align 2, 0
-_08011AFC: .4byte gFuncFileLineString2
-	thumb_func_end PrintMessageWithFuncFileLine
-
-        .align 2,0 @ Don't pad with nop
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index ddb0ef8..e765d1a 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -2875,7 +2875,7 @@ _08014110: .4byte 0x004000bc
 	thumb_func_start sub_8014114
 sub_8014114:
 	push {lr}
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	movs r0, 0
 	bl SetSavingIconCoords
 	pop {r0}
diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s
index 8aa4674..7c4a52b 100644
--- a/asm/code_8027C84.s
+++ b/asm/code_8027C84.s
@@ -1277,7 +1277,7 @@ _08028782:
 	ldr r1, [r4]
 	str r0, [r1, 0x44]
 _0802878A:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _08028AF2
 _08028790:
 	ldr r0, [r6]
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 5114113..2e47ea9 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -4476,7 +4476,7 @@ _08054B58:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8058AAC
+	bl SkyAttackMoveAction
 	bl _080554BA
 _08054B68:
 	adds r0, r7, 0
@@ -4800,7 +4800,7 @@ _08054E0C:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805B220
+	bl TrapperOrbAction
 	b _080554BA
 _08054E1A:
 	adds r0, r7, 0
@@ -4849,7 +4849,7 @@ _08054E6E:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805B8B0
+	bl SkullBashMoveAction
 	b _080554BA
 _08054E7C:
 	adds r0, r7, 0
@@ -4905,7 +4905,7 @@ _08054EDE:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8057A98
+	bl TormentMoveAction
 	b _080554BA
 _08054EEC:
 	adds r0, r7, 0
@@ -4961,7 +4961,7 @@ _08054F4E:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805C2AC
+	bl FillInOrbAction
 	b _080554BA
 _08054F5C:
 	adds r0, r7, 0
@@ -5031,7 +5031,7 @@ _08054FDA:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805983C
+	bl DiveMoveAction
 	b _080554BA
 _08054FE8:
 	adds r0, r7, 0
@@ -5066,7 +5066,7 @@ _08055020:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805BF40
+	bl TrapbustOrbAction
 	b _080554BA
 _0805502E:
 	adds r0, r7, 0
@@ -5087,7 +5087,7 @@ _0805504A:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805810C
+	bl GrudgeMoveAction
 	b _080554BA
 _08055058:
 	adds r0, r7, 0
@@ -5236,7 +5236,7 @@ _08055174:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805A640
+	bl SpitUpMoveAction
 	b _080554BA
 _08055182:
 	adds r0, r7, 0
@@ -5341,7 +5341,7 @@ _08055246:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8059C8C
+	bl HelpingHandMoveAction
 	b _080554BA
 _08055254:
 	adds r0, r7, 0
@@ -5390,7 +5390,7 @@ _080552A8:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805B038
+	bl TransformMoveAction
 	b _080554BA
 _080552B6:
 	adds r0, r7, 0
@@ -5425,7 +5425,7 @@ _080552EE:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805BD88
+	bl TransferOrbAction
 	b _080554BA
 _080552FC:
 	adds r0, r7, 0
@@ -5474,7 +5474,7 @@ _08055350:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805BED4
+	bl EscapeOrbAction
 	b _080554BA
 _0805535E:
 	adds r0, r7, 0
@@ -5502,7 +5502,7 @@ _08055388:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8059340
+	bl SketchMoveAction
 	b _080554BA
 _08055396:
 	adds r0, r7, 0
@@ -5523,7 +5523,7 @@ _080553B2:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8059290
+	bl SkillSwapMoveAction
 	b _080554BA
 _080553C0:
 	adds r0, r7, 0
@@ -5537,7 +5537,7 @@ _080553CE:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805BBA8
+	bl CleanseOrbAction
 	b _080554BA
 _080553DC:
 	adds r0, r7, 0
@@ -5635,7 +5635,7 @@ _08055492:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_805B464
+	bl MimicMoveAction
 	b _080554BA
 _080554A0:
 	adds r0, r7, 0
@@ -10577,8 +10577,8 @@ _08057A90: .4byte gUnknown_202DF98
 _08057A94: .4byte gUnknown_80FC7EC
 	thumb_func_end sub_8057A0C
 
-	thumb_func_start sub_8057A98
-sub_8057A98:
+	thumb_func_start TormentMoveAction
+TormentMoveAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -10719,7 +10719,7 @@ _08057B9C:
 	bx r1
 	.align 2, 0
 _08057BB0: .4byte gUnknown_80FCFE4
-	thumb_func_end sub_8057A98
+	thumb_func_end TormentMoveAction
 
 	thumb_func_start sub_8057BB4
 sub_8057BB4:
@@ -11439,8 +11439,8 @@ _080580F4:
 	bx r1
 	thumb_func_end sub_805805C
 
-	thumb_func_start sub_805810C
-sub_805810C:
+	thumb_func_start GrudgeMoveAction
+GrudgeMoveAction:
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -11478,7 +11478,7 @@ _0805814E:
 	bx r1
 	.align 2, 0
 _08058158: .4byte gUnknown_80FD294
-	thumb_func_end sub_805810C
+	thumb_func_end GrudgeMoveAction
 
 	thumb_func_start sub_805815C
 sub_805815C:
@@ -12740,8 +12740,8 @@ _08058AA4: .4byte gUnknown_8106A4C
 _08058AA8: .4byte gUnknown_8106A50
 	thumb_func_end sub_8058A7C
 
-	thumb_func_start sub_8058AAC
-sub_8058AAC:
+	thumb_func_start SkyAttackMoveAction
+SkyAttackMoveAction:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -12810,7 +12810,7 @@ _08058B2A:
 	bx r1
 	.align 2, 0
 _08058B38: .4byte gUnknown_80FACC4
-	thumb_func_end sub_8058AAC
+	thumb_func_end SkyAttackMoveAction
 
 	thumb_func_start sub_8058B3C
 sub_8058B3C:
@@ -13804,8 +13804,8 @@ _0805927E:
 	bx r1
 	thumb_func_end sub_80591E4
 
-	thumb_func_start sub_8059290
-sub_8059290:
+	thumb_func_start SkillSwapMoveAction
+SkillSwapMoveAction:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -13890,10 +13890,10 @@ _0805932E:
 	.align 2, 0
 _08059338: .4byte gUnknown_203B418
 _0805933C: .4byte gUnknown_80FC888
-	thumb_func_end sub_8059290
+	thumb_func_end SkillSwapMoveAction
 
-	thumb_func_start sub_8059340
-sub_8059340:
+	thumb_func_start SketchMoveAction
+SketchMoveAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -14008,7 +14008,7 @@ _0805940A:
 	.align 2, 0
 _0805941C: .4byte gUnknown_202DE58
 _08059420: .4byte gUnknown_80FE38C
-	thumb_func_end sub_8059340
+	thumb_func_end SketchMoveAction
 
 	thumb_func_start sub_8059424
 sub_8059424:
@@ -14549,8 +14549,8 @@ sub_80597F0:
 	bx r1
 	thumb_func_end sub_80597F0
 
-	thumb_func_start sub_805983C
-sub_805983C:
+	thumb_func_start DiveMoveAction
+DiveMoveAction:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -14616,7 +14616,7 @@ _080598B8:
 	bx r1
 	.align 2, 0
 _080598C8: .4byte gUnknown_80FAD2C
-	thumb_func_end sub_805983C
+	thumb_func_end DiveMoveAction
 
 	thumb_func_start sub_80598CC
 sub_80598CC:
@@ -15126,8 +15126,8 @@ sub_8059C80:
 	bx r1
 	thumb_func_end sub_8059C80
 
-	thumb_func_start sub_8059C8C
-sub_8059C8C:
+	thumb_func_start HelpingHandMoveAction
+HelpingHandMoveAction:
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -15163,7 +15163,7 @@ _08059CC6:
 	.align 2, 0
 _08059CD0: .4byte gUnknown_8106A4C
 _08059CD4: .4byte gUnknown_8106A50
-	thumb_func_end sub_8059C8C
+	thumb_func_end HelpingHandMoveAction
 
 	thumb_func_start sub_8059CD8
 sub_8059CD8:
@@ -16432,8 +16432,8 @@ _0805A632:
 _0805A63C: .4byte gUnknown_80F4DD2
 	thumb_func_end sub_805A5E8
 
-	thumb_func_start sub_805A640
-sub_805A640:
+	thumb_func_start SpitUpMoveAction
+SpitUpMoveAction:
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -16469,7 +16469,7 @@ _0805A678:
 	bx r1
 	.align 2, 0
 _0805A684: .4byte gUnknown_80FCA3C
-	thumb_func_end sub_805A640
+	thumb_func_end SpitUpMoveAction
 
 	thumb_func_start sub_805A688
 sub_805A688:
@@ -17721,8 +17721,8 @@ sub_805B028:
 	bx r1
 	thumb_func_end sub_805B028
 
-	thumb_func_start sub_805B038
-sub_805B038:
+	thumb_func_start TransformMoveAction
+TransformMoveAction:
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -17751,7 +17751,7 @@ _0805B068:
 	bx r1
 	.align 2, 0
 _0805B070: .4byte gUnknown_80FEFF4
-	thumb_func_end sub_805B038
+	thumb_func_end TransformMoveAction
 
 	thumb_func_start sub_805B074
 sub_805B074:
@@ -17977,8 +17977,8 @@ sub_805B214:
 	bx r1
 	thumb_func_end sub_805B214
 
-	thumb_func_start sub_805B220
-sub_805B220:
+	thumb_func_start TrapperOrbAction
+TrapperOrbAction:
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -18012,7 +18012,7 @@ _0805B252:
 	bx r1
 	.align 2, 0
 _0805B260: .4byte gUnknown_80FC5A8
-	thumb_func_end sub_805B220
+	thumb_func_end TrapperOrbAction
 
 	thumb_func_start sub_805B264
 sub_805B264:
@@ -18297,8 +18297,8 @@ sub_805B454:
 	bx r1
 	thumb_func_end sub_805B454
 
-	thumb_func_start sub_805B464
-sub_805B464:
+	thumb_func_start MimicMoveAction
+MimicMoveAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -18404,7 +18404,7 @@ _0805B524:
 	bx r1
 	.align 2, 0
 _0805B538: .4byte gUnknown_80FDD00
-	thumb_func_end sub_805B464
+	thumb_func_end MimicMoveAction
 
 	thumb_func_start sub_805B53C
 sub_805B53C:
@@ -18864,8 +18864,8 @@ sub_805B884:
 _0805B8AC: .4byte gUnknown_8106A4C
 	thumb_func_end sub_805B884
 
-	thumb_func_start sub_805B8B0
-sub_805B8B0:
+	thumb_func_start SkullBashMoveAction
+SkullBashMoveAction:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -18910,7 +18910,7 @@ _0805B900:
 	bx r1
 	.align 2, 0
 _0805B90C: .4byte gUnknown_80FAFF0
-	thumb_func_end sub_805B8B0
+	thumb_func_end SkullBashMoveAction
 
 	thumb_func_start sub_805B910
 sub_805B910:
@@ -19256,8 +19256,8 @@ sub_805BB98:
 	bx r1
 	thumb_func_end sub_805BB98
 
-	thumb_func_start sub_805BBA8
-sub_805BBA8:
+	thumb_func_start CleanseOrbAction
+CleanseOrbAction:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -19358,7 +19358,7 @@ _0805BC60:
 	bx r1
 	.align 2, 0
 _0805BC6C: .4byte gUnknown_80FC920
-	thumb_func_end sub_805BBA8
+	thumb_func_end CleanseOrbAction
 
 	thumb_func_start sub_805BC70
 sub_805BC70:
@@ -19517,8 +19517,8 @@ sub_805BD7C:
 	bx r1
 	thumb_func_end sub_805BD7C
 
-	thumb_func_start sub_805BD88
-sub_805BD88:
+	thumb_func_start TransferOrbAction
+TransferOrbAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -19644,7 +19644,7 @@ _0805BE78:
 	.align 2, 0
 _0805BE88: .4byte gUnknown_202DF98
 _0805BE8C: .4byte gUnknown_80FD450
-	thumb_func_end sub_805BD88
+	thumb_func_end TransferOrbAction
 
 	thumb_func_start sub_805BE90
 sub_805BE90:
@@ -19694,8 +19694,8 @@ sub_805BEC8:
 	bx r1
 	thumb_func_end sub_805BEC8
 
-	thumb_func_start sub_805BED4
-sub_805BED4:
+	thumb_func_start EscapeOrbAction
+EscapeOrbAction:
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -19739,7 +19739,7 @@ _0805BF26:
 	bx r1
 	.align 2, 0
 _0805BF30: .4byte gUnknown_80FD4C4
-	thumb_func_end sub_805BED4
+	thumb_func_end EscapeOrbAction
 
 	thumb_func_start sub_805BF34
 sub_805BF34:
@@ -19750,8 +19750,8 @@ sub_805BF34:
 	bx r1
 	thumb_func_end sub_805BF34
 
-	thumb_func_start sub_805BF40
-sub_805BF40:
+	thumb_func_start TrapbustOrbAction
+TrapbustOrbAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -19908,7 +19908,7 @@ _0805C06A:
 	bx r1
 	.align 2, 0
 _0805C07C: .4byte gUnknown_80FD1CC
-	thumb_func_end sub_805BF40
+	thumb_func_end TrapbustOrbAction
 
 	thumb_func_start sub_805C080
 sub_805C080:
@@ -20209,8 +20209,8 @@ sub_805C2A0:
 	bx r1
 	thumb_func_end sub_805C2A0
 
-	thumb_func_start sub_805C2AC
-sub_805C2AC:
+	thumb_func_start FillInOrbAction
+FillInOrbAction:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -20356,7 +20356,7 @@ _0805C3CA:
 	bx r1
 	.align 2, 0
 _0805C3D8: .4byte gUnknown_80FD0B8
-	thumb_func_end sub_805C2AC
+	thumb_func_end FillInOrbAction
 
 	thumb_func_start sub_805C3DC
 sub_805C3DC:
diff --git a/asm/code_8097F40.s b/asm/code_8097F40.s
index 5368da6..6392ba9 100644
--- a/asm/code_8097F40.s
+++ b/asm/code_8097F40.s
@@ -5,34 +5,6 @@
 
 	.text
 	
-	thumb_func_start sub_8097F74
-sub_8097F74:
-	push {r4,lr}
-	ldr r4, _08097FA0
-	ldr r0, [r4]
-	movs r1, 0
-	movs r2, 0x64
-	bl memset
-	movs r2, 0
-	ldr r3, _08097FA4
-_08097F86:
-	ldr r0, [r4]
-	adds r0, 0x58
-	adds r0, r2
-	ldrb r1, [r3, 0x2]
-	strb r1, [r0]
-	adds r3, 0x4
-	adds r2, 0x1
-	cmp r2, 0xB
-	ble _08097F86
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097FA0: .4byte gUnknown_203B498
-_08097FA4: .4byte gExclusivePokemon
-	thumb_func_end sub_8097F74
-
 	thumb_func_start sub_8097FA8
 sub_8097FA8:
 	lsls r0, 24
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index 2473525..a48ad08 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -1481,7 +1481,7 @@ _0809DEE8:
 	str r0, [r1]
 	add r0, sp, 0x4
 	ldrh r0, [r0, 0x2]
-	bl sub_8011940
+	bl IsEqualtoBGTrack
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809DF06
diff --git a/asm/fatal_system_1.s b/asm/debug.s
index e0f194d..e0f194d 100644
--- a/asm/fatal_system_1.s
+++ b/asm/debug.s
diff --git a/asm/music.s b/asm/music.s
index 0e13f2c..1bec74b 100644
--- a/asm/music.s
+++ b/asm/music.s
@@ -5,276 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_800C074
-sub_800C074:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r8, r5
-	lsls r1, 16
-	lsrs r6, r1, 16
-	ldr r0, _0800C0FC
-	cmp r5, r0
-	bne _0800C08C
-	b _0800C208
-_0800C08C:
-	movs r7, 0x80
-	lsls r7, 1
-	cmp r6, r7
-	bls _0800C096
-	adds r6, r7, 0
-_0800C096:
-	adds r0, r5, 0
-	bl sub_800CACC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0800C0A4
-	b _0800C1B0
-_0800C0A4:
-	adds r0, r5, 0
-	bl sub_800CAE0
-	lsls r0, 16
-	lsrs r7, r0, 16
-	cmp r7, 0x1
-	beq _0800C0B4
-	b _0800C1D0
-_0800C0B4:
-	bl DisableInterrupts
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r6, _0800C100
-	strh r5, [r6]
-	ldr r4, _0800C104
-	ldrh r0, [r4]
-	adds r2, r0, 0
-	cmp r2, 0
-	bne _0800C144
-	ldr r0, _0800C108
-	ldrh r1, [r0]
-	ldr r0, _0800C10C
-	cmp r1, r0
-	beq _0800C12C
-	ldr r0, _0800C110
-	ldrh r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _0800C120
-	strh r7, [r4]
-	ldr r1, _0800C114
-	movs r0, 0x10
-	strh r0, [r1]
-	ldr r0, _0800C118
-	strb r2, [r0]
-	ldr r0, _0800C11C
-	movs r1, 0x1
-	bl m4aMPlayFadeOutTemporarily
-	b _0800C15E
-	.align 2, 0
-_0800C0FC: .4byte 0x000003e5
-_0800C100: .4byte gUnknown_202D68E
-_0800C104: .4byte gUnknown_202D690
-_0800C108: .4byte gCurrentBGSong
-_0800C10C: .4byte 0x000003e7
-_0800C110: .4byte gBGMusicPlayerState
-_0800C114: .4byte gUnknown_202D692
-_0800C118: .4byte gUnknown_202D694
-_0800C11C: .4byte gUnknown_20008F0
-_0800C120:
-	lsls r0, r1, 16
-	lsrs r0, 16
-	cmp r0, 0x3
-	bne _0800C12C
-	movs r0, 0x2
-	b _0800C15C
-_0800C12C:
-	movs r0, 0x3
-	strh r0, [r4]
-	ldr r0, _0800C140
-	bl m4aMPlayStop
-	ldrh r0, [r6]
-	bl m4aSongNumStart
-	b _0800C15E
-	.align 2, 0
-_0800C140: .4byte gUnknown_20008F0
-_0800C144:
-	subs r0, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bls _0800C15E
-	ldr r0, _0800C17C
-	bl m4aMPlayStop
-	ldrh r0, [r6]
-	bl m4aSongNumStart
-	movs r0, 0x3
-_0800C15C:
-	strh r0, [r4]
-_0800C15E:
-	ldr r0, _0800C180
-	ldrh r0, [r0]
-	cmp r0, 0x26
-	bgt _0800C184
-	cmp r0, 0x25
-	bge _0800C19A
-	cmp r0, 0x1A
-	blt _0800C1A0
-	cmp r0, 0x1F
-	ble _0800C19A
-	cmp r0, 0x23
-	bgt _0800C1A0
-	cmp r0, 0x22
-	blt _0800C1A0
-	b _0800C19A
-	.align 2, 0
-_0800C17C: .4byte gUnknown_20008F0
-_0800C180: .4byte gCurrentBGSong
-_0800C184:
-	cmp r0, 0x7A
-	beq _0800C19A
-	cmp r0, 0x7A
-	bgt _0800C196
-	cmp r0, 0x77
-	bgt _0800C1A0
-	cmp r0, 0x75
-	blt _0800C1A0
-	b _0800C19A
-_0800C196:
-	cmp r0, 0x7F
-	bne _0800C1A0
-_0800C19A:
-	ldr r1, _0800C1AC
-	movs r0, 0x1
-	strb r0, [r1]
-_0800C1A0:
-	mov r0, r8
-	cmp r0, 0
-	beq _0800C208
-	bl EnableInterrupts
-	b _0800C208
-	.align 2, 0
-_0800C1AC: .4byte gUnknown_202D694
-_0800C1B0:
-	adds r0, r5, 0
-	bl sub_800CAAC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0800C208
-	adds r0, r5, 0
-	bl sub_800CAE0
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r2, r0, 3
-	ldr r1, _0800C1D8
-	adds r4, r2, r1
-	cmp r0, 0x1
-	bhi _0800C1DC
-_0800C1D0:
-	adds r0, r5, 0
-	bl nullsub_20
-	b _0800C208
-	.align 2, 0
-_0800C1D8: .4byte gUnknown_3000FD8
-_0800C1DC:
-	bl DisableInterrupts
-	lsls r0, 24
-	lsrs r5, r0, 24
-	mov r0, r8
-	bl m4aSongNumStart
-	movs r0, 0x1
-	strh r0, [r4]
-	mov r0, r8
-	strh r0, [r4, 0x2]
-	cmp r6, r7
-	bne _0800C1FA
-	movs r0, 0
-	b _0800C1FC
-_0800C1FA:
-	movs r0, 0x1
-_0800C1FC:
-	strb r0, [r4, 0x6]
-	strh r6, [r4, 0x4]
-	cmp r5, 0
-	beq _0800C208
-	bl EnableInterrupts
-_0800C208:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_800C074
-
-	thumb_func_start sub_800C214
-sub_800C214:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 16
-	lsrs r7, r1, 16
-	movs r0, 0x80
-	lsls r0, 1
-	cmp r7, r0
-	bls _0800C22C
-	adds r7, r0, 0
-_0800C22C:
-	adds r0, r5, 0
-	bl sub_800CACC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0800C286
-	adds r0, r5, 0
-	bl sub_800CAAC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0800C286
-	adds r0, r5, 0
-	bl sub_800CAE0
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, _0800C290
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	mov r8, r1
-	lsls r2, r0, 3
-	ldr r1, _0800C294
-	adds r4, r2, r1
-	cmp r0, 0x1
-	bls _0800C286
-	bl DisableInterrupts
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrh r0, [r4, 0x2]
-	cmp r0, r5
-	bne _0800C27E
-	mov r0, r8
-	movs r1, 0xF
-	adds r2, r7, 0
-	bl m4aMPlayVolumeControl
-_0800C27E:
-	cmp r6, 0
-	beq _0800C286
-	bl EnableInterrupts
-_0800C286:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800C290: .4byte gMPlayTable
-_0800C294: .4byte gUnknown_3000FD8
-	thumb_func_end sub_800C214
-
 	thumb_func_start sub_800C298
 sub_800C298:
 	push {r4-r7,lr}
diff --git a/asm/wonder_mail.s b/asm/wonder_mail.s
index f903140..df22c33 100644
--- a/asm/wonder_mail.s
+++ b/asm/wonder_mail.s
@@ -2393,7 +2393,7 @@ _0802AEE2:
 	ldr r0, [r0]
 	str r0, [r1]
 _0802AEE6:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _0802B2AA
 _0802AEEC:
 	ldr r0, _0802AEF0
@@ -18996,7 +18996,7 @@ _080333DA:
 _080333DC:
 	str r0, [r1]
 _080333DE:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _080338B4
 _080333E4:
 	ldr r0, _080333E8
@@ -26254,7 +26254,7 @@ _08036D44:
 	ldr r1, [r4]
 	str r0, [r1, 0xC]
 _08036D66:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _08036DFA
 	.align 2, 0
 _08036D6C: .4byte gUnknown_203B358
@@ -27375,7 +27375,7 @@ _080376AE:
 	ldr r1, [r4]
 	str r0, [r1, 0x4]
 _080376BE:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -32681,7 +32681,7 @@ _0803A138:
 	movs r2, 0xB4
 	bl memcpy
 _0803A14C:
-	bl sub_8011854
+	bl xxx_call_start_bg_music
 	b _0803A1AA
 _0803A152:
 	ldr r0, _0803A160