Skip to content

Label some damage calc symbols #489

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
Sep 28, 2026
Merged

Label some damage calc symbols #489

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
9 changes: 5 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 @@ -164,13 +164,13 @@ typedef struct ItemSpawns
s16 itemValues[NUMBER_OF_ITEM_IDS];
} ItemSpawns;

struct unkStruct_Dungeon134_sub
struct DamageCalcWorkingValues
{
u8 unk134;
u32 unk138;
u8 unk13C[2];
u8 unk13E[2];
u16 unk140[7];
u8 offensiveStages[2];
u16 rawDamageFormulaValues[7];
u32 unk150;
u32 unk154;
u32 unk158;
Expand Down Expand Up @@ -404,7 +404,8 @@ typedef struct Dungeon
Entity *unkB8;
Entity *unkBC;
Entity unkC0;
struct unkStruct_Dungeon134_sub unk134;
// Intermediate values used when calculating damage. Many of these values are assigned but not read anywhere.
struct DamageCalcWorkingValues damageCalcWorkingValues;
/* 0x17C */ RGB_Struct colorRamp[COLOR_RAMP_COUNT];
/* 0x57C */ unkDungeon57C unk57C;
/* 0x5C0 */ s32 unk5C0;
Expand Down
2 changes: 1 addition & 1 deletion src/dungeon_8041AD0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ void sub_80420E8(Entity *pokemon, struct DamageStruct *dmgStruct)
u32 typeEffectiveness;
u32 arg;
typeEffectiveness = dmgStruct->typeEffectiveness;
if(gDungeon->unk134.unk16D != 0)
if(gDungeon->damageCalcWorkingValues.unk16D != 0)
typeEffectiveness = sub_806F62C(dmgStruct->typeEffectiveness);
switch(typeEffectiveness)
{
Expand Down
Loading
Loading