diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/effect_commands.asm | 12 | ||||
| -rw-r--r-- | engine/battle/move_effects/belly_drum.asm | 2 | ||||
| -rw-r--r-- | engine/battle/used_move_text.asm | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 14f1afd82..53d1d9ff0 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -3652,17 +3652,17 @@ BattleCommand_SleepTarget: jr nz, .fail call AnimateCurrentMove - ld b, $7 + ld b, SLP ld a, [wInBattleTowerBattle] and a jr z, .random_loop - ld b, $3 + ld b, %011 .random_loop call BattleRandom and b jr z, .random_loop - cp 7 + cp SLP jr z, .random_loop inc a ld [de], a @@ -5714,7 +5714,8 @@ BattleCommand_Charge: text_far _BattleDugText text_end -BattleCommand_Unused3C: ; unreferenced +BattleCommand_Unused3C: +; effect0x3c ret BattleCommand_TrapTarget: @@ -6488,7 +6489,8 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm" INCLUDE "engine/battle/move_effects/rollout.asm" -BattleCommand_Unused5D: ; unreferenced +BattleCommand_Unused5D: +; effect0x5d ret INCLUDE "engine/battle/move_effects/fury_cutter.asm" diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm index ac415f576..912f702bd 100644 --- a/engine/battle/move_effects/belly_drum.asm +++ b/engine/battle/move_effects/belly_drum.asm @@ -17,7 +17,7 @@ BattleCommand_BellyDrum: pop bc callfar SubtractHPFromUser call UpdateUserInParty - ld a, 5 + ld a, MAX_STAT_LEVEL - BASE_STAT_LEVEL - 1 .max_attack_loop push af diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 605c48e30..c53378907 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -1,5 +1,4 @@ DisplayUsedMoveText: -; battle command 03 ld hl, UsedMoveText call BattleTextbox jp WaitBGMap |