atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix safari zone (#2898)

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2023-04-10 09:07:27 -04:00 committed by GitHub
commit 16b89e9991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/battle_interface.h
View file

@ -81,7 +81,6 @@ u8 CreateSafariPlayerHealthboxSprites(void);
void SetBattleBarStruct(u8 battler, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue); void SetBattleBarStruct(u8 battler, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
void SetHealthboxSpriteInvisible(u8 healthboxSpriteId); void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
void SetHealthboxSpriteVisible(u8 healthboxSpriteId); void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
void DestoryHealthboxSprite(u8 healthboxSpriteId);
void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly); void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly);
void UpdateOamPriorityInAllHealthboxes(u8 priority, bool32 hideHpBoxes); void UpdateOamPriorityInAllHealthboxes(u8 priority, bool32 hideHpBoxes);
void InitBattlerHealthboxCoords(u8 battler); void InitBattlerHealthboxCoords(u8 battler);

21
src/battle_interface.c
View file

@ -186,7 +186,6 @@ static void MegaIndicator_SetVisibilities(u32 healthboxId, bool32 invisible);
static void MegaIndicator_UpdateLevel(u32 healthboxId, u32 level); static void MegaIndicator_UpdateLevel(u32 healthboxId, u32 level);
static void MegaIndicator_CreateSprites(u32 battlerId, u32 healthboxSpriteId); static void MegaIndicator_CreateSprites(u32 battlerId, u32 healthboxSpriteId);
static void MegaIndicator_UpdateOamPriorities(u32 healthboxId, u32 oamPriority); static void MegaIndicator_UpdateOamPriorities(u32 healthboxId, u32 oamPriority);
static void MegaIndicator_DestroySprites(u32 healthboxSpriteId);
static void SpriteCb_MegaIndicator(struct Sprite *); static void SpriteCb_MegaIndicator(struct Sprite *);
static u8 GetStatusIconForBattlerId(u8, u8); static u8 GetStatusIconForBattlerId(u8, u8);
@ -884,14 +883,6 @@ static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
gSprites[spriteId].y = y; gSprites[spriteId].y = y;
} }
void DestoryHealthboxSprite(u8 healthboxSpriteId)
{
MegaIndicator_DestroySprites(healthboxSpriteId);
DestroySprite(&gSprites[gSprites[healthboxSpriteId].oam.affineParam]);
DestroySprite(&gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId]);
DestroySprite(&gSprites[healthboxSpriteId]);
}
void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBattlerOnly) void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBattlerOnly)
{ {
@ -1540,6 +1531,9 @@ void MegaIndicator_SetVisibilities(u32 healthboxId, bool32 invisible)
u8 *spriteIds = MegaIndicator_GetSpriteIds(healthboxId); u8 *spriteIds = MegaIndicator_GetSpriteIds(healthboxId);
u32 battlerId = gSprites[healthboxId].hMain_Battler; u32 battlerId = gSprites[healthboxId].hMain_Battler;
if (GetSafariZoneFlag())
return;
for (i = 0; i < INDICATOR_COUNT; i++) for (i = 0; i < INDICATOR_COUNT; i++)
{ {
if (invisible == TRUE) if (invisible == TRUE)
@ -1599,15 +1593,6 @@ static void MegaIndicator_CreateSprites(u32 battlerId, u32 healthboxSpriteId)
} }
} }
static void MegaIndicator_DestroySprites(u32 healthboxSpriteId)
{
u32 i;
u8 *spriteIds = MegaIndicator_GetSpriteIds(healthboxSpriteId);
for (i = 0; i < INDICATOR_COUNT; i++)
DestroySprite(&gSprites[spriteIds[i]]);
}
static void SpriteCb_MegaIndicator(struct Sprite *sprite) static void SpriteCb_MegaIndicator(struct Sprite *sprite)
{ {
u32 battlerId = sprite->tBattler; u32 battlerId = sprite->tBattler;