Change color to type

4 files changed, 28 insertions, 28 deletions

diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 769e16b..4d2daf2 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -45,12 +45,12 @@ DUELVARS_BENCH2_CARD_STAGE                EQUS "LOW(wPlayerBench2CardStage)"
 DUELVARS_BENCH3_CARD_STAGE                EQUS "LOW(wPlayerBench3CardStage)"             ; d1
 DUELVARS_BENCH4_CARD_STAGE                EQUS "LOW(wPlayerBench4CardStage)"             ; d2
 DUELVARS_BENCH5_CARD_STAGE                EQUS "LOW(wPlayerBench5CardStage)"             ; d3
-DUELVARS_ARENA_CARD_CHANGED_COLOR         EQUS "LOW(wPlayerArenaCardChangedColor)"       ; d4
-DUELVARS_BENCH1_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench1CardChangedColor)"      ; d5
-DUELVARS_BENCH2_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench2CardChangedColor)"      ; d6
-DUELVARS_BENCH3_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench3CardChangedColor)"      ; d7
-DUELVARS_BENCH4_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench4CardChangedColor)"      ; d8
-DUELVARS_BENCH5_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench5CardChangedColor)"      ; d9
+DUELVARS_ARENA_CARD_CHANGED_TYPE         EQUS "LOW(wPlayerArenaCardChangedType)"       ; d4
+DUELVARS_BENCH1_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench1CardChangedType)"      ; d5
+DUELVARS_BENCH2_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench2CardChangedType)"      ; d6
+DUELVARS_BENCH3_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench3CardChangedType)"      ; d7
+DUELVARS_BENCH4_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench4CardChangedType)"      ; d8
+DUELVARS_BENCH5_CARD_CHANGED_COLOR        EQUS "LOW(wPlayerBench5CardChangedType)"      ; d9
 DUELVARS_ARENA_CARD_ATTACHED_DEFENDER     EQUS "LOW(wPlayerArenaCardAttachedDefender)"   ; da
 DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER    EQUS "LOW(wPlayerBench1CardAttachedDefender)"  ; db
 DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER    EQUS "LOW(wPlayerBench2CardAttachedDefender)"  ; dc
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index f9a352a..cf187cb 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -970,7 +970,7 @@ ResetDevolvedCardStatus: ; 2c45d (b:445d)
 .skip_clear_status
 ; reset changed color status
 	ldh a, [hTempPlayAreaLocation_ff9d]
-	add DUELVARS_ARENA_CARD_CHANGED_COLOR
+	add DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call GetTurnDuelistVariable
 	ld [hl], $00
 ; reset C2 flags
@@ -2612,7 +2612,7 @@ Shift_ChangeColorEffect: ; 2cd5d (b:4d5d)
 	set USED_PKMN_POWER_THIS_TURN_F, [hl]
 
 	ldh a, [hTemp_ffa0]
-	add DUELVARS_ARENA_CARD_CHANGED_COLOR
+	add DUELVARS_ARENA_CARD_CHANGED_TYPE
 	ld l, a
 	ldh a, [hAIPkmnPowerEffectParam]
 	or HAS_CHANGED_COLOR
@@ -9094,7 +9094,7 @@ MorphEffect: ; 2eff6 (b:6ff6)
 	ld [hl], c
 
 ; clear changed color and status
-	ld l, DUELVARS_ARENA_CARD_CHANGED_COLOR
+	ld l, DUELVARS_ARENA_CARD_CHANGED_TYPE
 	ld [hl], $00
 	call ClearAllStatusConditions
 
diff --git a/src/engine/home.asm b/src/engine/home.asm
index adf70d8..c3c1024 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -3748,7 +3748,7 @@ EvolvePokemonCard: ; 13ac (0:13ac)
 	ld l, a
 	ld [hl], $00
 	ld a, e
-	add DUELVARS_ARENA_CARD_CHANGED_COLOR
+	add DUELVARS_ARENA_CARD_CHANGED_TYPE
 	ld l, a
 	ld [hl], $00
 	ld a, e
@@ -3914,7 +3914,7 @@ PutHandPokemonCardInPlayArea: ; 1485 (0:1485)
 	add e
 	ld l, a
 	ld [hl], $0
-	ld a, DUELVARS_ARENA_CARD_CHANGED_COLOR
+	ld a, DUELVARS_ARENA_CARD_CHANGED_TYPE
 	add e
 	ld l, a
 	ld [hl], $0
