Consolidate palette buffers

14 files changed, 48 insertions, 84 deletions

diff --git a/asm/battle_1.s b/asm/battle_1.s
index bb29b3aab..7db344aca 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -242,7 +242,7 @@ sub_800F380: @ 800F380
 	adds r2, 0x2
 	ldr r1, _0800F3FC @ =0x0000675a
 	strh r1, [r2]
-	ldr r5, _0800F400 @ =gUnknown_20376B0
+	ldr r5, _0800F400 @ =gPlttBufferFaded + 0xB8
 	adds r1, r5, 0
 	movs r2, 0x4
 	bl CpuSet
@@ -275,7 +275,7 @@ _0800F3F0: .4byte gPlttBufferUnfaded
 _0800F3F4: .4byte 0x00002529
 _0800F3F8: .4byte 0x00007fff
 _0800F3FC: .4byte 0x0000675a
-_0800F400: .4byte gUnknown_20376B0
+_0800F400: .4byte gPlttBufferFaded + 0xB8
 _0800F404: .4byte gBattleTypeFlags
 _0800F408: .4byte 0x00010010
 	thumb_func_end sub_800F380
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index f15200700..6f749f83c 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -1307,7 +1307,7 @@ _08072E5E:
 	movs r0, 0x16
 	bl SetGpuReg
 	lsls r4, r7, 5
-	ldr r0, _08072F7C @ =gUnknown_20373F8
+	ldr r0, _08072F7C @ =gPlttBufferUnfaded + 0x200
 	adds r4, r0
 	add r0, sp, 0x10
 	ldrb r1, [r0, 0x8]
@@ -1353,7 +1353,7 @@ _08072F6C: .4byte gUnknown_2023D44
 _08072F70: .4byte gUnknown_2022978
 _08072F74: .4byte gSprites
 _08072F78: .4byte gUnknown_202297A
-_08072F7C: .4byte gUnknown_20373F8
+_08072F7C: .4byte gPlttBufferUnfaded + 0x200
 _08072F80: .4byte 0x04000008
 _08072F84:
 	ldr r1, _08073094 @ =0x06006000
@@ -1440,7 +1440,7 @@ _08072F84:
 	movs r0, 0x1A
 	bl SetGpuReg
 	lsls r4, r7, 5
-	ldr r0, _080730B4 @ =gUnknown_20373F8
+	ldr r0, _080730B4 @ =gPlttBufferUnfaded + 0x200
 	adds r4, r0
 	adds r0, r4, 0
 	movs r1, 0x90
@@ -1487,7 +1487,7 @@ _080730A4: .4byte gUnknown_2023D44
 _080730A8: .4byte gUnknown_202297C
 _080730AC: .4byte gSprites
 _080730B0: .4byte gUnknown_202297E
-_080730B4: .4byte gUnknown_20373F8
+_080730B4: .4byte gPlttBufferUnfaded + 0x200
 _080730B8: .4byte 0x05000120
 _080730BC: .4byte 0x04000008
 	thumb_func_end sub_8072E48
@@ -1640,7 +1640,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
 	adds r0, r5
 	strh r0, [r1]
 	lsls r0, r6, 5
-	ldr r2, _08073200 @ =gUnknown_20377F8
+	ldr r2, _08073200 @ =gPlttBufferFaded + 0x200
 	adds r0, r2
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -1656,7 +1656,7 @@ _080731F0: .4byte gTasks
 _080731F4: .4byte gSprites
 _080731F8: .4byte gUnknown_2022978
 _080731FC: .4byte gUnknown_202297A
-_08073200: .4byte gUnknown_20377F8
+_08073200: .4byte gPlttBufferFaded + 0x200
 _08073204: .4byte 0xfffffe00
 _08073208: .4byte 0x04000008
 _0807320C:
@@ -1673,7 +1673,7 @@ _0807320C:
 	adds r0, r5
 	strh r0, [r1]
 	lsls r0, r6, 5
-	ldr r1, _08073244 @ =gUnknown_20377F8
+	ldr r1, _08073244 @ =gPlttBufferFaded + 0x200
 	adds r0, r1
 	subs r1, 0xE0
 	ldr r2, _08073248 @ =0x04000008
