aboutsummaryrefslogtreecommitdiffstats
path: root/data/trades.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
commit31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch)
tree6941b2b38a2615223b30e8cceb7aab636768dabd /data/trades.asm
parentSplit default names strings into separate lines to make it less unpleasant to... (diff)
parentFix typo: ninetails.asm -> ninetales.asm (diff)
downloadpokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/trades.asm')
-rwxr-xr-xdata/trades.asm13
1 files changed, 0 insertions, 13 deletions
diff --git a/data/trades.asm b/data/trades.asm
index 274b0297..e7f71233 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,17 +1,5 @@
TradeMons: ; 71b7b (1c:5b7b)
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
-IF DEF(_YELLOW)
- db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
- db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
- db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
- db KANGASKHAN,MUK, 0,"STICKY@@@@@"
- db MEW, MEW, 2,"BART@@@@@@@"
- db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
- db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
- db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
- db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
- db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
-ELSE
db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
db ABRA, MR_MIME, 0,"MARCEL@@@@@"
db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
@@ -22,4 +10,3 @@ ELSE
db RAICHU, ELECTRODE,1,"DORIS@@@@@@"
db VENONAT, TANGELA, 2,"CRINKLES@@@"
db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
-ENDC