diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /include/battle.h | |
parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) |
Merge branch 'master' into doc-overworld
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 b377dc23c..7da040188 100644 --- a/include/battle.h +++ b/include/battle.h @@ -390,7 +390,7 @@ struct BattleStruct u8 expGetterBattlerId; u8 unused_5; u8 field_91; // related to gAbsentBattlerFlags, possibly absent flags turn ago? - u8 field_92; // battle palace related + u8 palaceFlags; // First 4 bits are "is < 50% HP and not asleep" for each battler, last 4 bits are selected moves to pass to AI u8 field_93; // related to choosing pokemon? u8 wallyBattleState; u8 wallyMovesState; |