@@ -1686,7 +1686,7 @@ _08073232:
 	.align 2, 0
 _0807323C: .4byte gUnknown_202297C
 _08073240: .4byte gUnknown_202297E
-_08073244: .4byte gUnknown_20377F8
+_08073244: .4byte gPlttBufferFaded + 0x200
 _08073248: .4byte 0x04000008
 	thumb_func_end task_pA_ma0A_obj_to_bg_pal
 
diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s
index 2b522ffe8..40cb974fe 100644
--- a/asm/battle_anim_80A22E8.s
+++ b/asm/battle_anim_80A22E8.s
@@ -6117,7 +6117,7 @@ _080A51A4:
 	ldrb r1, [r4, 0x5]
 	lsrs r1, 4
 	lsls r0, r1, 5
-	ldr r2, _080A5204 @ =gUnknown_2037408
+	ldr r2, _080A5204 @ =gPlttBufferUnfaded + 0x210
 	adds r0, r2
 	lsls r1, 4
 	ldr r3, _080A5208 @ =0x00000101
@@ -6135,7 +6135,7 @@ _080A51A4:
 	b _080A5214
 	.align 2, 0
 _080A5200: .4byte 0x00007fff
-_080A5204: .4byte gUnknown_2037408
+_080A5204: .4byte gPlttBufferUnfaded + 0x210
 _080A5208: .4byte 0x00000101
 _080A520C:
 	cmp r0, 0
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index 3e3fb6500..98616d2c9 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -4066,7 +4066,7 @@ _08049AF4:
 	movs r2, 0x2
 	bl FillPalette
 	lsls r4, 1
-	ldr r0, _08049BCC @ =gUnknown_20373F8
+	ldr r0, _08049BCC @ =gPlttBufferUnfaded + 0x200
 	adds r0, r4, r0
 	ldr r1, _08049BD0 @ =0x05000200
 	adds r4, r1
@@ -4145,7 +4145,7 @@ _08049BB6:
 	.align 2, 0
 _08049BC4: .4byte gSprites
 _08049BC8: .4byte gUnknown_826055A
-_08049BCC: .4byte gUnknown_20373F8
+_08049BCC: .4byte gPlttBufferUnfaded + 0x200
 _08049BD0: .4byte 0x05000200
 _08049BD4: .4byte 0x06010000
 _08049BD8: .4byte 0x04000018
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 042b130b0..aaa023750 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -2968,7 +2968,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
 	ldrh r0, [r0, 0x2]
 	adds r5, 0xB6
 	strh r0, [r5]
-	ldr r4, _080D8A4C @ =gUnknown_20376B0
+	ldr r4, _080D8A4C @ =gPlttBufferFaded + 0xB8
 	adds r0, r2, 0
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -2987,7 +2987,7 @@ _080D8A3C: .4byte gUnknown_2022BC8
 _080D8A40: .4byte gUnknown_8D2FBB4
 _080D8A44: .4byte gUnknown_2023FFC
 _080D8A48: .4byte gPlttBufferUnfaded
-_080D8A4C: .4byte gUnknown_20376B0
+_080D8A4C: .4byte gPlttBufferFaded + 0xB8
 	thumb_func_end SetPpNumbersPaletteInMoveSelection
 
 	thumb_func_start GetCurrentPpToMaxPpState
diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
index dd268128f..1dafc92ea 100644
--- a/asm/evolution_graphics.s
+++ b/asm/evolution_graphics.s
@@ -997,8 +997,8 @@ sub_80F6080: @ 80F6080
 	movs r0, 0
 	strh r0, [r5, 0x26]
 	bl sub_80D0474
-	ldr r0, _080F60D0 @ =gUnknown_2037638
-	ldr r1, _080F60D4 @ =gUnknown_2037238
+	ldr r0, _080F60D0 @ =gPlttBufferFaded + 0x40
+	ldr r1, _080F60D4 @ =gPlttBufferUnfaded + 0x40
 	movs r2, 0x30
 	bl CpuSet
 	ldr r0, _080F60D8 @ =0xfff90f1c
@@ -1018,8 +1018,8 @@ sub_80F6080: @ 80F6080
 	bx r0
 	.align 2, 0
 _080F60CC: .4byte gTasks
