Extract move data table (needs identification)

7 files changed, 274 insertions, 10 deletions

diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index f7693ae..165cbab 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -294,6 +294,3 @@ NUM_ATTACKS EQU const_value - 1
 	const BATTLEANIM_WOBBLE
 	const BATTLEANIM_SHAKE
 	const BATTLEANIM_HIT_CONFUSION
-
-
-MOVE_DATA_SIZE EQU 7
diff --git a/data/moves/moves.asm b/data/moves/moves.asm
new file mode 100644
index 0000000..2cf54ed
--- /dev/null
+++ b/data/moves/moves.asm
@@ -0,0 +1,266 @@
+INCLUDE "constants.asm"
+
+move: MACRO
+	db \1 ; animation
+	db \2 ; effect
+	db \3 ; power
+	db \4 ; type
+	db \5 ; accuracy
+	db \6 ; pp
+	db \7 ; effect chance
+ENDM
+
+SECTION "data/moves/moves.asm", ROMX
+
+Moves::
+	move $01, $00, $28, $00, $ff, $23, $00
+	move $02, $00, $32, $00, $ff, $19, $00
+	move $03, $1d, $0f, $00, $d8, $0a, $00
+	move $04, $1d, $12, $00, $d8, $0f, $00
+	move $05, $00, $50, $00, $d8, $14, $00
+	move $06, $22, $28, $00, $ff, $14, $00
+	move $07, $04, $4b, $14, $ff, $0f, $19
+	move $08, $05, $4b, $19, $ff, $0f, $19
+	move $09, $06, $4b, $17, $ff, $0f, $19
+	move $0a, $00, $28, $00, $ff, $1e, $00
+	move $0b, $00, $37, $00, $ff, $1e, $00
+	move $0c, $26, $01, $00, $4c, $05, $00
+	move $0d, $27, $50, $00, $bf, $0a, $00
+	move $0e, $32, $00, $00, $ff, $1e, $00
+	move $0f, $00, $32, $00, $f2, $1e, $00
+	move $10, $00, $28, $02, $ff, $23, $00
+	move $11, $00, $3c, $02, $ff, $23, $00
+	move $12, $1c, $00, $00, $d8, $14, $00
+	move $13, $2b, $46, $02, $f2, $0f, $00
+	move $14, $2a, $0f, $00, $bf, $14, $00
+	move $15, $00, $50, $00, $bf, $14, $00
+	move $16, $00, $23, $16, $ff, $0a, $00
+	move $17, $25, $41, $00, $ff, $14, $4c
+	move $18, $2c, $1e, $01, $ff, $1e, $00
+	move $19, $00, $78, $00, $bf, $05, $00
+	move $1a, $2d, $46, $01, $f2, $19, $00
+	move $1b, $25, $3c, $01, $d8, $0f, $4c
+	move $1c, $17, $00, $00, $ff, $0f, $00
+	move $1d, $25, $46, $00, $ff, $0f, $4c
+	move $1e, $00, $41, $00, $ff, $19, $00
+	move $1f, $1d, $0f, $00, $d8, $14, $00
+	move $20, $26, $01, $00, $4c, $05, $00
+	move $21, $00, $23, $00, $f2, $23, $00
+	move $22, $06, $55, $00, $ff, $0f, $4c
+	move $23, $2a, $0f, $00, $d8, $14, $00
+	move $24, $30, $5a, $00, $d8, $14, $00
+	move $25, $1b, $5a, $00, $ff, $14, $00
+	move $26, $30, $64, $00, $ff, $0f, $00
+	move $27, $13, $00, $00, $ff, $1e, $00
+	move $28, $02, $0f, $03, $ff, $23, $19
+	move $29, $4d, $19, $07, $ff, $14, $33
+	move $2a, $1d, $0e, $07, $d8, $14, $00
+	move $2b, $13, $00, $00, $ff, $1e, $00
+	move $2c, $1f, $3c, $00, $ff, $19, $19
+	move $2d, $12, $00, $00, $ff, $28, $00
+	move $2e, $1c, $00, $00, $ff, $14, $00
+	move $2f, $01, $00, $00, $8c, $0f, $00
+	move $30, $31, $00, $00, $8c, $14, $00
+	move $31, $29, $14, $00, $e5, $14, $00
+	move $32, $56, $00, $00, $8c, $14, $00
+	move $33, $45, $28, $03, $ff, $1e, $19
+	move $34, $04, $28, $14, $ff, $19, $19
+	move $35, $04, $5f, $14, $ff, $0f, $19
+	move $36, $2e, $00, $19, $ff, $1e, $00
+	move $37, $00, $28, $15, $ff, $19, $00
+	move $38, $00, $78, $15, $cc, $05, $00
+	move $39, $00, $5f, $15, $ff, $0f, $00
+	move $3a, $05, $5f, $19, $ff, $0a, $19
+	move $3b, $05, $78, $19, $e5, $05, $4c
+	move $3c, $4c, $41, $18, $ff, $14, $19
+	move $3d, $46, $41, $15, $ff, $14, $19
+	move $3e, $44, $41, $19, $ff, $14, $19
+	move $3f, $50, $96, $00, $e5, $05, $00
+	move $40, $00, $23, $02, $ff, $23, $00
+	move $41, $00, $50, $02, $ff, $14, $00
+	move $42, $30, $50, $01, $cc, $19, $00
+	move $43, $25, $32, $01, $e5, $14, $4c
+	move $44, $59, $01, $01, $ff, $14, $00
+	move $45, $57, $01, $01, $ff, $14, $00
+	move $46, $00, $50, $00, $ff, $0f, $00
+	move $47, $03, $14, $16, $ff, $14, $00
+	move $48, $03, $28, $16, $ff, $0a, $00
+	move $49, $54, $01, $16, $e5, $0a, $00
+	move $4a, $0d, $00, $00, $ff, $28, $00
+	move $4b, $00, $37, $16, $f2, $19, $00
+	move $4c, $27, $78, $16, $ff, $0a, $00
+	move $4d, $42, $00, $03, $bf, $23, $00
+	move $4e, $43, $00, $16, $bf, $1e, $00
+	move $4f, $01, $00, $16, $bf, $0f, $00
+	move $50, $1b, $46, $16, $ff, $14, $00
+	move $51, $14, $00, $07, $f2, $28, $00
+	move $52, $29, $28, $1a, $ff, $0a, $00
+	move $53, $2a, $0f, $14, $b2, $0f, $00
+	move $54, $06, $28, $17, $ff, $1e, $19
+	move $55, $06, $5f, $17, $ff, $0f, $19
+	move $56, $43, $00, $17, $ff, $14, $00
+	move $57, $06, $78, $17, $b2, $0a, $19
+	move $58, $00, $32, $05, $a5, $0f, $00
+	move $59, $00, $64, $04, $ff, $0a, $00
+	move $5a, $26, $01, $04, $4c, $05, $00
+	move $5b, $27, $3c, $04, $ff, $0a, $00
+	move $5c, $21, $00, $03, $d8, $0a, $00
+	move $5d, $4c, $32, $18, $ff, $19, $19
+	move $5e, $48, $5a, $18, $ff, $0a, $00
+	move $5f, $01, $00, $18, $99, $14, $00
+	move $60, $0a, $00, $18, $ff, $28, $00
+	move $61, $34, $00, $18, $ff, $1e, $00
+	move $62, $67, $28, $00, $ff, $1e, $00
+	move $63, $51, $14, $00, $ff, $14, $00
+	move $64, $1c, $00, $18, $ff, $14, $00
+	move $65, $57, $01, $08, $ff, $0f, $00
+	move $66, $52, $00, $00, $ff, $0a, $00
+	move $67, $3b, $00, $00, $d8, $28, $00
+	move $68, $10, $00, $00, $ff, $0f, $00
+	move $69, $20, $00, $00, $ff, $14, $00
+	move $6a, $0b, $00, $00, $ff, $1e, $00
+	move $6b, $10, $00, $00, $ff, $14, $00
+	move $6c, $17, $00, $00, $ff, $14, $00
+	move $6d, $31, $00, $08, $ff, $0a, $00
+	move $6e, $0b, $00, $15, $ff, $28, $00
+	move $6f, $0b, $00, $00, $ff, $28, $00
+	move $70, $33, $00, $18, $ff, $1e, $00
+	move $71, $23, $00, $18, $ff, $1e, $00
+	move $72, $19, $00, $19, $ff, $1e, $00
+	move $73, $41, $00, $18, $ff, $14, $00
+	move $74, $2f, $00, $00, $ff, $1e, $00
+	move $75, $1a, $00, $00, $ff, $0a, $00
+	move $76, $53, $01, $00, $ff, $0a, $00
+	move $77, $09, $00, $02, $ff, $14, $00
+	move $78, $07, $c8, $00, $ff, $05, $00
+	move $79, $00, $64, $00, $bf, $0a, $00
+	move $7a, $06, $14, $08, $ff, $1e, $4c
+	move $7b, $02, $14, $03, $b2, $14, $00
+	move $7c, $02, $41, $03, $ff, $14, $4c
+	move $7d, $1f, $41, $04, $d8, $14, $19
+	move $7e, $04, $78, $14, $d8, $05, $19
+	move $7f, $00, $50, $15, $ff, $0f, $00
+	move $80, $2a, $23, $15, $bf, $0a, $00
+	move $81, $11, $3c, $00, $ff, $14, $00
+	move $82, $27, $64, $00, $ff, $0f, $00
+	move $83, $1d, $14, $00, $ff, $0f, $00
+	move $84, $46, $0a, $00, $ff, $23, $19
+	move $85, $36, $00, $18, $ff, $14, $00
+	move $86, $17, $00, $18, $cc, $0f, $00
+	move $87, $20, $00, $00, $ff, $0a, $00
+	move $88, $2d, $55, $01, $e5, $14, $00
+	move $89, $43, $00, $00, $bf, $1e, $00
+	move $8a, $08, $64, $18, $ff, $0f, $00
+	move $8b, $42, $00, $03, $8c, $28, $00
+	move $8c, $1d, $0f, $00, $d8, $14, $00
+	move $8d, $03, $14, $07, $ff, $0f, $00
+	move $8e, $01, $00, $00, $bf, $0a, $00
+	move $8f, $27, $8c, $02, $e5, $05, $00
+	move $90, $39, $00, $00, $ff, $0a, $00
+	move $91, $46, $14, $15, $ff, $1e, $19
+	move $92, $00, $46, $00, $ff, $0a, $00
+	move $93, $01, $00, $16, $ff, $0f, $00
+	move $94, $17, $00, $00, $b2, $14, $00
+	move $95, $58, $01, $18, $cc, $0f, $00
+	move $96, $55, $00, $00, $ff, $28, $00
+	move $97, $33, $00, $03, $ff, $28, $00
+	move $98, $00, $5a, $15, $d8, $0a, $00
+	move $99, $07, $fa, $00, $ff, $05, $00
+	move $9a, $1d, $12, $00, $cc, $0f, $00
+	move $9b, $2c, $32, $04, $e5, $0a, $00
+	move $9c, $20, $00, $18, $ff, $0a, $00
+	move $9d, $1f, $4b, $05, $e5, $0a, $4c
+	move $9e, $1f, $50, $00, $e5, $0f, $19
+	move $9f, $0a, $00, $00, $ff, $1e, $00
+	move $a0, $1e, $00, $00, $ff, $1e, $00
+	move $a1, $00, $50, $00, $ff, $0a, $4c
+	move $a2, $28, $01, $00, $e5, $0a, $00
+	move $a3, $00, $46, $00, $ff, $14, $00
+	move $a4, $4f, $00, $00, $ff, $0a, $00
+	move $a5, $30, $32, $00, $ff, $00, $00
+	move $a6, $5f, $00, $00, $ff, $01, $00
+	move $a7, $68, $3c, $01, $ff, $0a, $00
+	move $a8, $69, $28, $1b, $ff, $0a, $00
+	move $a9, $6a, $00, $07, $ff, $0a, $00
+	move $aa, $5e, $00, $00, $ff, $0a, $00
+	move $ab, $6b, $32, $08, $ff, $0a, $00
+	move $ac, $6c, $3c, $14, $ff, $0a, $00
+	move $ad, $5c, $28, $00, $ff, $0a, $4c
+	move $ae, $6d, $28, $08, $ff, $0a, $00
+	move $af, $63, $01, $00, $ff, $0a, $00
+	move $b0, $5d, $00, $00, $ff, $0f, $00
+	move $b1, $6e, $28, $00, $ff, $0a, $00
+	move $b2, $14, $00, $16, $ff, $0a, $00
+	move $b3, $63, $01, $01, $ff, $0a, $00
+	move $b4, $64, $00, $08, $ff, $05, $00
+	move $b5, $00, $28, $19, $ff, $0a, $19
+	move $b6, $6f, $00, $00, $ff, $0a, $00
+	move $b7, $67, $28, $01, $ff, $0f, $00
+	move $b8, $3b, $00, $00, $d8, $28, $00
+	move $b9, $00, $3c, $1b, $ff, $0a, $00
+	move $ba, $31, $00, $00, $ff, $0a, $00
+	move $bb, $0a, $00, $00, $ff, $0a, $00
+	move $bc, $00, $5a, $03, $ff, $0a, $00
+	move $bd, $17, $14, $00, $ff, $0a, $ff
+	move $be, $00, $41, $15, $ff, $0a, $00
+	move $bf, $70, $28, $00, $ff, $0a, $00
+	move $c0, $06, $64, $17, $7f, $05, $ff
+	move $c1, $71, $00, $00, $ff, $0a, $00
+	move $c2, $62, $00, $08, $ff, $05, $00
+	move $c3, $72, $00, $00, $ff, $0a, $00
+	move $c4, $1e, $00, $18, $ff, $0a, $00
+	move $c5, $5e, $00, $00, $ff, $0a, $00
+	move $c6, $00, $19, $04, $ff, $0a, $00
+	move $c7, $5e, $00, $00, $ff, $0a, $00
+	move $c8, $1b, $5a, $1a, $ff, $0a, $00
+	move $c9, $73, $14, $05, $ff, $0a, $00
+	move $ca, $00, $3c, $16, $ff, $0a, $00
+	move $cb, $74, $00, $00, $ff, $0a, $00
+	move $cc, $3a, $00, $00, $d8, $28, $00
+	move $cd, $75, $1e, $05, $c8, $0a, $00
+	move $ce, $65, $28, $00, $ff, $14, $00
+	move $cf, $76, $00, $00, $ff, $0a, $ff
+	move $d0, $20, $00, $00, $ff, $0a, $00
+	move $d1, $06, $41, $17, $ff, $14, $19
+	move $d2, $77, $19, $07, $ff, $14, $33
+	move $d3, $00, $46, $09, $ff, $0a, $00
+	move $d4, $31, $00, $18, $ff, $0a, $00
+	move $d5, $78, $00, $00, $ff, $0a, $00
+	move $d6, $61, $00, $00, $ff, $0a, $00
+	move $d7, $66, $00, $00, $ff, $0a, $00
+	move $d8, $79, $32, $00, $ff, $0a, $00
+	move $d9, $7a, $32, $00, $ff, $0a, $00
+	move $da, $7b, $32, $00, $ff, $0a, $00
+	move $db, $7c, $00, $00, $ff, $0a, $00
+	move $dc, $5b, $01, $00, $ff, $05, $00
+	move $dd, $7d, $50, $14, $ff, $0a, $00
+	move $de, $7e, $01, $04, $ff, $0a, $00
+	move $df, $00, $64, $01, $ff, $0a, $00
+	move $e0, $15, $00, $00, $d8, $28, $00
+	move $e1, $00, $28, $1a, $ff, $0a, $00
+	move $e2, $7f, $00, $00, $ff, $0a, $00
+	move $e3, $5a, $00, $00, $ff, $0a, $00
+	move $e4, $80, $28, $00, $ff, $0a, $00
+	move $e5, $81, $14, $00, $ff, $0a, $00
+	move $e6, $18, $00, $00, $ff, $0a, $00
+	move $e7, $82, $3c, $09, $ff, $0a, $00
+	move $e8, $00, $5a, $05, $ff, $0a, $00
+	move $e9, $83, $32, $01, $ff, $0a, $00
+	move $ea, $84, $00, $00, $ff, $0a, $00
+	move $eb, $85, $00, $16, $ff, $0a, $00
+	move $ec, $86, $00, $00, $ff, $0a, $00
+	move $ed, $87, $01, $13, $ff, $0a, $00
+	move $ee, $00, $32, $07, $ff, $0a, $00
+	move $ef, $00, $3c, $1a, $ff, $0a, $00
+	move $f0, $88, $00, $00, $ff, $0a, $00
+	move $f1, $89, $00, $00, $ff, $0a, $00
+	move $f2, $00, $00, $00, $ff, $0a, $00
+	move $f3, $00, $00, $00, $ff, $0a, $00
+	move $f4, $00, $00, $00, $ff, $0a, $00
+	move $f5, $00, $1e, $00, $ff, $0a, $00
+	move $f6, $00, $28, $02, $ff, $0a, $00
+	move $f7, $00, $1e, $15, $ff, $0a, $00
+	move $f8, $00, $1e, $09, $ff, $0a, $00
+	move $f9, $17, $00, $16, $ff, $0a, $00
+	move $fa, $00, $1e, $15, $ff, $0a, $00
+	move $fb, $00, $00, $15, $ff, $0a, $00
diff --git a/engine/dumps/bank01.asm b/engine/dumps/bank01.asm
index 36a2f6c..ab5f52d 100755
--- a/engine/dumps/bank01.asm
+++ b/engine/dumps/bank01.asm
@@ -3062,8 +3062,8 @@ Function6445:
 	push hl
 	push de
 	dec a
