Merge http://github.com/dannye/tcg

Conflicts:
	wram.asm

1 files changed, 16 insertions, 1 deletions

diff --git a/wram.asm b/wram.asm
index 37088ef..79ae8e8 100755
--- a/wram.asm
+++ b/wram.asm
@@ -114,11 +114,26 @@ wSerialRecvIndex: ; cba4
 
 wSerialRecvBuf: ; $cba5 - $cbc4
 	ds $20
+	ds $49
 
+; this seems to hold the current opponent's deck id - 2,
+; perhaps to account for the two unused pointers at the
+; beginning of DeckPointers
+wOpponentDeck: ; cc0e
+	ds $5
+
+wIsPracticeDuel: ; cc13
+	ds $7
+
+wDuelTheme: ; cc1a
+	ds $1
 
 ;--- Bank 1: $Dxxx ----------------------------------------
 SECTION "WRAM1", WRAMX, BANK[1]
-	ds $32f
+	ds $113
+
+wMatchStartTheme: ; d113
+	ds $21c
 
 wCurMap: ; d32f
 	ds $1