Skip to content

Label more damage calc symbols #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnonymousRandomPerson merged 1 commit into from
Oct 2, 2026
Merged

Label more damage calc symbols #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/structs/str_dungeon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions src/dungeon_damage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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;
Expand Down
Loading