From f20ec79157b0ec8fde1843b9ddd86f4261f16c6b Mon Sep 17 00:00:00 2001 From: RavePossum Date: Fri, 28 Feb 2025 20:25:10 -0500 Subject: [PATCH] Add inlines for unintuitive bitmask hideShadows field --- include/pokemon_sprite.h | 10 ++++++++++ src/battle/battle_display.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/pokemon_sprite.h b/include/pokemon_sprite.h index 5fe9c1ac44..b9451b8d51 100644 --- a/include/pokemon_sprite.h +++ b/include/pokemon_sprite.h @@ -215,4 +215,14 @@ void PokemonSprite_DecryptPt(u8 *rawCharData); void PokemonSprite_DecryptDP(u8 *rawCharData); void PokemonSprite_Decrypt(u8 *rawCharData, int narcID); +inline void PokemonSpriteManager_HideShadows(PokemonSpriteManager *monSpriteMan) +{ + PokemonSpriteManager_SetHideShadows(monSpriteMan, 1); +} + +inline void PokemonSpriteManager_ShowShadows(PokemonSpriteManager *monSpriteMan) +{ + PokemonSpriteManager_ClearHideShadows(monSpriteMan, 1); +} + #endif // POKEPLATINUM_POKEMON_SPRITE_H diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index c9f2bb9df9..3b9684abc9 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -4561,7 +4561,7 @@ static void ov16_022626C0(SysTask *param0, void *param1) } if (v0->unk_6C) { - PokemonSpriteManager_SetHideShadows(ov16_0223E000(v0->unk_00), 0x1); + PokemonSpriteManager_HideShadows(ov16_0223E000(v0->unk_00)); } ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_0C, &v0->unk_10); @@ -4575,7 +4575,7 @@ static void ov16_022626C0(SysTask *param0, void *param1) } if (v0->unk_6C) { - PokemonSpriteManager_ClearHideShadows(ov16_0223E000(v0->unk_00), 0x1); + PokemonSpriteManager_ShowShadows(ov16_0223E000(v0->unk_00)); } if ((v0->unk_10.unk_0E_0) && (v0->unk_10.unk_4C == 0) && (PokemonSprite_GetAttribute(v0->unk_08, 6) == 0)) {