From cfa56962e185237ddb0af037179748fcf0ad1b5b Mon Sep 17 00:00:00 2001 From: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> Date: Sat, 31 Aug 2024 04:15:56 -0700 Subject: [PATCH] fixed dupe gimmick use in doubles (#5235) Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com> --- src/battle_controller_player.c | 2 +- src/battle_gimmick.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 5fac761cf7e..bcdab75081b 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -890,7 +890,7 @@ static void HandleInputChooseMove(u32 battler) } else if (JOY_NEW(START_BUTTON)) { - if (gBattleStruct->gimmick.usableGimmick[battler] != GIMMICK_NONE) + if (gBattleStruct->gimmick.usableGimmick[battler] != GIMMICK_NONE && !HasTrainerUsedGimmick(battler, gBattleStruct->gimmick.usableGimmick[battler])) { gBattleStruct->gimmick.playerSelect ^= 1; ReloadMoveNames(battler); diff --git a/src/battle_gimmick.c b/src/battle_gimmick.c index c8ee9322186..79165c8901e 100644 --- a/src/battle_gimmick.c +++ b/src/battle_gimmick.c @@ -144,7 +144,8 @@ void CreateGimmickTriggerSprite(u32 battler) // Exit if there shouldn't be a sprite produced. if (GetBattlerSide(battler) == B_SIDE_OPPONENT || gBattleStruct->gimmick.usableGimmick[battler] == GIMMICK_NONE - || gimmick->triggerSheet == NULL) + || gimmick->triggerSheet == NULL + || HasTrainerUsedGimmick(battler, gBattleStruct->gimmick.usableGimmick[battler])) { return; }