diff options
| author | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
| commit | 377749ca4efac05b6c57dfed049899891af6c35a (patch) | |
| tree | 4b429403935c4a7c2de710a6cbf7310246874539 /data/events | |
| parent | Fix .tilemap file extension, fix some typos (#138) (diff) | |
| parent | Document visual glitch with Pewter City Gym guy (#526) (diff) | |
| download | pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.gz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.xz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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 1da0036c..0341a87f 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 LICKITUNG, DUGTRIO, TRADE_DIALOGSET_CASUAL, "GURIO@@@@@@" - db CLEFAIRY, MR_MIME, TRADE_DIALOGSET_CASUAL, "MILES@@@@@@" - db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "STINGER@@@@" ; unused - db KANGASKHAN, MUK, TRADE_DIALOGSET_CASUAL, "STICKY@@@@@" - db MEW, MEW, TRADE_DIALOGSET_HAPPY, "BART@@@@@@@" ; unused - db TANGELA, PARASECT, TRADE_DIALOGSET_CASUAL, "SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, TRADE_DIALOGSET_EVOLUTION, "MARTY@@@@@@" ; unused - db GOLDUCK, RHYDON, TRADE_DIALOGSET_EVOLUTION, "BUFFY@@@@@@" - db GROWLITHE, DEWGONG, TRADE_DIALOGSET_HAPPY, "CEZANNE@@@@" - db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" + npctrade LICKITUNG, DUGTRIO, TRADE_DIALOGSET_CASUAL, "GURIO" + npctrade CLEFAIRY, MR_MIME, TRADE_DIALOGSET_CASUAL, "MILES" + npctrade BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "STINGER" ; unused + npctrade KANGASKHAN, MUK, TRADE_DIALOGSET_CASUAL, "STICKY" + npctrade MEW, MEW, TRADE_DIALOGSET_HAPPY, "BART" ; unused + npctrade TANGELA, PARASECT, TRADE_DIALOGSET_CASUAL, "SPIKE" + npctrade PIDGEOT, PIDGEOT, TRADE_DIALOGSET_EVOLUTION, "MARTY" ; unused + npctrade GOLDUCK, RHYDON, TRADE_DIALOGSET_EVOLUTION, "BUFFY" + npctrade GROWLITHE, DEWGONG, TRADE_DIALOGSET_HAPPY, "CEZANNE" + npctrade CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY" assert_table_length NUM_NPC_TRADES |