Fix berry crusher graphics name

5 files changed, 11 insertions, 6 deletions

diff --git a/decompress.sh b/decompress.sh
new file mode 100755
index 000000000..26b5a0db7
--- /dev/null
+++ b/decompress.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+FILEPATH=$1
+
+tools/gbagfx/gbagfx graphics/$FILEPATH.bin.lz graphics/$FILEPATH.bin
diff --git a/graphics/berry_crush/crusher.bin b/graphics/berry_crush/text_windows.bin
index c6cc0edb1..c6cc0edb1 100644
--- a/graphics/berry_crush/crusher.bin
+++ b/graphics/berry_crush/text_windows.bin
diff --git a/include/graphics.h b/include/graphics.h
index c072babf3..7b29a70b7 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -5002,7 +5002,7 @@ extern const u16 gUsePokeblockCondition_Pal[];
 // Berry Crush
 extern const u32 gBerryCrush_Crusher_Gfx[];
 extern const u16 gBerryCrush_Crusher_Pal[];
-extern const u32 gBerryCrush_Crusher_Tilemap[];
+extern const u32 gBerryCrush_TextWindows_Tilemap[];
 
 // Pokenav
 extern const u32 gPokenavMessageBox_Gfx[];
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 9b8323e2d..e7a5df951 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -1947,15 +1947,15 @@ static void DrawPlayerNameWindows(struct BerryCrushGame *game)
 static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game)
 {
     u8 i = 0;
-    u8 * crusherGfx;
+    u8 * windowGfx;
 
-    LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer);
+    LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer);
 
-    for (crusherGfx = gDecompressionBuffer; i < game->playerCount; i++)
+    for (windowGfx = gDecompressionBuffer; i < game->playerCount; i++)
     {
         CopyToBgTilemapBufferRect(
             3,
-            &crusherGfx[game->gfx.playerCoords[i]->playerId * 40],
+            &windowGfx[game->gfx.playerCoords[i]->playerId * 40],
             game->gfx.playerCoords[i]->windowGfxX,
             game->gfx.playerCoords[i]->windowGfxY,
             10,
diff --git a/src/graphics.c b/src/graphics.c
index b79d449ae..d1a3654ea 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1523,7 +1523,7 @@ const u16 gFrontierPassCancelButtonHighlighted_Tilemap[] = INCBIN_U16("graphics/
 // Berry Crush
 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_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/crusher.bin.lz");
+const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz");
 
 // random garbage at the end.
 static const u8 sEmpty3[0x54BAC] = {0};