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

This commit is contained in:
PikalaxALT committed 2020-01-22 12:38:19 -05:00
commit 2d4be89ee5
175 files changed
+2750 -2724

No files matched your search

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