diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/battle/c.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/battle/c.asm')
| -rwxr-xr-x | engine/battle/c.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/c.asm b/engine/battle/c.asm index b93cc273..c1347d24 100755 --- a/engine/battle/c.asm +++ b/engine/battle/c.asm @@ -21,19 +21,19 @@ ShroudedInMistText: ; 33f52 (c:7f52) db "@" OneHitKOEffect_: ; 33f57 (c:7f57) - ld hl, W_DAMAGE ; $d0d7 + ld hl, W_DAMAGE ; W_DAMAGE xor a ld [hli], a ld [hl], a ; set the damage output to zero dec a - ld [$d05e], a - ld hl, $d02a - ld de, $cffb + ld [wd05e], a + ld hl, wBattleMonSpeed + 1 + ld de, wEnemyMonSpeed + 1 ld a, [H_WHOSETURN] ; $fff3 and a jr z, .asm_33f72 - ld hl, $cffb - ld de, $d02a + ld hl, wEnemyMonSpeed + 1 + ld de, wBattleMonSpeed + 1 .asm_33f72 ld a, [de] dec de @@ -45,14 +45,14 @@ OneHitKOEffect_: ; 33f57 (c:7f57) ld a, [hl] sbc b jr c, .asm_33f8a - ld hl, W_DAMAGE ; $d0d7 + ld hl, W_DAMAGE ; W_DAMAGE ld a, $ff ld [hli], a ld [hl], a ld a, $2 - ld [$d05e], a + ld [wd05e], a ret .asm_33f8a ld a, $1 - ld [W_MOVEMISSED], a ; $d05f + ld [W_MOVEMISSED], a ; W_MOVEMISSED ret |