ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix berry crusher graphics name

Browse Source
This commit is contained in:
GriffinR 2022-01-11 10:42:00 -05:00
parent 0a78cb5c9e
commit fde18b4774
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
decompress.sh Executable file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env bash
FILEPATH=$1
tools/gbagfx/gbagfx graphics/$FILEPATH.bin.lz graphics/$FILEPATH.bin

0
graphics/berry_crush/crusher.bin → graphics/berry_crush/text_windows.bin
View File

2
include/graphics.h
View File

@ -5002,7 +5002,7 @@ extern const u16 gUsePokeblockCondition_Pal[];
// Berry Crush // Berry Crush
extern const u32 gBerryCrush_Crusher_Gfx[]; extern const u32 gBerryCrush_Crusher_Gfx[];
extern const u16 gBerryCrush_Crusher_Pal[]; extern const u16 gBerryCrush_Crusher_Pal[];
extern const u32 gBerryCrush_Crusher_Tilemap[]; extern const u32 gBerryCrush_TextWindows_Tilemap[];
// Pokenav // Pokenav
extern const u32 gPokenavMessageBox_Gfx[]; extern const u32 gPokenavMessageBox_Gfx[];

8
src/berry_crush.c
View File

@ -1947,15 +1947,15 @@ static void DrawPlayerNameWindows(struct BerryCrushGame *game)
static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game) static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game)
{ {
u8 i = 0; 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( CopyToBgTilemapBufferRect(
3, 3,
&crusherGfx[game->gfx.playerCoords[i]->playerId * 40], &windowGfx[game->gfx.playerCoords[i]->playerId * 40],
game->gfx.playerCoords[i]->windowGfxX, game->gfx.playerCoords[i]->windowGfxX,
game->gfx.playerCoords[i]->windowGfxY, game->gfx.playerCoords[i]->windowGfxY,
10, 10,

2
src/graphics.c
View File

@ -1523,7 +1523,7 @@ const u16 gFrontierPassCancelButtonHighlighted_Tilemap[] = INCBIN_U16("graphics/
// Berry Crush // Berry Crush
const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal"); 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_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. // random garbage at the end.
static const u8 sEmpty3[0x54BAC] = {0}; static const u8 sEmpty3[0x54BAC] = {0};