summaryrefslogtreecommitdiff
path: root/src/engine/home.asm
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2020-12-20 15:21:24 +0000
committerElectroDeoxys <ElectroDeoxys@gmail.com>2020-12-20 15:21:24 +0000
commit180af7b96f32afa74d6fc77e0132de8655fee318 (patch)
treeb288155ee9410be5108e2f53bbacb742a529e750 /src/engine/home.asm
parent6943eea3d770b935020086008054c8a9bd2c28af (diff)
Change color to type
Diffstat (limited to 'src/engine/home.asm')
-rw-r--r--src/engine/home.asm14
1 files changed, 7 insertions, 7 deletions
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