Rename battle->duel and expand on menu wram addresses

1 files changed, 22 insertions, 10 deletions

diff --git a/src/wram.asm b/src/wram.asm
index 387ccab..0217576 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -274,24 +274,36 @@ wSerialRecvBuf:: ; $cba5 - $cbc4
 
 ;--- Duels 2 ----------------------------------------------
 
-wBattleMenuSelection:: ; $cbc6
+; In a duel, the main menu current or last selected menu item
+; From 0 to 5: Hand, Attack, Check, Pkmn Power, Retreat, Done
+wCurrentDuelMenuItem:: ; $cbc6
 	ds $1
-	ds $4
+
+; When we're viewing a card's information, the page we are currently at
+; For Pokemon cards, values from $1 to $6 (two pages for move descriptions)
+; For Energy cards, it's always $9
+; For Trainer cards, $d or $e (two pages for trainer card descriptions)
+wCardPageNumber:: ; $cbc7
+	ds $1
+	ds $3
 
 wBenchSelectedPokemon:: ; $cbcb
 	ds $1
 	ds $3
 
-;When you're in a battle menu like your hand
-;and you press a, this keeps track of where the cursor was
-wBattleSubMenuSelected:: ; $cbcf
+; When you're in a duel menu like your hand and you press a,
+; the following two addresses keep track of which item was selected by the cursor
+wSelectedDuelSubMenuItem:: ; $cbcf
+	ds $1
+
+wSelectedDuelSubMenuScrollOffset:: ; $cbd0
 	ds $1
-	ds $37
+	ds $36
 
-; 0 = no one has won battle yet
-; 1 = player whose turn it is has won the battle
-; 2 = player whose turn it is has lost the battle
-wBattleFinished:: ; $cc07
+; 0 = no one has won duel yet
+; 1 = player whose turn it is has won the duel
+; 2 = player whose turn it is has lost the duel
+wDuelFinished:: ; $cc07
 	ds $1
 	ds $6