diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
| commit | 8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch) | |
| tree | bbd238d169df88dc2dbbed17956daae2ad630227 /include/constants | |
| parent | 907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff) | |
| parent | 6068495619364c8e0ccae15ad036a1b5a9eef171 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle_setup.h | 2 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 329bfa650..d98e1762f 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -10,7 +10,7 @@ #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 #define TRAINER_BATTLE_REMATCH_DOUBLE 7 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 -#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_PYRAMID 9 #define TRAINER_BATTLE_SET_TRAINER_A 10 #define TRAINER_BATTLE_SET_TRAINER_B 11 #define TRAINER_BATTLE_12 12 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1a4741574..f63d755ad 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -2,6 +2,7 @@ #define GUARD_CONSTANTS_POKEMON_H // Pokemon types +#define TYPE_NONE 0xFF #define TYPE_NORMAL 0x00 #define TYPE_FIGHTING 0x01 #define TYPE_FLYING 0x02 @@ -22,6 +23,7 @@ #define TYPE_DARK 0x11 #define NUMBER_OF_MON_TYPES 0x12 + // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 |