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

Removed the unnecessary Dragon Energy effect

Browse Source 
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
This commit is contained in:
LOuroboros 2020-12-12 01:19:15 -03:00
parent 0ac026e6ca
commit c5e04cf243
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -365,7 +365,6 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectFairyLock .4byte BattleScript_EffectFairyLock
.4byte BattleScript_EffectAllySwitch .4byte BattleScript_EffectAllySwitch
.4byte BattleScript_EffectSleepHit .4byte BattleScript_EffectSleepHit
.4byte BattleScript_EffectDragonEnergy
BattleScript_EffectSleepHit: BattleScript_EffectSleepHit:
setmoveeffect MOVE_EFFECT_SLEEP setmoveeffect MOVE_EFFECT_SLEEP
@ -2008,7 +2007,6 @@ BattleScript_EffectPlaceholder:
printstring STRINGID_NOTDONEYET printstring STRINGID_NOTDONEYET
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectDragonEnergy:
BattleScript_EffectStompingTantrum: BattleScript_EffectStompingTantrum:
BattleScript_EffectEvasionDownHit: BattleScript_EffectEvasionDownHit:
BattleScript_EffectVitalThrow: BattleScript_EffectVitalThrow:

1
include/constants/battle_move_effects.h
View File

@ -351,6 +351,5 @@
#define EFFECT_FAIRY_LOCK 345 #define EFFECT_FAIRY_LOCK 345
#define EFFECT_ALLY_SWITCH 346 #define EFFECT_ALLY_SWITCH 346
#define EFFECT_SLEEP_HIT 347 // Relic Song #define EFFECT_SLEEP_HIT 347 // Relic Song
#define EFFECT_DRAGON_ENERGY 348
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

3
src/battle_util.c
View File

@ -6581,9 +6581,6 @@ 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_DRAGON_ENERGY:
basePower = 150 * gBattleMons[battlerAtk].hp / gBattleMons[battlerAtk].maxHP;
break;
} }
if (basePower == 0) if (basePower == 0)

4
src/data/battle_moves.h
View File

@ -11403,13 +11403,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_DRAGON_ENERGY] = [MOVE_DRAGON_ENERGY] =
{ {
.effect = EFFECT_DRAGON_ENERGY, .effect = EFFECT_ERUPTION,
.power = 150, .power = 150,
.type = TYPE_DRAGON, .type = TYPE_DRAGON,
.accuracy = 100, .accuracy = 100,
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_BOTH,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL, .split = SPLIT_SPECIAL,