From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sat, 11 Jun 2016 15:45:24 -0500
Subject: Sync with pokered from August 29, 2015 to April 6, 2016

---
 data/hidden_objects.asm |  2 +-
 data/trades.asm         | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'data')

diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
index ccf32510..6738d597 100755
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -299,7 +299,7 @@ SaffronPokecenterHiddenObjects:
 
 RedsHouse2FHiddenObjects:
 	hidden_object   1,   0, SPRITE_FACING_UP, OpenRedsPC
-	hidden_object   5,   3, $d0, PrintRedsNESText
+	hidden_object   5,   3, $d0, PrintRedSNESText
 	db $ff
 
 BluesHouseHiddenObjects:
diff --git a/data/trades.asm b/data/trades.asm
index b1430089..77fc55f4 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,12 +1,12 @@
 TradeMons: ; 71c1d (1c:5c1d)
 ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
-	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@@@@@@"
+	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@@@@@@"
-- 
cgit v1.3.1-sl0p