-_080F60D0: .4byte gUnknown_2037638
-_080F60D4: .4byte gUnknown_2037238
+_080F60D0: .4byte gPlttBufferFaded + 0x40
+_080F60D4: .4byte gPlttBufferUnfaded + 0x40
 _080F60D8: .4byte 0xfff90f1c
 _080F60DC: .4byte 0x00007fff
 _080F60E0: .4byte sub_80F60E4
@@ -1159,8 +1159,8 @@ sub_80F61C0: @ 80F61C0
 	movs r0, 0
 	strh r0, [r5, 0x26]
 	bl sub_80D0474
-	ldr r0, _080F6210 @ =gUnknown_2037638
-	ldr r1, _080F6214 @ =gUnknown_2037238
+	ldr r0, _080F6210 @ =gPlttBufferFaded + 0x40
+	ldr r1, _080F6214 @ =gPlttBufferUnfaded + 0x40
 	movs r2, 0x30
 	bl CpuSet
 	ldr r0, _080F6218 @ =0xfff90f00
@@ -1180,8 +1180,8 @@ sub_80F61C0: @ 80F61C0
 	bx r0
 	.align 2, 0
 _080F620C: .4byte gTasks
-_080F6210: .4byte gUnknown_2037638
-_080F6214: .4byte gUnknown_2037238
+_080F6210: .4byte gPlttBufferFaded + 0x40
+_080F6214: .4byte gPlttBufferUnfaded + 0x40
 _080F6218: .4byte 0xfff90f00
 _080F621C: .4byte 0x00007fff
 _080F6220: .4byte sub_80F6224
@@ -1369,7 +1369,7 @@ _080F62CE:
 	ldrb r1, [r2, 0x5]
 	lsrs r1, 4
 	lsls r1, 5
-	ldr r0, _080F63FC @ =gUnknown_20377F8
+	ldr r0, _080F63FC @ =gPlttBufferFaded + 0x200
 	mov r10, r0
 	add r1, r10
 	add r0, sp, 0x4
@@ -1422,7 +1422,7 @@ _080F63EC: .4byte 0x00007fff
 _080F63F0: .4byte gTasks
 _080F63F4: .4byte gSprites
 _080F63F8: .4byte nullsub_86
-_080F63FC: .4byte gUnknown_20377F8
+_080F63FC: .4byte gPlttBufferFaded + 0x200
 	thumb_func_end sub_80F62B4
 
 	thumb_func_start sub_80F6400
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 6e5466ca2..2e192824f 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -375,7 +375,7 @@ EvolutionScene: @ 80CDDF4
 	strh r2, [r0, 0x1C]
 	ldr r1, _080CE0A8 @ =gUnknown_2039A20
 	ldr r0, [r1]
-	ldr r1, _080CE0D8 @ =gUnknown_2037238
+	ldr r1, _080CE0D8 @ =gPlttBufferUnfaded + 0x40
 	adds r0, 0x4
 	movs r2, 0x60
 	bl memcpy
@@ -423,7 +423,7 @@ _080CE0C8: .4byte gSprites
 _080CE0CC: .4byte nullsub_10
 _080CE0D0: .4byte sub_80CE8DC
 _080CE0D4: .4byte gTasks
-_080CE0D8: .4byte gUnknown_2037238
+_080CE0D8: .4byte gPlttBufferUnfaded + 0x40
 _080CE0DC: .4byte nullsub_76
 _080CE0E0: .4byte sub_80D0050
 _080CE0E4: .4byte sub_80CE710
@@ -1748,7 +1748,7 @@ _080CECC0:
 	bl _080CF528
 _080CECCE:
 	bl m4aMPlayAllStop
-	ldr r0, _080CED00 @ =gUnknown_2037238
+	ldr r0, _080CED00 @ =gPlttBufferUnfaded + 0x40
 	ldr r1, _080CED04 @ =gUnknown_2039A20
 	ldr r1, [r1]
 	adds r1, 0x4
@@ -1769,7 +1769,7 @@ _080CECCE:
 	adds r1, r0
 	b _080CEFDE
 	.align 2, 0
