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

Remove unused, unneeded fields from BattleHealthboxInfo

Browse Source
This commit is contained in:
PikalaxALT
2021-03-15 20:17:47 -04:00
parent 81da6acff5
commit 14aa5bf52f
10 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_gfx_sfx_util.c
+6 -3
View File
@@ -296,15 +296,18 @@ bool8 IsBattleSEPlaying(u8 battlerId)
if (IsSEPlaying())
{
++gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_8 < 30)
++gBattleSpritesDataPtr->healthBoxesData[battlerId].soundTimer;
// UB: Uses gActiveBattler instead of battlerId.
// In practice, this is never a problem, as this routine
// is only ever passed gActiveBattler.
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].soundTimer < 30)
return TRUE;
m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlayInfo_SE2);
}
if (zero == 0)
{
gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8 = 0;
gBattleSpritesDataPtr->healthBoxesData[battlerId].soundTimer = 0;
return FALSE;
}
else