@@ -3994,7 +3994,7 @@ EmptyPlayAreaSlot: ; 14f8 (0:14f8)
 	call .init_duelvar
 	ld a, DUELVARS_ARENA_CARD_STAGE
 	call .init_duelvar
-	ld a, DUELVARS_ARENA_CARD_CHANGED_COLOR
+	ld a, DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call .init_duelvar
 	ld a, DUELVARS_ARENA_CARD_ATTACHED_DEFENDER
 	call .init_duelvar
@@ -4061,7 +4061,7 @@ SwapPlayAreaPokemon: ; 1548 (0:1548)
 	call .swap_duelvar
 	ld a, DUELVARS_ARENA_CARD_STAGE
 	call .swap_duelvar
-	ld a, DUELVARS_ARENA_CARD_CHANGED_COLOR
+	ld a, DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call .swap_duelvar
 	ld a, DUELVARS_ARENA_CARD_ATTACHED_PLUSPOWER
 	call .swap_duelvar
@@ -10295,7 +10295,7 @@ ClearChangedTypesIfMuk: ; 36d9 (0:36d9)
 	call .zero_changed_types
 	call SwapTurn
 .zero_changed_types
-	ld a, DUELVARS_ARENA_CARD_CHANGED_COLOR
+	ld a, DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call GetTurnDuelistVariable
 	ld c, MAX_PLAY_AREA_POKEMON
 .zero_changed_types_loop
@@ -10316,7 +10316,7 @@ GetPlayAreaCardColor: ; 36f7 (0:36f7)
 	push hl
 	push de
 	ld e, a
-	add DUELVARS_ARENA_CARD_CHANGED_COLOR
+	add DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call GetTurnDuelistVariable
 	bit HAS_CHANGED_COLOR_F, a
 	jr nz, .has_changed_color
@@ -10338,7 +10338,7 @@ GetPlayAreaCardColor: ; 36f7 (0:36f7)
 	call CheckCannotUseDueToStatus_OnlyToxicGasIfANon0
 	jr c, .regular_color ; jump if can't use Shift
 	ld a, e
-	add DUELVARS_ARENA_CARD_CHANGED_COLOR
+	add DUELVARS_ARENA_CARD_CHANGED_TYPE
 	call GetTurnDuelistVariable
 	pop de
 	pop hl
diff --git a/src/wram.asm b/src/wram.asm
index 8d6f860..bfa032e 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -106,17 +106,17 @@ wPlayerBench5CardStage:: ; c2d3
 
 ; changed type from Venomoth's Shift Pokemon Power
 ; if bit 7 == 1, then bits 0-3 override the Pokemon's actual color
-wPlayerArenaCardChangedColor:: ; c2d4
+wPlayerArenaCardChangedType:: ; c2d4
 	ds $1
-wPlayerBench1CardChangedColor:: ; c2d5
+wPlayerBench1CardChangedType:: ; c2d5
 	ds $1
-wPlayerBench2CardChangedColor:: ; c2d6
+wPlayerBench2CardChangedType:: ; c2d6
 	ds $1
-wPlayerBench3CardChangedColor:: ; c2d7
+wPlayerBench3CardChangedType:: ; c2d7
 	ds $1
-wPlayerBench4CardChangedColor:: ; c2d8
+wPlayerBench4CardChangedType:: ; c2d8
 	ds $1
-wPlayerBench5CardChangedColor:: ; c2d9
+wPlayerBench5CardChangedType:: ; c2d9
 	ds $1
 
 wPlayerArenaCardAttachedDefender:: ; c2da
@@ -269,17 +269,17 @@ wOpponentBench4CardStage:: ; c3d2
 wOpponentBench5CardStage:: ; c3d3
 	ds $1
 
-wOpponentArenaCardChangedColor:: ; c3d4
+wOpponentArenaCardChangedType:: ; c3d4
 	ds $1
-wOpponentBench1CardChangedColor:: ; c3d5
+wOpponentBench1CardChangedType:: ; c3d5
 	ds $1
-wOpponentBench2CardChangedColor:: ; c3d6
+wOpponentBench2CardChangedType:: ; c3d6
 	ds $1
-wOpponentBench3CardChangedColor:: ; c3d7
+wOpponentBench3CardChangedType:: ; c3d7
 	ds $1
-wOpponentBench4CardChangedColor:: ; c3d8
+wOpponentBench4CardChangedType:: ; c3d8
 	ds $1
-wOpponentBench5CardChangedColor:: ; c3d9
+wOpponentBench5CardChangedType:: ; c3d9
 	ds $1
 
 wOpponentArenaCardAttachedDefender:: ; c3da