From 5ec301f04ab1a9964996e759a88e2d6ba98479a0 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Tue, 25 Mar 2025 21:15:25 +0100 Subject: [PATCH] Removes unused Special Status members (#6479) --- include/battle.h | 2 -- src/battle_script_commands.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/include/battle.h b/include/battle.h index 13acd4b009..6930834a9c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -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; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index af6ab2cd1f..9a709e6a1e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -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;