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

Expanding Force

Browse source
This commit is contained in:
Xhyzi 2021-06-15 16:25:59 +02:00
parent 5a094a3033
commit 60ce39543e
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/battle_scripts_1.s
View file

@ -369,6 +369,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectSleepHit .4byte BattleScript_EffectSleepHit
.4byte BattleScript_EffectAttackerDefenseDownHit .4byte BattleScript_EffectAttackerDefenseDownHit
.4byte BattleScript_EffectBodyPress .4byte BattleScript_EffectBodyPress
.4byte BattleScript_EffectExpandingForce
BattleScript_EffectAttackerDefenseDownHit: BattleScript_EffectAttackerDefenseDownHit:
setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
@ -2059,6 +2060,7 @@ BattleScript_EffectFusionCombo:
BattleScript_EffectRevelationDance: BattleScript_EffectRevelationDance:
BattleScript_EffectBelch: BattleScript_EffectBelch:
BattleScript_EffectBodyPress: BattleScript_EffectBodyPress:
BattleScript_EffectExpandingForce:
BattleScript_HitFromAtkCanceler:: BattleScript_HitFromAtkCanceler::
attackcanceler attackcanceler

3
include/constants/battle_move_effects.h
View file

@ -353,7 +353,8 @@
#define EFFECT_SLEEP_HIT 347 // Relic Song #define EFFECT_SLEEP_HIT 347 // Relic Song
#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 348 #define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 348
#define EFFECT_BODY_PRESS 349 #define EFFECT_BODY_PRESS 349
#define EFFECT_EXPANDING_FORCE 350
#define NUM_BATTLE_MOVE_EFFECTS 350 #define NUM_BATTLE_MOVE_EFFECTS 351
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/battle_util.c
View file

@ -7210,6 +7210,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
if (gBattleMoves[gLastUsedMove].effect == EFFECT_FUSION_COMBO && move != gLastUsedMove) if (gBattleMoves[gLastUsedMove].effect == EFFECT_FUSION_COMBO && move != gLastUsedMove)
basePower *= 2; basePower *= 2;
break; break;
case EFFECT_EXPANDING_FORCE:
if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN)
basePower = 120;
break;
} }
if (basePower == 0) if (basePower == 0)

2
src/data/battle_moves.h
View file

@ -11220,7 +11220,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_EXPANDING_FORCE] = [MOVE_EXPANDING_FORCE] =
{ {
.effect = EFFECT_PLACEHOLDER, //TODO .effect = EFFECT_EXPANDING_FORCE,
.power = 80, .power = 80,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 100, .accuracy = 100,