Converted void to u16 in functions

This commit is contained in:
cellos51
2025-08-08 09:54:24 -04:00
parent 31ba1f166c
commit 650c09af28
4 changed files with 6 additions and 9 deletions
+2 -2
View File
@@ -8,7 +8,7 @@ AFF_SRC_EX asx = {32<<8, 64<<8, 120, 80, 0x0100, 0x0100, 0};
void affine_background_init()
{
memcpy16_tile8_with_palette_offset(&tile8_mem[AFFINE_BG_CBB], affine_background_gfxTiles, affine_background_gfxTilesLen/2, AFFINE_BG_PB);
memcpy16_tile8_with_palette_offset((u16*)tile8_mem[AFFINE_BG_CBB], (const u16*)affine_background_gfxTiles, affine_background_gfxTilesLen/2, AFFINE_BG_PB);
GRIT_CPY(&se_mem[AFFINE_BG_SBB], affine_background_gfxMap);
affine_background_load_palette(affine_background_gfxPal);
@@ -40,7 +40,7 @@ void affine_background_set_color(COLOR color)
}
}
void affine_background_load_palette(const void *src)
void affine_background_load_palette(const u16 *src)
{
memcpy16(&pal_bg_mem[AFFINE_BG_PB], src, AFFINE_BG_PAL_LEN);
}
+2 -5
View File
@@ -168,14 +168,11 @@ void update_text_rect_to_right_align_num(Rect* rect, int num, int overflow_direc
}
}
void memcpy16_tile8_with_palette_offset(void* dst, const void* src, uint hwcount, u8 palette_offset)
void memcpy16_tile8_with_palette_offset(u16* dst, const u16* src, uint hwcount, u8 palette_offset)
{
u16* dst16 = (u16*)dst;
const u16* src16 = (const u16*)src;
for (int i = 0; i < hwcount; i++)
{
// Copying u8 data twice across u16 data
dst16[i] = src16[i] + (((palette_offset) << 8) | (palette_offset));
dst[i] = src[i] + (((palette_offset) << 8) | (palette_offset));
}
}