diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
| commit | 40ea6a5f757bbbfdb4296e5acf644f6679a03a14 (patch) | |
| tree | 2f7957bfa877ce974ad185684f037ba5b6cdfccd /engine/in_game_trades.asm | |
| parent | Swap trade center and battle center (diff) | |
| parent | Merge pull request #101 from YamaArashi/master (diff) | |
| download | pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.gz pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.xz pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/in_game_trades.asm')
| -rwxr-xr-x | engine/in_game_trades.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 7366996c..6f1167d0 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -130,11 +130,11 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld a,[wInGameTradeReceiveMonSpecies] ld [wcf91],a xor a - ld [wcc49],a + ld [wMonDataLocation],a ; not used ld [wRemoveMonFromBox],a call RemovePokemon - ld a,$80 - ld [wcc49],a + ld a,$80 ; prevent the player from naming the mon + ld [wMonDataLocation],a call AddPartyMon call InGameTrade_CopyDataToReceivedMon callab EvolveTradeMon @@ -177,9 +177,9 @@ InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) ld bc, $b call InGameTrade_CopyData ld hl, InGameTrade_TrainerString - ld de, wcd4e + ld de, wTradedEnemyMonOT call InGameTrade_CopyData - ld de, W_GRASSRATE + ld de, wLinkEnemyTrainerName call InGameTrade_CopyData ld hl, wPartyMon1OTID ld bc, wPartyMon2 - wPartyMon1 |