diff options
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..4e21f6de 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -406,7 +406,7 @@ MainInBattleLoop: ld a, [wEnemyBattleStatus1] bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump -; enemy is using a mult-turn attack like wrap, so player is trapped and cannot execute a move +; enemy is using a multi-turn attack like wrap, so player is trapped and cannot execute a move ld a, $ff ld [wPlayerSelectedMove], a jr .selectEnemyMove @@ -704,7 +704,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ret ; adds bc to enemy HP -; bc isn't updated if HP substracted was capped to prevent overkill +; bc isn't updated if HP subtracted was capped to prevent overkill HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP @@ -1218,7 +1218,7 @@ ChooseNextMon: ret ; called when player is out of usable mons. -; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) +; prints appropriate lose message, sets carry flag if player blacked out (special case for initial rival fight) HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -3550,7 +3550,7 @@ CheckPlayerStatusConditions: ld c,[hl] ld hl,wPlayerBideAccumulatedDamage + 1 ld a,[hl] - add c ; acumulate damage taken + add c ; accumulate damage taken ld [hld],a ld a,[hl] adc b @@ -4286,7 +4286,7 @@ GetDamageVarsForPlayerAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wBattleMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4399,7 +4399,7 @@ GetDamageVarsForEnemyAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wEnemyMonSpecial ld a, [wCriticalHitOrOHKO] @@ -7291,16 +7291,16 @@ PoisonEffect: ld de, wEnemyMoveEffect .poisonEffect call CheckTargetSubstitute - jr nz, .noEffect ; can't posion a substitute target + jr nz, .noEffect ; can't poison a substitute target ld a, [hli] ld b, a and a jr nz, .noEffect ; miss if target is already statused ld a, [hli] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [hld] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [de] cp POISON_SIDE_EFFECT1 @@ -7780,7 +7780,7 @@ StatModifierDownEffect: jp nz, MoveMissed ld a, [de] sub ATTACK_DOWN1_EFFECT - cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers al -1 effects + cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects jr c, .decrementStatMod sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect .decrementStatMod |