From 0b2c90f03f0b04fbaf85d28cd2771f3a65f613a7 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Sat, 16 Jan 2016 19:11:38 +0100
Subject: player and opponent card data in wram

---
 src/constants/card_data_constants.asm |  2 ++
 src/wram.asm                          | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index fc6944e..dd356f1 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -1,3 +1,5 @@
+CARD_DATA_LENGTH EQU $41
+
 ; card types (byte 1 of every card data)
 FIRE      EQU $0
 GRASS     EQU $1
diff --git a/src/wram.asm b/src/wram.asm
index 79db58e..46f44b6 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1,4 +1,7 @@
+INCLUDE "constants.asm"
+
 ;--- Bank 0: $Cxxx ----------------------------------------
+
 SECTION "WRAM0", WRAM0
 	ds $a00
 
@@ -72,7 +75,8 @@ wBufPalette:: ; caf0 - cab7f
 	ds $80
 	ds $4
 
-;--- Serial transfer bytes (cb74-cbc4) ----------
+;--- Serial transfer bytes (cb74-cbc4) --------------------
+
 wSerialOp:: ; cb74
 	ds $1
 
@@ -116,7 +120,8 @@ wSerialRecvBuf:: ; $cba5 - $cbc4
 	ds $20
 	ds $49
 
-;--- Duels --------------------------------------
+;--- Duels ------------------------------------------------
+
 ; this seems to hold the current opponent's deck id - 2,
 ; perhaps to account for the two unused pointers at the
 ; beginning of DeckPointers
@@ -128,13 +133,22 @@ wIsPracticeDuel:: ; cc13
 
 wDuelTheme:: ; cc1a
 	ds $1
-	ds $f2
+	ds $9
+
+wPlayerCard::
+	ds CARD_DATA_LENGTH
+	
+wOpponentCard::
+	ds CARD_DATA_LENGTH
+	
+	ds $67
 
 wUppercaseFlag:: ; cd0d
 	ds $1
 
 
 ;--- Bank 1: $Dxxx ----------------------------------------
+
 SECTION "WRAM1", WRAMX, BANK[1]
 	ds $113
 
-- 
cgit v1.2.3