diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
| commit | bf79edbd8b5b398921d4094abfe44d16c4a182a1 (patch) | |
| tree | 5ad51360de30eda07c4e1df0bed5e74076bceadb /include | |
| parent | 1a63f6607e187a58973cff05eb150fd66f77b9b9 (diff) | |
| parent | 18f6c5c9d460c019453227abe033d84f1feb6310 (diff) | |
Merge branch 'master' into watanabe
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/macros/event.inc | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h index e63560421..b1677d90a 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/macros/event.inc b/include/macros/event.inc index a27e1da76..8b2d587c9 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -1233,9 +1233,9 @@ .byte 0xb7 .endm - .macro setvaddress long, word + .macro setvaddress addr .byte 0xb8 - .4byte \long + .4byte \addr .endm .macro vgoto pointer 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; |