summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2014-01-03 11:00:44 -0800
committerBryan Bishop <kanzure@gmail.com>2014-01-03 11:00:44 -0800
commit056c2403667a6670815528e220b4e1e4ea974e32 (patch)
treefc4bb5cccf2527a4ac23d7035db549615b906ab3 /main.asm
parent983ef29fd0e3645cb6335ee8bb172312790a56e2 (diff)
parenta10ee4e9f1ee3d671b67e2e68531b1f851661000 (diff)
Merge pull request #222 from yenatch/moves
clean up some move data
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/main.asm b/main.asm
index 2e1946282..3ae79784b 100644
--- a/main.asm
+++ b/main.asm
@@ -12183,11 +12183,11 @@ FillPP: ; da6d
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 @@ Function13256: ; 13256
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
@@ -40129,7 +40129,6 @@ Function41af7: ; 41af7
; 41afb
-Moves: ; 0x41afb
INCLUDE "battle/moves/moves.asm"