From fa6b2c46159b8b69097dac3e068fafaf3a396236 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 14:56:43 -0400 Subject: nvalidmons -> nValidMons --- src/battle_interface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 2a0bf17fa..3744c34eb 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1047,7 +1047,7 @@ void SwapHpBarsWithHpText(void) u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, bool8 isSwitchingMons, bool8 isBattleStart) { bool8 isOpponent; - s8 nvalidmons; + s8 nValidMons; s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s32 i; u8 summaryBarSpriteId; @@ -1084,10 +1084,10 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, 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) - nvalidmons++; + nValidMons++; } LoadCompressedSpriteSheetUsingHeap(&sStatusSummaryBarSpriteSheets[isOpponent]); @@ -1163,7 +1163,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } 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]].data[7] = 1; @@ -1202,7 +1202,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, else { 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]].data[7] = 1; -- cgit v1.2.3