"Finish" decompiling bg_palette_buffer.s and m4a_2.s, and rename text variables

We all have our breaking points :matchlikethis:

3 files changed, 1 insertions, 219 deletions

diff --git a/asm/bg_palette_buffer.s b/asm/bg_palette_buffer.s
deleted file mode 100644
index 9cafb43..0000000
--- a/asm/bg_palette_buffer.s
+++ /dev/null
@@ -1,148 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start InitBGPaletteBuffer
-InitBGPaletteBuffer:
-	push {lr}
-	movs r2, 0
-	ldr r1, =gBGPaletteBuffer
-	movs r0, 0x80
-	lsls r0, 2
-_0800463E:
-	strh r2, [r1]
-	adds r1, 0x2
-	subs r0, 0x1
-	cmp r0, 0
-	bne _0800463E
-	ldr r1, =gBGPaletteUsed
-	movs r2, 0x1
-	adds r0, r1, 0
-	adds r0, 0x1F
-_08004650:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _08004650
-	pop {r0}
-	bx r0
-	.align 2, 0
-	.pool
-	thumb_func_end InitBGPaletteBuffer
-
-	thumb_func_start SetBGPaletteBufferColorRGB
-SetBGPaletteBufferColorRGB:
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	cmp r2, 0
-	bge _08004670
-	movs r2, 0
-_08004670:
-	cmp r2, 0x1F
-	ble _08004676
-	movs r2, 0x1F
-_08004676:
-	ldr r1, =gBGPaletteUsed
-	adds r0, r4, 0
-	cmp r4, 0
-	bge _08004680
-	adds r0, 0xF
-_08004680:
-	asrs r0, 4
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	cmp r3, 0
-	bne _080046D4
-	ldr r0, =gBGPaletteBuffer
-	lsls r1, r4, 1
-	adds r6, r1, r0
-	ldrb r0, [r5, 0x2]
-	muls r0, r2
-	cmp r0, 0
-	bge _0800469C
-	adds r0, 0xFF
-_0800469C:
-	asrs r0, 8
-	movs r3, 0x1F
-	ands r0, r3
-	lsls r4, r0, 10
-	ldrb r0, [r5, 0x1]
-	muls r0, r2
-	cmp r0, 0
-	bge _080046AE
-	adds r0, 0xFF
-_080046AE:
-	asrs r0, 8
-	ands r0, r3
-	lsls r1, r0, 5
-	orrs r1, r4
-	ldrb r0, [r5]
-	muls r0, r2
-	cmp r0, 0
-	bge _080046C0
-	adds r0, 0xFF
-_080046C0:
-	asrs r0, 8
-	ands r0, r3
-	orrs r1, r0
-	strh r1, [r6]
-	b _08004722
-	.align 2, 0
-	.pool
-_080046D4:
-	ldr r1, =gBGPaletteBuffer
-	lsls r0, r4, 1
-	adds r7, r0, r1
-	ldrb r0, [r5, 0x2]
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0x2]
-	muls r0, r2
-	cmp r0, 0
-	bge _080046EA
-	adds r0, 0xFF
-_080046EA:
-	asrs r0, 8
-	movs r4, 0x1F
-	ands r0, r4
-	lsls r6, r0, 10
-	ldrb r0, [r5, 0x1]
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0, 0x1]
-	muls r0, r2
-	cmp r0, 0
-	bge _08004702
-	adds r0, 0xFF
-_08004702:
-	asrs r0, 8
-	ands r0, r4
-	lsls r1, r0, 5
-	orrs r1, r6
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r3
-	ldrb r0, [r0]
-	muls r0, r2
-	cmp r0, 0
-	bge _0800471A
-	adds r0, 0xFF
-_0800471A:
-	asrs r0, 8
-	ands r0, r4
-	orrs r1, r0
-	strh r1, [r7]
-_08004722:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-	.pool
-	thumb_func_end SetBGPaletteBufferColorRGB
-
-.align 2, 0 @ Don't pad with nop.
\ No newline at end of file
diff --git a/asm/m4a_2.s b/asm/m4a_2.s
deleted file mode 100644
index eb525ce..0000000
--- a/asm/m4a_2.s
+++ /dev/null
@@ -1,70 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/gba_constants.inc"
-	.include "constants/m4a_constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CgbModVol
-CgbModVol:
-	push {r4,lr}
-	adds r1, r0, 0
-	ldrb r0, [r1, 0x2]
-	lsls r2, r0, 24
-	lsrs r4, r2, 24
-	ldrb r3, [r1, 0x3]
-	lsls r0, r3, 24
-	lsrs r3, r0, 24
-	cmp r4, r3
-	bcc _080AFA94
-	lsrs r0, r2, 25
-	cmp r0, r3
-	bcc _080AFAA0
-	movs r0, 0xF
-	strb r0, [r1, 0x1B]
-	b _080AFAAE
-_080AFA94:
-	lsrs r0, 25
-	cmp r0, r4
-	bcc _080AFAA0
-	movs r0, 0xF0
-	strb r0, [r1, 0x1B]
-	b _080AFAAE
-_080AFAA0:
-	movs r0, 0xFF
-	strb r0, [r1, 0x1B]
-	ldrb r2, [r1, 0x3]
-	ldrb r3, [r1, 0x2]
-	adds r0, r2, r3
-	lsrs r0, 4
-	b _080AFABE
-_080AFAAE:
-	ldrb r2, [r1, 0x3]
-	ldrb r3, [r1, 0x2]
-	adds r0, r2, r3
-	lsrs r0, 4
-	strb r0, [r1, 0xA]
-	cmp r0, 0xF
-	bls _080AFAC0
-	movs r0, 0xF
-_080AFABE:
-	strb r0, [r1, 0xA]
-_080AFAC0:
-	ldrb r2, [r1, 0x6]
-	ldrb r3, [r1, 0xA]
-	adds r0, r2, 0
-	muls r0, r3
-	adds r0, 0xF
-	asrs r0, 4
-	strb r0, [r1, 0x19]
-	ldrb r0, [r1, 0x1C]
-	ldrb r2, [r1, 0x1B]
-	ands r0, r2
-	strb r0, [r1, 0x1B]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end CgbModVol
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/text.s b/asm/text.s
index 98b8797..bbf990b 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -4468,7 +4468,7 @@ sub_8008584:
 	adds r1, r5, r1
 	b _08008624
 	.align 2, 0
-_080085C4: .4byte gUnknown_2027490
+_080085C4: .4byte gKanji
 _080085C8: .4byte gUnknown_20274AC
 _080085CC: .4byte 0xffff0800
 _080085D0: .4byte 0x000007fe