diff --git a/graphics/diploma/diploma.pal b/graphics/diploma/diploma.pal deleted file mode 100644 index 3ba0bc65d..000000000 --- a/graphics/diploma/diploma.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -123 205 172 -255 0 255 -222 230 139 -205 246 156 -230 222 164 -197 238 172 -205 230 213 -213 246 172 -205 230 164 -238 255 156 -197 238 172 -222 230 238 -222 238 238 -213 246 172 -246 238 172 -238 238 139 -123 205 172 -255 0 255 -255 0 255 -246 246 205 -230 230 148 -230 230 148 -230 230 148 -238 238 164 -222 222 148 -255 238 180 -238 230 164 -238 222 180 -246 246 164 -246 230 131 -246 230 172 -222 238 222 diff --git a/graphics/diploma/diploma.png b/graphics/diploma/diploma.png index 2bf9cb27a..5f7003ddd 100644 Binary files a/graphics/diploma/diploma.png and b/graphics/diploma/diploma.png differ diff --git a/include/graphics.h b/include/graphics.h index d72e798a0..de054b91d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2886,7 +2886,7 @@ extern const u32 gTradeGba_Gfx[]; extern const u8 gTeachyTv_Gfx[]; extern const u8 gTeachyTvScreen_Tilemap[]; extern const u8 gTeachyTvTitle_Tilemap[]; -extern const u32 gTeachTv_Pal[]; +extern const u32 gTeachyTv_Pal[]; // berry_fix_program extern const u8 gBerryFixGameboy_Gfx[]; diff --git a/src/graphics.c b/src/graphics.c index 7b51576de..9278b00f2 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1130,7 +1130,7 @@ const u32 gUnknown_8E861A8[] = INCBIN_U32("graphics/unknown/unknown_E861A8.bin.l const u8 gTeachyTv_Gfx[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz"); const u8 gTeachyTvScreen_Tilemap[] = INCBIN_U8("graphics/teachy_tv/screen.bin.lz"); const u8 gTeachyTvTitle_Tilemap[] = INCBIN_U8("graphics/teachy_tv/title.bin.lz"); -const u32 gTeachTv_Pal[] = INCBIN_U32("graphics/teachy_tv/tiles.gbapal.lz"); +const u32 gTeachyTv_Pal[] = INCBIN_U32("graphics/teachy_tv/tiles.gbapal.lz"); const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz"); diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 6da0b5359..0f4e79099 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -530,7 +530,7 @@ static void TeachyTvLoadGraphic(void) DecompressAndCopyTileDataToVram(1, gTeachyTv_Gfx, 0, 0, 0); LZDecompressWram(gTeachyTvScreen_Tilemap, sResources->screenTilemap); LZDecompressWram(gTeachyTvTitle_Tilemap, sResources->titleTilemap); - LoadCompressedPalette(gTeachTv_Pal, 0, 0x80); + LoadCompressedPalette(gTeachyTv_Pal, 0, 0x80); LoadPalette(&src, 0, sizeof(src)); LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1); TeachyTvLoadBg3Map(sResources->buffer3);