From 2ffff788b441177752195fd3f2a4f4a56c2f95dc Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Fri, 6 May 2022 22:29:40 -0700 Subject: [PATCH] fixed Fling --- data/battle_scripts_1.s | 1 + src/battle_script_commands.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b8345a917..16ad64b5c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -622,6 +622,7 @@ BattleScript_EffectFlingConsumeBerry: restorebattleritem BS_TARGET BattleScript_FlingEnd: tryfaintmon BS_TARGET + trysymbiosis goto BattleScript_MoveEnd BattleScript_FlingFlameOrb: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1b53b0c4e..6d1055cb0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7066,6 +7066,7 @@ static bool32 TrySymbiosis(u32 battler, u32 itemId) && gBattleStruct->changedItems[battler] == ITEM_NONE && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_BUTTON && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_PACK + && gCurrentMove != MOVE_FLING && SYMBIOSIS_CHECK(battler, ally)) { BestowItem(ally, battler); @@ -9607,7 +9608,7 @@ static void Cmd_various(void) case VARIOUS_SWAP_SIDE_STATUSES: CourtChangeSwapSideStatuses(); break; - case VARIOUS_TRY_SYMBIOSIS: //called by Bestow and Bug Bite, which have cases that don't call Cmd_removeitem. + case VARIOUS_TRY_SYMBIOSIS: //called by Bestow, Fling, and Bug Bite, which don't work with Cmd_removeitem. if (SYMBIOSIS_CHECK(gActiveBattler, gActiveBattler ^ BIT_FLANK)) { BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler);