Merge branch 'master' of github.com:pret/pokefirered into union_room

2020-01-22 12:38:19 -05:00
parent 0495cce904 e97d3532d4
commit 2d4be89ee5
175 changed files with 2750 additions and 2724 deletions
@@ -131,6 +131,8 @@
 #define EGG_GROUP_DRAGON 14
 #define EGG_GROUP_UNDISCOVERED 15

+#define EGG_GROUPS_PER_MON      2
+
 // Pokemon natures
 #define NATURE_HARDY 0
 #define NATURE_LONELY 1