1 files changed, 9 insertions, 124 deletions

diff --git a/asm/bg_palette_buffer.s b/asm/bg_palette_buffer.s
index 9b42ee5..9cafb43 100644
--- a/asm/bg_palette_buffer.s
+++ b/asm/bg_palette_buffer.s
@@ -9,7 +9,7 @@
 InitBGPaletteBuffer:
 	push {lr}
 	movs r2, 0
-	ldr r1, _0800465C
+	ldr r1, =gBGPaletteBuffer
 	movs r0, 0x80
 	lsls r0, 2
 _0800463E:
@@ -18,7 +18,7 @@ _0800463E:
 	subs r0, 0x1
 	cmp r0, 0
 	bne _0800463E
-	ldr r1, _08004660
+	ldr r1, =gBGPaletteUsed
 	movs r2, 0x1
 	adds r0, r1, 0
 	adds r0, 0x1F
@@ -30,8 +30,7 @@ _08004650:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800465C: .4byte gUnknown_20251F0
-_08004660: .4byte gUnknown_20251D0
+	.pool
 	thumb_func_end InitBGPaletteBuffer
 
 	thumb_func_start SetBGPaletteBufferColorRGB
@@ -47,7 +46,7 @@ _08004670:
 	ble _08004676
 	movs r2, 0x1F
 _08004676:
-	ldr r1, _080046CC
+	ldr r1, =gBGPaletteUsed
 	adds r0, r4, 0
 	cmp r4, 0
 	bge _08004680
@@ -59,7 +58,7 @@ _08004680:
 	strb r1, [r0]
 	cmp r3, 0
 	bne _080046D4
-	ldr r0, _080046D0
+	ldr r0, =gBGPaletteBuffer
 	lsls r1, r4, 1
 	adds r6, r1, r0
 	ldrb r0, [r5, 0x2]
@@ -94,10 +93,9 @@ _080046C0:
 	strh r1, [r6]
 	b _08004722
 	.align 2, 0
-_080046CC: .4byte gUnknown_20251D0
-_080046D0: .4byte gUnknown_20251F0
+	.pool
 _080046D4:
-	ldr r1, _08004728
+	ldr r1, =gBGPaletteBuffer
 	lsls r0, r4, 1
 	adds r7, r0, r1
 	ldrb r0, [r5, 0x2]
@@ -144,120 +142,7 @@ _08004722:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08004728: .4byte gUnknown_20251F0
+	.pool
 	thumb_func_end SetBGPaletteBufferColorRGB
 
-	thumb_func_start SetBGPaletteBufferColorArray
-SetBGPaletteBufferColorArray:
-	push {lr}
-	adds r2, r0, 0
-	adds r3, r1, 0
-	ldr r1, _08004764
-	cmp r2, 0
-	bge _0800473A
-	adds r0, 0xF
-_0800473A:
-	asrs r0, 4
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, _08004768
-	lsls r2, 1
-	adds r2, r0
-	ldrb r1, [r3, 0x2]
-	lsrs r1, 3
-	lsls r1, 10
-	ldrb r0, [r3, 0x1]
-	lsrs r0, 3
-	lsls r0, 5
-	orrs r1, r0
-	ldrb r0, [r3]
-	lsrs r0, 3
-	orrs r0, r1
-	strh r0, [r2]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08004764: .4byte gUnknown_20251D0
-_08004768: .4byte gUnknown_20251F0
-	thumb_func_end SetBGPaletteBufferColorArray
-
-	thumb_func_start SetBGPaletteBufferColor
-SetBGPaletteBufferColor:
-	push {lr}
-	adds r2, r0, 0
-	adds r3, r1, 0
-	ldr r1, _08004790
-	cmp r2, 0
-	bge _0800477A
-	adds r0, 0xF
-_0800477A:
-	asrs r0, 4
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r1, _08004794
-	lsls r0, r2, 1
-	adds r0, r1
-	ldrh r1, [r3]
-	strh r1, [r0]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08004790: .4byte gUnknown_20251D0
-_08004794: .4byte gUnknown_20251F0
-	thumb_func_end SetBGPaletteBufferColor
-
-	thumb_func_start nullsub_4
-nullsub_4:
-	bx lr
-	thumb_func_end nullsub_4
-
-	thumb_func_start nullsub_5
-nullsub_5:
-	bx lr
-	thumb_func_end nullsub_5
-
-	thumb_func_start nullsub_143
-nullsub_143:
-	bx lr
-	thumb_func_end nullsub_143
-
-	thumb_func_start TransferBGPaletteBuffer
-TransferBGPaletteBuffer:
-	push {r4-r6,lr}
-	movs r6, 0
-	movs r4, 0
-	movs r5, 0xA0
-	lsls r5, 19
-_080047AE:
-	ldr r0, _080047DC
-	adds r1, r6, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _080047CA
-	movs r0, 0
-	strb r0, [r1]
-	lsls r1, r4, 1
-	ldr r0, _080047E0
-	adds r1, r0
-	adds r0, r5, 0
-	movs r2, 0x20
-	bl CpuCopy
-_080047CA:
-	adds r6, 0x1
-	adds r5, 0x20
-	adds r4, 0x10
-	ldr r0, _080047E4
-	cmp r4, r0
-	ble _080047AE
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080047DC: .4byte gUnknown_20251D0
-_080047E0: .4byte gUnknown_20251F0
-_080047E4: .4byte 0x000001ff
-	thumb_func_end TransferBGPaletteBuffer
-
-	.align 2, 0 @ Don't pad with nop.
+.align 2, 0 @ Don't pad with nop.
\ No newline at end of file