Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros

2021-11-17 22:03:37 -05:00
parent c4f8f4d11a ecb13cdbf7
commit b9fa18bdd4
79 changed files with 6531 additions and 6301 deletions
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -270,7 +270,9 @@
 #define FRIENDSHIP_EVENT_FAINT_FIELD_PSN  7
 #define FRIENDSHIP_EVENT_FAINT_LARGE      8 // If opponent was >= 30 levels higher. See AdjustFriendshipOnBattleFaint

-#define MAX_FRIENDSHIP  0xFF
+#define MAX_FRIENDSHIP  255
+#define MAX_SHEEN       255
+#define MAX_CONDITION   255

 #define MAX_PER_STAT_IVS 31
 #define MAX_IV_MASK 31