diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/effect_commands.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/rollout.asm | 2 | ||||
| -rw-r--r-- | engine/battle/used_move_text.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 815cc17d..07717114 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1110,7 +1110,7 @@ CheckMimicUsed: call GetBattleVar cp MIMIC jr z, .mimic -; + ld b, 0 add hl, bc ld a, [hl] @@ -1545,7 +1545,7 @@ BattleCommand_DamageVariation: call Multiply ; ...divide by 100%... - ld a, $ff ; 100% + ld a, 100 percent ldh [hDivisor], a ld b, $4 call Divide diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index e2f810e6..64d66ad6 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -14,7 +14,7 @@ BattleCommand_CheckCurl: bit SUBSTATUS_ROLLOUT, a jr z, .reset - ld b, $4 ; doturn + ld b, doturn_command jp SkipToBattleCommand .reset diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 5b148ab5..afc735f9 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -5,9 +5,9 @@ BattleCommand_UsedMoveText: jp WaitBGMap UsedMoveText: -; this is a stream of text and asm from 105db9 to 105ef6 text_far _ActorNameText text_asm + ldh a, [hBattleTurn] and a jr nz, .start |