From 12aec1bb718eb7b04d4a5506030154b0cce454a0 Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Tue, 28 Sep 2021 12:50:36 -0400 Subject: Created species/item data JSONs (#57) * Created species data JSON * Added item data JSON * Removed address field from JSONs -Moved constants/item.h import to item.h. * Used default values for some JSON fields -Use item ID macros for item evolutions. --- include/constants/type.h | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'include/constants/type.h') diff --git a/include/constants/type.h b/include/constants/type.h index 8c982fd..6ca9177 100644 --- a/include/constants/type.h +++ b/include/constants/type.h @@ -1,25 +1,23 @@ #ifndef GUARD_CONSTANTS_TYPE_H #define GUARD_CONSTANTS_TYPE_H -enum Type -{ - TYPE_NORMAL = 0x1, - TYPE_FIRE = 0x2, - TYPE_WATER = 0x3, - TYPE_GRASS = 0x4, - TYPE_ELECTRIC = 0x5, - TYPE_ICE = 0x6, - TYPE_FIGHTING = 0x7, - TYPE_POISON = 0x8, - TYPE_GROUND = 0x9, - TYPE_FLYING = 0xA, - TYPE_PSYCHIC = 0xB, - TYPE_BUG = 0xC, - TYPE_ROCK = 0xD, - TYPE_GHOST = 0xE, - TYPE_DRAGON = 0xF, - TYPE_DARK = 0x10, - TYPE_STEEL = 0x11 -}; +#define TYPE_NONE 0x0 +#define TYPE_NORMAL 0x1 +#define TYPE_FIRE 0x2 +#define TYPE_WATER 0x3 +#define TYPE_GRASS 0x4 +#define TYPE_ELECTRIC 0x5 +#define TYPE_ICE 0x6 +#define TYPE_FIGHTING 0x7 +#define TYPE_POISON 0x8 +#define TYPE_GROUND 0x9 +#define TYPE_FLYING 0xA +#define TYPE_PSYCHIC 0xB +#define TYPE_BUG 0xC +#define TYPE_ROCK 0xD +#define TYPE_GHOST 0xE +#define TYPE_DRAGON 0xF +#define TYPE_DARK 0x10 +#define TYPE_STEEL 0x11 #endif -- cgit v1.2.3