Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add sprite fill function taking a sprite as argument (#8940)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2026-01-17 21:30:02 +01:00 committed by GitHub
parent 36fcd9c6b2
commit 9023b203c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sprite.h
View File

@ -334,6 +334,7 @@ void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip);
u8 IndexOfSpriteTileTag(u16 tag);
void FillSpriteRectColor(u32 spriteId, u32 left, u32 top, u32 width, u32 height, u32 color);
void FillSpriteRectSprite(u32 spriteId, u32 left, u32 top, u32 width, u32 height);
void FillSpriteRectSpriteWithSprite(u32 spriteId, u32 left, u32 top, u32 width, u32 height, u32 *sprite);
void SetupSpritesForTextPrinting(u8 *spriteIds, const u32 **spriteSrc, u32 numSpritesX, u32 numSpritesY);
u32 *GetSrcPtrFromSprite(struct Sprite *sprite);
u32 GetSpriteWidth(struct Sprite *sprite);

49
src/sprite.c
View File

@ -1855,22 +1855,48 @@ static u32 UpdateFillSpanY(u32 spriteId, u32 spriteHeight, u32 top, u32 height)
return height;
}
enum SpriteFillMode
{
SPRITE_FILL_COLOR,
SPRITE_FILL_EXISTING_SPRITE,
SPRITE_FILL_PROVIDED_SPRITE,
};
union FillInput
{
u32 color;
u32 *spriteSrc;
};
#define CURRENT_SPRITE_POS ((spriteY / 8) * spriteWidth + spriteX + spriteY % 8)
#define BITS_PER_PIXEL 4
#define PIXELS_PER_TILE 8
static void FillSpriteRect(u32 spriteId, u32 left, u32 top, u32 width, u32 height, bool32 isColor, u32 color)
static void FillSpriteRect(u32 spriteId, u32 left, u32 top, u32 width, u32 height, enum SpriteFillMode mode, union FillInput input)
{
// Check if area spans more than 1 sprite
u32 spriteWidth = GetSpriteWidth(&gSprites[spriteId]);
u32 spriteHeight = GetSpriteHeight(&gSprites[spriteId]);
u32 color = 0;
bool32 isColor;
u32 *src = NULL;
if (isColor)
color = color * 0x11111111;
else
switch (mode)
{
case SPRITE_FILL_COLOR:
color = input.color * 0x11111111;
isColor = TRUE;
break;
case SPRITE_FILL_EXISTING_SPRITE:
src = GetSrcPtrFromSprite(&gSprites[spriteId]);
isColor = FALSE;
break;
case SPRITE_FILL_PROVIDED_SPRITE:
src = input.spriteSrc;
isColor = FALSE;
break;
}
// Check if only one sprite is being filled
if (left + width > spriteWidth || top + height > spriteHeight)
@ -2000,12 +2026,23 @@ static void FillSpriteRect(u32 spriteId, u32 left, u32 top, u32 width, u32 heigh
void FillSpriteRectColor(u32 spriteId, u32 left, u32 top, u32 width, u32 height, u32 color)
{
FillSpriteRect(spriteId, left, top, width, height, TRUE, color);
union FillInput input;
input.color = color;
FillSpriteRect(spriteId, left, top, width, height, SPRITE_FILL_COLOR, input);
}
void FillSpriteRectSprite(u32 spriteId, u32 left, u32 top, u32 width, u32 height)
{
FillSpriteRect(spriteId, left, top, width, height, FALSE, 0);
union FillInput input;
input.spriteSrc = NULL;
FillSpriteRect(spriteId, left, top, width, height, SPRITE_FILL_EXISTING_SPRITE, input);
}
void FillSpriteRectSpriteWithSprite(u32 spriteId, u32 left, u32 top, u32 width, u32 height, u32 *sprite)
{
union FillInput input;
input.spriteSrc = sprite;
FillSpriteRect(spriteId, left, top, width, height, SPRITE_FILL_PROVIDED_SPRITE, input);
}
static void StorePointerInSpriteData(struct Sprite *sprite, const u32 *ptr)