dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Colorize teachy tv graphics

Browse Source
This commit is contained in:
GriffinR
2023-01-26 23:20:03 -05:00
parent 240cf616ff
commit 719d3d3cc6
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/teachy_tv/bg1_tilemap.bin → graphics/teachy_tv/screen.bin
View File
graphics/teachy_tv/tiles.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

graphics/teachy_tv/bg2_tilemap.bin → graphics/teachy_tv/title.bin
View File
include/graphics.h
+4 -4
View File
@@ -2883,10 +2883,10 @@ extern const u32 gTradeGba2_Pal[];
extern const u32 gTradeGba_Gfx[]; extern const u32 gTradeGba_Gfx[];
// teachy_tv // teachy_tv
extern const u8 gUnknown_8E86240[]; extern const u8 gTeachyTv_Gfx[];
extern const u8 gUnknown_8E86BE8[]; extern const u8 gTeachyTvScreen_Tilemap[];
extern const u8 gUnknown_8E86D6C[]; extern const u8 gTeachyTvTitle_Tilemap[];
extern const u32 gUnknown_8E86F98[]; extern const u32 gTeachTv_Pal[];
// berry_fix_program // berry_fix_program
extern const u8 gBerryFixGameboy_Gfx[]; extern const u8 gBerryFixGameboy_Gfx[];
src/graphics.c
+4 -4
View File
@@ -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 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 gTeachyTv_Gfx[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz");
const u8 gUnknown_8E86BE8[] = INCBIN_U8("graphics/teachy_tv/bg1_tilemap.bin.lz"); const u8 gTeachyTvScreen_Tilemap[] = INCBIN_U8("graphics/teachy_tv/screen.bin.lz");
const u8 gUnknown_8E86D6C[] = INCBIN_U8("graphics/teachy_tv/bg2_tilemap.bin.lz"); const u8 gTeachyTvTitle_Tilemap[] = INCBIN_U8("graphics/teachy_tv/title.bin.lz");
const u32 gUnknown_8E86F98[] = INCBIN_U32("graphics/teachy_tv/palettes.gbapal.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"); const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz");
src/teachy_tv.c
+10 -10
View File
@@ -40,10 +40,10 @@ struct TeachyTvCtrlBlk
struct TeachyTvBuf struct TeachyTvBuf
{ {
MainCallback savedCallback; MainCallback savedCallback;
u16 buffer1[0x800]; u16 screenTilemap[BG_SCREEN_SIZE];
u16 buffer2[0x800]; u16 buffer2[BG_SCREEN_SIZE];
u16 buffer3[0x800]; u16 buffer3[BG_SCREEN_SIZE];
u16 buffer4[0x800]; u16 titleTilemap[BG_SCREEN_SIZE];
u8 grassAnimCounterLo; u8 grassAnimCounterLo;
u8 grassAnimCounterHi; u8 grassAnimCounterHi;
u8 grassAnimDisabled; u8 grassAnimDisabled;
@@ -508,7 +508,7 @@ static void TeachyTvSetupBg(void)
ResetAllBgsCoordinatesAndBgCntRegs(); ResetAllBgsCoordinatesAndBgCntRegs();
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sBgTemplates, 4); InitBgsFromTemplates(0, sBgTemplates, 4);
SetBgTilemapBuffer(1, sResources->buffer1); SetBgTilemapBuffer(1, sResources->screenTilemap);
SetBgTilemapBuffer(2, sResources->buffer2); SetBgTilemapBuffer(2, sResources->buffer2);
SetBgTilemapBuffer(3, sResources->buffer3); SetBgTilemapBuffer(3, sResources->buffer3);
SetGpuReg(REG_OFFSET_DISPCNT, 0x3040); SetGpuReg(REG_OFFSET_DISPCNT, 0x3040);
@@ -527,10 +527,10 @@ static void TeachyTvLoadGraphic(void)
{ {
u16 src = RGB_BLACK; u16 src = RGB_BLACK;
ResetTempTileDataBuffers(); ResetTempTileDataBuffers();
DecompressAndCopyTileDataToVram(1, gUnknown_8E86240, 0, 0, 0); DecompressAndCopyTileDataToVram(1, gTeachyTv_Gfx, 0, 0, 0);
LZDecompressWram(gUnknown_8E86BE8, sResources->buffer1); LZDecompressWram(gTeachyTvScreen_Tilemap, sResources->screenTilemap);
LZDecompressWram(gUnknown_8E86D6C, sResources->buffer4); LZDecompressWram(gTeachyTvTitle_Tilemap, sResources->titleTilemap);
LoadCompressedPalette(gUnknown_8E86F98, 0, 0x80); LoadCompressedPalette(gTeachTv_Pal, 0, 0x80);
LoadPalette(&src, 0, sizeof(src)); LoadPalette(&src, 0, sizeof(src));
LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1); LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1);
TeachyTvLoadBg3Map(sResources->buffer3); TeachyTvLoadBg3Map(sResources->buffer3);
@@ -758,7 +758,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId)
TeachyTvBg2AnimController(); TeachyTvBg2AnimController();
if (++data[2] > 63) 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); TeachyTvSetSpriteCoordsAndSwitchFrame(data[1], 8, 0x38, 7);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
data[2] = 0; data[2] = 0;