summaryrefslogtreecommitdiff
path: root/engine/pokemon/move_mon.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-05-11 00:45:00 -0400
committerGitHub <noreply@github.com>2018-05-11 00:45:00 -0400
commit9b0ca7b8c2a6ef6e3b6ef1f591f0ec875432b03a (patch)
tree802e2f9d77c263fa501d9c6330033ecc27055d9e /engine/pokemon/move_mon.asm
parent59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff)
parent6e91c3a293d94990695e6b002a8c031873aefdf9 (diff)
Merge pull request #510 from Rangi42/master
Use explicit HELD_NONE and NO_LIMITS, not 0s; also fix #511
Diffstat (limited to 'engine/pokemon/move_mon.asm')
-rw-r--r--engine/pokemon/move_mon.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 8ccf319f0..630479797 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -115,20 +115,20 @@ GeneratePartyMonStats: ; d906
and a
jr nz, .randomlygeneratemoves
ld de, wEnemyMonMoves
- rept NUM_MOVES + -1
+rept NUM_MOVES + -1
ld a, [de]
inc de
ld [hli], a
- endr
+endr
ld a, [de]
ld [hl], a
jr .next
.randomlygeneratemoves
xor a
- rept NUM_MOVES + -1
+rept NUM_MOVES + -1
ld [hli], a
- endr
+endr
ld [hl], a
ld [wBuffer1], a
predef FillMoves
@@ -220,7 +220,7 @@ endr
call FillPP
pop de
pop hl
-rept 4
+rept NUM_MOVES
inc de
endr