diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-02 19:39:07 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-02 19:39:07 +0100 |
| commit | c27f7a8131d4ebf9e01d7f4fecaf5cc5616866d8 (patch) | |
| tree | b90d308f17cf13a45c7d8c6f405081ede42ecb5a /include | |
| parent | 0250aefb73a995a6812a657193abeb96eb34d489 (diff) | |
start working on pokeball
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_anim.h | 17 | ||||
| -rw-r--r-- | include/pokeball.h | 9 | ||||
| -rw-r--r-- | include/sprite.h | 9 |
4 files changed, 26 insertions, 11 deletions
diff --git a/include/battle.h b/include/battle.h index 3f39db374..c99913237 100644 --- a/include/battle.h +++ b/include/battle.h @@ -933,7 +933,7 @@ struct BattleHealthboxInfo u8 flag_x1 : 1; u8 flag_x2 : 1; u8 flag_x4 : 1; - u8 flag_x8 : 1; + u8 ballAnimActive : 1; // 0x8 u8 statusAnimActive : 1; // x10 u8 animFromTableActive : 1; // x20 u8 specialAnimActive : 1; //x40 diff --git a/include/battle_anim.h b/include/battle_anim.h index c055e94fa..1bb85d023 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -79,11 +79,21 @@ void HandleIntroSlide(u8 terrainId); // battle_anim_80A5C6C.s void sub_80A6EEC(struct Sprite *sprite); +void sub_80A68D4(struct Sprite *sprite); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); u8 sub_80A82E4(u8 bank); -u8 sub_80A5C6C(u8 bank, u8 attributeId); +bool8 AnimateBallThrow(struct Sprite *sprite); + +enum +{ + BANK_X_POS, + BANK_Y_POS, +}; + +u8 GetBankPosition(u8 bank, u8 attributeId); + bool8 IsBankSpritePresent(u8 bank); void sub_80A6C68(u8 arg0); u8 GetAnimBankSpriteId(u8 wantedBank); @@ -99,4 +109,9 @@ u8 GetSubstituteSpriteDefault_Y(u8 bank); // battle_anim_80A9C70.s void LaunchStatusAnimation(u8 bank, u8 statusAnimId); +// battle_anim_8170478.s +u8 ItemIdToBallId(u16 itemId); +u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); +u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u8 arg2, u8 ballId); + #endif // GUARD_BATTLE_ANIM_H diff --git a/include/pokeball.h b/include/pokeball.h index 76f084465..863abe5c9 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -1,7 +1,14 @@ #ifndef GUARD_POKEBALL_H #define GUARD_POKEBALL_H -u8 sub_80753E8(u16, u8); +#define POKEBALL_COUNT 12 + +#define POKEBALL_PLAYER_SENDOUT 0xFF +#define POKEBALL_OPPONENT_SENDOUT 0xFE + +u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); +void LoadBallGfx(u8 ballId); +void FreeBallGfx(u8 ballId); void sub_8076918(u8 bank); void DoHitAnimHealthboxEffect(u8 bank); diff --git a/include/sprite.h b/include/sprite.h index 531314079..170d77c3f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -195,14 +195,7 @@ struct Sprite /*0x2D*/ u8 animLoopCounter; // general purpose data fields - /*0x2E*/ s16 data0; - /*0x30*/ s16 data1; - /*0x32*/ s16 data2; - /*0x34*/ s16 data3; - /*0x36*/ s16 data4; - /*0x38*/ s16 data5; - /*0x3A*/ s16 data6; - /*0x3C*/ s16 data7; + /*0x2E*/ s16 data[8]; /*0x3E*/ u16 inUse:1; //1 u16 coordOffsetEnabled:1; //2 |