ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented Good as Gold's effect

Browse Source
This commit is contained in:
LOuroboros 2022-12-04 20:17:14 -03:00
parent e25f843db3
commit de05c4dd56
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/battle_scripts_1.s
View File

@ -9888,6 +9888,15 @@ BattleScript_WindRiderActivatesMoveEnd::
BattleScript_WindRiderActivatesMoveEnd_End: BattleScript_WindRiderActivatesMoveEnd_End:
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_GoodAsGoldActivates::
attackstring
ppreduce
showabilitypopup BS_TARGET
pause B_WAIT_TIME_SHORT
printstring STRINGID_ITDOESNTAFFECT
waitmessage B_WAIT_TIME_MED
goto BattleScript_MoveEnd
BattleScript_PastelVeilActivates:: BattleScript_PastelVeilActivates::
setbyte gBattleCommunication, 0 setbyte gBattleCommunication, 0
setbyte gBattleCommunication + 1, 0 setbyte gBattleCommunication + 1, 0

1
include/battle_scripts.h
View File

@ -442,6 +442,7 @@ extern const u8 BattleScript_WindPowerActivates[];
extern const u8 BattleScript_WindPowerActivatesEnd2[]; extern const u8 BattleScript_WindPowerActivatesEnd2[];
extern const u8 BattleScript_ProtosynthesisActivates[]; extern const u8 BattleScript_ProtosynthesisActivates[];
extern const u8 BattleScript_QuarkDriveActivates[]; extern const u8 BattleScript_QuarkDriveActivates[];
extern const u8 BattleScript_GoodAsGoldActivates[];
// zmoves // zmoves
extern const u8 BattleScript_ZMoveActivateDamaging[]; extern const u8 BattleScript_ZMoveActivateDamaging[];

9
src/battle_util.c
View File

@ -5149,6 +5149,15 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
gBattlescriptCurrInstr = BattleScript_WindRiderActivatesMoveEnd; gBattlescriptCurrInstr = BattleScript_WindRiderActivatesMoveEnd;
effect = 1; effect = 1;
} }
else if (GetBattlerAbility(gBattlerTarget) == ABILITY_GOOD_AS_GOLD
&& IS_MOVE_STATUS(gCurrentMove)
&& !(moveTarget & MOVE_TARGET_USER)
&& !(moveTarget & MOVE_TARGET_OPPONENTS_FIELD)
&& !(moveTarget & MOVE_TARGET_ALL_BATTLERS))
{
gBattlescriptCurrInstr = BattleScript_GoodAsGoldActivates;
effect = 1;
}
break; break;
} }
case ABILITYEFFECT_ABSORBING: // 3 case ABILITYEFFECT_ABSORBING: // 3