ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

use fewer easy chat macros

Browse Source
This commit is contained in:
YamaArashi 2015-10-16 21:58:26 -07:00
parent 22bafa45ca
commit b189af94cc
3 changed files with 3378 additions and 3445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
asm/macros.s
View File

@ -109,90 +109,22 @@
.2byte 20000 + \species .2byte 20000 + \species
.endm .endm
.macro ec_word_pokemon ec_word .macro ec_word word
.2byte (EC_GROUP_POKEMON << 9) | SPECIES_\ec_word .2byte EC_WORD_\word
.endm .endm
.macro ec_word_trainer ec_word .macro ec_move1 name
.2byte (EC_GROUP_TRAINER << 9) | EC_WORD_\ec_word .2byte (EC_GROUP_MOVE_1 << 9) | MOVE_\name
.endm .endm
.macro ec_word_status ec_word .macro ec_move2 name
.2byte (EC_GROUP_STATUS << 9) | EC_WORD_\ec_word .2byte (EC_GROUP_MOVE_2 << 9) | MOVE_\name
.endm .endm
.macro ec_word_battle ec_word .macro ec_pokemon1 name
.2byte (EC_GROUP_BATTLE << 9) | EC_WORD_\ec_word .2byte (EC_GROUP_POKEMON << 9) | SPECIES_\name
.endm .endm
.macro ec_word_greetings ec_word .macro ec_pokemon2 name
.2byte (EC_GROUP_GREETINGS << 9) | EC_WORD_\ec_word .2byte (EC_GROUP_POKEMON2 << 9) | SPECIES_\name
.endm
.macro ec_word_people ec_word
.2byte (EC_GROUP_PEOPLE << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_voices ec_word
.2byte (EC_GROUP_VOICES << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_speech ec_word
.2byte (EC_GROUP_SPEECH << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_endings ec_word
.2byte (EC_GROUP_ENDINGS << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_feelings ec_word
.2byte (EC_GROUP_FEELINGS << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_conditions ec_word
.2byte (EC_GROUP_CONDITIONS << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_actions ec_word
.2byte (EC_GROUP_ACTIONS << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_lifestyle ec_word
.2byte (EC_GROUP_LIFESTYLE << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_hobbies ec_word
.2byte (EC_GROUP_HOBBIES << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_time ec_word
.2byte (EC_GROUP_TIME << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_misc ec_word
.2byte (EC_GROUP_MISC << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_adjectives ec_word
.2byte (EC_GROUP_ADJECTIVES << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_events ec_word
.2byte (EC_GROUP_EVENTS << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_move_1 ec_word
.2byte (EC_GROUP_MOVE_1 << 9) | MOVE_\ec_word
.endm
.macro ec_word_move_2 ec_word
.2byte (EC_GROUP_MOVE_2 << 9) | MOVE_\ec_word
.endm
.macro ec_word_trendy_saying ec_word
.2byte (EC_GROUP_TRENDY_SAYING << 9) | EC_WORD_\ec_word
.endm
.macro ec_word_pokemon2 ec_word
.2byte (EC_GROUP_POKEMON2 << 9) | SPECIES_\ec_word
.endm .endm

2061
constants/easy_chat_constants.s
View File

File diff suppressed because it is too large Load Diff

4674
data/text/easy_chat/easy_chat_words_by_letter.s
View File

File diff suppressed because it is too large Load Diff