diff options
| author | klektron <klektron@users.noreply.github.com> | 2020-12-28 13:59:57 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2020-12-28 13:59:57 +0100 |
| commit | 34db7c5554880e83eb35019700e19d859972d5b7 (patch) | |
| tree | 5a3e5336f0f25dac61cac8d0ceab8c4b948fb65e | |
| parent | 15b76961743e851d82b70674e282b51d297a77fd (diff) | |
changed trades nicknames and fixed error in text_1
| -rwxr-xr-x | data/events/trades.asm | 12 | ||||
| -rw-r--r-- | data/text/text_1.asm | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/data/events/trades.asm b/data/events/trades.asm index 7018c22f..c71987a9 100755 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -1,13 +1,13 @@ TradeMons: ; entries correspond to TRADE_FOR_* constants ; give mon, get mon, dialog id, nickname - db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@" + db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "BOB@@@@@@@@" db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" - db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@" - db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@" + db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "MARINERO@@@" + db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "KUMO@@@@@@@" + db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARCO@@@@@@" db POLIWHIRL, JYNX, TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@" db RAICHU, ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@" - db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@" + db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "RINKES@@@@@" + db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "DON@@@@@@@@" diff --git a/data/text/text_1.asm b/data/text/text_1.asm index c0857347..c8f0364b 100644 --- a/data/text/text_1.asm +++ b/data/text/text_1.asm @@ -16,7 +16,6 @@ _CardKeyFailText:: done _TrainerNameText:: - text_start text_ram wcd6d text ": @" text_end |