diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 10:55:04 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 10:55:04 -0700 |
| commit | 888109935e9c35d6794c340759e4fd8c8c96760d (patch) | |
| tree | eb1bd6a4749b5149e19355a9001b8bedaeb8738d /include/battle.h | |
| parent | ed5847cb41c48357d83b92823e08393a1ca54bdd (diff) | |
Start decompiling battle_9
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index 6a5a97e90..6fa5c1ffe 100644 --- a/include/battle.h +++ b/include/battle.h @@ -242,8 +242,7 @@ struct BattleStruct /* 0x2000000 */ /*0x160C5*/ u8 unk160C5; /*0x160C6*/ u8 unk160C6; /*0x160C7*/ u8 unk160C7; - /*0x160C8*/ u8 unk160C8; - /*0x160C9*/ u8 unk160C9; + /*0x160C8*/ u8 AI_monToSwitchIntoId[2]; /*0x160CA*/ u8 synchroniseEffect; /*0x160CB*/ u8 linkPlayerIndex; /*0x160CC*/ u16 usedHeldItems[4]; @@ -352,8 +351,8 @@ struct DisableStruct /*0x0D*/ u8 unkD; /*0x0E*/ u8 encoreTimer1 : 4; /*0x0E*/ u8 encoreTimer2 : 4; - /*0x0F*/ u8 perishSong1 : 4; - /*0x0F*/ u8 perishSong2 : 4; + /*0x0F*/ u8 perishSongTimer1 : 4; + /*0x0F*/ u8 perishSongTimer2 : 4; /*0x10*/ u8 furyCutterCounter; /*0x11*/ u8 rolloutTimer1 : 4; /*0x11*/ u8 rolloutTimer2 : 4; |