diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
| commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
| tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /include/pokemon.h | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 3e69845e6..5d7f7f2ae 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -112,25 +112,6 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define TYPE_NORMAL 0x00 -#define TYPE_FIGHTING 0x01 -#define TYPE_FLYING 0x02 -#define TYPE_POISON 0x03 -#define TYPE_GROUND 0x04 -#define TYPE_ROCK 0x05 -#define TYPE_BUG 0x06 -#define TYPE_GHOST 0x07 -#define TYPE_STEEL 0x08 -#define TYPE_MYSTERY 0x09 -#define TYPE_FIRE 0x0a -#define TYPE_WATER 0x0b -#define TYPE_GRASS 0x0c -#define TYPE_ELECTRIC 0x0d -#define TYPE_PSYCHIC 0x0e -#define TYPE_ICE 0x0f -#define TYPE_DRAGON 0x10 -#define TYPE_DARK 0x11 - #define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 #define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused #define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 // unused @@ -465,7 +446,6 @@ extern const u8 gUnknown_08329D2A[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; -extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const s8 gNatureStatTable[][5]; void ZeroBoxMonData(struct BoxPokemon *boxMon); |