resolve compiler errors

include/battle_anim.h

@@ -197,8 +197,12 @@ void sub_80BCEF4(s32 bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar
 // battle_anim_special.s
 void sub_80F1720(u8 battler, struct Pokemon *mon);
 
-// battle_anim_effects_1.s
-void AnimMoveTwisterParticle(struct Sprite *sprite);
+// battle_anim_effects_1.c
+void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
+void AnimMoveTwisterParticle(struct Sprite* sprite);
+
+// water.c
+void AnimWaterPulseRing(struct Sprite *sprite);
 
 enum
 {
@@ -284,7 +288,7 @@ void sub_8075358(u32 bgId);
 void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset);
 void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
 void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
-u8 sub_8075454(void);
+u8 GetBattleBgPaletteNum(void);
 void sub_8075458(bool8 arg0);
 void sub_8075490(struct Sprite *sprite);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
@@ -451,6 +455,9 @@ void sub_80AD800(u8 taskId);
 extern const union AnimCmd *const gUnknown_83E5958[];
 extern const union AnimCmd *const gUnknown_83E5A78[];
 
+// smokescreen.c
+u8 SmokescreenImpact(s16 x, s16 y, u8 a3);
+
 // battle_anim_utility_funcs.c
 void sub_80BA7F8(u8 taskId);
 void sub_80BA83C(u8 taskId);

include/gba/defines.h

@@ -73,10 +73,18 @@
 #define TOTAL_OBJ_TILE_COUNT 1024
 
 #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
+#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
+#define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
 
 #define RGB_BLACK RGB(0, 0, 0)
 #define RGB_WHITE RGB(31, 31, 31)
-#define RGB_WHITEALPHA (0xFFFF)
+#define RGB_RED RGB(31, 0, 0)
+#define RGB_GREEN RGB(0, 31, 0)
+#define RGB_BLUE RGB(0, 0, 31)
+#define RGB_YELLOW RGB(31, 31, 0)
+#define RGB_MAGENTA RGB(31, 0, 31)
+#define RGB_CYAN RGB(0, 31, 31)
+#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
 
 #define NAKED __attribute__((naked))
 #define UNUSED __attribute__((unused))

include/graphics.h

@@ -4215,6 +4215,7 @@ extern const u32 gBattleAnimSpritePal_CrossImpact[];
 extern const u32 gBattleAnimSpritePal_Slash2[];
 extern const u32 gBattleAnimSpritePal_WhipHit[];
 extern const u32 gBattleAnimSpritePal_BlueRing2[];
+extern const u32 gCureBubblesPal[];
 
 // battle bg
 extern const u32 gBattleAnimBgImage_Dark[];