diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2015-02-03 20:51:53 +0100 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-04 23:22:46 -0800 |
| commit | 9de54645c896cc57a79679aecd6174afc59762c8 (patch) | |
| tree | 8ae99f34ab3e24453c4b8da9b602842d995bb86b /engine/battle/1.asm | |
| parent | More battle commentary/labels/constans and fix some spacing issues (diff) | |
| download | pokeyellow-9de54645c896cc57a79679aecd6174afc59762c8.tar.gz pokeyellow-9de54645c896cc57a79679aecd6174afc59762c8.tar.xz pokeyellow-9de54645c896cc57a79679aecd6174afc59762c8.zip | |
add constants for volatile statuses and more battle labels/commentary/constants
Diffstat (limited to 'engine/battle/1.asm')
| -rwxr-xr-x | engine/battle/1.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/1.asm b/engine/battle/1.asm index fdf2841d..e28cd056 100755 --- a/engine/battle/1.asm +++ b/engine/battle/1.asm @@ -1,5 +1,5 @@ DrainHPEffect_: ; 783f (1:783f) - ld hl, W_DAMAGE ; W_DAMAGE + ld hl, W_DAMAGE ld a, [hl] srl a ; divide damage by 2 ld [hli], a @@ -16,8 +16,8 @@ DrainHPEffect_: ; 783f (1:783f) ld a, [H_WHOSETURN] ; $fff3 and a jp z, Func_7861 - ld hl, wEnemyMonHP ; wEnemyMonHP - ld de, wEnemyMonMaxHP ; wEnemyMonMaxHP + ld hl, wEnemyMonHP + ld de, wEnemyMonMaxHP Func_7861: ; 7861 (1:7861) ld bc, wHPBarOldHP+1 @@ -38,7 +38,7 @@ Func_7861: ; 7861 (1:7861) add b ld [hld], a ld [wHPBarNewHP], a - ld a, [W_DAMAGE] ; W_DAMAGE + ld a, [W_DAMAGE] ld b, [hl] adc b ld [hli], a @@ -83,7 +83,7 @@ Func_7861: ; 7861 (1:7861) and a ld a, [W_PLAYERMOVEEFFECT] ; wcfd3 jr z, .asm_78d2 - ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT + ld a, [W_ENEMYMOVEEFFECT] .asm_78d2 cp DREAM_EATER_EFFECT jr nz, .asm_78d9 |