diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/in_game_trades.asm | |
| parent | Use more *Coord (diff) | |
| parent | named town map stuff (diff) | |
| download | pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.gz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.xz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
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 32b55002..7366996c 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -87,8 +87,8 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a) INCLUDE "data/trades.asm" InGameTrade_DoTrade: ; 71c07 (1c:5c07) - xor a - ld [wd07d],a + xor a ; NORMAL_PARTY_MENU + ld [wPartyMenuTypeOrMessageID],a dec a ld [wUpdateSpritesEnabled],a call DisplayPartyMenu @@ -131,7 +131,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld [wcf91],a xor a ld [wcc49],a - ld [wcf95],a + ld [wRemoveMonFromBox],a call RemovePokemon ld a,$80 ld [wcc49],a |