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

Remove modern compiler warning by removing fakematches (#742)

Browse Source 
Aggressive optimizations warning was flagging these two files.

For image processing effects I just copy-pasted pokeemerald.
This commit is contained in:
SiliconA-Z
2026-03-23 08:55:42 -04:00
committed by GitHub
parent d559eb56ce
commit 9bbcab4b06
2 changed files with 3363 additions and 3356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_interface.c
+12 -16
View File
@@ -1082,7 +1082,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
bool8 isOpponent; bool8 isOpponent;
s8 nValidMons; s8 nValidMons;
s16 x, y, x2, speed; s16 x, y, x2, speed;
s32 i; s32 i, s;
u8 summaryBarSpriteId; u8 summaryBarSpriteId;
u8 ballIconSpritesIds[PARTY_SIZE]; u8 ballIconSpritesIds[PARTY_SIZE];
u8 taskId; u8 taskId;
@@ -1204,39 +1204,35 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
} }
else else
{ {
s = 5;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{ {
if (partyInfo[i].hp == HP_EMPTY_SLOT) if (partyInfo[i].hp == HP_EMPTY_SLOT)
{ {
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[s]].oam.tileNum += 1;
gSprites[ballIconSpritesIds[5 - i]].sIsEmptyBall = TRUE; gSprites[ballIconSpritesIds[s]].sIsEmptyBall = TRUE;
} }
else if (partyInfo[i].hp == 0) else if (partyInfo[i].hp == 0)
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 3; gSprites[ballIconSpritesIds[s]].oam.tileNum += 3;
else if (partyInfo[i].status != STATUS1_NONE) else if (partyInfo[i].status != STATUS1_NONE)
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 2; gSprites[ballIconSpritesIds[s]].oam.tileNum += 2;
s--;
} }
else else
{ {
ballIconSpritesIds[5 - i] += 0;
if (i >= nValidMons) if (i >= nValidMons)
{ {
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[s]].oam.tileNum += 1;
gSprites[ballIconSpritesIds[5 - i]].sIsEmptyBall = TRUE; gSprites[ballIconSpritesIds[s]].sIsEmptyBall = TRUE;
} }
else if (partyInfo[i].hp == 0) else if (partyInfo[i].hp == 0)
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 3; gSprites[ballIconSpritesIds[s]].oam.tileNum += 3;
else if (partyInfo[i].status != STATUS1_NONE) else if (partyInfo[i].status != STATUS1_NONE)
{ gSprites[ballIconSpritesIds[s]].oam.tileNum += 2;
do s--;
{
gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 2;
} while (0);
}
} }
ballIconSpritesIds[5 - ++i] += 0; i--;
} }
} }
src/image_processing_effects.c
+3351 -3340
View File
File diff suppressed because it is too large Load Diff