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

Fix Payday

Browse Source 
Only scatters coins on the first hit of Parental Bond.
This commit is contained in:
BuffelSaft 2021-11-13 14:01:36 +13:00
parent 6232b046b1
commit d0336a9edf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle_script_commands.c
View File

@ -1141,7 +1141,6 @@ static const u16 sFinalStrikeOnlyEffects[] =
EFFECT_BUG_BITE, EFFECT_BUG_BITE,
EFFECT_THIEF, EFFECT_THIEF,
EFFECT_BURN_UP, EFFECT_BURN_UP,
EFFECT_PAY_DAY,
EFFECT_SECRET_POWER, EFFECT_SECRET_POWER,
EFFECT_HIT_SWITCH_TARGET, EFFECT_HIT_SWITCH_TARGET,
EFFECT_SMACK_DOWN, EFFECT_SMACK_DOWN,
@ -3019,15 +3018,21 @@ void SetMoveEffect(bool32 primary, u32 certain)
} }
break; break;
case MOVE_EFFECT_PAYDAY: case MOVE_EFFECT_PAYDAY:
if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER) // Don't scatter coins on the second hit of Parental Bond
if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER && gSpecialStatuses[gBattlerAttacker].parentalBondOn != 1)
{ {
u16 PayDay = gPaydayMoney; u16 PayDay = gPaydayMoney;
gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5);
if (PayDay > gPaydayMoney) if (PayDay > gPaydayMoney)
gPaydayMoney = 0xFFFF; gPaydayMoney = 0xFFFF;
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_MoveEffectPayDay;
}
else
{
gBattlescriptCurrInstr++;
} }
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleScripting.moveEffect];
break; break;
case MOVE_EFFECT_HAPPY_HOUR: case MOVE_EFFECT_HAPPY_HOUR:
if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER && !gBattleStruct->moneyMultiplierMove) if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER && !gBattleStruct->moneyMultiplierMove)