diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
| commit | 8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch) | |
| tree | bbd238d169df88dc2dbbed17956daae2ad630227 /include/battle.h | |
| parent | 907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff) | |
| parent | 6068495619364c8e0ccae15ad036a1b5a9eef171 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index c4a0fe9a5..9e67e8ec5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -479,10 +479,10 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 field_DA; + u8 arenaTurnCounter; u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; - u8 field_DF; + u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party. u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte] u16 castformPalette[MAX_BATTLERS_COUNT][16]; u8 field_180; |