Sync pokemon.c

2023-03-01 00:42:12 -05:00
parent 3a4eaa0ff5
commit ab417d1255
54 changed files with 3710 additions and 4365 deletions
@@ -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