summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-01-16 23:11:57 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-01-16 23:11:57 +0100
commitc57303c887f376ab8d9c2b7edbf84658ddd1d017 (patch)
tree401c1da3dc3681ba96889467531a767932dccea8 /src
parentf75d9155202051092a6f1de46cc84260db5f03cf (diff)
some label/commentary corrections
Diffstat (limited to 'src')
-rw-r--r--src/data/move_effects.asm6
-rwxr-xr-xsrc/wram.asm9
2 files changed, 9 insertions, 6 deletions
diff --git a/src/data/move_effects.asm b/src/data/move_effects.asm
index ea8a0b9..1dab5a8 100644
--- a/src/data/move_effects.asm
+++ b/src/data/move_effects.asm
@@ -1,5 +1,7 @@
-MoveEffectCommands: ; 186f7 (6:46f7)
-; Each move has a two-byte effect pointer (move's 7th param) that points to one of these structures:
+MoveEffectAndTrainerCardCommands: ; 186f7 (6:46f7)
+; Each move has a two-byte effect pointer (move's 7th param) that points to one of these structures.
+; Similarly, trainer cards have a two-byte pointer (7th param) to one of these structures, which determines the card's function.
+; Energy cards also point to one of these, but their data is just $00.
; db CommandId ($01 - $09)
; dw Function
; ...
diff --git a/src/wram.asm b/src/wram.asm
index ff854c4..18bb3ed 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -137,12 +137,13 @@ wDuelTheme:: ; cc1a
ds $1
ds $9
-; data of the player's card currently in play
-wPlayerCard:: ; c224
+; wCardBuffer1 and wCardBuffer2 hold the data of a player's or opponent's card.
+; can be data from a card on either side of the field, or from a card in the bench, depending on the duel state.
+; sometimes the two buffers even hold the same card's data.
+wCardBuffer1:: ; c224
ds CARD_DATA_LENGTH
-; data of the opponent's card currently in play
-wOpponentCard:: ; cc65
+wCardBuffer2:: ; cc65
ds CARD_DATA_LENGTH
ds $67