diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 16:38:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 19:21:40 -0500 |
| commit | d084a5ca84ec7062b8e546293e67202f2d2f4732 (patch) | |
| tree | af486891024318e0f2162044e18684a24e644bd0 /include/constants | |
| parent | 055e5d2bbff31a98bcdffec0d7392e7ce77bcd46 (diff) | |
Sync AI scripts
Diffstat (limited to 'include/constants')
| -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 |
3 files changed, 9 insertions, 5 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 |