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 fdf32ca30..ecc121d02 100644 Binary files a/graphics/teachy_tv/tiles.png and b/graphics/teachy_tv/tiles.png differ 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;