From 88b788bfabc689b7b152bd5be6ff49bdddac475b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 27 Jan 2019 11:57:13 +0100 Subject: [PATCH] Fix Charge Beam effect --- data/battle_scripts_1.s | 5 +++++ include/constants/battle_move_effects.h | 1 + src/data/battle_moves.h | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 23c20f8d7..755ae22d1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -340,6 +340,11 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectAcupressure .4byte BattleScript_EffectAromaticMist .4byte BattleScript_EffectPowder + .4byte BattleScript_EffectSpAtkUpHit + +BattleScript_EffectSpAtkUpHit: + setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER + goto BattleScript_EffectHit BattleScript_EffectPowder: attackcanceler diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 31ffec84e..db4ea0a1f 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -328,5 +328,6 @@ #define EFFECT_ACUPRESSURE 322 #define EFFECT_AROMATIC_MIST 323 #define EFFECT_POWDER 324 +#define EFFECT_SP_ATTACK_UP_HIT 325 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 4ea7c9f85..fc771a4f3 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -6325,7 +6325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_CHARGE_BEAM] = { - .effect = EFFECT_SPECIAL_ATTACK_UP, + .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 50, .type = TYPE_ELECTRIC, .accuracy = 90, @@ -7741,7 +7741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_FIERY_DANCE] = { - .effect = EFFECT_SPECIAL_ATTACK_UP, + .effect = EFFECT_SP_ATTACK_UP_HIT, .power = 80, .type = TYPE_FIRE, .accuracy = 100,