From 92a0b04b65f8c9211f2558006afcc76b775df684 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 10 Oct 2023 17:40:14 -0300 Subject: [PATCH] Applied trigger fix from upstream --- src/battle_dynamax.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index ee602a04e8..d2005a77d0 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -1258,11 +1258,10 @@ bool32 IsDynamaxTriggerSpriteActive(void) void HideDynamaxTriggerSprite(void) { - if (gBattleStruct->dynamax.triggerSpriteId != 0xFF) - { - ChangeDynamaxTriggerSprite(gBattleStruct->dynamax.triggerSpriteId, 0); - gSprites[gBattleStruct->dynamax.triggerSpriteId].tHide = TRUE; - } + if (gBattleStruct->dynamax.triggerSpriteId >= MAX_SPRITES) + return; + ChangeDynamaxTriggerSprite(gBattleStruct->dynamax.triggerSpriteId, 0); + gSprites[gBattleStruct->dynamax.triggerSpriteId].tHide = TRUE; } void DestroyDynamaxTriggerSprite(void)