diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-04 19:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 19:44:33 -0400 |
| commit | 135ed6a1623ecda72ede79a12d2a8483231da95f (patch) | |
| tree | 66ee20f129d3b729b9ad557745665210f02825c8 /include | |
| parent | 8324a355176b2edbc3ad4ab8aec03f3fc7eb0a8c (diff) | |
| parent | afb3472282c52746aaac52d1e361d0c9bdf31de3 (diff) | |
Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/battle_main.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_anim.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index 0ebc9fe01..5a04c1eec 100644 --- a/include/battle.h +++ b/include/battle.h @@ -544,8 +544,8 @@ struct BattleHealthboxInfo u8 statusAnimActive:1; // x10 u8 animFromTableActive:1; // x20 u8 specialAnimActive:1; // x40 - u8 flag_x80:1; - u8 field_1_x1:1; + u8 triedShinyMonAnim:1; + u8 finishedShinyMonAnim:1; u8 field_1_x1E:4; u8 field_1_x20:1; u8 field_1_x40:1; diff --git a/include/battle_main.h b/include/battle_main.h index 217b10b39..890e47f39 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -67,7 +67,7 @@ void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d); void EndBounceEffect(u8 battlerId, bool8 b); void SpriteCb_PlayerMonFromBall(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); -void sub_8039E84(struct Sprite *sprite); +void SpriteCB_TrainerThrowObject(struct Sprite *sprite); void sub_8039E9C(struct Sprite *sprite); void nullsub_20(void); void BeginBattleIntro(void); diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index dfdd9f912..ebc422b18 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -376,7 +376,7 @@ #define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 #define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 #define B_ANIM_BALL_THROW 0x3 -#define B_ANIM_SAFARI_BALL_THROW 0x4 +#define B_ANIM_BALL_THROW_WITH_TRAINER 0x4 #define B_ANIM_SUBSTITUTE_TO_MON 0x5 #define B_ANIM_MON_TO_SUBSTITUTE 0x6 |