diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/battle/5.asm | |
| parent | rename hJoyHeldLast -> hJoyLast (diff) | |
| parent | Rename some labels (diff) | |
| download | pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/battle/5.asm')
| -rwxr-xr-x | engine/battle/5.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/5.asm b/engine/battle/5.asm index e534470d..ef3e1362 100755 --- a/engine/battle/5.asm +++ b/engine/battle/5.asm @@ -4,7 +4,7 @@ SubstituteEffectHandler: ; 17dad (5:7dad) ld hl, wBattleMonMaxHP ld de, wPlayerSubstituteHP ld bc, W_PLAYERBATTSTATUS2 - ld a, [$fff3] ;whose turn? + ld a, [H_WHOSETURN] and a jr z, .notEnemy ld hl, wEnemyMonMaxHP @@ -23,8 +23,8 @@ SubstituteEffectHandler: ; 17dad (5:7dad) srl a rr b push de - ld de, $fff2 ;subtract 8 to point to [current hp] instead of [max hp] - add hl, de ;HL -= 8 + ld de, wBattleMonHP - wBattleMonMaxHP + add hl, de ; point hl to current HP pop de ld a, b ld [de], a ;save copy of HP to subtract in ccd7/ccd8 [how much HP substitute has] @@ -44,8 +44,8 @@ SubstituteEffectHandler: ; 17dad (5:7dad) set HasSubstituteUp, [hl] ;set bit 4 of flags, user now has substitute ld a, [W_OPTIONS] ;load options bit 7, a ;battle animation is enabled? - ld hl, Func_3fba8 ;animation enabled: 0F:7BA8 - ld b, BANK(Func_3fba8) + ld hl, PlayCurrentMoveAnimation ;animation enabled: 0F:7BA8 + ld b, BANK(PlayCurrentMoveAnimation) jr z, .animationEnabled ld hl, AnimationSubstitute ;animation disabled: 1E:56E0 ld b, BANK(AnimationSubstitute) |