Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-06-02 22:05:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removes unused Special Status members (#6479)

Browse Source
This commit is contained in:
Alex 2025-03-25 21:15:25 +01:00 committed by GitHub
parent c82959dbe6
commit 5ec301f04a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -197,8 +197,6 @@ struct SpecialStatus
{
s32 physicalDmg;
s32 specialDmg;
u8 physicalBattlerId;
u8 specialBattlerId;
u8 changedStatsBattlerId; // Battler that was responsible for the latest stat change. Can be self.
u8 statLowered:1;
u8 lightningRodRedirected:1;

12
src/battle_script_commands.c
View File

@ -2628,15 +2628,9 @@ static void Cmd_datahpupdate(void)
gProtectStructs[battler].physicalDmg = gBattleStruct->moveDamage[battler];
gSpecialStatuses[battler].physicalDmg = gBattleStruct->moveDamage[battler];
if (cmd->battler == BS_TARGET)
{
gProtectStructs[battler].physicalBattlerId = gBattlerAttacker;
gSpecialStatuses[battler].physicalBattlerId = gBattlerAttacker;
}
else
{
gProtectStructs[battler].physicalBattlerId = gBattlerTarget;
gSpecialStatuses[battler].physicalBattlerId = gBattlerTarget;
}
}
else if (!IsBattleMovePhysical(gCurrentMove) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && effect != EFFECT_PAIN_SPLIT)
{
@ -2644,15 +2638,9 @@ static void Cmd_datahpupdate(void)
gProtectStructs[battler].specialDmg = gBattleStruct->moveDamage[battler];
gSpecialStatuses[battler].specialDmg = gBattleStruct->moveDamage[battler];
if (cmd->battler == BS_TARGET)
{
gProtectStructs[battler].specialBattlerId = gBattlerAttacker;
gSpecialStatuses[battler].specialBattlerId = gBattlerAttacker;
}
else
{
gProtectStructs[battler].specialBattlerId = gBattlerTarget;
gSpecialStatuses[battler].specialBattlerId = gBattlerTarget;
}
}
}
gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;