diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-25 13:26:22 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-03-27 17:27:20 -0500 |
| commit | 7a5c6d4d869b314ce748fe2ccff493c468fa0a91 (patch) | |
| tree | 0f6b4b4ab794da91b7a2565dc33e5981c886776b /include | |
| parent | 0f869fb26630cd7ec65a1873d76d144bdfaf11d4 (diff) | |
Standardize Friendship/Happiness
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/hold_effects.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index b653f5a92..5853f1708 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -28,7 +28,7 @@ #define HOLD_EFFECT_MACHO_BRACE 24 #define HOLD_EFFECT_EXP_SHARE 25 #define HOLD_EFFECT_QUICK_CLAW 26 -#define HOLD_EFFECT_HAPPINESS_UP 27 +#define HOLD_EFFECT_FRIENDSHIP_UP 27 #define HOLD_EFFECT_CURE_ATTRACT 28 #define HOLD_EFFECT_CHOICE_BAND 29 #define HOLD_EFFECT_FLINCH 30 diff --git a/include/constants/vars.h b/include/constants/vars.h index 625c37aa9..d3d1aba87 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -56,7 +56,7 @@ #define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 #define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 #define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 -#define VAR_HAPPINESS_STEP_COUNTER 0x402A +#define VAR_FRIENDSHIP_STEP_COUNTER 0x402A #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D |