ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed Fling

Browse Source
This commit is contained in:
AgustinGDLV 2022-05-06 22:29:40 -07:00
parent 542a0f07b4
commit 2ffff788b4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

@ -622,6 +622,7 @@ BattleScript_EffectFlingConsumeBerry:
restorebattleritem BS_TARGET restorebattleritem BS_TARGET
BattleScript_FlingEnd: BattleScript_FlingEnd:
tryfaintmon BS_TARGET tryfaintmon BS_TARGET
trysymbiosis
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_FlingFlameOrb: BattleScript_FlingFlameOrb:

3
src/battle_script_commands.c
View File

@ -7066,6 +7066,7 @@ static bool32 TrySymbiosis(u32 battler, u32 itemId)
&& gBattleStruct->changedItems[battler] == ITEM_NONE && gBattleStruct->changedItems[battler] == ITEM_NONE
&& ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_BUTTON && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_BUTTON
&& ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_PACK && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_PACK
&& gCurrentMove != MOVE_FLING
&& SYMBIOSIS_CHECK(battler, ally)) && SYMBIOSIS_CHECK(battler, ally))
{ {
BestowItem(ally, battler); BestowItem(ally, battler);
@ -9607,7 +9608,7 @@ static void Cmd_various(void)
case VARIOUS_SWAP_SIDE_STATUSES: case VARIOUS_SWAP_SIDE_STATUSES:
CourtChangeSwapSideStatuses(); CourtChangeSwapSideStatuses();
break; 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)) if (SYMBIOSIS_CHECK(gActiveBattler, gActiveBattler ^ BIT_FLANK))
{ {
BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler); BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler);