From 095decbd278216893fe9f374a3393c180b5e01c8 Mon Sep 17 00:00:00 2001 From: Nephrite Date: Fri, 12 Jan 2024 07:25:51 +0900 Subject: [PATCH] FINAL review changes --- src/battle_script_commands.c | 13 +------------ test/battle/move_effect/fling.c | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 960a6db293..50d76a9e5c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2753,17 +2753,6 @@ void StealTargetItem(u8 battlerStealer, u8 battlerItem) return; \ } -// For a future update... -// #define INCREMENT_RETURN_ON_PARENTAL_BOND_1ST_HIT \ -// { \ -// if (gSpecialStatuses[gBattlerAttacker].parentalBondState == PARENTAL_BOND_1ST_HIT \ -// && gBattleMons[gEffectBattler].hp != 0) \ -// { \ -// gBattlescriptCurrInstr++; \ -// return; \ -// } \ -// } - void SetMoveEffect(bool32 primary, bool32 certain) { s32 i, affectsUser = 0; @@ -3666,7 +3655,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) case TYPE_FIRE: // Burn Up gBattlescriptCurrInstr = BattleScript_RemoveFireType; break; - case TYPE_ELECTRIC: // Electro Shot + case TYPE_ELECTRIC: // Double Shot gBattlescriptCurrInstr = BattleScript_RemoveElectricType; break; default: diff --git a/test/battle/move_effect/fling.c b/test/battle/move_effect/fling.c index d4348b95cc..1f31a7d505 100644 --- a/test/battle/move_effect/fling.c +++ b/test/battle/move_effect/fling.c @@ -257,7 +257,7 @@ SINGLE_BATTLE_TEST("Fling applies special effects when throwing specific Items") } } -SINGLE_BATTLE_TEST("Fling's effects are blocked by Shield Dust") +SINGLE_BATTLE_TEST("Fling's secondary effects are blocked by Shield Dust") { u16 item;