ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Battle indicator now depends on species instead of held item

Browse Source 
- This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.
This commit is contained in:
Eduardo Quezada 2022-11-06 16:01:07 -03:00
parent 0eccbdf980
commit 62912f8caf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/form_change_types.h
View File

@ -81,5 +81,6 @@
// Form change that activates automatically when entering battle with the specified item.
// If the item is a Red Orb, it uses the Omega Symbol for the animation and icon. Otherwise, it defaults to the Alpha symbol.
// The battle indicator icon is based on the species, with Primal Groudon's as Omega and otherwise being Alpha.
// param1: item to hold.
#define FORM_CHANGE_BATTLE_PRIMAL_REVERSION 13

8
src/battle_interface.c
View File

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