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 6e43adb27..000000000 Binary files a/graphics/berry_crush/berry_crush.png and /dev/null differ diff --git a/graphics/berry_crush/crusher.png b/graphics/berry_crush/crusher.png new file mode 100644 index 000000000..6a57360a7 Binary files /dev/null and b/graphics/berry_crush/crusher.png differ diff --git a/graphics/berry_crush/crusher_base.png b/graphics/berry_crush/crusher_base.png index 88659471b..ee448d15c 100644 Binary files a/graphics/berry_crush/crusher_base.png and b/graphics/berry_crush/crusher_base.png differ 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");