diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-24 15:25:20 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-24 15:25:20 +0200 |
| commit | bffcd426cf1414287443c67d955fb36b861dbd91 (patch) | |
| tree | 910519b569264b3735cb9c185614d2323530af0a /include/battle.h | |
| parent | 1f3a867a0b05c52344c5a145db3272e653deb697 (diff) | |
link opponent controller is done
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index f731168dd..e4f3ea77d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -799,8 +799,8 @@ extern struct BattleStruct* gBattleStruct; // special animations table #define B_ANIM_LVL_UP 0x0 -#define B_ANIM_SWITCH_OUT_MON 0x1 -#define B_ANIM_SPECIAL_2 0x2 +#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_SUBSTITUTE_TO_MON 0x5 @@ -898,6 +898,7 @@ void SetBattleSpriteInvisibilityBitToSpriteInvisibility(u8 bank); u16 ChooseMoveAndTargetInBattlePalace(void); void LoadBattleBarGfx(u8 arg0); bool8 mplay_80342A4(u8 bank); +void sub_805EEE0(u8 bank); enum { @@ -955,10 +956,7 @@ struct BattleHealthboxInfo u8 specialAnimActive : 1; //x40 u8 flag_x80 : 1; u8 field_1_x1 : 1; - u8 field_1_x2 : 1; - u8 field_1_x4 : 1; - u8 field_1_x8 : 1; - u8 field_1_x10 : 1; + u8 field_1_x1E : 4; u8 field_1_x20 : 1; u8 field_1_x40 : 1; u8 field_1_x80 : 1; |