Generalize to "effect commands", even for trainer cards, to avoid confusion

5 files changed, 13 insertions, 13 deletions

diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm
index 5b10ccb..dd96647 100755
--- a/src/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
@@ -227,4 +227,4 @@ POKEMON_FLUTE           EQU $E2
 GAMBLER                 EQU $E3
 RECYCLE                 EQU $E4
 
-NUM_CARDS               EQUS "RECYCLE"
+NUM_CARDS               EQU RECYCLE
diff --git a/src/data/move_card_effects.asm b/src/data/effect_commands.asm
index 04b5a00..38e4dc5 100644
--- a/src/data/move_card_effects.asm
+++ b/src/data/effect_commands.asm
@@ -1,8 +1,8 @@
-MoveEffectAndTrainerCardCommands: ; 186f7 (6:46f7)

+EffectCommands: ; 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)

+; 	db CommandId ($01 - $0a)

 ; 	dw Function

 ; 	...

 ; 	db $00

@@ -13,7 +13,7 @@ MoveEffectAndTrainerCardCommands: ; 186f7 (6:46f7)
 

 ; Similar move effects of different Pokemon cards all point to a different command list, 

 ; even though in some cases their commands and function pointers match.

-; xxx use <TrainerCardName>FunctionCommands or <EnergyCardName>FunctionCommands for these types of cards.

+; xxx use <TrainerCardName>EffectCommands or <EnergyCardName>EffectCommands for these types of cards.

 

 EkansSpitPoisonEffectCommands:

 	dbw $03, $46F8

diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index d59a510..77ca9b9 100755
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -1,6 +1,6 @@
 INCBIN "baserom.gbc",$18000,$186f7 - $18000
 
-INCLUDE "data/move_card_effects.asm"
+INCLUDE "data/effect_commands.asm"
 
 INCBIN "baserom.gbc",$18f9c,$1996e - $18f9c
 
diff --git a/src/engine/home.asm b/src/engine/home.asm
index ea26bc8..6897d57 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -3805,13 +3805,13 @@ Func_2fcb: ; 2fcb (0:2fcb)
 	ret
 ; 0x2fd9	
 	
-TryExecuteCommandFunction: ; 2fd9 (0:2fd9)
+TryExecuteEffectCommandFunction: ; 2fd9 (0:2fd9)
 ; Checks if the command ID at a is one of the commands of the move or card effect currently in use,
 ; and executes its associated function if so.
-; input: a = move effect / card function command ID
+; input: a = move or trainer card effect command ID
 	push af
-; grab pointer to command list from wCurrentMoveEffectOrCardFunction	
-	ld hl, wCurrentMoveEffectOrCardFunction
+; grab pointer to command list from wCurrentMoveOrCardEffect	
+	ld hl, wCurrentMoveOrCardEffect
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -3843,7 +3843,7 @@ TryExecuteCommandFunction: ; 2fd9 (0:2fd9)
 CheckMatchingCommand: ; 2ffe (0:2ffe)
 ; input: 
 ; a = command ID to check
-; hl = pointer to current move effect or trainer card command list
+; hl = pointer to current move effect or trainer card effect command list
 ; return nc if command ID matching a is found, c otherwise
 	ld c, a
 	ld a, l
@@ -3856,7 +3856,7 @@ CheckMatchingCommand: ; 2ffe (0:2ffe)
 .notNullPointer
 	ld a, [hBankROM]
 	push af
-	ld a, BANK(MoveEffectAndTrainerCardCommands)
+	ld a, BANK(EffectCommands)
 	call BankswitchHome
 ; store the bank number of command functions ($b) in wce22
 	ld a, $b
diff --git a/src/wram.asm b/src/wram.asm
index ad91ab2..83dea99 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -148,7 +148,7 @@ wCardBuffer2:: ; cc65
 	
 	ds $c
 	
-wCurrentMoveEffectOrCardFunction:: ; ccb2
+wCurrentMoveOrCardEffect:: ; ccb2
 	ds $1
 	ds $5a
 
@@ -158,7 +158,7 @@ wUppercaseFlag:: ; cd0d
 
 ; During a duel, this is always $b after the first attack.
 ; $b is the bank where the functions associated to card or effect commands are.
-; Its only purpose seems to be store this value to be read by TryExecuteCommandFunction.
+; Its only purpose seems to be store this value to be read by TryExecuteEffectCommandFunction.
 wce22:: ; ce22
 
 ;--- Bank 1: $Dxxx ----------------------------------------