atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show gender differences in evo scene

Browse source
This commit is contained in:
BuffelSaft 2021-09-11 16:30:09 +12:00
parent b0a1153a2b
commit 4aa7c096b7
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/decompress.h
View file

@ -18,6 +18,8 @@ bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette
void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality);
void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);

8
src/decompress.c
View file

@ -67,6 +67,14 @@ void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffe
LZ77UnCompWram(src->data, buffer);
}
void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality)
{
if (SpeciesHasGenderDifference[species] && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
DecompressPicFromTable(&gMonFrontPicTableFemale[species], buffer, species);
else
DecompressPicFromTable(&gMonFrontPicTable[species], buffer, species);
}
void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality)
{
bool8 isFrontPic;

30
src/evolution_scene.c
View file

@ -259,9 +259,9 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
currSpecies = GetMonData(mon, MON_DATA_SPECIES);
trainerId = GetMonData(mon, MON_DATA_OT_ID);
personality = GetMonData(mon, MON_DATA_PERSONALITY);
DecompressPicFromTable(&gMonFrontPicTable[currSpecies],
gMonSpritesGfxPtr->sprites.ptr[1],
currSpecies);
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[1],
currSpecies,
personality);
pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x110, 0x20);
@ -274,9 +274,9 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
gSprites[ID].invisible = TRUE;
// postEvo sprite
DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies);
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies,
personality);
pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);
@ -351,9 +351,9 @@ static void CB2_EvolutionSceneLoadGraphics(void)
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 4;
DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies);
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies,
personality);
pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);
@ -423,9 +423,9 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
const struct CompressedSpritePalette* pokePal;
u32 trainerId = GetMonData(mon, MON_DATA_OT_ID);
u32 personality = GetMonData(mon, MON_DATA_PERSONALITY);
DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies);
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies,
personality);
pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);
gMain.state++;
@ -487,9 +487,9 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
sEvoStructPtr = AllocZeroed(sizeof(struct EvoInfo));
sEvoStructPtr->preEvoSpriteId = preEvoSpriteId;
DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[1],
postEvoSpecies);
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[1],
postEvoSpecies,
personality);
pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);