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/battle/e.asm | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
| parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) | |
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/battle/e.asm')
| -rwxr-xr-x | engine/battle/e.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/e.asm b/engine/battle/e.asm index 9abeeec8..072aca49 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -1203,11 +1203,11 @@ Func_3a72a: ; 3a72a (e:672a) ld a,d ; how many available monsters are there? cp 2 ; don't bother if only 1 or 2 - jp nc,Func_3a74b + jp nc,SwitchEnemyMon and a ret -Func_3a74b: ; 3a74b (e:674b) +SwitchEnemyMon: ; 3a74b (e:674b) ; prepare to withdraw the active monster: copy hp, number, and status to roster |