diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:12:54 -0500 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:12:54 -0500 |
commit | b56c1b6351f51742903250ee0c4eae9d22e2b6a5 (patch) | |
tree | e288ee3655a5c4c9d383370c4eb4102f1ad8f9a0 /engine/battle/effect_commands.asm | |
parent | 980153ac472870602a51779dbff623ea0072ed98 (diff) |
More syncing with pokecrystal
Diffstat (limited to 'engine/battle/effect_commands.asm')
-rw-r--r-- | engine/battle/effect_commands.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 12f7a101..2560c33d 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -3632,9 +3632,9 @@ BattleCommand_SleepTarget: .random_loop call BattleRandom - and 7 + and SLP jr z, .random_loop - cp 7 + cp SLP jr z, .random_loop inc a ld [de], a @@ -4667,7 +4667,7 @@ GetStatName: .Copy: ld de, wStringBuffer2 - ld bc, 10 + ld bc, NAME_LENGTH - 1 jp CopyBytes INCLUDE "data/battle/stat_names.asm" @@ -5669,7 +5669,7 @@ BattleCommand_Charge: text_end BattleCommand_Unused3C: -; unused +; effect0x3c ret BattleCommand_TrapTarget: @@ -6440,7 +6440,7 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm" INCLUDE "engine/battle/move_effects/rollout.asm" BattleCommand_Unused5D: -; unused +; effect0x5d ret INCLUDE "engine/battle/move_effects/fury_cutter.asm" |