diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 18:39:38 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 18:39:38 -0400 |
commit | fb402725c6c668ee2ac50d6c345f3f8207a32cea (patch) | |
tree | 4499c27a65e2ea1a44ec2bc48467c84b4bb6ca73 | |
parent | aba42513d3a33cec1d8e6cd199b07317b2eece87 (diff) |
Convert more battle constants to bit shifts
-rw-r--r-- | include/constants/battle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index 93dafd12c..8b860e384 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -90,7 +90,7 @@ #define B_OUTCOME_NO_SAFARI_BALLS 8 #define B_OUTCOME_FORFEITED 9 #define B_OUTCOME_MON_TELEPORTED 10 -#define B_OUTCOME_LINK_BATTLE_RAN 128 +#define B_OUTCOME_LINK_BATTLE_RAN (1 << 7) // 128 // Non-volatile status conditions // These persist remain outside of battle and after switching out @@ -287,8 +287,8 @@ #define MOVE_EFFECT_SP_ATK_TWO_DOWN 59 #define NUM_MOVE_EFFECTS 60 -#define MOVE_EFFECT_AFFECTS_USER 64 -#define MOVE_EFFECT_CERTAIN 128 +#define MOVE_EFFECT_AFFECTS_USER (1 << 6) // 64 +#define MOVE_EFFECT_CERTAIN (1 << 7) // 128 // Battle terrain defines for gBattleTerrain. #define BATTLE_TERRAIN_GRASS 0 |