ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 05:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1947 from LOuroboros/lightBall

Browse Source 
Updated Light Ball's effect and improved readability
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-18 15:03:18 -03:00 committed by GitHub
commit 4ca9f406f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_util.c
View File

@ -8338,6 +8338,9 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b
u8 atkStage; u8 atkStage;
u32 atkStat; u32 atkStat;
u16 modifier; u16 modifier;
u16 atkBaseSpeciesId;
atkBaseSpeciesId = GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species);
if (gBattleMoves[move].effect == EFFECT_FOUL_PLAY) if (gBattleMoves[move].effect == EFFECT_FOUL_PLAY)
{ {
@ -8484,9 +8487,7 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b
switch (GetBattlerHoldEffect(battlerAtk, TRUE)) switch (GetBattlerHoldEffect(battlerAtk, TRUE))
{ {
case HOLD_EFFECT_THICK_CLUB: case HOLD_EFFECT_THICK_CLUB:
if ((GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species) == SPECIES_CUBONE if ((atkBaseSpeciesId == SPECIES_CUBONE || atkBaseSpeciesId == SPECIES_MAROWAK) && IS_MOVE_PHYSICAL(move))
|| GET_BASE_SPECIES_ID(gBattleMons[battlerAtk].species) == SPECIES_MAROWAK)
&& IS_MOVE_PHYSICAL(move))
MulModifier(&modifier, UQ_4_12(2.0)); MulModifier(&modifier, UQ_4_12(2.0));
break; break;
case HOLD_EFFECT_DEEP_SEA_TOOTH: case HOLD_EFFECT_DEEP_SEA_TOOTH:
@ -8494,7 +8495,7 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b
MulModifier(&modifier, UQ_4_12(2.0)); MulModifier(&modifier, UQ_4_12(2.0));
break; break;
case HOLD_EFFECT_LIGHT_BALL: case HOLD_EFFECT_LIGHT_BALL:
if (gBattleMons[battlerAtk].species == SPECIES_PIKACHU) if (atkBaseSpeciesId == SPECIES_PIKACHU)
MulModifier(&modifier, UQ_4_12(2.0)); MulModifier(&modifier, UQ_4_12(2.0));
break; break;
case HOLD_EFFECT_CHOICE_BAND: case HOLD_EFFECT_CHOICE_BAND: