dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvalidmons -> nValidMons

Browse Source
This commit is contained in:
PikalaxALT
2021-03-16 14:56:43 -04:00
parent aedd30e104
commit fa6b2c4615
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_interface.c
+5 -5
View File
@@ -1047,7 +1047,7 @@ void SwapHpBarsWithHpText(void)
u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, bool8 isSwitchingMons, bool8 isBattleStart) u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, bool8 isSwitchingMons, bool8 isBattleStart)
{ {
bool8 isOpponent; bool8 isOpponent;
s8 nvalidmons; s8 nValidMons;
s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s16 bar_X, bar_Y, bar_pos2_X, bar_data0;
s32 i; s32 i;
u8 summaryBarSpriteId; u8 summaryBarSpriteId;
@@ -1084,10 +1084,10 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
bar_data0 = 5; bar_data0 = 5;
} }
for (i = 0, nvalidmons = 0; i < PARTY_SIZE; i++) for (i = 0, nValidMons = 0; i < PARTY_SIZE; i++)
{ {
if (partyInfo[i].hp != 0xFFFF) if (partyInfo[i].hp != 0xFFFF)
nvalidmons++; nValidMons++;
} }
LoadCompressedSpriteSheetUsingHeap(&sStatusSummaryBarSpriteSheets[isOpponent]); LoadCompressedSpriteSheetUsingHeap(&sStatusSummaryBarSpriteSheets[isOpponent]);
@@ -1163,7 +1163,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
} }
else else
{ {
if (i >= nvalidmons) // empty slot or an egg if (i >= nValidMons) // empty slot or an egg
{ {
gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
gSprites[ballIconSpritesIds[i]].data[7] = 1; gSprites[ballIconSpritesIds[i]].data[7] = 1;
@@ -1202,7 +1202,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
else else
{ {
ballIconSpritesIds[5 - i] += 0; ballIconSpritesIds[5 - i] += 0;
if (i >= nvalidmons) // empty slot or an egg if (i >= nValidMons) // empty slot or an egg
{ {
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 1;
gSprites[ballIconSpritesIds[5 - i]].data[7] = 1; gSprites[ballIconSpritesIds[5 - i]].data[7] = 1;