4 files changed, 48 insertions, 48 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index cfb855b..3b775b0 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -31,32 +31,32 @@ TRN_CARD_DATA_LENGTH    EQU $0e
 ENERGY_CARD_DATA_LENGTH EQU $0e
 
 ; TYPE_PKMN card only
-CARD_DATA_MOVE1                 EQU $0c
-CARD_DATA_MOVE1_ENERGY_COST     EQU $0c
-CARD_DATA_MOVE1_NAME            EQU $10
-CARD_DATA_MOVE1_DESCRIPTION     EQU $12
-CARD_DATA_MOVE1_DAMAGE          EQU $16
-CARD_DATA_MOVE1_CATEGORY        EQU $17
-CARD_DATA_MOVE1_EFFECT_COMMANDS EQU $18
-CARD_DATA_MOVE1_FLAG1           EQU $1a
-CARD_DATA_MOVE1_FLAG2           EQU $1b
-CARD_DATA_MOVE1_FLAG3           EQU $1c
-CARD_DATA_MOVE1_EFFECT_PARAM    EQU $1d
-CARD_DATA_MOVE1_ANIMATION       EQU $1e
+CARD_DATA_ATTACK1                 EQU $0c
+CARD_DATA_ATTACK1_ENERGY_COST     EQU $0c
+CARD_DATA_ATTACK1_NAME            EQU $10
+CARD_DATA_ATTACK1_DESCRIPTION     EQU $12
+CARD_DATA_ATTACK1_DAMAGE          EQU $16
+CARD_DATA_ATTACK1_CATEGORY        EQU $17
+CARD_DATA_ATTACK1_EFFECT_COMMANDS EQU $18
+CARD_DATA_ATTACK1_FLAG1           EQU $1a
+CARD_DATA_ATTACK1_FLAG2           EQU $1b
+CARD_DATA_ATTACK1_FLAG3           EQU $1c
+CARD_DATA_ATTACK1_EFFECT_PARAM    EQU $1d
+CARD_DATA_ATTACK1_ANIMATION       EQU $1e
 
 ; TYPE_PKMN card only
-CARD_DATA_MOVE2                 EQU $1f
-CARD_DATA_MOVE2_ENERGY_COST     EQU $1f
-CARD_DATA_MOVE2_NAME            EQU $23
-CARD_DATA_MOVE2_DESCRIPTION     EQU $25
-CARD_DATA_MOVE2_DAMAGE          EQU $29
-CARD_DATA_MOVE2_CATEGORY        EQU $2a
-CARD_DATA_MOVE2_EFFECT_COMMANDS EQU $2b
-CARD_DATA_MOVE2_FLAG1           EQU $2d
-CARD_DATA_MOVE2_FLAG2           EQU $2e
-CARD_DATA_MOVE2_FLAG3           EQU $2f
-CARD_DATA_MOVE2_EFFECT_PARAM    EQU $30
-CARD_DATA_MOVE2_ANIMATION       EQU $31
+CARD_DATA_ATTACK2                 EQU $1f
+CARD_DATA_ATTACK2_ENERGY_COST     EQU $1f
+CARD_DATA_ATTACK2_NAME            EQU $23
+CARD_DATA_ATTACK2_DESCRIPTION     EQU $25
+CARD_DATA_ATTACK2_DAMAGE          EQU $29
+CARD_DATA_ATTACK2_CATEGORY        EQU $2a
+CARD_DATA_ATTACK2_EFFECT_COMMANDS EQU $2b
+CARD_DATA_ATTACK2_FLAG1           EQU $2d
+CARD_DATA_ATTACK2_FLAG2           EQU $2e
+CARD_DATA_ATTACK2_FLAG3           EQU $2f
+CARD_DATA_ATTACK2_EFFECT_PARAM    EQU $30
+CARD_DATA_ATTACK2_ANIMATION       EQU $31
 
 ; TYPE_PKMN card only
 CARD_DATA_RETREAT_COST          EQU $32
@@ -156,7 +156,7 @@ WR_WATER     EQU $10
 WR_FIGHTING  EQU $08
 WR_PSYCHIC   EQU $04
 
