summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2015-02-13 14:38:23 -0600
committerBryan Bishop <kanzure@gmail.com>2015-02-13 14:38:23 -0600
commitd7bc1d12f23a6d800169b887592807cf92b4974a (patch)
tree0b8be61e8f894e0cd21c3794378b4c871d4f9717 /wram.asm
parentb22a3347939a040ca3dc85c60c1cf6313c984add (diff)
parent1480602df75b980e291a832ba3a485d123a53047 (diff)
Merge pull request #277 from yenatch/master
Start splitting code out of main.
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index 3689e3849..609702da3 100644
--- a/wram.asm
+++ b/wram.asm
@@ -4,7 +4,7 @@ flag_array: MACRO
ds ((\1) + 7) / 8
ENDM
-box_struct_length EQU 32
+box_struct_length EQU 24 + NUM_MOVES * 2
box_struct: MACRO
\1Species:: db
\1Item:: db
@@ -801,7 +801,7 @@ wc712::
PlayerUsedMoves:: ; c712
; add a move that has been used once by the player
; added in order of use
- ds 4
+ ds NUM_MOVES
wc716:: ds 1
wc717:: ds 1