diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /include/battle_anim.h | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index c3601bbd9..541c165e7 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,16 +3,17 @@ #include "battle.h" #include "constants/battle_anim.h" +#include "task.h" enum { BG_ANIM_SCREEN_SIZE, BG_ANIM_AREA_OVERFLOW_MODE, - BG_ANIM2, + BG_ANIM_MOSAIC, BG_ANIM_CHAR_BASE_BLOCK, BG_ANIM_PRIORITY, - BG_ANIM_5, - BG_ANIM_6 + BG_ANIM_PALETTES_MODE, + BG_ANIM_SCREEN_BASE_BLOCK, }; struct UnknownAnimStruct2 @@ -66,11 +67,11 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); void sub_80A4720(u16 a, u16 *b, u32 c, u8 d); void sub_80A477C(bool8); -// battle_anim_80FE840.s +// battle_intro.s void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); -void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, void *arg5, u16 *arg6, u16 arg7); +void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 arg7); void HandleIntroSlide(u8 terrainId); -u32 GetAnimBgAttribute(u8 bgId, u8 attributeId); +int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s void sub_80A6450(struct Sprite *sprite); @@ -124,6 +125,12 @@ void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6CC0(u32, const void*, u32); void sub_80A6DAC(bool8); void sub_80A634C(struct Sprite *); +void sub_80A653C(struct Sprite *); +void sub_80A7E6C(u8 spriteId); +void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +u8 sub_80A80C8(struct Task *task); +void sub_80A8EE4(struct Sprite *); +void sub_80A67F4(struct Sprite *); enum { |