From 7c0a589e58a247fb4d77edf59687ea6c51c16d6b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 26 Jan 2023 23:59:05 -0500 Subject: [PATCH] Fix diploma colors --- graphics/diploma/diploma.pal | 35 ----------------------------------- graphics/diploma/diploma.png | Bin 2924 -> 3172 bytes include/graphics.h | 2 +- src/graphics.c | 2 +- src/teachy_tv.c | 2 +- 5 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 graphics/diploma/diploma.pal 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 2bf9cb27a07600563e87a40aaab52a744ab2d01b..5f7003dddfa4a0c3eff02ab03d82f861e0776b8b 100644 GIT binary patch delta 3134 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 jt`IC5uscreenTilemap); 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);