Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 21:25:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix spinda spots

Browse Source
This commit is contained in:
cawtds 2025-11-10 17:11:43 +01:00
parent f4a2b8d14e
commit 3966bb2d89
3 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@ -836,7 +836,7 @@ enum KantoDexOrder NationalToKantoDexNum(enum NationalDexOrder natDexNum);
enum NationalDexOrder HoennToNationalDexNum(enum HoennDexOrder hoennNum);
u16 KantoNumToSpecies(enum KantoDexOrder kantoNum);
u16 HoennNumToSpecies(enum HoennDexOrder hoennNum);
void DrawSpindaSpots(u32 species, u32 personality, u8 *dest, bool8 isFrontPic);
void DrawSpindaSpots(u32 personality, u8 *dest, bool32 isSecondFrame);
void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
u8 GetPlayerFlankId(void);
u16 GetLinkTrainerFlankId(u8 linkPlayerId);

6
src/decompress.c
View File

@ -1157,7 +1157,11 @@ void LoadSpecialPokePic(void *dest, s32 species, u32 personality, bool8 isFrontP
DecompressDataWithHeaderWram(gSpeciesInfo[SPECIES_NONE].backPic, dest);
}
DrawSpindaSpots(species, personality, dest, isFrontPic);
if (species == SPECIES_SPINDA && isFrontPic)
{
DrawSpindaSpots(personality, dest, FALSE);
DrawSpindaSpots(personality, dest, TRUE);
}
}
void Unused_DecompressDataWithHeaderWramIndirect(const void **src, void *dest)

121
src/pokemon.c
View File

@ -5297,63 +5297,74 @@ u16 KantoNumToSpecies(enum KantoDexOrder kantoNum)
(destPixels) is an 8 bit pointer, so it addresses two pixels. Shifting by 4 accesses the 2nd
of these pixels, so this is done every other time.
*/
#define DRAW_SPINDA_SPOTS(personality, dest) \
{ \
s32 i; \
for (i = 0; i < (s32)ARRAY_COUNT(sSpindaSpotGraphics); i++) \
{ \
s32 row; \
u8 x = sSpindaSpotGraphics[i].x + ((personality & 0x0F) - 8); \
u8 y = sSpindaSpotGraphics[i].y + (((personality & 0xF0) >> 4) - 8); \
\
for (row = 0; row < SPINDA_SPOT_HEIGHT; row++) \
{ \
s32 column; \
s32 spotPixelRow = sSpindaSpotGraphics[i].image[row]; \
\
for (column = x; column < x + SPINDA_SPOT_WIDTH; column++) \
{ \
/* Get target pixels on Spinda's sprite */ \
u8 *destPixels = dest + ((column / 8) * TILE_SIZE_4BPP) + \
((column % 8) / 2) + \
((y / 8) * TILE_SIZE_4BPP * 8) + \
((y % 8) * 4); \
\
/* Is this pixel in the 16x16 spot image part of the spot? */ \
if (spotPixelRow & 1) \
{ \
/* destPixels addressess two pixels, alternate which */ \
/* of the two pixels is being considered for drawing */ \
if (column & 1) \
{ \
/* Draw spot pixel if this is Spinda's body color */ \
if ((u8)((*destPixels & 0xF0) - (FIRST_SPOT_COLOR << 4))\
<= ((LAST_SPOT_COLOR - FIRST_SPOT_COLOR) << 4))\
*destPixels += (SPOT_COLOR_ADJUSTMENT << 4); \
} \
else \
{ \
/* Draw spot pixel if this is Spinda's body color */ \
if ((u8)((*destPixels & 0xF) - FIRST_SPOT_COLOR) \
<= (LAST_SPOT_COLOR - FIRST_SPOT_COLOR)) \
*destPixels += SPOT_COLOR_ADJUSTMENT; \
} \
} \
\
spotPixelRow >>= 1; \
} \
\
y++; \
} \
\
personality >>= 8; \
} \
}
void DrawSpindaSpots(u32 species, u32 personality, u8 *dest, bool8 isFrontPic)
// Draw spot pixel if this is Spinda's body color
#define TRY_DRAW_SPOT_PIXEL(pixels, shift) \
if (((*(pixels) & (0xF << (shift))) >= (FIRST_SPOT_COLOR << (shift))) \
&& ((*(pixels) & (0xF << (shift))) <= (LAST_SPOT_COLOR << (shift)))) \
{ \
*(pixels) += (SPOT_COLOR_ADJUSTMENT << (shift)); \
}
void DrawSpindaSpots(u32 personality, u8 *dest, bool32 isSecondFrame)
{
if (species == SPECIES_SPINDA && isFrontPic)
DRAW_SPINDA_SPOTS(personality, dest);
s32 i;
for (i = 0; i < (s32)ARRAY_COUNT(sSpindaSpotGraphics); i++)
{
s32 row;
u8 x = sSpindaSpotGraphics[i].x + (personality & 0x0F);
u8 y = sSpindaSpotGraphics[i].y + ((personality & 0xF0) >> 4);
if (isSecondFrame)
{
x -= 12;
y += 56;
}
else
{
x -= 8;
y -= 8;
}
for (row = 0; row < SPINDA_SPOT_HEIGHT; row++)
{
s32 column;
s32 spotPixelRow = sSpindaSpotGraphics[i].image[row];
for (column = x; column < x + SPINDA_SPOT_WIDTH; column++)
{
/* Get target pixels on Spinda's sprite */
u8 *destPixels = dest + ((column / 8) * TILE_SIZE_4BPP) +
((column % 8) / 2) +
((y / 8) * TILE_SIZE_4BPP * 8) +
((y % 8) * 4);
/* Is this pixel in the 16x16 spot image part of the spot? */
if (spotPixelRow & 1)
{
/* destPixels addressess two pixels, alternate which */
/* of the two pixels is being considered for drawing */
if (column & 1)
{
/* Draw spot pixel if this is Spinda's body color */
TRY_DRAW_SPOT_PIXEL(destPixels, 4);
}
else
{
/* Draw spot pixel if this is Spinda's body color */
TRY_DRAW_SPOT_PIXEL(destPixels, 0);
}
}
spotPixelRow >>= 1;
}
y++;
}
personality >>= 8;
}
}
void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies)