diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 14:07:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 14:07:31 -0600 |
| commit | 5498eaf94849bbc7b56d8c280862b61ecefa0643 (patch) | |
| tree | 518b0b12e669c09c31a33c7a071f10bcd4ea76b9 /asm/macros | |
| parent | 66f2ac4ba38cb32eb210545536a487969b593d10 (diff) | |
| parent | 5d74d11d3e3047b4b53153365325db9e6999c627 (diff) | |
Merge pull request #477 from camthesaxman/constant_headers
Use common headers for constants in assembly and C
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/ec.inc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/asm/macros/ec.inc b/asm/macros/ec.inc index 44c974e53..d3fd45c2f 100644 --- a/asm/macros/ec.inc +++ b/asm/macros/ec.inc @@ -1,22 +1,3 @@ - .macro ec_word word - .2byte EC_WORD_\word - .endm - - .macro ec_move1 name - .2byte (EC_GROUP_MOVE_1 << 9) | MOVE_\name - .endm - - .macro ec_move2 name - .2byte (EC_GROUP_MOVE_2 << 9) | MOVE_\name - .endm - - .macro ec_pokemon1 name - .2byte (EC_GROUP_POKEMON << 9) | SPECIES_\name - .endm - - .macro ec_pokemon2 name - .2byte (EC_GROUP_POKEMON_2 << 9) | SPECIES_\name - .endm .macro ec_duplicates count .2byte 0xff00 + \count |