From 240cf616ff02c82e313802ee4ad30d5b8472898a Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 26 Jan 2023 22:30:16 -0500
Subject: [PATCH] Colorize berry crush graphics

---
 graphics/berry_crush/berry_crush.pal          |  99 ------------------
 graphics/berry_crush/berry_crush.png          | Bin 2151 -> 0 bytes
 graphics/berry_crush/crusher.png              | Bin 0 -> 2502 bytes
 graphics/berry_crush/crusher_base.png         | Bin 639 -> 626 bytes
 .../{data_EB0ADC.bin => text_windows.bin}     |   0
 include/graphics.h                            |   2 +-
 src/berry_crush.c                             |   2 +-
 src/graphics.c                                |   7 +-
 8 files changed, 5 insertions(+), 105 deletions(-)
 delete mode 100644 graphics/berry_crush/berry_crush.pal
 delete mode 100644 graphics/berry_crush/berry_crush.png
 create mode 100644 graphics/berry_crush/crusher.png
 rename graphics/berry_crush/{data_EB0ADC.bin => text_windows.bin} (100%)

diff --git a/graphics/berry_crush/berry_crush.pal b/graphics/berry_crush/berry_crush.pal
deleted file mode 100644
index 8ee3398d5..000000000
--- a/graphics/berry_crush/berry_crush.pal
+++ /dev/null
@@ -1,99 +0,0 @@
-JASC-PAL
-0100
-96
-98 172 180
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-156 213 189
-123 180 156
-222 156 255
-172 123 222
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-255 238 0
-230 189 0
-180 180 180
-139 139 139
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-197 213 246
-255 255 255
-238 238 246
-205 205 213
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-255 180 255
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-148 222 164
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
-0 0 0
-148 222 164
-164 230 172
-180 238 189
-197 246 205
-213 255 222
-238 255 238
-255 255 255
-65 180 238
-255 255 255
-0 197 57
-255 255 255
-246 213 0
-255 0 255
-246 238 205
-139 123 74
-255 164 106
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-115 156 189
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
diff --git a/graphics/berry_crush/berry_crush.png b/graphics/berry_crush/berry_crush.png
deleted file mode 100644
index 6e43adb27bf0226c4d175b9dee89bb4b0566856b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2151
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

diff --git a/graphics/berry_crush/crusher.png b/graphics/berry_crush/crusher.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a57360a7198fa6c05d0b7b7a6eae754c4d11618
GIT binary patch
literal 2502
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
Vzggl@6aVAK_w@?&taN8&{{a<tmA3!@

literal 0
HcmV?d00001

diff --git a/graphics/berry_crush/crusher_base.png b/graphics/berry_crush/crusher_base.png
index 88659471b096302eeedaa1ce072dace0e8f4a1e4..ee448d15c4a668dcc281557ed9c68e007013367d 100644
GIT binary patch
delta 10
Rcmey*@`+_a{Kgz%CIA~d1RDSV

delta 22
dcmeyw@}FfwJU0VlNswPKgTu2MX&YljnE+l+2ju_&

diff --git a/graphics/berry_crush/data_EB0ADC.bin b/graphics/berry_crush/text_windows.bin
similarity index 100%
rename from graphics/berry_crush/data_EB0ADC.bin
rename to graphics/berry_crush/text_windows.bin
diff --git a/include/graphics.h b/include/graphics.h
index e86ea2e27..8b77b8d7a 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4892,7 +4892,7 @@ extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[];
 // berry_crush
 extern const u16 gBerryCrush_Crusher_Pal[];
 extern const u32 gBerryCrush_Crusher_Gfx[];
-extern const u32 gBerryCrush_Crusher_Tilemap[];
+extern const u32 gBerryCrush_TextWindows_Tilemap[];
 
 // easy_chat_3
 extern const u32 gEasyChatWindow_Gfx[];
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 78a9e6fba..4adf42a6a 100644
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -3274,7 +3274,7 @@ static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame * game)
     u8 i = 0;
     u8 *crusherGfx;
 
-    LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer);
+    LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer);
     for (crusherGfx = gDecompressionBuffer; i < game->playerCount; ++i)
     {
         CopyToBgTilemapBufferRect(
diff --git a/src/graphics.c b/src/graphics.c
index 0cdca0e46..031b3be9c 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1392,7 +1392,6 @@ const u32 gTradeGba_Gfx[] = INCBIN_U32("graphics/link/gba.4bpp");
 
 const u16 gUnknown_8EAFE80[] = INCBIN_U16("graphics/interface/blank2.gbapal");
 
-const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal");
-const u16 gUnknown_8EAFF60[] = INCBIN_U16("graphics/unknown/unknown_EAFF60.gbapal");
-const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz");
-const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz");
+const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal");
+const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/crusher.4bpp.lz");
+const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz");