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/5.asm | |
| parent | 97637e7ce7110c9a20e5fa9222e445700857a9cb (diff) | |
add constants for volatile statuses and more battle labels/commentary/constants
Diffstat (limited to 'engine/battle/5.asm')
| -rwxr-xr-x | engine/battle/5.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/5.asm b/engine/battle/5.asm index 82518052..e534470d 100755 --- a/engine/battle/5.asm +++ b/engine/battle/5.asm @@ -12,7 +12,7 @@ SubstituteEffectHandler: ; 17dad (5:7dad) ld bc, W_ENEMYBATTSTATUS2 .notEnemy ld a, [bc] ;load flags - bit 4, a ;user already has substitute? + bit HasSubstituteUp, a ;user already has substitute? jr nz, .alreadyHasSubstitute ;skip this code if so ;user doesn't have a substitute [yet] push bc @@ -41,13 +41,13 @@ SubstituteEffectHandler: ; 17dad (5:7dad) ld [hl], d ;store low byte HP ld h, b ld l, c - set 4, [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 ; $7ba8 ;animation enabled: 0F:7BA8 + 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) jr z, .animationEnabled - ld hl, AnimationSubstitute ;animation disabled: 1E:56E0 + ld hl, AnimationSubstitute ;animation disabled: 1E:56E0 ld b, BANK(AnimationSubstitute) .animationEnabled call Bankswitch ;jump to routine depending on animation setting |