shithub: pokecrystal

Download patch

ref: bfaad924e7f0ebad59da85830211b9b0c8d2afa8
parent: 82214440e190fc250023a7b59bb4c20432700555
author: yenatch <[email protected]>
date: Mon Dec 30 18:22:27 EST 2013

label more pointers to Moves

--- a/battle/core.asm
+++ b/battle/core.asm
@@ -896,10 +896,10 @@
 Function3c5ec: ; 3c5ec
 	ld a, b
 	dec a
-	ld hl, $5afc
-	ld bc, $0007
+	ld hl, Moves + MOVE_EFFECT
+	ld bc, Move2 - Move1
 	call AddNTimes
-	ld a, $10
+	ld a, BANK(Moves)
 	call GetFarByte
 	ld b, a
 	ret
@@ -3399,11 +3399,11 @@
 	push de
 	push bc
 	dec a
-	ld hl, $5afb
-	ld bc, $0007
+	ld hl, Moves + MOVE_ANIM
+	ld bc, Move2 - Move1
 	call AddNTimes
 	ld de, EnemyMoveAnimation
-	ld a, $10
+	ld a, BANK(Moves)
 	call FarCopyBytes
 	call SetEnemyTurn
 	callab Function0x347c8
--- a/main.asm
+++ b/main.asm
@@ -12183,11 +12183,11 @@
 	push hl
 	push de
 	push bc
-	ld hl, $5afb
-	ld bc, $0007
+	ld hl, Moves
+	ld bc, Move2 - Move1
 	call AddNTimes
 	ld de, StringBuffer1
-	ld a, $10
+	ld a, BANK(Moves)
 	call FarCopyBytes
 	pop bc
 	pop de
@@ -19254,10 +19254,10 @@
 	call Predef
 	ld a, [CurSpecies]
 	dec a
-	ld hl, $5afd
-	ld bc, $0007
+	ld hl, Moves + MOVE_POWER
+	ld bc, Move2 - Move1
 	call AddNTimes
-	ld a, $10
+	ld a, BANK(Moves)
 	call GetFarByte
 	ld hl, $c5a0
 	cp $2