diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /engine/evolve_trade.asm | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| parent | Commented/labelled misc functions (diff) | |
| download | pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.gz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.xz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.zip | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'engine/evolve_trade.asm')
| -rwxr-xr-x | engine/evolve_trade.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index ffb8a778..7fbd4607 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -38,7 +38,7 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ld [wccd4], a ld a, $32 ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE - callab Func_3ad0e + callab TryEvolvingMon xor a ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE - jp Func_2307 + jp PlayDefaultMusic |