diff options
| author | Evan <eroelke@gmail.com> | 2019-12-03 10:54:47 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-03 10:54:47 -0700 |
| commit | aacb202f812d0b7a54ba40eaafe48e7e21451f8c (patch) | |
| tree | c7199f1c8ad97af33c431bae1c5d1984aa23ca3a /include | |
| parent | f2eb137154f1afe98ed86f883662a01ba318efa6 (diff) | |
resolve compiler errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 14 | ||||
| -rw-r--r-- | include/math_util.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 60245ee55..cc60dfc5a 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -454,6 +454,7 @@ void sub_80AD800(u8 taskId); // water.s extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5A78[]; +void AnimWaterPulseRing(struct Sprite *sprite); // smokescreen.c u8 SmokescreenImpact(s16 x, s16 y, u8 a3); diff --git a/include/graphics.h b/include/graphics.h index bd839882a..30b1011f3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3962,6 +3962,8 @@ extern const u32 gBattleAnimSpriteGfx_Protect[]; extern const u32 gBattleAnimSpriteGfx_DirtMound[]; extern const u32 gBattleAnimSpriteGfx_Shock3[]; extern const u32 gBattleAnimSpriteGfx_WeatherBall[]; +extern const u32 gBattleAnim_ScaryFaceGfx[]; +extern const u32 gBattleAnim_ScaryFacePal[]; extern const u32 gBattleAnimBgTilemap_ScaryFacePlayer[]; extern const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[]; extern const u32 gBattleAnimBgTilemap_ScaryFaceContest[]; @@ -4215,7 +4217,19 @@ extern const u32 gBattleAnimSpritePal_CrossImpact[]; extern const u32 gBattleAnimSpritePal_Slash2[]; extern const u32 gBattleAnimSpritePal_WhipHit[]; extern const u32 gBattleAnimSpritePal_BlueRing2[]; + +// battle anim task +extern const u32 gUnknown_D2EC24_Gfx[]; +extern const u32 gUnknown_D2EC24_Tilemap[]; +extern const u32 gCureBubblesGfx[]; extern const u32 gCureBubblesPal[]; +extern const u32 gCureBubblesTilemap[]; +extern const u32 gBattleAnimBg_AttractGfx[]; +extern const u32 gBattleAnimBg_AttractTilemap[]; +extern const u32 gBattleAnimBg_AttractPal[]; +extern const u32 gBattleAnim_MorningSunGfx[]; +extern const u32 gBattleAnim_MorningSunTilemap[]; +extern const u32 gBattleAnim_MorningSunPal[]; // battle bg extern const u32 gBattleAnimBgImage_Dark[]; diff --git a/include/math_util.h b/include/math_util.h index 74dbbe98e..473be5d45 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -2,5 +2,6 @@ #define GUARD_MATH_UTIL_H s16 sub_80D8B90(s16 y); +s16 sub_80D8AA0(s16 x, s16 y); #endif //GUARD_MATH_UTIL_H |