-_080CED00: .4byte gUnknown_2037238
+_080CED00: .4byte gPlttBufferUnfaded + 0x40
 _080CED04: .4byte gUnknown_2039A20
 _080CED08: .4byte gTasks
 _080CED0C:
@@ -3085,7 +3085,7 @@ _080CF86E:
 	ldrh r0, [r4, 0xC]
 	movs r1, 0
 	bl PlayCry1
-	ldr r0, _080CF894 @ =gUnknown_2037238
+	ldr r0, _080CF894 @ =gPlttBufferUnfaded + 0x40
 	ldr r1, _080CF898 @ =gUnknown_2039A20
 	ldr r1, [r1]
 	adds r1, 0x4
@@ -3094,7 +3094,7 @@ _080CF86E:
 	b _080CFA90
 	.align 2, 0
 _080CF890: .4byte gTasks
-_080CF894: .4byte gUnknown_2037238
+_080CF894: .4byte gPlttBufferUnfaded + 0x40
 _080CF898: .4byte gUnknown_2039A20
 _080CF89C:
 	bl IsCryFinished
diff --git a/asm/field_weather.s b/asm/field_weather.s
index 36f7941c7..77a138ad2 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -22,7 +22,7 @@ sub_8079C08: @ 8079C08
 	lsrs r5, 24
 	ldr r0, _08079CD0 @ =gUnknown_83C2CE0
 	lsls r1, r5, 5
-	ldr r2, _08079CD4 @ =gUnknown_20373F8
+	ldr r2, _08079CD4 @ =gPlttBufferUnfaded + 0x200
 	adds r1, r2
 	ldr r2, _08079CD8 @ =0x04000008
 	bl CpuSet
@@ -101,7 +101,7 @@ _08079CC4:
 	.align 2, 0
 _08079CCC: .4byte Task_WeatherMain
 _08079CD0: .4byte gUnknown_83C2CE0
-_08079CD4: .4byte gUnknown_20373F8
+_08079CD4: .4byte gPlttBufferUnfaded + 0x200
 _08079CD8: .4byte 0x04000008
 _08079CDC: .4byte gUnknown_2037F34
 _08079CE0: .4byte 0x000006d5
diff --git a/asm/intro.s b/asm/intro.s
index 45f4c6e1d..b3fe5a30c 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -2477,7 +2477,7 @@ _080EDA1C:
 	ldr r2, _080EDA50 @ =0x00007fff
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r1, _080EDA54 @ =gUnknown_2037218
+	ldr r1, _080EDA54 @ =gPlttBufferUnfaded + 0x20
 	ldr r2, _080EDA58 @ =0x01000020
 	add r0, sp, 0x4
 	bl CpuSet
@@ -2492,7 +2492,7 @@ _080EDA1C:
 	b _080EDA6E
 	.align 2, 0
 _080EDA50: .4byte 0x00007fff
-_080EDA54: .4byte gUnknown_2037218
+_080EDA54: .4byte gPlttBufferUnfaded + 0x20
 _080EDA58: .4byte 0x01000020
 _080EDA5C:
 	ldr r0, _080EDA78 @ =gPaletteFade
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index 3c67e682a..275c9f0a7 100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -348,7 +348,7 @@ _080983B4: .4byte 0x00ffffff
 _080983B8:
 	movs r0, 0x3
 	bl stdpal_get
-	ldr r1, _080983FC @ =gUnknown_2037398
+	ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0
 	movs r2, 0x10
 	bl CpuSet
 _080983C6:
@@ -374,7 +374,7 @@ _080983C6:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080983FC: .4byte gUnknown_2037398
+_080983FC: .4byte gPlttBufferUnfaded + 0x1A0
 	thumb_func_end sub_8098340
 
 	thumb_func_start sub_8098400
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 9754bb605..89121fe61 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -739,7 +739,7 @@ sub_811F03C: @ 811F03C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 28
-	ldr r5, _0811F068 @ =gUnknown_2037258
+	ldr r5, _0811F068 @ =gPlttBufferUnfaded + 0x60
 	lsrs r4, 23
 	adds r1, r5, 0
 	subs r1, 0x60
