From d363ed8152678b5945b4a428dc79207e1c2f0cc6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 11 Feb 2023 19:55:08 +0100 Subject: [PATCH 1/2] z indicator in double battles --- src/battle_z_move.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 2eccd82f5..2406c6bb3 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -372,7 +372,7 @@ static void ShowZMoveTriggerSprite(void) { struct Sprite *sprite = &gSprites[gBattleStruct->zmove.triggerSpriteId]; gBattleStruct->zmove.viable = TRUE; - CreateZMoveTriggerSprite(sprite->tBattler, TRUE); + CreateZMoveTriggerSprite(gActiveBattler, TRUE); } void DestroyZMoveTriggerSprite(void) From 2b32bfcdc1a4fc16641ea1651e5a7355f49b7605 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 12 Feb 2023 19:39:14 +0100 Subject: [PATCH 2/2] add battlerId arg to ShowZMoveTriggerSprite --- src/battle_z_move.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 2406c6bb3..bdbf5674c 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -50,7 +50,7 @@ static u16 GetSignatureZMove(u16 move, u16 species, u16 item); static u16 GetTypeBasedZMove(u16 move, u8 battler); static void ZMoveSelectionDisplayPpNumber(void); static void ZMoveSelectionDisplayPower(u16 move, u16 zMove); -static void ShowZMoveTriggerSprite(void); +static void ShowZMoveTriggerSprite(u8 battleId); static bool32 AreStatsMaxed(u8 battlerId, u8 n); static u8 GetZMoveScore(u8 battlerAtk, u8 battlerDef, u16 baseMove, u16 zMove); static void ZMoveSelectionDisplayMoveType(u16 zMove); @@ -258,7 +258,7 @@ bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex) if (gBattleStruct->zmove.viable && !viableZMove) HideZMoveTriggerSprite(); // Was a viable z move, now is not -> slide out else if (!gBattleStruct->zmove.viable && viableZMove) - ShowZMoveTriggerSprite(); // Was not a viable z move, now is -> slide back in + ShowZMoveTriggerSprite(battlerId); // Was not a viable z move, now is -> slide back in } #define SINGLES_Z_TRIGGER_POS_X_OPTIMAL (29) @@ -368,11 +368,11 @@ void HideZMoveTriggerSprite(void) gBattleStruct->zmove.viable = FALSE; } -static void ShowZMoveTriggerSprite(void) +static void ShowZMoveTriggerSprite(u8 battlerId) { struct Sprite *sprite = &gSprites[gBattleStruct->zmove.triggerSpriteId]; gBattleStruct->zmove.viable = TRUE; - CreateZMoveTriggerSprite(gActiveBattler, TRUE); + CreateZMoveTriggerSprite(battlerId, TRUE); } void DestroyZMoveTriggerSprite(void)