diff --git a/data/events/trades.asm b/data/events/trades.asm index 8734d1d4b..ea5554f60 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -15,14 +15,14 @@ TradeMons: ; Red/Blue uses the original JP Red/Green trades but with the JP Blue ; post-trade text. English Yellow changed _AfterTrade2Text to ; not mention evolution. - 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" + npctrade NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY" ; ROUTE_11_GATE_2F + npctrade ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL" ; ROUTE_2_TRADE_HOUSE + npctrade BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU" ; UNUSED + npctrade PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR" ; CINNABAR_LAB_FOSSIL_ROOM + npctrade SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX" ; VERMILION_TRADE_HOUSE + npctrade SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC" ; ROUTE_18_GATE_2F + npctrade POLIWHIRL, JYNX, TRADE_DIALOGSET_EVOLUTION, "LOLA" ; CERULEAN_TRADE_HOUSE + npctrade RAICHU, ELECTRODE, TRADE_DIALOGSET_EVOLUTION, "DORIS" ; CINNABAR_LAB_TRADE_ROOM + npctrade VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES" ; CINNABAR_LAB_TRADE_ROOM + npctrade NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT" ; UNDERGROUND_PATH_ROUTE_5 assert_table_length NUM_NPC_TRADES