summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h5
-rw-r--r--include/battle_anim.h10
-rw-r--r--include/battle_anim_813F0F4.h5
-rw-r--r--include/rom_8077ABC.h12
-rw-r--r--include/util.h6
5 files changed, 31 insertions, 7 deletions
diff --git a/include/battle.h b/include/battle.h
index c9bbb56eb..06a390cdf 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -458,6 +458,9 @@ struct Struct2017840
u8 filler2[6];
u8 unk8;
u8 unk9_0:1;
+ u8 unk9_1:1;
+ u8 unkA;
+ u16 unkC;
};
struct Struct20238C8
@@ -840,6 +843,8 @@ void SetBankFuncToOpponentBufferRunCommand(void);
void BattleStopLowHpSound(void);
void sub_8031FC4(u8, u8, bool8);
void sub_8032984(u8, u16);
+void refresh_graphics_maybe(u8, u8, u8);
+void sub_80324E0(u8 a);
void SetBankFuncToLinkOpponentBufferRunCommand(void);
diff --git a/include/battle_anim.h b/include/battle_anim.h
index b5b85625e..e3a3bd7b1 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -34,6 +34,15 @@ struct UnknownStruct3
u8 filler1[0xB];
};
+struct EWRAM_19348_Struct
+{
+ /*0x00*/ u16 species2;
+ /*0x02*/ u16 species;
+ /*0x04*/ u8 filler4[0x8];
+ /*0x0C*/ u32 otId;
+ /*0x10*/ u32 personality;
+};
+
extern void (*gAnimScriptCallback)(void);
extern u8 gAnimScriptActive;
extern u8 gAnimFriendship;
@@ -129,5 +138,6 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
s16 sub_8077104(s16 newPan, int oldPan);
void DestroyAnimSoundTask(u8 taskId);
void sub_8076464(u8 a);
+s8 BattleAnimAdjustPanning2(s8);
#endif
diff --git a/include/battle_anim_813F0F4.h b/include/battle_anim_813F0F4.h
index 230a04dbb..9916f2fe6 100644
--- a/include/battle_anim_813F0F4.h
+++ b/include/battle_anim_813F0F4.h
@@ -1,6 +1,9 @@
#ifndef GUARD_BATTLE_ANIM_813F0F4_H
#define GUARD_BATTLE_ANIM_813F0F4_H
-void sub_8141828();
+void sub_8141828(u8, struct Pokemon *);
+u8 ball_number_to_ball_processing_index(u16);
+u8 sub_814086C(u8, u8, u8, u8, u8);
+u8 sub_8141314(u8, u8, u32, u8);
#endif // GUARD_BATTLE_ANIM_813F0F4_H
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 7cfdff2d4..5be158c54 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -41,9 +41,9 @@ bool8 IsDoubleBattle(void);
void sub_8078914();
u8 sub_80789BC();
void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
-void InitAnimSpriteTranslationDeltas(struct Sprite *sprite);
-bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite);
-void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite);
+void InitAnimLinearTranslation(struct Sprite *sprite);
+bool8 TranslateAnimLinear(struct Sprite *sprite);
+void TranslateAnimLinearUntil(struct Sprite *sprite);
void sub_8078D44(struct Sprite *sprite);
void obj_id_set_rotscale(u8 sprite, s16, s16, u16);
bool8 sub_8078E38();
@@ -72,9 +72,9 @@ void sub_807A960(struct Sprite *sprite);
void sub_8078A34(struct Sprite *sprite);
void InitAnimSpritePos(struct Sprite *sprite, u8);
void sub_8078764(struct Sprite *sprite, u8);
-void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite);
+void StartAnimLinearTranslation(struct Sprite *sprite);
void sub_8078D60(struct Sprite *sprite);
-void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite);
+void InitAnimArcTranslation(struct Sprite *sprite);
void WaitAnimForDuration(struct Sprite *sprite);
void sub_8078CC0(struct Sprite *sprite);
void sub_8078600(struct Sprite *sprite);
@@ -104,7 +104,7 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3);
bool8 sub_807992C(struct Task *task);
u8 sub_8077FC0(u8 slot);
void move_anim_8074EE0(struct Sprite *sprite);
-bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite);
+bool8 TranslateAnimArc(struct Sprite *sprite);
bool8 sub_8078CE8(struct Sprite *sprite);
void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
void sub_8078BD4(struct Sprite *sprite);
diff --git a/include/util.h b/include/util.h
index 02c503f75..1a3bd5f1a 100644
--- a/include/util.h
+++ b/include/util.h
@@ -3,6 +3,12 @@
#include "sprite.h"
+//Extracts the upper 16 bits of a 32-bit number
+#define HIHALF(n) (((n) & 0xFFFF0000) >> 16)
+
+//Extracts the lower 16 bits of a 32-bit number
+#define LOHALF(n) ((n) & 0xFFFF)
+
extern const u8 gMiscBlank_Gfx[];
extern const u32 gBitTable[];