From 719d3d3cc65a3bc32835be3b0d668c734637ae1f Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 26 Jan 2023 23:20:03 -0500
Subject: [PATCH] Colorize teachy tv graphics

---
 .../teachy_tv/{bg1_tilemap.bin => screen.bin} | Bin
 graphics/teachy_tv/tiles.png                  | Bin 1760 -> 1971 bytes
 .../teachy_tv/{bg2_tilemap.bin => title.bin}  | Bin
 include/graphics.h                            |   8 +++----
 src/graphics.c                                |   8 +++----
 src/teachy_tv.c                               |  20 +++++++++---------
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename graphics/teachy_tv/{bg1_tilemap.bin => screen.bin} (100%)
 rename graphics/teachy_tv/{bg2_tilemap.bin => title.bin} (100%)

diff --git a/graphics/teachy_tv/bg1_tilemap.bin b/graphics/teachy_tv/screen.bin
similarity index 100%
rename from graphics/teachy_tv/bg1_tilemap.bin
rename to graphics/teachy_tv/screen.bin
diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png
index fdf32ca305c9aeab9be89e10177f4cef11a6ef7e..ecc121d02ff984e57a7e6cd0888396490c9d7bfa 100644
GIT binary patch
literal 1971
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
VS@z)GUg_fn9xgu4H=O9F{tNT6gP{Nb

delta 1756
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

diff --git a/graphics/teachy_tv/bg2_tilemap.bin b/graphics/teachy_tv/title.bin
similarity index 100%
rename from graphics/teachy_tv/bg2_tilemap.bin
rename to graphics/teachy_tv/title.bin
diff --git a/include/graphics.h b/include/graphics.h
index 8b77b8d7a..d72e798a0 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2883,10 +2883,10 @@ extern const u32 gTradeGba2_Pal[];
 extern const u32 gTradeGba_Gfx[];
 
 // teachy_tv
-extern const u8 gUnknown_8E86240[];
-extern const u8 gUnknown_8E86BE8[];
-extern const u8 gUnknown_8E86D6C[];
-extern const u32 gUnknown_8E86F98[];
+extern const u8 gTeachyTv_Gfx[];
+extern const u8 gTeachyTvScreen_Tilemap[];
+extern const u8 gTeachyTvTitle_Tilemap[];
+extern const u32 gTeachTv_Pal[];
 
 // berry_fix_program
 extern const u8 gBerryFixGameboy_Gfx[];
diff --git a/src/graphics.c b/src/graphics.c
index 031b3be9c..7b51576de 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1127,10 +1127,10 @@ const u32 gBuyMenuFrame_Pal[] = INCBIN_U32("graphics/shop_menu/shop_menu.gbapal.
 
 const u32 gUnknown_8E861A8[] = INCBIN_U32("graphics/unknown/unknown_E861A8.bin.lz");
 
-const u8 gUnknown_8E86240[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz");
-const u8 gUnknown_8E86BE8[] = INCBIN_U8("graphics/teachy_tv/bg1_tilemap.bin.lz");
-const u8 gUnknown_8E86D6C[] = INCBIN_U8("graphics/teachy_tv/bg2_tilemap.bin.lz");
-const u32 gUnknown_8E86F98[] = INCBIN_U32("graphics/teachy_tv/palettes.gbapal.lz");
+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 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz");
 
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 86634db83..6da0b5359 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -40,10 +40,10 @@ struct TeachyTvCtrlBlk
 struct TeachyTvBuf
 {
     MainCallback savedCallback;
-    u16 buffer1[0x800];
-    u16 buffer2[0x800];
-    u16 buffer3[0x800];
-    u16 buffer4[0x800];
+    u16 screenTilemap[BG_SCREEN_SIZE];
+    u16 buffer2[BG_SCREEN_SIZE];
+    u16 buffer3[BG_SCREEN_SIZE];
+    u16 titleTilemap[BG_SCREEN_SIZE];
     u8 grassAnimCounterLo;
     u8 grassAnimCounterHi;
     u8 grassAnimDisabled;
@@ -508,7 +508,7 @@ static void TeachyTvSetupBg(void)
     ResetAllBgsCoordinatesAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sBgTemplates, 4);
-    SetBgTilemapBuffer(1, sResources->buffer1);
+    SetBgTilemapBuffer(1, sResources->screenTilemap);
     SetBgTilemapBuffer(2, sResources->buffer2);
     SetBgTilemapBuffer(3, sResources->buffer3);
     SetGpuReg(REG_OFFSET_DISPCNT, 0x3040);
@@ -527,10 +527,10 @@ static void TeachyTvLoadGraphic(void)
 {
     u16 src = RGB_BLACK;
     ResetTempTileDataBuffers();
-    DecompressAndCopyTileDataToVram(1, gUnknown_8E86240, 0, 0, 0);
-    LZDecompressWram(gUnknown_8E86BE8, sResources->buffer1);
-    LZDecompressWram(gUnknown_8E86D6C, sResources->buffer4);
-    LoadCompressedPalette(gUnknown_8E86F98, 0, 0x80);
+    DecompressAndCopyTileDataToVram(1, gTeachyTv_Gfx, 0, 0, 0);
+    LZDecompressWram(gTeachyTvScreen_Tilemap, sResources->screenTilemap);
+    LZDecompressWram(gTeachyTvTitle_Tilemap, sResources->titleTilemap);
+    LoadCompressedPalette(gTeachTv_Pal, 0, 0x80);
     LoadPalette(&src, 0, sizeof(src));
     LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1);
     TeachyTvLoadBg3Map(sResources->buffer3);
@@ -758,7 +758,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId)
     TeachyTvBg2AnimController();
     if (++data[2] > 63)
     {
-        CopyToBgTilemapBufferRect_ChangePalette(2, sResources->buffer4, 0, 0, 0x20, 0x20, 0x11);
+        CopyToBgTilemapBufferRect_ChangePalette(2, sResources->titleTilemap, 0, 0, 0x20, 0x20, 0x11);
         TeachyTvSetSpriteCoordsAndSwitchFrame(data[1], 8, 0x38, 7);
         ScheduleBgCopyTilemapToVram(2);
         data[2] = 0;