diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-26 08:43:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-26 08:43:34 -0400 |
| commit | 7f2ac54fbee67b9e3ee0085f773d68d2d4aadcd7 (patch) | |
| tree | 3ae24d0475d4d0ac67f680908c6869122007e85d /include | |
| parent | 478ac343ff97015adf5b61d8a80dfb1ac1180e67 (diff) | |
| parent | ec4cf65aa0c4194f5314f5b7c7b63264ce997b98 (diff) | |
Merge branch 'master' into pokedex_area_screen
Diffstat (limited to 'include')
| -rw-r--r-- | include/macros.inc | 1 | ||||
| -rw-r--r-- | include/macros/ec.inc | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/macros.inc b/include/macros.inc index 8d58f06de..ea9e57140 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -2,7 +2,6 @@ .include "include/macros/function.inc" .include "include/macros/movement.inc" .include "include/macros/pokemon_data.inc" - .include "include/macros/ec.inc" .include "include/macros/map.inc" .include "include/macros/mystery_event_script.inc" diff --git a/include/macros/ec.inc b/include/macros/ec.inc deleted file mode 100644 index d3fd45c2f..000000000 --- a/include/macros/ec.inc +++ /dev/null @@ -1,8 +0,0 @@ - - .macro ec_duplicates count - .2byte 0xff00 + \count - .endm - - .macro ec_words_by_letter label - .2byte (gEasyChatWordsByLetter_\label - gEasyChatWordsAlphabetized) / 2 - .endm |