Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-11-19 10:26:40 +08:00
commit 1d3ae2fe78
188 files changed
+15683 -8215

No files matched your search

+1 -1
View File
@@ -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;