diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 14:05:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 14:05:40 -0600 |
| commit | f639c7c309bbd32fc60278eafa726db5c0c49914 (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /include/battle.h | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
| parent | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (diff) | |
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index f34364ea6..90bef24ac 100644 --- a/include/battle.h +++ b/include/battle.h @@ -498,10 +498,12 @@ struct BattleStruct struct BattleTv tv; u8 notSureWhatFieldLol[0x28]; u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; - u8 field_298[8]; - u8 field_2A0; - u8 field_2A1; - u8 field_2A2; + s8 arenaMindPoints[2]; + s8 arenaSkillPoints[2]; + u16 arenaStartHp[2]; + u8 arenaLostPlayerMons; // Bits for party member, lost as in referee's decision, not by fainting. + u8 arenaLostOpponentMons; + u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed pokemon. }; #define GET_MOVE_TYPE(move, typeArg) \ |