diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /include/battle_gfx_sfx_util.h | |
parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) |
move mon data fix conflicts
Diffstat (limited to 'include/battle_gfx_sfx_util.h')
-rw-r--r-- | include/battle_gfx_sfx_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index 313a29811..75bc3e003 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -39,8 +39,8 @@ void sub_805EAE8(void); void sub_805EB9C(u8 affineMode); void LoadAndCreateEnemyShadowSprites(void); void SpriteCB_SetInvisible(struct Sprite *sprite); -void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species); -void EnemyShadowCallbackToSetInvisible(u8 bank); +void SetBattlerShadowSpriteCallback(u8 bank, u16 species); +void HideBattlerShadowSprite(u8 bank); void sub_805EF14(void); void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute); void AllocateMonSpritesGfx(void); |