aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-05-10 12:25:27 -0500
committerdannye <33dannye@gmail.com>2025-05-10 12:25:27 -0500
commit2c74f137fc42cf7eaffa0a6f9046e4aa89887f91 (patch)
treec52fc10a17597a1d04b63b79c6df78cc1b00de41 /data
parentFix hardcoded address in VC patch (diff)
parentUse features new to RGBDS 0.9.2 (#506) (diff)
downloadpokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.gz
pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.xz
pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data')
-rw-r--r--data/events/trades.asm7
1 files changed, 5 insertions, 2 deletions
diff --git a/data/events/trades.asm b/data/events/trades.asm
index 5c332eb2..1da0036c 100644
--- a/data/events/trades.asm
+++ b/data/events/trades.asm
@@ -4,8 +4,11 @@ TradeMons:
; 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.
- ; Japanese Red and Green used TRADE_DIALOGSET_CASUAL, and had
- ; the same species as English Red and Blue.
+ ; TRADE_DIALOGSET_EVOLUTION did not refer to evolution in Japanese
+ ; Red/Green. Japanese Blue changed _AfterTrade2Text to say your Pokémon
+ ; "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