summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-07-07 19:57:09 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-07-07 19:57:09 +0200
commit008d961b2a3d2d145f9ff8e7515cfb4f5e04128c (patch)
tree91fa8c967a0ff63da316cfd9b9bd7c5bc396cfce /include/battle.h
parent1c48e585747de0a2273c4b3eb4be114d5214b8a2 (diff)
add party menu defines
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 6e941191f..fba5fb460 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -177,7 +177,7 @@ struct ProtectStruct
/* field_0 */
u32 protected:1;
u32 endured:1;
- u32 onlyStruggle:1;
+ u32 noValidMoves:1;
u32 helpingHand:1;
u32 bounceMove:1;
u32 stealMove:1;
@@ -456,7 +456,7 @@ struct BattleStruct
u8 field_46;
u8 field_47;
u8 focusPunchBattlerId;
- u8 field_49;
+ u8 battlerPreventingSwitchout;
u8 moneyMultiplier;
u8 savedTurnActionNumber;
u8 switchInAbilitiesCounter;
@@ -509,7 +509,7 @@ struct BattleStruct
u8 field_A7;
u16 hpOnSwitchout[2];
u32 savedBattleTypeFlags;
- u8 field_B0;
+ u8 abilityPreventingSwitchout;
u8 hpScale;
u8 synchronizeMoveEffect;
bool8 anyMonHasTransformed;