-	ld hl, Moves
-	ld bc, $0007
+	ld hl, Moves + MOVE_PP
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld a, BANK(Moves)
 	call GetFarByte
diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm
index 8ea4aa5..4e9d5ea 100755
--- a/engine/dumps/bank03.asm
+++ b/engine/dumps/bank03.asm
@@ -5130,8 +5130,8 @@ Functionf960:
 	ld a, [hl]
 	dec a
 	push hl
-	ld hl, Moves
-	ld bc, $0007
+	ld hl, Moves + MOVE_PP
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld a, BANK(Moves)
 	call GetFarByte
diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm
index 0bb3536..cf50310 100755
--- a/engine/pokemon/health.asm
+++ b/engine/pokemon/health.asm
@@ -33,8 +33,8 @@ HealParty:
 	jr z, .next_move
 	dec a
 	push hl
-	ld hl, Moves
-	ld bc, MOVE_DATA_SIZE
+	ld hl, Moves + MOVE_PP
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld a, BANK(Moves)
 	call GetFarByte
diff --git a/layout.link b/layout.link
index f84ba9e..a8d9835 100644
--- a/layout.link
+++ b/layout.link
@@ -277,6 +277,8 @@ ROMX $10
 	"data/types/search_types.asm"
 	org $52a1
 	"data/moves/names.asm"
+	org $58b6
+	"data/moves/moves.asm"
 	org $6493
 	"data/pokemon/evos_attacks.asm"
 
diff --git a/shim.sym b/shim.sym
index 457338f..f869813 100755
--- a/shim.sym
+++ b/shim.sym
@@ -93,7 +93,6 @@
 10:4B45 Function40b45
 10:4B5C Function40b5c
 10:58B8 Data4a8b8
-10:58BB Moves
 10:5F93 Function4af93
 10:5FA1 Function41fa1
 10:61F8 Function421f8