diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-29 21:15:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 21:15:47 -0700 |
| commit | f74d4742f597a423b7a8685d72c06597c8c78db7 (patch) | |
| tree | ee772429758a1b4262225086ec7c0cc49a099cb1 /include | |
| parent | 445cdf69c9744fe6d6f5161f9119d605e0df76c8 (diff) | |
| parent | 5487c755f054b464665849bbe5a31ab92ff34574 (diff) | |
Merge pull request #399 from Doesnty/battle4
Improve battle_4
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 47cb7cf8e..2b6773660 100644 --- a/include/battle.h +++ b/include/battle.h @@ -243,12 +243,11 @@ struct BattleStruct /* 0x2000000 */ /*0x16001*/ u8 turnEffectsBank; /*0x16002*/ u8 animTurn; /*0x16003*/ u8 scriptingActive; - /*0x16004*/ u8 wrappedMove1[4]; - /*0x16008*/ u8 wrappedMove2[4]; + /*0x16004*/ u8 wrappedMove[8]; /*0x1600C*/ u8 cmd49StateTracker; /*0x1600D*/ u8 unk1600D; /*0x1600E*/ u8 turncountersTracker; - /*0x1600F*/ u8 cmd23StateTracker; + /*0x1600F*/ u8 atk23StateTracker; /*0x16010*/ u8 moveTarget[4]; /*0x16014*/ u8 unk16014; /*0x16015*/ u8 unk16015; |