@@ -757,7 +757,7 @@ sub_811F03C: @ 811F03C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0811F068: .4byte gUnknown_2037258
+_0811F068: .4byte gPlttBufferUnfaded + 0x60
 _0811F06C: .4byte gPlttBufferFaded
 	thumb_func_end sub_811F03C
 
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 04dae118c..e76a6bcc2 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -12030,7 +12030,7 @@ _08091924:
 	adds r1, r2
 	ldrb r1, [r1]
 	lsls r1, 6
-	ldr r2, _08091964 @ =gUnknown_2037278
+	ldr r2, _08091964 @ =gPlttBufferUnfaded + 0x80
 	adds r1, r2
 	movs r2, 0x20
 	bl CpuSet
@@ -12055,7 +12055,7 @@ _08091938:
 	bx r0
 	.align 2, 0
 _08091960: .4byte 0x000002d2
-_08091964: .4byte gUnknown_2037278
+_08091964: .4byte gPlttBufferUnfaded + 0x80
 _08091968: .4byte gUnknown_20397B0
 	thumb_func_end sub_8091850
 
diff --git a/asm/title_screen.s b/asm/title_screen.s
index 9e12dfbff..de70452ff 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -577,7 +577,7 @@ _08078DF2:
 	bgt _08078E02
 	b _08078FB6
 _08078E02:
-	ldr r0, _08078E20 @ =gUnknown_2037398
+	ldr r0, _08078E20 @ =gPlttBufferUnfaded + 0x1A0
 	movs r1, 0x10
 	bl TintPalette_GrayScale2
 	movs r0, 0x80
@@ -590,7 +590,7 @@ _08078E02:
 	bl BeginNormalPaletteFade
 	b _08078F80
 	.align 2, 0
-_08078E20: .4byte gUnknown_2037398
+_08078E20: .4byte gPlttBufferUnfaded + 0x1A0
 _08078E24:
 	ldr r0, _08078E3C @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
@@ -749,7 +749,7 @@ _08078F24:
 	movs r0, 0
 	bl ShowBg
 	ldr r0, _08078F90 @ =gUnknown_8EAD5E8
-	ldr r1, _08078F94 @ =gUnknown_2037398
+	ldr r1, _08078F94 @ =gPlttBufferUnfaded + 0x1A0
 	movs r2, 0x10
 	bl CpuSet
 	movs r0, 0x80
@@ -772,7 +772,7 @@ _08078F80:
 _08078F88: .4byte 0x00001fff
 _08078F8C: .4byte 0x00007fde
 _08078F90: .4byte gUnknown_8EAD5E8
-_08078F94: .4byte gUnknown_2037398
+_08078F94: .4byte gPlttBufferUnfaded + 0x1A0
 _08078F98:
 	movs r0, 0
 	bl sub_807185C
diff --git a/sym_ewram.txt b/sym_ewram.txt
index dd96b15fd..a399afa95 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -762,46 +762,10 @@ gUnknown_2037108: @ 2037108
 	.space 0xF0
 
 gPlttBufferUnfaded: @ 20371F8
-	.space 0x2
-
-gUnknown_20371FA: @ 20371FA
-	.space 0x1E
-
-gUnknown_2037218: @ 2037218
-	.space 0x20
-
-gUnknown_2037238: @ 2037238
-	.space 0x20
-
-gUnknown_2037258: @ 2037258
-	.space 0x20
-
-gUnknown_2037278: @ 2037278
-	.space 0x120
-
-gUnknown_2037398: @ 2037398
-	.space 0x60
-
-gUnknown_20373F8: @ 20373F8
-	.space 0x10
-
-gUnknown_2037408: @ 2037408
-	.space 0x1F0
+	.space 0x400
 
 gPlttBufferFaded: @ 20375F8
-	.space 0x2
-
-gUnknown_20375FA: @ 20375FA
-	.space 0x3E
-
-gUnknown_2037638: @ 2037638
-	.space 0x78
-
-gUnknown_20376B0: @ 20376B0
-	.space 0x148
-
-gUnknown_20377F8: @ 20377F8
-	.space 0x200
+	.space 0x400
 
 gUnknown_20379F8: @ 20379F8
 	.space 0xC0