diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 18:35:24 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2017-08-10 18:35:24 +1200 |
| commit | bfff18f882b325827fbfc892ba4ce5b9e1a51604 (patch) | |
| tree | d8db8dc0caa7d42b493d820fd5a0975f5331092a /engine/battle/moveEffects | |
| parent | 834fa28551f3f0df9668be8d344c8affaf94c62a (diff) | |
Update to latest pokered
Diffstat (limited to 'engine/battle/moveEffects')
| -rw-r--r-- | engine/battle/moveEffects/haze_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/heal_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/recoil_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/substitute_effect.asm | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index bd20f231..06907bcc 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -12,6 +12,7 @@ HazeEffect_: ld hl, wEnemyMonUnmodifiedAttack ld de, wEnemyMonAttack call ResetStats +; cure non-volatile status, but only for the target ld hl, wEnemyMonStatus ld de, wEnemySelectedMove ld a, [H_WHOSETURN] @@ -46,7 +47,6 @@ HazeEffect_: jp PrintText CureVolatileStatuses: -; only cures statuses of the Pokemon not using Haze res Confused, [hl] inc hl ; BATTSTATUS2 ld a, [hl] diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index b7d8283f..2e68acc0 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -76,7 +76,7 @@ HealEffect_: ld a, [de] sbc [hl] jr c, .playAnim -; copy max HP to current HP if an overflow ocurred +; copy max HP to current HP if an overflow occurred ld a, [hli] ld [de], a ld [wHPBarNewHP+1], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 7fc90c44..0f2f087b 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -25,7 +25,7 @@ RecoilEffect_: jr nz, .updateHP inc c ; minimum recoil damage is 1 .updateHP -; substract HP from user due to the recoil damage +; subtract HP from user due to the recoil damage ld a, [hli] ld [wHPBarMaxHP+1], a ld a, [hl] diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 03314ebf..6cca3eae 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -37,9 +37,9 @@ SubstituteEffect_: sbc 0 pop bc jr c, .notEnoughHP ; underflow means user would be left with negative health - ; bug: since it only brances on carry, it will possibly leave user with 0 HP + ; bug: since it only branches on carry, it will possibly leave user with 0 HP .userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after substraction into current HP + ldi [hl], a ; save resulting HP after subtraction into current HP ld [hl], d ld h, b ld l, c |