diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:26:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:26:49 -0500 |
| commit | ea748ff7f51a7c119658930f878d046cc8b83c51 (patch) | |
| tree | 3616ea8ad0a2b3f05482ffd3b9db929a8b5f4573 /asm | |
| parent | 70c560cc84ec4152438815a7abae673ae6f589f8 (diff) | |
| parent | 293df1887f4b849e96d06530c722bd39afb7b72b (diff) | |
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.inc | 1 | ||||
| -rw-r--r-- | asm/macros/ec.inc | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index 6782f4200..77f44a847 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -3,7 +3,6 @@ .include "asm/macros/movement.inc" .include "asm/macros/window.inc" .include "asm/macros/pokemon_data.inc" - .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/field_effect_script.inc" .include "asm/macros/trainer_hill.inc" diff --git a/asm/macros/ec.inc b/asm/macros/ec.inc deleted file mode 100644 index a70b8e244..000000000 --- a/asm/macros/ec.inc +++ /dev/null @@ -1,19 +0,0 @@ - .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_POKEMON2 << 9) | SPECIES_\name - .endm |