diff options
author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-08 20:46:20 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-08 20:46:20 -0800 |
commit | 03a457c60afa2b8454d570c20f90ae3f7bb9b153 (patch) | |
tree | 473cd0d9098b3ac1562e165ea253643c192265da | |
parent | a58d647946fc9dadd52dd0855498ad49232d648d (diff) | |
parent | 72770d22ea76626ce9fdc1d28412a53338054e01 (diff) |
Merge pull request #180 from yenatch/species-enum
Forgot to add Unown species constants to the enum
-rw-r--r-- | constants/species_constants.inc | 2 | ||||
-rw-r--r-- | include/species.h | 30 |
2 files changed, 30 insertions, 2 deletions
diff --git a/constants/species_constants.inc b/constants/species_constants.inc index bf14d258d..d023662b7 100644 --- a/constants/species_constants.inc +++ b/constants/species_constants.inc @@ -445,4 +445,4 @@ enum SPECIES_UNOWN_EMARK enum SPECIES_UNOWN_QMARK - .set NUM_SPECIES, __enum__ - 1 + .set NUM_SPECIES, SPECIES_EGG diff --git a/include/species.h b/include/species.h index eeb9ae18e..d0cd7f664 100644 --- a/include/species.h +++ b/include/species.h @@ -417,8 +417,36 @@ enum { SPECIES_DEOXYS, // 0x19a SPECIES_CHIMECHO, // 0x19b SPECIES_EGG, // 0x19c + + SPECIES_UNOWN_B, + SPECIES_UNOWN_C, + SPECIES_UNOWN_D, + SPECIES_UNOWN_E, + SPECIES_UNOWN_F, + SPECIES_UNOWN_G, + SPECIES_UNOWN_H, + SPECIES_UNOWN_I, + SPECIES_UNOWN_J, + SPECIES_UNOWN_K, + SPECIES_UNOWN_L, + SPECIES_UNOWN_M, + SPECIES_UNOWN_N, + SPECIES_UNOWN_O, + SPECIES_UNOWN_P, + SPECIES_UNOWN_Q, + SPECIES_UNOWN_R, + SPECIES_UNOWN_S, + SPECIES_UNOWN_T, + SPECIES_UNOWN_U, + SPECIES_UNOWN_V, + SPECIES_UNOWN_W, + SPECIES_UNOWN_X, + SPECIES_UNOWN_Y, + SPECIES_UNOWN_Z, + SPECIES_UNOWN_EMARK, + SPECIES_UNOWN_QMARK, }; -#define NUM_SPECIES 412 +#define NUM_SPECIES SPECIES_EGG #endif // GUARD_SPECIES_H |