-; CARD_DATA_MOVE*_CATEGORY constants
+; CARD_DATA_ATTACK*_CATEGORY constants
 DAMAGE_NORMAL EQU $00
 DAMAGE_PLUS   EQU $01
 DAMAGE_MINUS  EQU $02
@@ -165,13 +165,13 @@ POKEMON_POWER EQU $04
 RESIDUAL_F    EQU 7
 RESIDUAL      EQU 1 << RESIDUAL_F
 
-; Bit mask for CheckLoadedMoveFlag
-; for flag address from wLoadedMoveFlag1
-MOVE_FLAG1_ADDRESS EQU $0 << 3
-MOVE_FLAG2_ADDRESS EQU $1 << 3
-MOVE_FLAG3_ADDRESS EQU $2 << 3
+; Bit mask for CheckLoadedAttackFlag
+; for flag address from wLoadedAttackFlag1
+ATTACK_FLAG1_ADDRESS EQU $0 << 3
+ATTACK_FLAG2_ADDRESS EQU $1 << 3
+ATTACK_FLAG3_ADDRESS EQU $2 << 3
 
-; CARD_DATA_MOVE*_FLAG1 constants
+; CARD_DATA_ATTACK*_FLAG1 constants
 INFLICT_POISON_F           EQU %000
 INFLICT_SLEEP_F            EQU %001
 INFLICT_PARALYSIS_F        EQU %010
@@ -181,7 +181,7 @@ DAMAGE_TO_OPPONENT_BENCH_F EQU %101
 HIGH_RECOIL_F              EQU %110
 DRAW_CARD_F                EQU %111
 
-; CARD_DATA_MOVE*_FLAG2 constants
+; CARD_DATA_ATTACK*_FLAG2 constants
 ; bits 5, 6 and 7 cover a wide variety of effects
 SWITCH_OPPONENT_POKEMON_F  EQU %000
 HEAL_USER_F                EQU %001
@@ -192,13 +192,13 @@ FLAG_2_BIT_5_F             EQU %101
 FLAG_2_BIT_6_F             EQU %110
 FLAG_2_BIT_7_F             EQU %111
 
-; CARD_DATA_MOVE*_FLAG3 constants
+; CARD_DATA_ATTACK*_FLAG3 constants
 ; bit 1 covers a wide variety of effects
 ; bits 2-7 are unused
 BOOST_IF_TAKEN_DAMAGE_F    EQU %000
 FLAG_3_BIT_1_F             EQU %001
 
-; CARD_DATA_MOVE*_FLAG1_F constants
+; CARD_DATA_ATTACK*_FLAG1_F constants
 INFLICT_POISON           EQU $1 << INFLICT_POISON_F
 INFLICT_SLEEP            EQU $1 << INFLICT_SLEEP_F
 INFLICT_PARALYSIS        EQU $1 << INFLICT_PARALYSIS_F
@@ -208,7 +208,7 @@ DAMAGE_TO_OPPONENT_BENCH EQU $1 << DAMAGE_TO_OPPONENT_BENCH_F
 HIGH_RECOIL              EQU $1 << HIGH_RECOIL_F
 DRAW_CARD                EQU $1 << DRAW_CARD_F
 
-; CARD_DATA_MOVE*_FLAG2_F constants
+; CARD_DATA_ATTACK*_FLAG2_F constants
 ; bits 5, 6 and 7 cover a wide variety of effects
 SWITCH_OPPONENT_POKEMON  EQU $1 << SWITCH_OPPONENT_POKEMON_F
 HEAL_USER                EQU $1 << HEAL_USER_F
@@ -219,7 +219,7 @@ FLAG_2_BIT_5             EQU $1 << FLAG_2_BIT_5_F
 FLAG_2_BIT_6             EQU $1 << FLAG_2_BIT_6_F
 FLAG_2_BIT_7             EQU $1 << FLAG_2_BIT_7_F
 
-; CARD_DATA_MOVE*_FLAG3_F constants
+; CARD_DATA_ATTACK*_FLAG3_F constants
 ; bit 1 covers a wide variety of effects
 ; bits 2-7 are unused
 BOOST_IF_TAKEN_DAMAGE    EQU $1 << BOOST_IF_TAKEN_DAMAGE_F
