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

Tweaked Oblivious

Browse Source 
-Made it unaffected by a foe's taunt.
-Changed the Battle Script it calls when a foe tries to infatuate.
This commit is contained in:
LOuroboros 2021-03-31 21:20:00 -03:00
parent d270dee6bc
commit da24b9c251
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_script_commands.c
View File

@ -9689,7 +9689,7 @@ static void Cmd_tryinfatuating(void)
if (GetBattlerAbility(gBattlerTarget) == ABILITY_OBLIVIOUS)
{
gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction;
gBattlescriptCurrInstr = BattleScript_NotAffected;
gLastUsedAbility = ABILITY_OBLIVIOUS;
RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS);
}
@ -11094,7 +11094,13 @@ static void Cmd_jumpifnodamage(void)
static void Cmd_settaunt(void)
{
if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
if (GetBattlerAbility(gBattlerTarget) == ABILITY_OBLIVIOUS)
{
gBattlescriptCurrInstr = BattleScript_NotAffected;
gLastUsedAbility = ABILITY_OBLIVIOUS;
RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS);
}
else if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
{
u8 turns = 4;
if (GetBattlerTurnOrderNum(gBattlerTarget) > GetBattlerTurnOrderNum(gBattlerAttacker))