From 19f05a7cdfeacde17535ca39717ae60691717896 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 2 Oct 2026 16:00:07 -0400 Subject: [PATCH] Label more damage calc symbols --- include/structs/str_dungeon.h | 8 ++++---- src/dungeon_damage.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h index d90b0f38a..0781df280 100644 --- a/include/structs/str_dungeon.h +++ b/include/structs/str_dungeon.h @@ -175,10 +175,10 @@ struct DamageCalcWorkingValues u32 unk154; u32 unk158; s24_8 unk15C; - u8 unk160; - u8 unk161; - u8 unk162; - u8 unk163; + u8 atkItemBoost; + u8 spAtkItemBoost; + u8 defItemBoost; + u8 spDefItemBoost; u8 unk164; u8 unk165; u8 unk166; diff --git a/src/dungeon_damage.c b/src/dungeon_damage.c index a337b4941..492bd7160 100644 --- a/src/dungeon_damage.c +++ b/src/dungeon_damage.c @@ -1203,29 +1203,29 @@ void CalcDamage(Entity *attacker, Entity *target, u8 moveType, s32 movePower, s3 if (splitIndex == 0) { if (HasHeldItem(attacker, ITEM_POWER_BAND)) { atkStat += gPowerBandBoost; - gDungeon->damageCalcWorkingValues.unk160 += gPowerBandBoost; + gDungeon->damageCalcWorkingValues.atkItemBoost += gPowerBandBoost; } if (HasHeldItem(attacker, ITEM_MUNCH_BELT)) { atkStat += gMunchBeltBoost; - gDungeon->damageCalcWorkingValues.unk160 += gMunchBeltBoost; + gDungeon->damageCalcWorkingValues.atkItemBoost += gMunchBeltBoost; } if (arg_10 && HasHeldItem(target, ITEM_DEF_SCARF)) { defStat += gDefScarfBoost; - gDungeon->damageCalcWorkingValues.unk162 += gDefScarfBoost; + gDungeon->damageCalcWorkingValues.defItemBoost += gDefScarfBoost; } } else { if (arg_10 && HasHeldItem(target, ITEM_ZINC_BAND)) { defStat += gZincBandBoost; - gDungeon->damageCalcWorkingValues.unk163 += gZincBandBoost; + gDungeon->damageCalcWorkingValues.spDefItemBoost += gZincBandBoost; } if (HasHeldItem(attacker, ITEM_SPECIAL_BAND)) { atkStat += gSpecialBandBoost; - gDungeon->damageCalcWorkingValues.unk161 += gSpecialBandBoost; + gDungeon->damageCalcWorkingValues.spAtkItemBoost += gSpecialBandBoost; } if (HasHeldItem(attacker, ITEM_MUNCH_BELT)) { atkStat += gMunchBeltBoost; - gDungeon->damageCalcWorkingValues.unk161 += gMunchBeltBoost; + gDungeon->damageCalcWorkingValues.spAtkItemBoost += gMunchBeltBoost; } } @@ -1528,10 +1528,10 @@ static void ResetDamageCalcWorkingValues(void) damageCalcWorkingValues->unk150 = 0; damageCalcWorkingValues->unk158 = 0; damageCalcWorkingValues->unk15C = F248_ZERO; - damageCalcWorkingValues->unk160 = 0; - damageCalcWorkingValues->unk161 = 0; - damageCalcWorkingValues->unk162 = 0; - damageCalcWorkingValues->unk163 = 0; + damageCalcWorkingValues->atkItemBoost = 0; + damageCalcWorkingValues->spAtkItemBoost = 0; + damageCalcWorkingValues->defItemBoost = 0; + damageCalcWorkingValues->spDefItemBoost = 0; damageCalcWorkingValues->unk164 = 0; damageCalcWorkingValues->unk165 = 0; damageCalcWorkingValues->unk166 = 0;