summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-01-16 19:11:38 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-01-16 19:11:38 +0100
commit0b2c90f03f0b04fbaf85d28cd2771f3a65f613a7 (patch)
tree25bf4900f9ce802488853237ff9acf27455541cd /src
parent950955613dcba3e64ecb4b300c41b59422322ac0 (diff)
player and opponent card data in wram
Diffstat (limited to 'src')
-rw-r--r--src/constants/card_data_constants.asm2
-rwxr-xr-xsrc/wram.asm20
2 files changed, 19 insertions, 3 deletions
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