ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gave Grav Apple a move effect of its own

Browse Source
This commit is contained in:
LOuroboros 2021-10-17 09:27:35 -03:00
parent c2e25272b0
commit 59cfbe55c1
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -381,6 +381,10 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectTripleHit @ EFFECT_TRIPLE_HIT
.4byte BattleScript_EffectRecoilHP25 @ EFFECT_RECOIL_HP_25
.4byte BattleScript_EffectStuffCheeks @ EFFECT_STUFF_CHEEKS
.4byte BattleScript_EffectGravApple @ EFFECT_GRAV_APPLE
BattleScript_EffectGravApple:
goto BattleScript_EffectAttackerDefenseDownHit
BattleScript_EffectStuffCheeks::
attackcanceler

3
include/constants/battle_move_effects.h
View File

@ -365,7 +365,8 @@
#define EFFECT_TRIPLE_HIT 359
#define EFFECT_RECOIL_HP_25 360
#define EFFECT_STUFF_CHEEKS 361
#define EFFECT_GRAV_APPLE 362
#define NUM_BATTLE_MOVE_EFFECTS 362
#define NUM_BATTLE_MOVE_EFFECTS 363
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

8
src/battle_util.c
View File

@ -7693,6 +7693,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
#endif
break;
}
case EFFECT_GRAV_APPLE:
if (gFieldStatuses & STATUS_FIELD_GRAVITY)
MulModifier(&basePower, UQ_4_12(1.5));
break;
}
// move-specific base power changes
@ -7702,10 +7706,6 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
if (gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH)
basePower = 20;
break;
case MOVE_GRAV_APPLE:
if (gFieldStatuses & STATUS_FIELD_GRAVITY)
basePower = 120;
break;
}
if (basePower == 0)

2
src/data/battle_moves.h
View File

@ -11103,7 +11103,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_GRAV_APPLE] =
{
.effect = EFFECT_DEFENSE_DOWN_HIT,
.effect = EFFECT_GRAV_APPLE,
.power = 80,
.type = TYPE_GRASS,
.accuracy = 100,