ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 01:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Defaults Primal Reversion indicator to Alpha when item not Red Orb.

Browse Source
This commit is contained in:
Eduardo Quezada 2022-11-01 15:02:22 -03:00
parent a57f6d184b
commit f5b900e2ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_interface.c
View File

@ -1563,12 +1563,12 @@ u32 CreateMegaIndicatorSprite(u32 battlerId, u32 which)
} }
else if (IsBattlerPrimalReverted(battlerId)) else if (IsBattlerPrimalReverted(battlerId))
{ {
if (GET_BASE_SPECIES_ID(gBattleMons[battlerId].species) == SPECIES_GROUDON) if (gBattleMons[battlerId].item == ITEM_RED_ORB)
{ {
LoadSpritePalette(&sSpritePalette_OmegaIndicator); LoadSpritePalette(&sSpritePalette_OmegaIndicator);
LoadSpriteSheet(&sSpriteSheet_OmegaIndicator); LoadSpriteSheet(&sSpriteSheet_OmegaIndicator);
} }
else if (GET_BASE_SPECIES_ID(gBattleMons[battlerId].species) == SPECIES_KYOGRE) else // ITEM_BLUE_ORB
{ {
LoadSpritePalette(&sSpritePalette_AlphaIndicator); LoadSpritePalette(&sSpritePalette_AlphaIndicator);
LoadSpriteSheet(&sSpriteSheet_AlphaIndicator); LoadSpriteSheet(&sSpriteSheet_AlphaIndicator);
@ -1592,9 +1592,9 @@ u32 CreateMegaIndicatorSprite(u32 battlerId, u32 which)
} }
else if (IsBattlerPrimalReverted(battlerId)) else if (IsBattlerPrimalReverted(battlerId))
{ {
if (GET_BASE_SPECIES_ID(gBattleMons[battlerId].species) == SPECIES_GROUDON) if (gBattleMons[battlerId].item == ITEM_RED_ORB)
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_OmegaIndicator, x, y, 0); spriteId = CreateSpriteAtEnd(&sSpriteTemplate_OmegaIndicator, x, y, 0);
else if (GET_BASE_SPECIES_ID(gBattleMons[battlerId].species) == SPECIES_KYOGRE) else // ITEM_BLUE_ORB
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_AlphaIndicator, x, y, 0); spriteId = CreateSpriteAtEnd(&sSpriteTemplate_AlphaIndicator, x, y, 0);
} }