diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle.h | 4 | ||||
| -rw-r--r-- | include/constants/battle_ai.h | 6 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 34 |
4 files changed, 10 insertions, 38 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index 2da89d815..c273b9a50 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -61,8 +61,8 @@ #define BATTLE_TYPE_REGI 0x4000 #define BATTLE_TYPE_GHOST 0x8000 #define BATTLE_TYPE_POKEDUDE 0x10000 -#define BATTLE_TYPE_PALACE 0x20000 -#define BATTLE_TYPE_ARENA 0x40000 +#define BATTLE_TYPE_PALACE 0x20000 // TODO: Update name +#define BATTLE_TYPE_ARENA 0x40000 // TOOD: Update name #define BATTLE_TYPE_TRAINER_TOWER 0x80000 #define BATTLE_TYPE_PIKE 0x100000 #define BATTLE_TYPE_PYRAMID 0x200000 diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h index f55661b91..d23648f39 100644 --- a/include/constants/battle_ai.h +++ b/include/constants/battle_ai.h @@ -23,7 +23,7 @@ #define AI_EFFECTIVENESS_x0 0 // ai weather -#define AI_WEATHER_SUNNY 0 +#define AI_WEATHER_SUN 0 #define AI_WEATHER_RAIN 1 #define AI_WEATHER_SANDSTORM 2 #define AI_WEATHER_HAIL 3 @@ -35,8 +35,8 @@ // script's table id to bit #define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0) -#define AI_SCRIPT_TRY_TO_FAINT (1 << 1) -#define AI_SCRIPT_CHECK_VIABILITY (1 << 2) +#define AI_SCRIPT_CHECK_VIABILITY (1 << 1) +#define AI_SCRIPT_TRY_TO_FAINT (1 << 2) #define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3) #define AI_SCRIPT_RISKY (1 << 4) #define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index c6fc55003..e394a8fb4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -91,4 +91,8 @@ #define PLAYER_HAS_ONE_MON 0x1 #define PLAYER_HAS_ONE_USABLE_MON 0x2 +#define MON_MALE 0x00 +#define MON_FEMALE 0xFE +#define MON_GENDERLESS 0xFF + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index ae909018c..54ea44efd 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -3,6 +3,7 @@ #include "global.h" #include "sprite.h" +#include "constants/pokemon.h" #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 @@ -104,10 +105,6 @@ #define MON_GIVEN_TO_PC 0x1 #define MON_CANT_GIVE 0x2 -#define MON_MALE 0x00 -#define MON_FEMALE 0xFE -#define MON_GENDERLESS 0xFF - #define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 #define FRIENDSHIP_EVENT_VITAMIN 0x1 #define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 @@ -145,25 +142,6 @@ #define UNOWN_FORM_COUNT 28 #define MAX_MON_LEVEL 100 -enum -{ - EGG_GROUP_NONE, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - EGG_GROUP_BUG, - EGG_GROUP_FLYING, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_WATER_3, - EGG_GROUP_MINERAL, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_WATER_2, - EGG_GROUP_DITTO, - EGG_GROUP_DRAGON, - EGG_GROUP_UNDISCOVERED -}; struct PokemonSubstruct0 { @@ -369,16 +347,6 @@ enum STAT_STAGE_EVASION, // 7 }; -enum -{ - STAT_HP, // 0 - STAT_ATK, // 1 - STAT_DEF, // 2 - STAT_SPD, // 3 - STAT_SPATK, // 4 - STAT_SPDEF, // 5 -}; - struct BaseStats { /* 0x00 */ u8 baseHP; |