Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Charge Beam effect

Browse Source
This commit is contained in:
DizzyEggg 2019-01-27 11:57:13 +01:00
parent 6653ecf676
commit 88b788bfab
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/battle_scripts_1.s
View File

@ -340,6 +340,11 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectAcupressure .4byte BattleScript_EffectAcupressure
.4byte BattleScript_EffectAromaticMist .4byte BattleScript_EffectAromaticMist
.4byte BattleScript_EffectPowder .4byte BattleScript_EffectPowder
.4byte BattleScript_EffectSpAtkUpHit
BattleScript_EffectSpAtkUpHit:
setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
BattleScript_EffectPowder: BattleScript_EffectPowder:
attackcanceler attackcanceler

1
include/constants/battle_move_effects.h
View File

@ -328,5 +328,6 @@
#define EFFECT_ACUPRESSURE 322 #define EFFECT_ACUPRESSURE 322
#define EFFECT_AROMATIC_MIST 323 #define EFFECT_AROMATIC_MIST 323
#define EFFECT_POWDER 324 #define EFFECT_POWDER 324
#define EFFECT_SP_ATTACK_UP_HIT 325
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/data/battle_moves.h
View File

@ -6325,7 +6325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_CHARGE_BEAM] = [MOVE_CHARGE_BEAM] =
{ {
.effect = EFFECT_SPECIAL_ATTACK_UP, .effect = EFFECT_SP_ATTACK_UP_HIT,
.power = 50, .power = 50,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 90, .accuracy = 90,
@ -7741,7 +7741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_FIERY_DANCE] = [MOVE_FIERY_DANCE] =
{ {
.effect = EFFECT_SPECIAL_ATTACK_UP, .effect = EFFECT_SP_ATTACK_UP_HIT,
.power = 80, .power = 80,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 100, .accuracy = 100,