diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-14 12:57:49 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-19 10:26:40 +0800 |
| commit | 1d3ae2fe78823a6a0d4d9d93a988aa5ca1092801 (patch) | |
| tree | acb385b82e1b361e36e6075b13329563fe93f415 /include/battle.h | |
| parent | 17b55f50dbcdf9797d0aecfba356bc8681dea8f5 (diff) | |
| parent | f6dfeba742c415d964b415bfefb859c3a3764930 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 0a441df1c..00f7dcea9 100644 --- a/include/battle.h +++ b/include/battle.h @@ -432,7 +432,7 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 arenaTurnCounter; // not used in FR? + u8 field_DA; // battle tower related u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; u8 givenExpMons; |