Merge branch 'master' into doc-dome

This commit is contained in:
GriffinR
2020-01-08 01:15:36 -05:00
committed by GitHub
164 changed files with 6060 additions and 5867 deletions

View File

@@ -332,7 +332,7 @@ struct BattleFrontier
/*0xCA8*/ u8 challengeStatus;
/*0xCA9*/ u8 lvlMode:2;
/*0xCA9*/ u8 challengePaused:1;
/*0xCA9*/ u8 field_CA9_b:1;
/*0xCA9*/ u8 disableRecordBattle:1;
/*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
/*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid)
/*0xCB4*/ u16 trainerIds[20];