diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
| commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
| tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /include/constants/decorations.h | |
| parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
resolve merge conflicts
Diffstat (limited to 'include/constants/decorations.h')
| -rw-r--r-- | include/constants/decorations.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/constants/decorations.h b/include/constants/decorations.h index 2e3558721..b9f626d24 100644 --- a/include/constants/decorations.h +++ b/include/constants/decorations.h @@ -122,5 +122,6 @@ #define DECOR_REGIROCK_DOLL 118 #define DECOR_REGICE_DOLL 119 #define DECOR_REGISTEEL_DOLL 120 +#define NUM_DECORATIONS DECOR_REGISTEEL_DOLL #endif // GUARD_CONSTANTS_DECORATIONS_H |