there is no Move0

This commit is contained in:
yenatch
2013-04-25 13:21:49 -04:00
parent 0844e3ee59
commit c0918f94fd
3 changed files with 6 additions and 6 deletions

View File

@@ -11122,7 +11122,7 @@ SkipToBattleCommand: ; 37e8c
GetMoveAttr: ; 37ea1 GetMoveAttr: ; 37ea1
; Assuming hl = Moves + x, return attribute x of move a. ; Assuming hl = Moves + x, return attribute x of move a.
push bc push bc
ld bc, Move1 - Move0 ld bc, Move2 - Move1
call AddNTimes call AddNTimes
call GetMoveByte call GetMoveByte
pop bc pop bc
@@ -11133,7 +11133,7 @@ GetMoveAttr: ; 37ea1
GetMoveData: ; 37ead GetMoveData: ; 37ead
; Copy move struct a to de. ; Copy move struct a to de.
ld hl, Moves ld hl, Moves
ld bc, Move1 - Move0 ld bc, Move2 - Move1
call AddNTimes call AddNTimes
ld a, Bank(Moves) ld a, Bank(Moves)
jp FarCopyBytes jp FarCopyBytes

View File

@@ -2,9 +2,9 @@
; animation, effect, power, type, accuracy, PP, effect chance ; animation, effect, power, type, accuracy, PP, effect chance
Move0:
db POUND, EFFECT_NORMAL_HIT, 40, NORMAL, $ff, 35, $00
Move1: Move1:
db POUND, EFFECT_NORMAL_HIT, 40, NORMAL, $ff, 35, $00
Move2:
db KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, $ff, 25, $00 db KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, $ff, 25, $00
db DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, $d8, 10, $00 db DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, $d8, 10, $00
db COMET_PUNCH, EFFECT_MULTI_HIT, 18, NORMAL, $d8, 15, $00 db COMET_PUNCH, EFFECT_MULTI_HIT, 18, NORMAL, $d8, 15, $00

View File

@@ -10560,8 +10560,8 @@ SpecialDratini: ; 0x8b170
; get the PP of the new move ; get the PP of the new move
dec a dec a
ld hl, Moves + 5 ld hl, Moves + PlayerMovePP - PlayerMoveStruct
ld bc, Move1 - Move0 ld bc, Move2 - Move1
call AddNTimes call AddNTimes
ld a, BANK(Moves) ld a, BANK(Moves)
call GetFarByte call GetFarByte