diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-08-17 09:58:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-17 09:58:09 -0400 |
| commit | 5e8b835ba3db49eed6461d47492499d938c49158 (patch) | |
| tree | 627a831c8d29bbf9446ec7aa1012176ca396d63a /data/events | |
| parent | Use `<STAT>_UP1_EFFECT` constants (#522) (diff) | |
| download | pokeyellow-5e8b835ba3db49eed6461d47492499d938c49158.tar.gz pokeyellow-5e8b835ba3db49eed6461d47492499d938c49158.tar.xz pokeyellow-5e8b835ba3db49eed6461d47492499d938c49158.zip | |
Use `dname` macro to automatically pad names with `"@"` characters (#525)
Diffstat (limited to 'data/events')
| -rw-r--r-- | data/events/trades.asm | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/data/events/trades.asm b/data/events/trades.asm index e02177d5..2f5b9116 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -1,7 +1,12 @@ +MACRO npctrade +; give mon, get mon, dialog id, nickname + db \1, \2, \3 + dname \4, NAME_LENGTH +ENDM + TradeMons: ; entries correspond to TRADE_FOR_* constants table_width 3 + NAME_LENGTH - ; give mon, get mon, dialog id, nickname ; The two instances of TRADE_DIALOGSET_EVOLUTION are a leftover ; from the Japanese Blue trades, which used species that evolve. ; TRADE_DIALOGSET_EVOLUTION did not refer to evolution in Japanese @@ -9,14 +14,14 @@ TradeMons: ; "went and evolved" and also changed the trades to match. English ; Red/Blue uses the original JP Red/Green trades but with the JP Blue ; post-trade text. - db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@" - db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" - db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" ; unused - db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@" - db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@" - db POLIWHIRL, JYNX, TRADE_DIALOGSET_EVOLUTION, "LOLA@@@@@@@" - db RAICHU, ELECTRODE, TRADE_DIALOGSET_EVOLUTION, "DORIS@@@@@@" - db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@" + npctrade NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY" + npctrade ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL" + npctrade BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU" ; unused + npctrade PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR" + npctrade SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX" + npctrade SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC" + npctrade POLIWHIRL, JYNX, TRADE_DIALOGSET_EVOLUTION, "LOLA" + npctrade RAICHU, ELECTRODE, TRADE_DIALOGSET_EVOLUTION, "DORIS" + npctrade VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES" + npctrade NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT" assert_table_length NUM_NPC_TRADES |