Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix species gfx change in link battles (#8552)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-16 19:39:21 -03:00 committed by GitHub
parent ec1a283b1b
commit 6855a5a732
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_gfx_sfx_util.c
View File

@ -919,6 +919,8 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 changeType)
bool32 isShiny;
const void *src;
const u16 *paletteData;
struct Pokemon *monAtk = GetBattlerMon(battlerAtk);
struct Pokemon *monDef = GetBattlerMon(battlerDef);
void *dst;
if (IsContest())
@ -944,11 +946,11 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 changeType)
else if (gBattleStruct->illusion[battlerDef].state == ILLUSION_ON)
targetSpecies = GetIllusionMonSpecies(battlerDef);
else
targetSpecies = gBattleMons[battlerDef].species;
targetSpecies = GetMonData(monDef, MON_DATA_SPECIES);
}
else
{
targetSpecies = gBattleMons[battlerAtk].species;
targetSpecies = GetMonData(monAtk, MON_DATA_SPECIES);
}
gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies = targetSpecies;
@ -959,8 +961,8 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 changeType)
}
else
{
personalityValue = gBattleMons[battlerAtk].personality;
isShiny = gBattleMons[battlerAtk].isShiny;
personalityValue = GetMonData(monAtk, MON_DATA_PERSONALITY);
isShiny = GetMonData(monAtk, MON_DATA_IS_SHINY);
}
HandleLoadSpecialPokePic(!IsOnPlayerSide(battlerAtk),
gMonSpritesGfxPtr->spritesGfx[position],