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/c.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/c.asm')
| -rwxr-xr-x | engine/battle/c.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/c.asm b/engine/battle/c.asm index c1347d24..e31b1fce 100755 --- a/engine/battle/c.asm +++ b/engine/battle/c.asm @@ -26,7 +26,7 @@ OneHitKOEffect_: ; 33f57 (c:7f57) ld [hli], a ld [hl], a ; set the damage output to zero dec a - ld [wd05e], a + ld [wCriticalHitOrOHKO], a ld hl, wBattleMonSpeed + 1 ld de, wEnemyMonSpeed + 1 ld a, [H_WHOSETURN] ; $fff3 @@ -50,7 +50,7 @@ OneHitKOEffect_: ; 33f57 (c:7f57) ld [hli], a ld [hl], a ld a, $2 - ld [wd05e], a + ld [wCriticalHitOrOHKO], a ret .asm_33f8a ld a, $1 |