diff options
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/battle/move_effects/substitute.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c5d6a1d1..83a52c2a 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4160,7 +4160,7 @@ IgnoredOrdersText: GetDamageVarsForPlayerAttack: xor a ld hl, wDamage ; damage to eventually inflict, initialise to zero - ldi [hl], a + ld [hli], a ld [hl], a ld hl, wPlayerMovePower ld a, [hli] @@ -4466,8 +4466,8 @@ CalculateDamage: xor a ld hl, hDividend - ldi [hl], a - ldi [hl], a + ld [hli], a + ld [hli], a ld [hl], a ; Multiply level by 2 @@ -4480,11 +4480,11 @@ CalculateDamage: pop af .nc inc hl - ldi [hl], a + ld [hli], a ; Divide by 5 ld a, 5 - ldd [hl], a + ld [hld], a push bc ld b, 4 call Divide @@ -4723,7 +4723,7 @@ HandleCounterMove: ; if it did damage, double it ld a, [hl] add a - ldd [hl], a + ld [hld], a ld a, [hl] adc a ld [hl], a @@ -5074,7 +5074,7 @@ HandleBuildingRage: call StatModifierUpEffect ; stat modifier raising function pop hl xor a - ldd [hl], a ; null move effect + ld [hld], a ; null move effect ld a, RAGE ld [hl], a ; restore the target pokemon's move number to Rage ldh a, [hWhoseTurn] diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index b1fd8ac2..e4311209 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -39,7 +39,7 @@ SubstituteEffect_: jr c, .notEnoughHP ; underflow means user would be left with negative health ; bug: since it only branches on carry, it will possibly leave user with 0 HP .userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after subtraction into current HP + ld [hli], a ; save resulting HP after subtraction into current HP ld [hl], d ld h, b ld l, c |