diff options
| author | Sewef <elagroum@gmail.com> | 2019-11-24 18:00:51 +0100 |
|---|---|---|
| committer | Sewef <elagroum@gmail.com> | 2019-11-24 18:00:51 +0100 |
| commit | 07b79c3fc3b0a0df1aa329eaed8cd75d3b59af20 (patch) | |
| tree | 2345dea04e217854eb4d3e39e6905d3d1edddba5 /include | |
| parent | 1dfe34dee371d3b64b41de2ce3634ecc78bc7ee5 (diff) | |
battle_anim_effects_3 (5)
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_anim.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index d9d1d6420..c3019a5cf 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -185,7 +185,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId); void sub_80A6C68(u32 arg0); u8 GetAnimBattlerSpriteId(u8 wantedBattler); bool8 IsDoubleBattle(void); -u8 GetPaletteOffset(void); +u8 GetBattleBgPaletteNum(void); u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 5a62f65ae..0fe231cdc 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -237,7 +237,7 @@ #define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) #define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) #define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) -#define ANIM_TAG_TRI_ATTACK_TRIANGLE (ANIM_SPRITES_START + 230) +#define ANIM_TAG_TRI_ATTACK_TRIANGLE (ANIM_SPRITES_START + 230) #define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) #define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) #define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) |