ref: c0918f94fdd3ad5fbe90310f00cc5da40bbab14c
parent: 0844e3ee5948376c948a5a536bbf65fa92bb2af8
author: yenatch <[email protected]>
date: Thu Apr 25 09:21:49 EDT 2013
there is no Move0
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -11122,7 +11122,7 @@
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 @@
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
--- 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
--- a/main.asm
+++ b/main.asm
@@ -10560,8 +10560,8 @@
; get the PP of the new move
dec a
- ld hl, Moves + 5
- ld bc, Move1 - Move0
+ ld hl, Moves + PlayerMovePP - PlayerMoveStruct
+ ld bc, Move2 - Move1
call AddNTimes
ld a, BANK(Moves)
call GetFarByte