ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 20:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mega evo issues

Browse Source
This commit is contained in:
DizzyEggg 2019-05-24 11:27:02 +02:00
parent 65be7868ec
commit ad63540522
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_interface.c
View File

@ -692,7 +692,7 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
healthBarSpritePtr->invisible = TRUE; healthBarSpritePtr->invisible = TRUE;
// Create mega indicator sprite if is a mega evolved mon. // Create mega indicator sprite if is a mega evolved mon.
if (gBattleStruct->mega.alreadyEvolved[GetBattlerPosition(battlerId)]) if (gBattleStruct->mega.evolvedPartyIds[GetBattlerSide(battlerId)] & gBitTable[gBattlerPartyIndexes[battlerId]])
CreateMegaIndicatorSprite(battlerId, 0); CreateMegaIndicatorSprite(battlerId, 0);
return healthboxLeftSpriteId; return healthboxLeftSpriteId;
@ -875,7 +875,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
u8 battler = gSprites[healthboxSpriteId].hMain_Battler; u8 battler = gSprites[healthboxSpriteId].hMain_Battler;
// Don't print Lv char if mon is mega evolved. // Don't print Lv char if mon is mega evolved.
if (gBattleStruct->mega.alreadyEvolved[GetBattlerPosition(battler)]) if (gBattleStruct->mega.evolvedPartyIds[GetBattlerSide(battler)] & gBitTable[gBattlerPartyIndexes[battler]])
{ {
xPos = (u32) ConvertIntToDecimalStringN(text, lvl, STR_CONV_MODE_LEFT_ALIGN, 3); xPos = (u32) ConvertIntToDecimalStringN(text, lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
} }
@ -1340,15 +1340,15 @@ void DestroyMegaTriggerSprite(void)
static const s8 sIndicatorPosSingles[][2] = static const s8 sIndicatorPosSingles[][2] =
{ {
[B_POSITION_PLAYER_LEFT] = {53, -8}, [B_POSITION_PLAYER_LEFT] = {53, -8},
[B_POSITION_OPPONENT_LEFT] = {53, -8}, [B_POSITION_OPPONENT_LEFT] = {45, -8},
}; };
static const s8 sIndicatorPosDoubles[][2] = static const s8 sIndicatorPosDoubles[][2] =
{ {
[B_POSITION_PLAYER_LEFT] = {53, -8}, [B_POSITION_PLAYER_LEFT] = {53, -8},
[B_POSITION_OPPONENT_LEFT] = {53, -8}, [B_POSITION_OPPONENT_LEFT] = {45, -8},
[B_POSITION_PLAYER_RIGHT] = {53, -8}, [B_POSITION_PLAYER_RIGHT] = {53, -8},
[B_POSITION_OPPONENT_RIGHT] = {53, -8}, [B_POSITION_OPPONENT_RIGHT] = {45, -8},
}; };
void CreateMegaIndicatorSprite(u32 battlerId, u32 which) void CreateMegaIndicatorSprite(u32 battlerId, u32 which)