Merge branch 'master' into battle

2019-11-14 12:57:49 +08:00
parent 17b55f50db f6dfeba742
commit 1d3ae2fe78
188 changed files with 15683 additions and 8215 deletions
@@ -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;