From fde18b47746b577c4d2037ab065ce66062da2a67 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 10:42:00 -0500 Subject: Fix berry crusher graphics name --- decompress.sh | 5 +++++ graphics/berry_crush/crusher.bin | 1 - graphics/berry_crush/text_windows.bin | 1 + include/graphics.h | 2 +- src/berry_crush.c | 8 ++++---- src/graphics.c | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100755 decompress.sh delete mode 100644 graphics/berry_crush/crusher.bin create mode 100644 graphics/berry_crush/text_windows.bin 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/crusher.bin deleted file mode 100644 index c6cc0edb1..000000000 --- a/graphics/berry_crush/crusher.bin +++ /dev/null @@ -1 +0,0 @@ -L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ú`é`é`é`é`é`é`é`é`é`ê`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@ÜdÛ`Û`Û`Û`Û`Û`Û`Û`Û`ìdë`ë`ë`ë`ë`ë`ë`ë`ë` \ No newline at end of file diff --git a/graphics/berry_crush/text_windows.bin b/graphics/berry_crush/text_windows.bin new file mode 100644 index 000000000..c6cc0edb1 --- /dev/null +++ b/graphics/berry_crush/text_windows.bin @@ -0,0 +1 @@ +L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ú`é`é`é`é`é`é`é`é`é`ê`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@ÜdÛ`Û`Û`Û`Û`Û`Û`Û`Û`ìdë`ë`ë`ë`ë`ë`ë`ë`ë` \ No newline at end of file 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}; -- cgit v1.2.3