atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed OW type effectiveness function for clarity (#5917)

Browse source
This commit is contained in:
Eduardo Quezada 2024-12-31 18:55:42 -03:00 committed by GitHub
parent 13dcd35db0
commit e1275594c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle_util.h
View file

@ -237,7 +237,7 @@ s32 CalculateMoveDamageVars(struct DamageCalculationData *damageCalcData, u32 fi
uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, u32 battlerDef, u32 defAbility, bool32 recordAbilities); uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, u32 battlerDef, u32 defAbility, bool32 recordAbilities);
uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef); uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef);
uq4_12_t GetTypeModifier(u32 atkType, u32 defType); uq4_12_t GetTypeModifier(u32 atkType, u32 defType);
uq4_12_t GetTypeEffectiveness(struct Pokemon *mon, u8 moveType); uq4_12_t GetOverworldTypeEffectiveness(struct Pokemon *mon, u8 moveType);
s32 GetStealthHazardDamage(u8 hazardType, u32 battler); s32 GetStealthHazardDamage(u8 hazardType, u32 battler);
s32 GetStealthHazardDamageByTypesAndHP(u8 hazardType, u8 type1, u8 type2, u32 maxHp); s32 GetStealthHazardDamageByTypesAndHP(u8 hazardType, u8 type1, u8 type2, u32 maxHp);
bool32 CanMegaEvolve(u32 battler); bool32 CanMegaEvolve(u32 battler);

2
src/battle_util.c
View file

@ -10670,7 +10670,7 @@ static uq4_12_t GetInverseTypeMultiplier(uq4_12_t multiplier)
} }
} }
uq4_12_t GetTypeEffectiveness(struct Pokemon *mon, u8 moveType) uq4_12_t GetOverworldTypeEffectiveness(struct Pokemon *mon, u8 moveType)
{ {
uq4_12_t modifier = UQ_4_12(1.0); uq4_12_t modifier = UQ_4_12(1.0);
u16 abilityDef = GetMonAbility(mon); u16 abilityDef = GetMonAbility(mon);

2
src/event_object_movement.c
View file

@ -2520,7 +2520,7 @@ void GetFollowerAction(struct ScriptContext *ctx) // Essentially a big switch fo
} }
if (multi < NUMBER_OF_MON_TYPES) if (multi < NUMBER_OF_MON_TYPES)
{ {
multi = GetTypeEffectiveness(mon, multi); multi = GetOverworldTypeEffectiveness(mon, multi);
if (multi <= UQ_4_12(0.5)) if (multi <= UQ_4_12(0.5))
condEmotes[condCount++] = (struct SpecialEmote) {.emotion = FOLLOWER_EMOTION_HAPPY, .index = 32}; condEmotes[condCount++] = (struct SpecialEmote) {.emotion = FOLLOWER_EMOTION_HAPPY, .index = 32};
else if (multi >= UQ_4_12(2.0)) else if (multi >= UQ_4_12(2.0))