summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h1
-rw-r--r--include/battle_anim.h2
-rw-r--r--include/battle_gfx_sfx_util.h4
-rw-r--r--include/bg.h14
-rw-r--r--include/link.h2
-rw-r--r--include/reshow_battle_screen.h2
6 files changed, 22 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 357bbbd8c..1e50a5dc1 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -795,6 +795,7 @@ void ApplyPlayerChosenFrameToBattleMenu(void);
bool8 LoadChosenBattleElement(u8 caseId);
void DrawMainBattleBackground(void);
void task00_0800F6FC(u8 taskId);
+void sub_800F324(void);
enum
{
diff --git a/include/battle_anim.h b/include/battle_anim.h
index fb744c316..8e4f2a7ea 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -129,6 +129,7 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 bank);
u8 sub_80A82E4(u8 bank);
u8 GetSubstituteSpriteDefault_Y(u8 bank);
+u8 GetGhostSpriteDefault_Y(u8 battlerId);
// battle_anim_80A9C70.s
void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
@@ -148,6 +149,7 @@ void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
bool8 IsContest(void);
void sub_80759DC(u8 spriteId);
bool8 IsBattlerSpritePresent(u8 battlerId);
+u8 GetBattlerSpriteSubpriority(u8 battlerId);
// battle_anim_mon_movement.c
void AnimTask_ShakeMon(u8 taskId);
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h
index 39cea7ad1..667686af8 100644
--- a/include/battle_gfx_sfx_util.h
+++ b/include/battle_gfx_sfx_util.h
@@ -12,9 +12,9 @@ bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
bool8 mplay_80342A4(u8 battlerId);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
-void DecompressGhostFrontPic(u16 frontPicId, u8 battlerId);
+void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId);
void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId);
-void sub_8034750(u16 a1, u8 a2);
+void DecompressTrainerBackPalette(u16 a1, u8 a2);
void nullsub_16(u8 a1);
void FreeTrainerFrontPicPaletteAndTile(u16 frontPicId);
bool8 BattleLoadAllHealthBoxesGfx(u8 state);
diff --git a/include/bg.h b/include/bg.h
index 40c51167f..70ec38275 100644
--- a/include/bg.h
+++ b/include/bg.h
@@ -15,6 +15,20 @@ struct BGCntrlBitfield // for the I/O registers
enum
{
+ BG_ATTR_CHARBASEINDEX = 1,
+ BG_ATTR_MAPBASEINDEX,
+ BG_ATTR_SCREENSIZE,
+ BG_ATTR_PALETTEMODE,
+ BG_ATTR_MOSAIC,
+ BG_ATTR_WRAPAROUND,
+ BG_ATTR_PRIORITY,
+ BG_ATTR_METRIC,
+ BG_ATTR_TYPE,
+ BG_ATTR_BASETILE,
+};
+
+enum
+{
BG_CTRL_ATTR_VISIBLE = 1,
BG_CTRL_ATTR_CHARBASEINDEX = 2,
BG_CTRL_ATTR_MAPBASEINDEX = 3,
diff --git a/include/link.h b/include/link.h
index 190a9d96a..d816cfcf9 100644
--- a/include/link.h
+++ b/include/link.h
@@ -211,5 +211,7 @@ bool32 sub_800B270(void);
void sub_800B388(void);
void sub_8054A28(void);
void sub_800B1F4(void);
+void LoadWirelessStatusIndicatorSpriteGfx(void);
+void CreateWirelessStatusIndicatorSprite(u8, u8);
#endif // GUARD_LINK_H
diff --git a/include/reshow_battle_screen.h b/include/reshow_battle_screen.h
index 9d1ec30f2..cc20eed96 100644
--- a/include/reshow_battle_screen.h
+++ b/include/reshow_battle_screen.h
@@ -3,7 +3,7 @@
#include "global.h"
-void nullsub_35(void);
+void nullsub_44(void);
void ReshowBattleScreenAfterMenu(void);
#endif // GUARD_RESHOW_BATTLE_SCREEN_H