diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/effect_commands.asm | 4 | ||||
| -rw-r--r-- | battle/moves/moves.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 2b9ac4eab..cceeac39f 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -11122,7 +11122,7 @@ SkipToBattleCommand: ; 37e8c GetMoveAttr: ; 37ea1 ; Assuming hl = Moves + x, return attribute x of move a. push bc - ld bc, Move1 - Move0 + ld bc, Move2 - Move1 call AddNTimes call GetMoveByte pop bc @@ -11133,7 +11133,7 @@ GetMoveAttr: ; 37ea1 GetMoveData: ; 37ead ; Copy move struct a to de. ld hl, Moves - ld bc, Move1 - Move0 + ld bc, Move2 - Move1 call AddNTimes ld a, Bank(Moves) jp FarCopyBytes diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index d218f7634..ee30cd1e7 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -2,9 +2,9 @@ ; animation, effect, power, type, accuracy, PP, effect chance -Move0: - db POUND, EFFECT_NORMAL_HIT, 40, NORMAL, $ff, 35, $00 Move1: + db POUND, EFFECT_NORMAL_HIT, 40, NORMAL, $ff, 35, $00 +Move2: db KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, $ff, 25, $00 db DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, $d8, 10, $00 db COMET_PUNCH, EFFECT_MULTI_HIT, 18, NORMAL, $d8, 15, $00 |