diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-15 20:04:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-15 20:04:58 -0700 |
| commit | bd7d9815936decc5b636f4235c0ee745812dcb48 (patch) | |
| tree | d88ff7a45f7b8a80a02f099052da9b4eb2e14d21 /engine/in_game_trades.asm | |
| parent | more movement stuff (diff) | |
| download | pokeyellow-bd7d9815936decc5b636f4235c0ee745812dcb48.tar.gz pokeyellow-bd7d9815936decc5b636f4235c0ee745812dcb48.tar.xz pokeyellow-bd7d9815936decc5b636f4235c0ee745812dcb48.zip | |
menu stuff
Diffstat (limited to 'engine/in_game_trades.asm')
| -rwxr-xr-x | engine/in_game_trades.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index fb263995..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 |