diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
| commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
| tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /data | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'data')
| -rwxr-xr-x | data/hidden_objects.asm | 2 | ||||
| -rwxr-xr-x | data/trades.asm | 20 |
2 files changed, 11 insertions, 11 deletions
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@@@@@@" |