From 68814c42ded612c0336bef6686556c35b7fea80a Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 23 Oct 2018 08:25:51 -0400 Subject: begin 80FE840 data --- include/battle_anim.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index fcb430816..1cb19200d 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "battle.h" #include "constants/battle_anim.h" enum @@ -128,4 +129,14 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); +extern const struct OamData gUnknown_08524944; +extern const struct OamData gUnknown_08524A8C; +extern const struct OamData gUnknown_08524904; +extern const struct OamData gUnknown_085249C4; +extern const struct OamData gUnknown_0852490C; +extern const struct OamData gUnknown_08524934; +extern const struct OamData gUnknown_08524974; +extern const struct OamData gUnknown_0852499C; +extern const struct OamData gUnknown_085249CC; + #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 2f4b00e34b650bbc42228280a7a4bbb8e8ebf9c6 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 23 Oct 2018 12:17:31 -0400 Subject: finish effects_1 data --- include/battle_anim.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 1cb19200d..c7884aa18 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -138,5 +138,17 @@ extern const struct OamData gUnknown_08524934; extern const struct OamData gUnknown_08524974; extern const struct OamData gUnknown_0852499C; extern const struct OamData gUnknown_085249CC; +extern const struct OamData gUnknown_08524914; +extern const struct OamData gUnknown_0852496C; +extern const struct OamData gUnknown_08524A34; +extern const struct OamData gUnknown_08524A3C; +extern const struct OamData gUnknown_08524A94; +extern const struct OamData gUnknown_0852490C; +extern const struct OamData gUnknown_08524974; +extern const struct OamData gUnknown_08524954; +extern const struct OamData gUnknown_08524AE4; +extern const struct OamData gUnknown_08524914; +extern const struct OamData gUnknown_085249CC; +extern const struct OamData gUnknown_085249D4; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 22a0b58e57a26f8636b0afcb841aef8ae4910192 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 24 Oct 2018 15:52:21 -0400 Subject: effects_2 and water data --- include/battle_anim.h | 19 +++++++++++++++---- include/sprite.h | 9 +++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index c7884aa18..61659c350 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -143,12 +143,23 @@ extern const struct OamData gUnknown_0852496C; extern const struct OamData gUnknown_08524A34; extern const struct OamData gUnknown_08524A3C; extern const struct OamData gUnknown_08524A94; -extern const struct OamData gUnknown_0852490C; -extern const struct OamData gUnknown_08524974; extern const struct OamData gUnknown_08524954; extern const struct OamData gUnknown_08524AE4; -extern const struct OamData gUnknown_08524914; -extern const struct OamData gUnknown_085249CC; extern const struct OamData gUnknown_085249D4; +extern const struct OamData gUnknown_08524A9C; +extern const struct OamData gUnknown_08524ADC; +extern const struct OamData gUnknown_08524B14; +extern const struct OamData gUnknown_08524A54; +extern const struct OamData gUnknown_08524A14; +extern const struct OamData gUnknown_08524A1C; +extern const struct OamData gUnknown_085249BC; +extern const struct OamData gUnknown_08524AF4; +extern const struct OamData gUnknown_085249DC; +extern const struct OamData gUnknown_08524AFC; +extern const struct OamData gUnknown_08524B1C; +extern const struct OamData gUnknown_08524A04; +extern const struct OamData gUnknown_08524A2C; +extern const struct OamData gUnknown_08524AEC; +extern const struct OamData gUnknown_08524964; #endif // GUARD_BATTLE_ANIM_H diff --git a/include/sprite.h b/include/sprite.h index 085faff68..32bdd9c55 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -103,12 +103,19 @@ struct AffineAnimJumpCmd u16 target; }; +struct AffineAnimEndCmdAlt +{ + s16 type; + u16 val; +}; + union AffineAnimCmd { s16 type; struct AffineAnimFrameCmd frame; struct AffineAnimLoopCmd loop; struct AffineAnimJumpCmd jump; + struct AffineAnimEndCmdAlt end; // unused in code }; #define AFFINEANIMCMDTYPE_LOOP 0x7FFD @@ -123,6 +130,8 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} +#define AFFINEANIMCMD_END_ALT(_val) \ + {.end = {.type = AFFINEANIMCMDTYPE_END, .val = _val}} struct AffineAnimState { -- cgit v1.2.3 From 17c26fae1a71d4b95b044b70c03656ef44194da5 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 24 Oct 2018 20:01:40 -0400 Subject: fire, electric, ice data --- include/battle_anim.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 61659c350..8d6785a44 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -161,5 +161,11 @@ extern const struct OamData gUnknown_08524A04; extern const struct OamData gUnknown_08524A2C; extern const struct OamData gUnknown_08524AEC; extern const struct OamData gUnknown_08524964; +extern const struct OamData gUnknown_08524B24; +extern const struct OamData gUnknown_08524A24; +extern const struct OamData gUnknown_08524AC4; +extern const struct OamData gUnknown_08524A84; +extern const struct OamData gUnknown_08524A64; +extern const struct OamData gUnknown_0852496C; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From de90ce912319b219b1c9f00cca618755bc68b3e3 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 25 Oct 2018 17:46:23 -0400 Subject: finish 80FE840 data (almost) --- include/battle_anim.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 8d6785a44..6484bd6c2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -166,6 +166,12 @@ extern const struct OamData gUnknown_08524A24; extern const struct OamData gUnknown_08524AC4; extern const struct OamData gUnknown_08524A84; extern const struct OamData gUnknown_08524A64; -extern const struct OamData gUnknown_0852496C; +extern const struct OamData gUnknown_0852491C; +extern const struct OamData gUnknown_0852495C; +extern const struct OamData gUnknown_0852497C; +extern const struct OamData gUnknown_085249F4; +extern const struct OamData gUnknown_0852493C; +extern const struct OamData gUnknown_08524A5C; +extern const struct OamData gUnknown_08524A74; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3