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

This commit is contained in:
GriffinR committed 2021-11-17 22:03:37 -05:00
commit b9fa18bdd4
79 files changed
+6531 -6301

No files matched your search

+3 -1
View File
@@ -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