5% wooo

1 files changed, 2 insertions, 403 deletions

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