From de72056f0ddeee7e6275f44ae7facb973efb1176 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:53:57 +0200 Subject: [PATCH] fix ghost unveil animation --- data/battle_anim_scripts.s | 2 +- include/battle_gfx_sfx_util.h | 2 +- src/battle_gfx_sfx_util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c83318f91..a64c02b28 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -152,7 +152,7 @@ General_SilphScoped: monbg ANIM_ATTACKER playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 - createvisualtask AnimTask_TransformMon, 2, 255 + createvisualtask AnimTask_TransformMon, 3, FALSE, FALSE, TRUE waitsound waitforvisualfinish clearmonbg ANIM_ATTACKER diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index ab7613a64..e11499198 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -22,7 +22,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId); void ClearSpritesHealthboxAnimData(void); void CopyAllBattleSpritesInvisibilities(void); void CopyBattleSpriteInvisibility(u8 battlerId); -void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bool8 trackEnemyPersonality, bool8 ghostUnveil); +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bool32 trackEnemyPersonality, bool32 ghostUnveil); void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite); void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId); void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index b099395d1..9f14da4d7 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -652,7 +652,7 @@ void CopyBattleSpriteInvisibility(u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible; } -void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bool8 trackEnemyPersonality, bool8 ghostUnveil) +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bool32 trackEnemyPersonality, bool32 ghostUnveil) { u32 personalityValue, position, paletteOffset, targetSpecies; bool8 isShiny;