diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-19 20:01:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 20:01:57 -0700 |
| commit | a55b14d47def2735f7ec274ccf64b6e2d8805320 (patch) | |
| tree | b70298ac8785cbe3b5ec6a39da4453f20da34a69 /include | |
| parent | f6ed2ff9c31d7912e2dc259ddc10e17f0ecbbd1f (diff) | |
| parent | 39710a12cbb854f2cc50ea2955c9f94b6b5e6024 (diff) | |
Merge pull request #597 from yenatch/type-mystery
physical/special type macros and move gBattleMoves to c
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index 02e02ca83..dab18f5c5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -42,6 +42,10 @@ #define TYPE_FORESIGHT 0xFE #define TYPE_ENDTABLE 0xFF +// physical/special types +#define TYPE_IS_PHYSICAL(type) ((type) < TYPE_MYSTERY) +#define TYPE_IS_SPECIAL(type) ((type) > TYPE_MYSTERY) + enum { BATTLE_TERRAIN_GRASS, diff --git a/include/pokemon.h b/include/pokemon.h index 82ec9d644..6bb44a227 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -441,12 +441,6 @@ struct BattleMove u8 flags; }; -#define FLAG_MAKES_CONTACT 0x1 -#define FLAG_PROTECT_AFFECTED 0x2 -#define FLAG_MAGICCOAT_AFFECTED 0x4 -#define FLAG_SNATCH_AFFECTED 0x8 -#define FLAG_KINGSROCK_AFFECTED 0x20 - struct PokemonStorage { /*0x0000*/ u8 currentBox; |