From 9c4aba116e2f7b2df390d14292d18ba5be870f15 Mon Sep 17 00:00:00 2001 From: WillKolada <57021938+WillKolada@users.noreply.github.com> Date: Thu, 9 May 2024 03:27:46 -0500 Subject: [PATCH] Prevents Terastallization UI from making part of the Safari Zone battle UI invisible (#4529) * Update battle_terastal.c Checks if the Safari Zone flag is set to avoid making part of the battle UI invisible. * Update src/battle_terastal.c --------- Co-authored-by: Bassoonian --- src/battle_terastal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/battle_terastal.c b/src/battle_terastal.c index 62d83efd5a..796cc4ba08 100644 --- a/src/battle_terastal.c +++ b/src/battle_terastal.c @@ -8,6 +8,7 @@ #include "item.h" #include "palette.h" #include "pokemon.h" +#include "safari_zone.h" #include "sprite.h" #include "util.h" #include "constants/abilities.h" @@ -722,6 +723,9 @@ void TeraIndicator_SetVisibilities(u32 healthboxId, bool32 invisible) u8 spriteId = TeraIndicator_GetSpriteId(healthboxId); u32 battler = gSprites[healthboxId].hMain_Battler; + if (GetSafariZoneFlag()) + return; + if (invisible == TRUE) gSprites[spriteId].invisible = TRUE; else // Try visible.