Merge branch 'master' of https://github.com/anmart/poketcg

1 files changed, 10 insertions, 3 deletions

diff --git a/src/wram.asm b/src/wram.asm
index db424fe..7c7c774 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1,4 +1,5 @@
 INCLUDE "constants.asm"
+INCLUDE "macros.asm"
 
 ;----------------------------------------------------------
 ;--- Bank 0: $Cxxx ----------------------------------------
@@ -167,7 +168,13 @@ wPlayerDeck:: ; c400
 
 wOpponentDeck:: ; c480
 	ds $80
-	ds $500
+	ds $10
+
+; when the attack menu opens, it stores 
+; each move in the order of 
+; cardNumber, moveNumber, ...
+DuelAttackPointerTable:: ; c510
+	ds $4f0
 
 ;--- Engine -----------------------------------------------
 
@@ -407,10 +414,10 @@ wDuelTheme:: ; cc1a
 ; Can be data from a card on either side of the field or hand, or from a card in the bench, depending on the duel state.
 ; Sometimes the two buffers even hold the same card's data.
 wCardBuffer1:: ; cc24
-	ds CARD_DATA_LENGTH
+	card_data_struct wCardBuffer1
 
 wCardBuffer2:: ; cc65
-	ds CARD_DATA_LENGTH
+	card_data_struct wCardBuffer2
 
 	ds $4