@@ -232,7 +232,7 @@ UNABLE_RETREAT EQU $64
 FIRST_ATTACK_OR_PKMN_POWER EQU $0
 SECOND_ATTACK              EQU $1
 
-; whether move with the ATTACHED_ENERGY_BOOST flag
+; whether attack with the ATTACHED_ENERGY_BOOST flag
 ; has limit on attached energy cards boost.
 MAX_ENERGY_BOOST_IS_LIMITED     EQU $2
 MAX_ENERGY_BOOST_IS_NOT_LIMITED EQU $3
diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 44b8e0b..9fd0e05 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -339,7 +339,7 @@ ENDM
 	txsymbol PARALYZED  ; $0b
 	txsymbol CURSOR_U   ; $0c
 	txsymbol POKEMON    ; $0d
-	txsymbol MOVE_DESCR ; $0e
+	txsymbol ATK_DESCR ; $0e
 	txsymbol CURSOR_R   ; $0f
 	txsymbol HP         ; $10
 	txsymbol Lv         ; $11
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index fd5d883..fe21753 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -74,7 +74,7 @@ DUELVARS_NUMBER_OF_CARDS_IN_HAND          EQUS "LOW(wPlayerNumberOfCardsInHand)"
 DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA   EQUS "LOW(wPlayerNumberOfPokemonInPlayArea)"   ; ef
 DUELVARS_ARENA_CARD_STATUS                EQUS "LOW(wPlayerArenaCardStatus)"             ; f0
 DUELVARS_DUELIST_TYPE                     EQUS "LOW(wPlayerDuelistType)"                 ; f1
-DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX   EQUS "LOW(wPlayerArenaCardDisabledMoveIndex)"  ; f2
+DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX EQUS "LOW(wPlayerArenaCardDisabledAttackIndex)" ; f2
 DUELVARS_ARENA_CARD_LAST_TURN_DAMAGE      EQUS "LOW(wPlayerArenaCardLastTurnDamage)"     ; f3
 DUELVARS_ARENA_CARD_LAST_TURN_STATUS      EQUS "LOW(wPlayerArenaCardLastTurnStatus)"     ; f5
 DUELVARS_ARENA_CARD_LAST_TURN_SUBSTATUS2  EQUS "LOW(wPlayerArenaCardLastTurnSubstatus2)" ; f6
diff --git a/src/constants/duel_interface_constants.asm b/src/constants/duel_interface_constants.asm
index 6add375..f3bd7ec 100644
--- a/src/constants/duel_interface_constants.asm
+++ b/src/constants/duel_interface_constants.asm
@@ -1,19 +1,19 @@
 ; wCardPageNumber constants
 CARDPAGE_POKEMON_OVERVIEW    EQU $01
-CARDPAGE_POKEMON_MOVE1_1     EQU $02
-CARDPAGE_POKEMON_MOVE1_2     EQU $03
-CARDPAGE_POKEMON_MOVE2_1     EQU $04
-CARDPAGE_POKEMON_MOVE2_2     EQU $05
+CARDPAGE_POKEMON_ATTACK1_1   EQU $02
+CARDPAGE_POKEMON_ATTACK1_2   EQU $03
+CARDPAGE_POKEMON_ATTACK2_1   EQU $04
+CARDPAGE_POKEMON_ATTACK2_2   EQU $05
 CARDPAGE_POKEMON_DESCRIPTION EQU $06
 CARDPAGE_ENERGY              EQU $09
 CARDPAGE_TRAINER_1           EQU $0d
 CARDPAGE_TRAINER_2           EQU $0e
 
-; wMovePageNumber constants
-MOVEPAGE_MOVE1_1 EQU $00
-MOVEPAGE_MOVE1_2 EQU $01
-MOVEPAGE_MOVE2_1 EQU $02
-MOVEPAGE_MOVE2_2 EQU $03
+; wAttackPageNumber constants
+ATTACKPAGE_ATTACK1_1 EQU $00
+ATTACKPAGE_ATTACK1_2 EQU $01
+ATTACKPAGE_ATTACK2_1 EQU $02
+ATTACKPAGE_ATTACK2_2 EQU $03
 
 ; wCardPageType constants
 CARDPAGETYPE_NOT_PLAY_AREA EQU $00