ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 10:52:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix echoed voice power boost

Browse Source
This commit is contained in:
ghoulslash 2021-09-09 11:15:58 -04:00
parent 9ad4feecf2
commit 6915b029bd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle.h
View File

@ -217,7 +217,6 @@ struct FieldTimer
u8 mistyTerrainTimer; u8 mistyTerrainTimer;
u8 electricTerrainTimer; u8 electricTerrainTimer;
u8 psychicTerrainTimer; u8 psychicTerrainTimer;
u8 echoVoiceCounter;
u8 gravityTimer; u8 gravityTimer;
u8 fairyLockTimer; u8 fairyLockTimer;
}; };

2
src/battle_script_commands.c
View File

@ -1743,7 +1743,7 @@ static void Cmd_ppreduce(void)
if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattlerAttacker].pp[gCurrMovePos]) if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattlerAttacker].pp[gCurrMovePos])
{ {
gProtectStructs[gBattlerAttacker].notFirstStrike = 1; gProtectStructs[gBattlerAttacker].notFirstStrike = 1;
// For item Metronome // For item Metronome, echoed voice
if (gCurrentMove == gLastResultingMoves[gBattlerAttacker] if (gCurrentMove == gLastResultingMoves[gBattlerAttacker]
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& !WasUnableToUseMove(gBattlerAttacker)) && !WasUnableToUseMove(gBattlerAttacker))

7
src/battle_util.c
View File

@ -7192,12 +7192,13 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
basePower = 150; basePower = 150;
break; break;
case EFFECT_ECHOED_VOICE: case EFFECT_ECHOED_VOICE:
if (gFieldTimers.echoVoiceCounter != 0) // gBattleStruct->sameMoveTurns incremented in ppreduce
if (gBattleStruct->sameMoveTurns[battlerAtk] != 0)
{ {
if (gFieldTimers.echoVoiceCounter >= 5) if (gBattleStruct->sameMoveTurns[battlerAtk] >= 5)
basePower *= 5; basePower *= 5;
else else
basePower *= gFieldTimers.echoVoiceCounter; basePower *= gBattleStruct->sameMoveTurns[battlerAtk];
} }
break; break;
case EFFECT_PAYBACK: case EFFECT_PAYBACK: