From 2f6c94828b62df2c6715e998731558bfba6218b7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Jun 2020 15:03:34 -0400 Subject: evo tables to JSON --- include/constants/pokemon.h | 31 +++++++++++++++++++++++++++++++ include/pokemon.h | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'include') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 9accbad1..5c8c32d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -404,4 +404,35 @@ typedef enum { UNOWN_QUESTION_MARK = 27 } AlternateForms; +typedef enum EvoMethod +{ + EVO_NONE = 0, + EVO_FRIENDSHIP, + EVO_FRIENDSHIP_DAY, + EVO_FRIENDSHIP_NIGHT, + EVO_LEVEL, + EVO_TRADE, + EVO_TRADE_ITEM, + EVO_STONE, + EVO_LEVEL_ATK_GT_DEF, + EVO_LEVEL_ATK_EQ_DEF, + EVO_LEVEL_ATK_LT_DEF, + EVO_LEVEL_PID_LO, + EVO_LEVEL_PID_HI, + EVO_LEVEL_NINJASK, + EVO_LEVEL_SHEDINJA, + EVO_BEAUTY, + EVO_STONE_MALE, + EVO_STONE_FEMALE, + EVO_ITEM_DAY, + EVO_ITEM_NIGHT, + EVO_HAS_MOVE, + EVO_OTHER_PARTY_MON, + EVO_LEVEL_MALE, + EVO_LEVEL_FEMALE, + EVO_CORONET, + EVO_ETERNA, + EVO_ROUTE217, +} EvoMethod; + #endif //POKEDIAMOND_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index 01a03763..2387ef78 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -46,37 +46,6 @@ struct BaseStats { /* 0x28 */ u32 unk28; }; -typedef enum EvoMethod -{ - EVO_NONE = 0, - EVO_FRIENDSHIP, - EVO_FRIENDSHIP_DAY, - EVO_FRIENDSHIP_NIGHT, - EVO_LEVEL, - EVO_TRADE, - EVO_TRADE_ITEM, - EVO_STONE, - EVO_LEVEL_ATK_GT_DEF, - EVO_LEVEL_ATK_EQ_DEF, - EVO_LEVEL_ATK_LT_DEF, - EVO_LEVEL_PID_LO, - EVO_LEVEL_PID_HI, - EVO_LEVEL_NINJASK, - EVO_LEVEL_SHEDINJA, - EVO_BEAUTY, - EVO_STONE_MALE, - EVO_STONE_FEMALE, - EVO_ITEM_DAY, - EVO_ITEM_NIGHT, - EVO_HAS_MOVE, - EVO_OTHER_PARTY_MON, - EVO_LEVEL_MALE, - EVO_LEVEL_FEMALE, - EVO_CORONET, - EVO_ETERNA, - EVO_ROUTE217, -} EvoMethod; - // Structs typedef struct { -- cgit v1.2.3