Leahnaya/Poke_Transporter_GB
1
0
Fork 0
mirror of https://github.com/GearsProgress/Poke_Transporter_GB.git synced 2026-08-22 00:34:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix grey filter over front sprite during pkmn injection

Browse Source
This commit is contained in:
Philippe Symons
2026-04-01 22:07:39 +02:00
parent c2aad6d82a
commit 167f49a468
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/sprite_data.cpp
View File

@@ -872,7 +872,7 @@ void update_y_offset()
obj_set_pos(flag, (8 * 11) + 4, (8 * 4) + 19 + y_offset);
}
void update_front_box_sprite(Pokemon *curr_pkmn)
void update_front_box_sprite(Pokemon *curr_pkmn, bool make_greyscale)
{
if (g_debug_options.ignore_game_pak || g_debug_options.ignore_game_pak_sprites)
{
@@ -905,16 +905,21 @@ void update_front_box_sprite(Pokemon *curr_pkmn)
unsigned short buffer[16];
LZ77UnCompWram((const unsigned short *)palette_location, buffer); // This is a little silly, but it's being weird with bytes vs shorts when we copy it directly
for (int i = 0; i < 16; i++)
{
unsigned red = (buffer[i] >> 0) & 0b11111;
unsigned green = (buffer[i] >> 5) & 0b11111;
unsigned blue = (buffer[i] >> 10) & 0b11111;
unsigned grey = ((QF(0.299f) * red) + (QF(0.587f) * green) + (QF(0.114f) * blue)) >> 16;
// buffer[i] = RGB15_SAFE(red, ((int)green >> 1), 0);
buffer[i] = RGB15_SAFE(grey, (grey >> 1), 0);
if(make_greyscale)
{
for (int i = 0; i < 16; i++)
{
unsigned red = (buffer[i] >> 0) & 0b11111;
unsigned green = (buffer[i] >> 5) & 0b11111;
unsigned blue = (buffer[i] >> 10) & 0b11111;
unsigned grey = ((QF(0.299f) * red) + (QF(0.587f) * green) + (QF(0.114f) * blue)) >> 16;
// buffer[i] = RGB15_SAFE(red, ((int)green >> 1), 0);
buffer[i] = RGB15_SAFE(grey, (grey >> 1), 0);
}
}
tonccpy((pal_obj_mem + (PULLED_SPRITE_PAL * 16)), buffer, 32);
LZ77UnCompVram((const unsigned int *)sprite_location, &tile_mem[SPRITE_CHAR_BLOCK][curr_tile_id]);
}