diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
| commit | 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch) | |
| tree | cfc859d11d462e8b4bab1968360a9a85cd83154d /engine/battle/1.asm | |
| parent | Use MAX_LEVEL instead of 100/$64 (diff) | |
| download | pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.gz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.xz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.zip | |
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/battle/1.asm')
| -rwxr-xr-x | engine/battle/1.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/1.asm b/engine/battle/1.asm index 3ae20351..8c0466d4 100755 --- a/engine/battle/1.asm +++ b/engine/battle/1.asm @@ -11,13 +11,13 @@ DrainHPEffect_: ; 783f (1:783f) inc hl inc [hl] .asm_784f - ld hl, W_PLAYERMONCURHP ; wd015 - ld de, W_PLAYERMONMAXHP ; wd023 + ld hl, wBattleMonHP ; wd015 + ld de, wBattleMonMaxHP ; wd023 ld a, [H_WHOSETURN] ; $fff3 and a jp z, Func_7861 - ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP - ld de, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP + ld hl, wEnemyMonHP ; wEnemyMonHP + ld de, wEnemyMonMaxHP ; wEnemyMonMaxHP Func_7861: ; 7861 (1:7861) ld bc, wHPBarOldHP+1 |