diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
| commit | 3fdb8a0d8995746d5605136ece384516338489b0 (patch) | |
| tree | 214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/evolve_trade.asm | |
| parent | add constants for volatile statuses and more battle labels/commentary/constants (diff) | |
| download | pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.gz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.xz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.zip | |
serial/trade/misc
Diffstat (limited to 'engine/evolve_trade.asm')
| -rwxr-xr-x | engine/evolve_trade.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index 7fbd4607..ec230677 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -17,7 +17,7 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ; This was fixed in Yellow. - ld a, [wTradeMonNick] + ld a, [wInGameTradeReceiveMonName] ; GRAVELER cp "G" @@ -26,7 +26,7 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ; "SPECTRE" (HAUNTER) cp "S" ret nz - ld a, [wTradeMonNick + 1] + ld a, [wInGameTradeReceiveMonName + 1] cp "P" ret nz @@ -36,9 +36,9 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ld [wWhichPokemon], a ; wWhichPokemon ld a, $1 ld [wccd4], a - ld a, $32 - ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE + ld a, LINK_STATE_TRADING + ld [wLinkState], a callab TryEvolvingMon - xor a - ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE + xor a ; LINK_STATE_NONE + ld [wLinkState], a jp PlayDefaultMusic |