diff options
| author | YamaArashi <shadow962@live.com> | 2016-01-26 23:45:20 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-01-26 23:45:20 -0800 |
| commit | 10b1f13681ce4f5894ef41ad9057ab4b65e3172e (patch) | |
| tree | 55bad60769113d536b7f113428e0ff69f333ebe9 /asm | |
| parent | 6b7cddeda393dda2e5e980c67c8425480c24d0a8 (diff) | |
alphabetized easy chat words
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/ec.s | 10 | ||||
| -rw-r--r-- | asm/rom.s | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/asm/macros/ec.s b/asm/macros/ec.s index a70b8e244..44c974e53 100644 --- a/asm/macros/ec.s +++ b/asm/macros/ec.s @@ -15,5 +15,13 @@ .endm .macro ec_pokemon2 name - .2byte (EC_GROUP_POKEMON2 << 9) | SPECIES_\name + .2byte (EC_GROUP_POKEMON_2 << 9) | SPECIES_\name + .endm + + .macro ec_duplicates count + .2byte 0xff00 + \count + .endm + + .macro ec_words_by_letter label + .2byte (gEasyChatWordsByLetter_\label - gEasyChatWordsAlphabetized) / 2 .endm @@ -482923,7 +482923,7 @@ _080EAEE6: .align 2 _080EAF10: .4byte gUnknown_083DB694 _080EAF14: .4byte 0x00004142 -_080EAF18: .4byte gUnknown_083DEFC2 +_080EAF18: .4byte gEasyChatWordsByLetter _080EAF1C: ldr r2, _080EAFB0 adds r0, r6, 0 @@ -483001,7 +483001,7 @@ _080EAFA2: bne _080EAF4E b _080EB00C .align 2 -_080EAFB0: .4byte gUnknown_083DE138 +_080EAFB0: .4byte gEasyChatWordsAlphabetized _080EAFB4: .4byte 0x0000feff _080EAFB8: .4byte 0x0000ffff _080EAFBC: .4byte 0x000001ff |