Change all references of "move" to "attack"

author: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-03 11:41:26 +0000
committer: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-03 11:50:15 +0000
commit: 91ecded7f6d4727dbd017e3188a4834fe9926f79 (patch)
tree: ea501a09e2a23b015372e0d88a78f138af54f2b0
parent: 68b8291b1920bcae99750f4bb97b7c01b73f786c (diff)
19 files changed, 1269 insertions, 1268 deletions
diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
index 4727496..4669e29 100644
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -48,7 +48,7 @@ When naming a function, it should be concise but also capture the purpose and co
 * ``OpenNonTurnHolderDiscardPileScreen``
 * ``LoadCardDataToBuffer1_FromCardID``
 * ``LoadCardDataToBuffer1_FromDeckIndex``
-* ``CheckIfEnoughEnergiesToMove``
+* ``CheckIfEnoughEnergiesToAttack``
 * ``CheckIfEnoughEnergiesOfType``
 
 Sometimes a function is the most top-level function of this kind, so it can be given a very direct name that suggests it, like:
@@ -134,13 +134,13 @@ CopyLine: ; 1ea5 (0:1ea5)
 ```
 
 ```
-; check if a pokemon card has enough energy attached to it in order to use a move
+; check if a pokemon card has enough energy attached to it in order to use an attack
 ; input:
 ;   d = deck index of card (0 to 59)
 ;   e = attack index (0 or 1)
 ;   wAttachedEnergies and wTotalAttachedEnergies
 ; returns: carry if not enough energy, nc if enough energy.
-_CheckIfEnoughEnergiesToMove: ; 48ac (1:48ac)
+_CheckIfEnoughEnergiesToAttack: ; 48ac (1:48ac)
 ```
 
 ```
diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md
index a1a7e1d..96e3c40 100644
--- a/bugs_and_glitches.md
+++ b/bugs_and_glitches.md
@@ -30,12 +30,12 @@ Fixes are written in the `diff` format.
 
 When the AI is scoring each Play Area Pokémon card to attach an Energy card, it first checks whether it's the Arena card and, if so, checks whether the attack can KO the Defending Pokémon. If it's true, then 20 is added to the score. Then it does the same Arena card check to increase the score further. The intention is probably to score the card with 20 if it can KO the opponent regardless of Play Area position, and additionally if it's the Arena card it should score 10 more points.
 
-**Fix:** Edit `DetermineAIScoreOfMoveEnergyRequirement` in [src/engine/bank05.asm](https://github.com/pret/poketcg/blob/master/src/engine/bank05.asm):
+**Fix:** Edit `DetermineAIScoreOfAttackEnergyRequirement` in [src/engine/bank05.asm](https://github.com/pret/poketcg/blob/master/src/engine/bank05.asm):
 ```diff
-DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
+DetermineAIScoreOfAttackEnergyRequirement: ; 16695 (5:6695)
  	...
--; if the move KOs player and this is the active card, add to AI score.
-+; if the move KOs player add to AI score.
+-; if the attack KOs player and this is the active card, add to AI score.
++; if the attack KOs player add to AI score.
 -	ldh a, [hTempPlayAreaLocation_ff9d]
 -	or a
 -	jr nz, .check_evolution
@@ -45,9 +45,9 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	call GetNonTurnDuelistVariable
 	ld hl, wDamage
 	sub [hl]
-	jr z, .move_kos_defending
+	jr z, .atk_kos_defending
 	jr nc, .check_evolution
-.move_kos_defending
+.atk_kos_defending
 	ld a, 20
 	call AddToAIScore
 
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
diff --git a/src/data/cards.asm b/src/data/cards.asm
index 9c1ae11..c6f480c 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -244,7 +244,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 2 ; energies
 	tx LeechSeedName ; name
 	tx BulbasaursLeechSeedDescription ; description
@@ -258,7 +258,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
 	db 1
 	db ATK_ANIM_DRAIN ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -295,7 +295,7 @@ IvysaurCard: ; 30e69 (c:4e69)
 	db STAGE1 ; stage
 	tx BulbasaurName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1, COLORLESS, 2 ; energies
 	tx VineWhipName ; name
 	dw NONE ; description
@@ -309,7 +309,7 @@ IvysaurCard: ; 30e69 (c:4e69)
 	db 0
 	db ATK_ANIM_WHIP ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx PoisonPowderName ; name
 	tx InflictPoisonDescription ; description
@@ -346,7 +346,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
 	db STAGE2 ; stage
 	tx IvysaurName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx SolarPowerName ; name
 	tx SolarPowerDescription ; description
@@ -360,7 +360,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
 	db 0
 	db ATK_ANIM_SOLAR_POWER ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 4 ; energies
 	tx MegaDrainName ; name
 	tx VenusaursMegaDrainDescription ; description
@@ -397,7 +397,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
 	db STAGE2 ; stage
 	tx IvysaurName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx EnergyTransName ; name
 	tx EnergyTransDescription ; description
@@ -411,7 +411,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 4 ; energies
 	tx SolarBeamName ; name
 	dw NONE ; description
@@ -448,7 +448,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx StringShotName ; name
 	tx MayInflictParalysisDescription ; description
@@ -462,7 +462,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
 	db 0
 	db ATK_ANIM_STRING_SHOT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -499,7 +499,7 @@ MetapodCard: ; 30f6d (c:4f6d)
 	db STAGE1 ; stage
 	tx CaterpieName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx StiffenName ; name
 	tx MetapodsStiffenDescription ; description
@@ -513,7 +513,7 @@ MetapodCard: ; 30f6d (c:4f6d)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx StunSporeName ; name
 	tx MayInflictParalysisDescription ; description
@@ -550,7 +550,7 @@ ButterfreeCard: ; 30fae (c:4fae)
 	db STAGE2 ; stage
 	tx MetapodName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx WhirlwindName ; name
 	tx WhirlwindDescription ; description
@@ -564,7 +564,7 @@ ButterfreeCard: ; 30fae (c:4fae)
 	db 0
 	db ATK_ANIM_WHIRLWIND ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 4 ; energies
 	tx MegaDrainName ; name
 	tx ButterfreesMegaDrainDescription ; description
@@ -601,7 +601,7 @@ WeedleCard: ; 30fef (c:4fef)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx PoisonStingName ; name
 	tx MayInflictPoisonDescription ; description
@@ -615,7 +615,7 @@ WeedleCard: ; 30fef (c:4fef)
 	db 0
 	db ATK_ANIM_NEEDLES ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -652,7 +652,7 @@ KakunaCard: ; 31030 (c:5030)
 	db STAGE1 ; stage
 	tx WeedleName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx StiffenName ; name
 	tx KakunasStiffenDescription ; description
@@ -666,7 +666,7 @@ KakunaCard: ; 31030 (c:5030)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx PoisonPowderName ; name
 	tx MayInflictPoisonDescription ; description
@@ -703,7 +703,7 @@ BeedrillCard: ; 31071 (c:5071)
 	db STAGE2 ; stage
 	tx KakunaName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx TwineedleName ; name
 	tx DoubleAttackX30Description ; description
@@ -717,7 +717,7 @@ BeedrillCard: ; 31071 (c:5071)
 	db 0
 	db ATK_ANIM_NEEDLES ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx PoisonStingName ; name
 	tx MayInflictPoisonDescription ; description
@@ -754,7 +754,7 @@ EkansCard: ; 310b2 (c:50b2)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx SpitPoisonName ; name
 	tx MayInflictPoisonDescription ; description
@@ -768,7 +768,7 @@ EkansCard: ; 310b2 (c:50b2)
 	db 0
 	db ATK_ANIM_SPIT_POISON ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1, COLORLESS, 1 ; energies
 	tx WrapName ; name
 	tx MayInflictParalysisDescription ; description
@@ -805,7 +805,7 @@ ArbokCard: ; 310f3 (c:50f3)
 	db STAGE1 ; stage
 	tx EkansName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx TerrorStrikeName ; name
 	tx TerrorStrikeDescription ; description
@@ -819,7 +819,7 @@ ArbokCard: ; 310f3 (c:50f3)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 1 ; energies
 	tx PoisonFangName ; name
 	tx InflictPoisonDescription ; description
@@ -856,7 +856,7 @@ NidoranFCard: ; 31134 (c:5134)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx FurySwipesName ; name
 	tx TripleAttackX10Description ; description
@@ -870,7 +870,7 @@ NidoranFCard: ; 31134 (c:5134)
 	db 0
 	db ATK_ANIM_MULTIPLE_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx CallForFamilyName ; name
 	tx NidoranFsCallForFamilyDescription ; description
@@ -907,7 +907,7 @@ NidorinaCard: ; 31175 (c:5175)
 	db STAGE1 ; stage
 	tx NidoranFName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx SupersonicName ; name
 	tx MayInflictConfusionDescription ; description
@@ -921,7 +921,7 @@ NidorinaCard: ; 31175 (c:5175)
 	db 0
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1, COLORLESS, 2 ; energies
 	tx DoubleKickName ; name
 	tx DoubleAttackX30Description ; description
@@ -958,7 +958,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
 	db STAGE2 ; stage
 	tx NidorinaName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1, COLORLESS, 1 ; energies
 	tx BoyfriendsName ; name
 	tx BoyfriendsDescription ; description
@@ -972,7 +972,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
 	db 0
 	db ATK_ANIM_BOYFRIENDS ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 2 ; energies
 	tx MegaPunchName ; name
 	dw NONE ; description
@@ -1009,7 +1009,7 @@ NidoranMCard: ; 311f7 (c:51f7)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx HornHazardName ; name
 	tx MayDoNothingDescription ; description
@@ -1023,7 +1023,7 @@ NidoranMCard: ; 311f7 (c:51f7)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -1060,7 +1060,7 @@ NidorinoCard: ; 31238 (c:5238)
 	db STAGE1 ; stage
 	tx NidoranMName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1, COLORLESS, 2 ; energies
 	tx DoubleKickName ; name
 	tx DoubleAttackX30Description ; description
@@ -1074,7 +1074,7 @@ NidorinoCard: ; 31238 (c:5238)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 2 ; energies
 	tx HornDrillName ; name
 	dw NONE ; description
@@ -1111,7 +1111,7 @@ NidokingCard: ; 31279 (c:5279)
 	db STAGE2 ; stage
 	tx NidorinoName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1, COLORLESS, 2 ; energies
 	tx ThrashName ; name
 	tx ThrashDescription ; description
@@ -1125,7 +1125,7 @@ NidokingCard: ; 31279 (c:5279)
 	db 0
 	db ATK_ANIM_MULTIPLE_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx ToxicName ; name
 	tx ToxicDescription ; description
@@ -1162,7 +1162,7 @@ ZubatCard: ; 312ba (c:52ba)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx SupersonicName ; name
 	tx MayInflictConfusionDescription ; description
@@ -1176,7 +1176,7 @@ ZubatCard: ; 312ba (c:52ba)
 	db 0
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1, COLORLESS, 1 ; energies
 	tx LeechLifeName ; name
 	tx ZubatsLeechLifeDescription ; description
@@ -1213,7 +1213,7 @@ GolbatCard: ; 312fb (c:52fb)
 	db STAGE1 ; stage
 	tx ZubatName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx WingAttackName ; name
 	dw NONE ; description
@@ -1227,7 +1227,7 @@ GolbatCard: ; 312fb (c:52fb)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 1 ; energies
 	tx LeechLifeName ; name
 	tx GolbatsLeechLifeDescription ; description
@@ -1264,7 +1264,7 @@ OddishCard: ; 3133c (c:533c)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx StunSporeName ; name
 	tx MayInflictParalysisDescription ; description
@@ -1278,7 +1278,7 @@ OddishCard: ; 3133c (c:533c)
 	db 0
 	db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx SproutName ; name
 	tx SproutDescription ; description
@@ -1315,7 +1315,7 @@ GloomCard: ; 3137d (c:537d)
 	db STAGE1 ; stage
 	tx OddishName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx PoisonPowderName ; name
 	tx InflictPoisonDescription ; description
@@ -1329,7 +1329,7 @@ GloomCard: ; 3137d (c:537d)
 	db 3
 	db ATK_ANIM_POISON_POWDER ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx FoulOdorName ; name
 	tx FoulOdorDescription ; description
@@ -1366,7 +1366,7 @@ VileplumeCard: ; 313be (c:53be)
 	db STAGE2 ; stage
 	tx GloomName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx HealName ; name
 	tx HealDescription ; description
@@ -1380,7 +1380,7 @@ VileplumeCard: ; 313be (c:53be)
 	db 1
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx PetalDanceName ; name
 	tx PetalDanceDescription ; description
@@ -1417,7 +1417,7 @@ ParasCard: ; 313ff (c:53ff)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx ScratchName ; name
 	dw NONE ; description
@@ -1431,7 +1431,7 @@ ParasCard: ; 313ff (c:53ff)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx SporeName ; name
 	tx InflictSleepDescription ; description
@@ -1468,7 +1468,7 @@ ParasectCard: ; 31440 (c:5440)
 	db STAGE1 ; stage
 	tx ParasName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 2 ; energies
 	tx SporeName ; name
 	tx InflictSleepDescription ; description
@@ -1482,7 +1482,7 @@ ParasectCard: ; 31440 (c:5440)
 	db 0
 	db ATK_ANIM_SPORE ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx SlashName ; name
 	dw NONE ; description
@@ -1519,7 +1519,7 @@ VenonatCard: ; 31481 (c:5481)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx StunSporeName ; name
 	tx MayInflictParalysisDescription ; description
@@ -1533,7 +1533,7 @@ VenonatCard: ; 31481 (c:5481)
 	db 0
 	db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1, COLORLESS, 1 ; energies
 	tx LeechLifeName ; name
 	tx VenonatLeechLifeDescription ; description
@@ -1570,7 +1570,7 @@ VenomothCard: ; 314c2 (c:54c2)
 	db STAGE1 ; stage
 	tx VenonatName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx ShiftName ; name
 	tx ShiftDescription ; description
@@ -1584,7 +1584,7 @@ VenomothCard: ; 314c2 (c:54c2)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx VenomPowderName ; name
 	tx VenomPowderDescription ; description
@@ -1621,7 +1621,7 @@ BellsproutCard: ; 31503 (c:5503)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx VineWhipName ; name
 	dw NONE ; description
@@ -1635,7 +1635,7 @@ BellsproutCard: ; 31503 (c:5503)
 	db 0
 	db ATK_ANIM_WHIP ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1 ; energies
 	tx CallForFamilyName ; name
 	tx BellsproutsCallForFamilyDescription ; description
@@ -1672,7 +1672,7 @@ WeepinbellCard: ; 31544 (c:5544)
 	db STAGE1 ; stage
 	tx BellsproutName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx PoisonPowderName ; name
 	tx MayInflictPoisonDescription ; description
@@ -1686,7 +1686,7 @@ WeepinbellCard: ; 31544 (c:5544)
 	db 0
 	db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx RazorLeafName ; name
 	dw NONE ; description
@@ -1723,7 +1723,7 @@ VictreebelCard: ; 31585 (c:5585)
 	db STAGE2 ; stage
 	tx WeepinbellName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx LureName ; name
 	tx VictreebelsLureDescription ; description
@@ -1737,7 +1737,7 @@ VictreebelCard: ; 31585 (c:5585)
 	db 0
 	db ATK_ANIM_LURE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx AcidName ; name
 	tx VictreebelsAcidDescription ; description
@@ -1774,7 +1774,7 @@ GrimerCard: ; 315c6 (c:55c6)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx NastyGooName ; name
 	tx MayInflictParalysisDescription ; description
@@ -1788,7 +1788,7 @@ GrimerCard: ; 315c6 (c:55c6)
 	db 0
 	db ATK_ANIM_GOO ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 1 ; energies
 	tx MinimizeName ; name
 	tx GrimersMinimizeDescription ; description
@@ -1825,7 +1825,7 @@ MukCard: ; 31607 (c:5607)
 	db STAGE1 ; stage
 	tx GrimerName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx ToxicGasName ; name
 	tx ToxicGasDescription ; description
@@ -1839,7 +1839,7 @@ MukCard: ; 31607 (c:5607)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx SludgeName ; name
 	tx MayInflictPoisonDescription ; description
@@ -1876,7 +1876,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx HypnosisName ; name
 	tx InflictSleepDescription ; description
@@ -1890,7 +1890,7 @@ ExeggcuteCard: ; 31648 (c:5648)
 	db 0
 	db ATK_ANIM_HYPNOSIS ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2 ; energies
 	tx LeechSeedName ; name
 	tx ExeggcutesLeechSeedDescription ; description
@@ -1927,7 +1927,7 @@ ExeggutorCard: ; 31689 (c:5689)
 	db STAGE1 ; stage
 	tx ExeggcuteName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx TeleportName ; name
 	tx TeleportDescription ; description
@@ -1941,7 +1941,7 @@ ExeggutorCard: ; 31689 (c:5689)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 1 ; energies
 	tx BigEggsplosionName ; name
 	tx BigEggsplosionDescription ; description
@@ -1978,7 +1978,7 @@ KoffingCard: ; 316ca (c:56ca)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 2 ; energies
 	tx FoulGasName ; name
 	tx FoulGasDescription ; description
@@ -1992,7 +1992,7 @@ KoffingCard: ; 316ca (c:56ca)
 	db 0
 	db ATK_ANIM_FOUL_GAS ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -2029,7 +2029,7 @@ WeezingCard: ; 3170b (c:570b)
 	db STAGE1 ; stage
 	tx KoffingName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 2 ; energies
 	tx SmogName ; name
 	tx MayInflictPoisonDescription ; description
@@ -2043,7 +2043,7 @@ WeezingCard: ; 3170b (c:570b)
 	db 0
 	db ATK_ANIM_SMOG ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 1 ; energies
 	tx SelfdestructName ; name
 	tx WeezingsSelfdestructDescription ; description
@@ -2080,7 +2080,7 @@ Tangela1Card: ; 3174c (c:574c)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1, COLORLESS, 1 ; energies
 	tx BindName ; name
 	tx MayInflictParalysisDescription ; description
@@ -2094,7 +2094,7 @@ Tangela1Card: ; 3174c (c:574c)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 3 ; energies
 	tx PoisonPowderName ; name
 	tx InflictPoisonDescription ; description
@@ -2131,7 +2131,7 @@ Tangela2Card: ; 3178d (c:578d)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx StunSporeName ; name
 	tx MayInflictParalysisDescription ; description
@@ -2145,7 +2145,7 @@ Tangela2Card: ; 3178d (c:578d)
 	db 0
 	db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 1 ; energies
 	tx PoisonWhipName ; name
 	tx InflictPoisonDescription ; description
@@ -2182,7 +2182,7 @@ ScytherCard: ; 317ce (c:57ce)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 1 ; energies
 	tx SwordsDanceName ; name
 	tx SwordsDanceDescription ; description
@@ -2196,7 +2196,7 @@ ScytherCard: ; 317ce (c:57ce)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx SlashName ; name
 	dw NONE ; description
@@ -2233,7 +2233,7 @@ PinsirCard: ; 3180f (c:580f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy GRASS, 2 ; energies
 	tx IronGripName ; name
 	tx MayInflictParalysisDescription ; description
@@ -2247,7 +2247,7 @@ PinsirCard: ; 3180f (c:580f)
 	db 0
 	db ATK_ANIM_HIT_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy GRASS, 2, COLORLESS, 2 ; energies
 	tx GuillotineName ; name
 	dw NONE ; description
@@ -2284,7 +2284,7 @@ CharmanderCard: ; 31850 (c:5850)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx ScratchName ; name
 	dw NONE ; description
@@ -2298,7 +2298,7 @@ CharmanderCard: ; 31850 (c:5850)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 1, COLORLESS, 1 ; energies
 	tx EmberName ; name
 	tx EmberDescription ; description
@@ -2335,7 +2335,7 @@ CharmeleonCard: ; 31891 (c:5891)
 	db STAGE1 ; stage
 	tx CharmanderName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx SlashName ; name
 	dw NONE ; description
@@ -2349,7 +2349,7 @@ CharmeleonCard: ; 31891 (c:5891)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2, COLORLESS, 1 ; energies
 	tx FlamethrowerName ; name
 	tx CharmeleonsFlamethrowerDescription ; description
@@ -2386,7 +2386,7 @@ CharizardCard: ; 318d2 (c:58d2)
 	db STAGE2 ; stage
 	tx CharmeleonName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx EnergyBurnName ; name
 	tx EnergyBurnDescription ; description
@@ -2400,7 +2400,7 @@ CharizardCard: ; 318d2 (c:58d2)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 4 ; energies
 	tx FireSpinName ; name
 	tx FireSpinDescription ; description
@@ -2437,7 +2437,7 @@ VulpixCard: ; 31913 (c:5913)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 2 ; energies
 	tx ConfuseRayName ; name
 	tx MayInflictConfusionDescription ; description
@@ -2451,7 +2451,7 @@ VulpixCard: ; 31913 (c:5913)
 	db 0
 	db ATK_ANIM_CONFUSE_RAY ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -2488,7 +2488,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	db STAGE1 ; stage
 	tx VulpixName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx LureName ; name
 	tx NinetailsLureDescription ; description
@@ -2502,7 +2502,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	db 0
 	db ATK_ANIM_LURE ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 4 ; energies
 	tx FireBlastName ; name
 	tx FireBlastDescription ; description
@@ -2539,7 +2539,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	db STAGE1 ; stage
 	tx VulpixName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 2 ; energies
 	tx MixUpName ; name
 	tx MixUpDescription ; description
@@ -2553,7 +2553,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 3 ; energies
 	tx DancingEmbersName ; name
 	tx DancingEmbersDescription ; description
@@ -2590,7 +2590,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 1, COLORLESS, 1 ; energies
 	tx FlareName ; name
 	dw NONE ; description
@@ -2604,7 +2604,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
 	db 0
 	db ATK_ANIM_SMALL_FLAME ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -2641,7 +2641,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
 	db STAGE1 ; stage
 	tx GrowlitheName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx QuickAttackDescription ; description
@@ -2655,7 +2655,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2 ; energies
 	tx FlamesOfRageName ; name
 	tx FlamesOfRageDescription ; description
@@ -2692,7 +2692,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
 	db STAGE1 ; stage
 	tx GrowlitheName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 2, COLORLESS, 1 ; energies
 	tx FlamethrowerName ; name
 	tx ArcaninesFlamethrowerDescription ; description
@@ -2706,7 +2706,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
 	db 3
 	db ATK_ANIM_BIG_FLAME ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2, COLORLESS, 2 ; energies
 	tx TakeDownName ; name
 	tx TakeDownDescription ; description
@@ -2743,7 +2743,7 @@ PonytaCard: ; 31a99 (c:5a99)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx SmashKickName ; name
 	dw NONE ; description
@@ -2757,7 +2757,7 @@ PonytaCard: ; 31a99 (c:5a99)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2 ; energies
 	tx FlameTailName ; name
 	dw NONE ; description
@@ -2794,7 +2794,7 @@ RapidashCard: ; 31ada (c:5ada)
 	db STAGE1 ; stage
 	tx PonytaName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx StompName ; name
 	tx StompDescription ; description
@@ -2808,7 +2808,7 @@ RapidashCard: ; 31ada (c:5ada)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2, COLORLESS, 1 ; energies
 	tx AgilityName ; name
 	tx RapidashsAgilityDescription ; description
@@ -2845,7 +2845,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 2 ; energies
 	tx FirePunchName ; name
 	dw NONE ; description
@@ -2859,7 +2859,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
 	db 0
 	db ATK_ANIM_FIRE_PUNCH ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2, COLORLESS, 1 ; energies
 	tx FlamethrowerName ; name
 	tx FirePunchDescription ; description
@@ -2896,7 +2896,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 1 ; energies
 	tx SmokescreenName ; name
 	tx MagmarsSmokescreenDescription ; description
@@ -2910,7 +2910,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
 	db 0
 	db ATK_ANIM_DARK_GAS ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2 ; energies
 	tx SmogName ; name
 	tx MayInflictPoisonDescription ; description
@@ -2947,7 +2947,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx BiteName ; name
 	dw NONE ; description
@@ -2961,7 +2961,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx RageName ; name
 	tx FlareonsRageDescription ; description
@@ -2998,7 +2998,7 @@ Flareon2Card: ; 31bde (c:5bde)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx QuickAttackDescription ; description
@@ -3012,7 +3012,7 @@ Flareon2Card: ; 31bde (c:5bde)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 2, COLORLESS, 2 ; energies
 	tx FlamethrowerName ; name
 	tx FlareonsFlamethrowerDescription ; description
@@ -3049,7 +3049,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIRE, 1 ; energies
 	tx WildfireName ; name
 	tx WildfireDescription ; description
@@ -3063,7 +3063,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 4 ; energies
 	tx DiveBombName ; name
 	tx MayDoNothingDescription ; description
@@ -3100,7 +3100,7 @@ Moltres2Card: ; 31c60 (c:5c60)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx FiregiverName ; name
 	tx FiregiverDescription ; description
@@ -3114,7 +3114,7 @@ Moltres2Card: ; 31c60 (c:5c60)
 	db 0
 	db ATK_ANIM_FIREGIVER ; animation
 
-	; move 2
+	; attack 2
 	energy FIRE, 3 ; energies
 	tx DiveBombName ; name
 	tx MayDoNothingDescription ; description
@@ -3151,7 +3151,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx BubbleName ; name
 	tx MayInflictParalysisDescription ; description
@@ -3165,7 +3165,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
 	db 0
 	db ATK_ANIM_BUBBLES ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx WithdrawName ; name
 	tx SquirtlesWithdrawDescription ; description
@@ -3202,7 +3202,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
 	db STAGE1 ; stage
 	tx SquirtleName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx WithdrawName ; name
 	tx WartortlesWithdrawDescription ; description
@@ -3216,7 +3216,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 2 ; energies
 	tx BiteName ; name
 	dw NONE ; description
@@ -3253,7 +3253,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
 	db STAGE2 ; stage
 	tx WartortleName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx RainDanceName ; name
 	tx RainDanceDescription ; description
@@ -3267,7 +3267,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 3 ; energies
 	tx HydroPumpName ; name
 	tx HydroPumpDescription ; description
@@ -3304,7 +3304,7 @@ PsyduckCard: ; 31d64 (c:5d64)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx HeadacheName ; name
 	tx HeadacheDescription ; description
@@ -3318,7 +3318,7 @@ PsyduckCard: ; 31d64 (c:5d64)
 	db 2
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1 ; energies
 	tx FurySwipesName ; name
 	tx TripleAttackX10Description ; description
@@ -3355,7 +3355,7 @@ GolduckCard: ; 31da5 (c:5da5)
 	db STAGE1 ; stage
 	tx PsyduckName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx PsyshockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -3369,7 +3369,7 @@ GolduckCard: ; 31da5 (c:5da5)
 	db 0
 	db ATK_ANIM_PSYCHIC_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx HyperBeamName ; name
 	tx Discard1EnergyFromTargetDescription ; description
@@ -3406,7 +3406,7 @@ PoliwagCard: ; 31de6 (c:5de6)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx WaterGunName ; name
 	tx PoliwagsWaterGunDescription ; description
@@ -3420,7 +3420,7 @@ PoliwagCard: ; 31de6 (c:5de6)
 	db MAX_ENERGY_BOOST_IS_LIMITED
 	db ATK_ANIM_WATER_GUN ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -3457,7 +3457,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
 	db STAGE1 ; stage
 	tx PoliwagName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2 ; energies
 	tx AmnesiaName ; name
 	tx PoliwhirlsAmnesiaDescription ; description
@@ -3471,7 +3471,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
 	db 0
 	db ATK_ANIM_AMNESIA ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx DoubleslapName ; name
 	tx DoubleAttackX30Description ; description
@@ -3508,7 +3508,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
 	db STAGE2 ; stage
 	tx PoliwhirlName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx WaterGunName ; name
 	tx PoliwrathsWaterGunDescription ; description
@@ -3522,7 +3522,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
 	db MAX_ENERGY_BOOST_IS_LIMITED
 	db ATK_ANIM_WATER_GUN ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 2 ; energies
 	tx WhirlpoolName ; name
 	tx Discard1EnergyFromTargetDescription ; description
@@ -3559,7 +3559,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx CowardiceName ; name
 	tx CowardiceDescription ; description
@@ -3573,7 +3573,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1 ; energies
 	tx AcidName ; name
 	dw NONE ; description
@@ -3610,7 +3610,7 @@ TentacruelCard: ; 31eea (c:5eea)
 	db STAGE1 ; stage
 	tx TentacoolName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx SupersonicName ; name
 	tx MayInflictConfusionDescription ; description
@@ -3624,7 +3624,7 @@ TentacruelCard: ; 31eea (c:5eea)
 	db 0
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2 ; energies
 	tx JellyfishStingName ; name
 	tx InflictPoisonDescription ; description
@@ -3661,7 +3661,7 @@ SeelCard: ; 31f2b (c:5f2b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx HeadbuttName ; name
 	dw NONE ; description
@@ -3675,7 +3675,7 @@ SeelCard: ; 31f2b (c:5f2b)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -3712,7 +3712,7 @@ DewgongCard: ; 31f6c (c:5f6c)
 	db STAGE1 ; stage
 	tx SeelName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx AuroraBeamName ; name
 	dw NONE ; description
@@ -3726,7 +3726,7 @@ DewgongCard: ; 31f6c (c:5f6c)
 	db 0
 	db ATK_ANIM_BEAM ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 2 ; energies
 	tx IceBeamName ; name
 	tx MayInflictParalysisDescription ; description
@@ -3763,7 +3763,7 @@ ShellderCard: ; 31fad (c:5fad)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx SupersonicName ; name
 	tx MayInflictConfusionDescription ; description
@@ -3777,7 +3777,7 @@ ShellderCard: ; 31fad (c:5fad)
 	db 0
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1 ; energies
 	tx HideInShellName ; name
 	tx HideInShellDescription ; description
@@ -3814,7 +3814,7 @@ CloysterCard: ; 31fee (c:5fee)
 	db STAGE1 ; stage
 	tx ShellderName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2 ; energies
 	tx ClampName ; name
 	tx ClampDescription ; description
@@ -3828,7 +3828,7 @@ CloysterCard: ; 31fee (c:5fee)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2 ; energies
 	tx SpikeCannonName ; name
 	tx DoubleAttackX30Description ; description
@@ -3865,7 +3865,7 @@ KrabbyCard: ; 3202f (c:602f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx CallForFamilyName ; name
 	tx KrabbysCallForFamilyDescription ; description
@@ -3879,7 +3879,7 @@ KrabbyCard: ; 3202f (c:602f)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx IronGripName ; name
 	dw NONE ; description
@@ -3916,7 +3916,7 @@ KinglerCard: ; 32070 (c:6070)
 	db STAGE1 ; stage
 	tx KrabbyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx FlailName ; name
 	tx KinglersFlailDescription ; description
@@ -3930,7 +3930,7 @@ KinglerCard: ; 32070 (c:6070)
 	db 0
 	db ATK_ANIM_BIG_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx CrabhammerName ; name
 	dw NONE ; description
@@ -3967,7 +3967,7 @@ HorseaCard: ; 320b1 (c:60b1)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx SmokescreenName ; name
 	tx OpponentAttackMayDoNothingDescription ; description
@@ -3981,7 +3981,7 @@ HorseaCard: ; 320b1 (c:60b1)
 	db 0
 	db ATK_ANIM_DARK_GAS ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -4018,7 +4018,7 @@ SeadraCard: ; 320f2 (c:60f2)
 	db STAGE1 ; stage
 	tx HorseaName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx WaterGunName ; name
 	tx SeadrasWaterGunDescription ; description
@@ -4032,7 +4032,7 @@ SeadraCard: ; 320f2 (c:60f2)
 	db MAX_ENERGY_BOOST_IS_LIMITED
 	db ATK_ANIM_WATER_GUN ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 2 ; energies
 	tx AgilityName ; name
 	tx SeadrasAgilityDescription ; description
@@ -4069,7 +4069,7 @@ GoldeenCard: ; 32133 (c:6133)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx HornAttackName ; name
 	dw NONE ; description
@@ -4083,7 +4083,7 @@ GoldeenCard: ; 32133 (c:6133)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -4120,7 +4120,7 @@ SeakingCard: ; 32174 (c:6174)
 	db STAGE1 ; stage
 	tx GoldeenName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx HornAttackName ; name
 	dw NONE ; description
@@ -4134,7 +4134,7 @@ SeakingCard: ; 32174 (c:6174)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx WaterfallName ; name
 	dw NONE ; description
@@ -4171,7 +4171,7 @@ StaryuCard: ; 321b5 (c:61b5)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx SlapName ; name
 	dw NONE ; description
@@ -4185,7 +4185,7 @@ StaryuCard: ; 321b5 (c:61b5)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -4222,7 +4222,7 @@ StarmieCard: ; 321f6 (c:61f6)
 	db STAGE1 ; stage
 	tx StaryuName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2 ; energies
 	tx RecoverName ; name
 	tx StarmiesRecoverDescription ; description
@@ -4236,7 +4236,7 @@ StarmieCard: ; 321f6 (c:61f6)
 	db 3
 	db ATK_ANIM_RECOVER ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1, COLORLESS, 2 ; energies
 	tx StarFreezeName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4273,7 +4273,7 @@ MagikarpCard: ; 32237 (c:6237)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx TackleName ; name
 	dw NONE ; description
@@ -4287,7 +4287,7 @@ MagikarpCard: ; 32237 (c:6237)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1 ; energies
 	tx FlailName ; name
 	tx MagikarpsFlailDescription ; description
@@ -4324,7 +4324,7 @@ GyaradosCard: ; 32278 (c:6278)
 	db STAGE1 ; stage
 	tx MagikarpName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 3 ; energies
 	tx DragonRageName ; name
 	dw NONE ; description
@@ -4338,7 +4338,7 @@ GyaradosCard: ; 32278 (c:6278)
 	db 0
 	db ATK_ANIM_DRAGON_RAGE ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 4 ; energies
 	tx BubblebeamName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4375,7 +4375,7 @@ LaprasCard: ; 322b9 (c:62b9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1 ; energies
 	tx WaterGunName ; name
 	tx LaprasWaterGunDescription ; description
@@ -4389,7 +4389,7 @@ LaprasCard: ; 322b9 (c:62b9)
 	db MAX_ENERGY_BOOST_IS_LIMITED
 	db ATK_ANIM_WATER_GUN ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2 ; energies
 	tx ConfuseRayName ; name
 	tx MayInflictConfusionDescription ; description
@@ -4426,7 +4426,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx FocusEnergyName ; name
 	tx FocusEnergyDescription ; description
@@ -4440,7 +4440,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx BiteName ; name
 	dw NONE ; description
@@ -4477,7 +4477,7 @@ Vaporeon2Card: ; 3233b (c:633b)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx QuickAttackDescription ; description
@@ -4491,7 +4491,7 @@ Vaporeon2Card: ; 3233b (c:633b)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2, COLORLESS, 1 ; energies
 	tx WaterGunName ; name
 	tx VaporeonsWaterGunDescription ; description
@@ -4528,7 +4528,7 @@ OmanyteCard: ; 3237c (c:637c)
 	db STAGE1 ; stage
 	tx MysteriousFossilName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx ClairvoyanceName ; name
 	tx ClairvoyanceDescription ; description
@@ -4542,7 +4542,7 @@ OmanyteCard: ; 3237c (c:637c)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 1 ; energies
 	tx WaterGunName ; name
 	tx OmanytesWaterGunDescription ; description
@@ -4579,7 +4579,7 @@ OmastarCard: ; 323bd (c:63bd)
 	db STAGE2 ; stage
 	tx OmanyteName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 1, COLORLESS, 1 ; energies
 	tx WaterGunName ; name
 	tx OmastarsWaterGunDescription ; description
@@ -4593,7 +4593,7 @@ OmastarCard: ; 323bd (c:63bd)
 	db MAX_ENERGY_BOOST_IS_LIMITED
 	db ATK_ANIM_WATER_GUN ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 2 ; energies
 	tx SpikeCannonName ; name
 	tx DoubleAttackX30Description ; description
@@ -4630,7 +4630,7 @@ Articuno1Card: ; 323fe (c:63fe)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 3 ; energies
 	tx FreezeDryName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4644,7 +4644,7 @@ Articuno1Card: ; 323fe (c:63fe)
 	db 0
 	db ATK_ANIM_BEAM ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 4 ; energies
 	tx BlizzardName ; name
 	tx BlizzardDescription ; description
@@ -4681,7 +4681,7 @@ Articuno2Card: ; 3243f (c:643f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx QuickfreezeName ; name
 	tx QuickfreezeDescription ; description
@@ -4695,7 +4695,7 @@ Articuno2Card: ; 3243f (c:643f)
 	db 0
 	db ATK_ANIM_QUICKFREEZE ; animation
 
-	; move 2
+	; attack 2
 	energy WATER, 3 ; energies
 	tx IceBreathName ; name
 	tx IceBreathDescription ; description
@@ -4732,7 +4732,7 @@ Pikachu1Card: ; 32480 (c:6480)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx GnawName ; name
 	dw NONE ; description
@@ -4746,7 +4746,7 @@ Pikachu1Card: ; 32480 (c:6480)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 1, COLORLESS, 1 ; energies
 	tx ThunderJoltName ; name
 	tx ThunderJoltDescription ; description
@@ -4783,7 +4783,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 2 ; energies
 	tx SparkName ; name
 	tx SparkDescription ; description
@@ -4797,7 +4797,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
 	db 10
 	db ATK_ANIM_THUNDER_WHOLE_SCREEN ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -4834,7 +4834,7 @@ Pikachu3Card: ; 32502 (c:6502)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx GrowlName ; name
 	tx GrowlDescription ; description
@@ -4848,7 +4848,7 @@ Pikachu3Card: ; 32502 (c:6502)
 	db 10
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 2 ; energies
 	tx ThundershockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4885,7 +4885,7 @@ Pikachu4Card: ; 32543 (c:6543)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx GrowlName ; name
 	tx GrowlDescription ; description
@@ -4899,7 +4899,7 @@ Pikachu4Card: ; 32543 (c:6543)
 	db 10
 	db ATK_ANIM_SUPERSONIC ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 2 ; energies
 	tx ThundershockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4936,7 +4936,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1 ; energies
 	tx ThundershockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -4950,7 +4950,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
 	db 0
 	db ATK_ANIM_THUNDERSHOCK ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx FlyName ; name
 	tx FlyDescription ; description
@@ -4987,7 +4987,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2 ; energies
 	tx SurfName ; name
 	dw NONE ; description
@@ -5001,7 +5001,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
 	db 0
 	db ATK_ANIM_WATER_JETS ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5038,7 +5038,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy WATER, 2 ; energies
 	tx SurfName ; name
 	dw NONE ; description
@@ -5052,7 +5052,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
 	db 0
 	db ATK_ANIM_WATER_JETS ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5089,7 +5089,7 @@ Raichu1Card: ; 32647 (c:6647)
 	db STAGE1 ; stage
 	tx PikachuName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1, COLORLESS, 2 ; energies
 	tx AgilityName ; name
 	tx RaichusAgilityDescription ; description
@@ -5103,7 +5103,7 @@ Raichu1Card: ; 32647 (c:6647)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 3, COLORLESS, 1 ; energies
 	tx ThunderName ; name
 	tx RaichusThunderDescription ; description
@@ -5140,7 +5140,7 @@ Raichu2Card: ; 32688 (c:6688)
 	db STAGE1 ; stage
 	tx PikachuName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 4 ; energies
 	tx GigashockName ; name
 	tx GigashockDescription ; description
@@ -5154,7 +5154,7 @@ Raichu2Card: ; 32688 (c:6688)
 	db 10
 	db ATK_ANIM_THUNDER_WHOLE_SCREEN ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5191,7 +5191,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1 ; energies
 	tx ThunderWaveName ; name
 	tx MayInflictParalysisDescription ; description
@@ -5205,7 +5205,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
 	db 0
 	db ATK_ANIM_THUNDER_WAVE ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 1, COLORLESS, 1 ; energies
 	tx SelfdestructName ; name
 	tx MagnemitesSelfdestructDescription ; description
@@ -5242,7 +5242,7 @@ Magnemite2Card: ; 3270a (c:670a)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx TackleName ; name
 	dw NONE ; description
@@ -5256,7 +5256,7 @@ Magnemite2Card: ; 3270a (c:670a)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 1, COLORLESS, 1 ; energies
 	tx MagneticStormName ; name
 	tx MagneticStormDescription ; description
@@ -5293,7 +5293,7 @@ Magneton1Card: ; 3274b (c:674b)
 	db STAGE1 ; stage
 	tx MagnemiteName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 2, COLORLESS, 1 ; energies
 	tx ThunderWaveName ; name
 	tx MayInflictParalysisDescription ; description
@@ -5307,7 +5307,7 @@ Magneton1Card: ; 3274b (c:674b)
 	db 0
 	db ATK_ANIM_THUNDER_WAVE ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 2, COLORLESS, 2 ; energies
 	tx SelfdestructName ; name
 	tx Magneton1sSelfdestructDescription ; description
@@ -5344,7 +5344,7 @@ Magneton2Card: ; 3278c (c:678c)
 	db STAGE1 ; stage
 	tx MagnemiteName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1, COLORLESS, 1 ; energies
 	tx SonicboomName ; name
 	tx SonicboomDescription ; description
@@ -5358,7 +5358,7 @@ Magneton2Card: ; 3278c (c:678c)
 	db 0
 	db ATK_ANIM_TEAR ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 4 ; energies
 	tx SelfdestructName ; name
 	tx Magneton2sSelfdestructDescription ; description
@@ -5395,7 +5395,7 @@ VoltorbCard: ; 327cd (c:67cd)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx TackleName ; name
 	dw NONE ; description
@@ -5409,7 +5409,7 @@ VoltorbCard: ; 327cd (c:67cd)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5446,7 +5446,7 @@ Electrode1Card: ; 3280e (c:680e)
 	db STAGE1 ; stage
 	tx VoltorbName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 2 ; energies
 	tx SonicboomName ; name
 	tx SonicboomDescription ; description
@@ -5460,7 +5460,7 @@ Electrode1Card: ; 3280e (c:680e)
 	db 0
 	db ATK_ANIM_TEAR ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 3 ; energies
 	tx EnergySpikeName ; name
 	tx EnergySpikeDescription ; description
@@ -5497,7 +5497,7 @@ Electrode2Card: ; 3284f (c:684f)
 	db STAGE1 ; stage
 	tx VoltorbName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx TackleName ; name
 	dw NONE ; description
@@ -5511,7 +5511,7 @@ Electrode2Card: ; 3284f (c:684f)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 3 ; energies
 	tx ChainLightningName ; name
 	tx ChainLightningDescription ; description
@@ -5548,7 +5548,7 @@ Electabuzz1Card: ; 32890 (c:6890)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1 ; energies
 	tx LightScreenName ; name
 	tx LightScreenDescription ; description
@@ -5562,7 +5562,7 @@ Electabuzz1Card: ; 32890 (c:6890)
 	db 0
 	db ATK_ANIM_BARRIER ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx ElectabuzzsQuickAttackDescription ; description
@@ -5599,7 +5599,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 1 ; energies
 	tx ThundershockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -5613,7 +5613,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
 	db 0
 	db ATK_ANIM_THUNDERSHOCK ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 1, COLORLESS, 1 ; energies
 	tx ThunderpunchName ; name
 	tx ThunderpunchDescription ; description
@@ -5650,7 +5650,7 @@ Jolteon1Card: ; 32912 (c:6912)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx DoubleKickName ; name
 	tx DoubleAttackX20Description ; description
@@ -5664,7 +5664,7 @@ Jolteon1Card: ; 32912 (c:6912)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx StunNeedleName ; name
 	tx MayInflictParalysisDescription ; description
@@ -5701,7 +5701,7 @@ Jolteon2Card: ; 32953 (c:6953)
 	db STAGE1 ; stage
 	tx EeveeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx QuickAttackDescription ; description
@@ -5715,7 +5715,7 @@ Jolteon2Card: ; 32953 (c:6953)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 2, COLORLESS, 1 ; energies
 	tx PinMissileName ; name
 	tx QuadrupleAttackX20Description ; description
@@ -5752,7 +5752,7 @@ Zapdos1Card: ; 32994 (c:6994)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 4 ; energies
 	tx ThunderstormName ; name
 	tx ThunderstormDescription ; description
@@ -5766,7 +5766,7 @@ Zapdos1Card: ; 32994 (c:6994)
 	db 0
 	db ATK_ANIM_THUNDERSTORM ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5803,7 +5803,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy LIGHTNING, 3, COLORLESS, 1 ; energies
 	tx ThunderName ; name
 	tx ZapdosThunderDescription ; description
@@ -5817,7 +5817,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
 	db 0
 	db ATK_ANIM_THUNDER ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 4 ; energies
 	tx ThunderboltName ; name
 	tx ThunderboltDescription ; description
@@ -5854,7 +5854,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx PealOfThunderName ; name
 	tx PealOfThunderDescription ; description
@@ -5868,7 +5868,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
 	db 0
 	db ATK_ANIM_PEAL_OF_THUNDER ; animation
 
-	; move 2
+	; attack 2
 	energy LIGHTNING, 3 ; energies
 	tx BigThunderName ; name
 	tx BigThunderDescription ; description
@@ -5905,7 +5905,7 @@ SandshrewCard: ; 32a57 (c:6a57)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1 ; energies
 	tx SandAttackName ; name
 	tx OpponentAttackMayDoNothingDescription ; description
@@ -5919,7 +5919,7 @@ SandshrewCard: ; 32a57 (c:6a57)
 	db 0
 	db ATK_ANIM_DARK_GAS ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -5956,7 +5956,7 @@ SandslashCard: ; 32a98 (c:6a98)
 	db STAGE1 ; stage
 	tx SandshrewName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx SlashName ; name
 	dw NONE ; description
@@ -5970,7 +5970,7 @@ SandslashCard: ; 32a98 (c:6a98)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2 ; energies
 	tx FurySwipesName ; name
 	tx TripleAttackX20Description ; description
@@ -6007,7 +6007,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1 ; energies
 	tx DigName ; name
 	dw NONE ; description
@@ -6021,7 +6021,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2 ; energies
 	tx MudSlapName ; name
 	dw NONE ; description
@@ -6058,7 +6058,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
 	db STAGE1 ; stage
 	tx DiglettName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx SlashName ; name
 	dw NONE ; description
@@ -6072,7 +6072,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 4 ; energies
 	tx EarthquakeName ; name
 	tx EarthquakeDescription ; description
@@ -6109,7 +6109,7 @@ MankeyCard: ; 32b5b (c:6b5b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx PeekName ; name
 	tx PeekDescription ; description
@@ -6123,7 +6123,7 @@ MankeyCard: ; 32b5b (c:6b5b)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 1 ; energies
 	tx ScratchName ; name
 	dw NONE ; description
@@ -6160,7 +6160,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 	db STAGE1 ; stage
 	tx MankeyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2 ; energies
 	tx FurySwipesName ; name
 	tx TripleAttackX20Description ; description
@@ -6174,7 +6174,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 	db 0
 	db ATK_ANIM_MULTIPLE_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx TantrumName ; name
 	tx TantrumDescription ; description
@@ -6211,7 +6211,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1 ; energies
 	tx LowKickName ; name
 	dw NONE ; description
@@ -6225,7 +6225,7 @@ MachopCard: ; 32bdd (c:6bdd)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -6262,7 +6262,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	db STAGE1 ; stage
 	tx MachopName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx KarateChopName ; name
 	tx KarateChopDescription ; description
@@ -6276,7 +6276,7 @@ MachokeCard: ; 32c1e (c:6c1e)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2, COLORLESS, 2 ; energies
 	tx SubmissionName ; name
 	tx SubmissionDescription ; description
@@ -6313,7 +6313,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	db STAGE2 ; stage
 	tx MachokeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx StrikesBackName ; name
 	tx StrikesBackDescription ; description
@@ -6327,7 +6327,7 @@ MachampCard: ; 32c5f (c:6c5f)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 3, COLORLESS, 1 ; energies
 	tx SeismicTossName ; name
 	dw NONE ; description
@@ -6364,7 +6364,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1, COLORLESS, 1 ; energies
 	tx StoneBarrageName ; name
 	tx StoneBarrageDescription ; description
@@ -6378,7 +6378,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
 	db 0
 	db ATK_ANIM_STONE_BARRAGE ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -6415,7 +6415,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
 	db STAGE1 ; stage
 	tx GeodudeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2 ; energies
 	tx HardenName ; name
 	tx GravelersHardenDescription ; description
@@ -6429,7 +6429,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
 	db 0
 	db ATK_ANIM_PROTECT ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx RockThrowName ; name
 	dw NONE ; description
@@ -6466,7 +6466,7 @@ GolemCard: ; 32d22 (c:6d22)
 	db STAGE2 ; stage
 	tx GravelerName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 3, COLORLESS, 1 ; energies
 	tx AvalancheName ; name
 	dw NONE ; description
@@ -6480,7 +6480,7 @@ GolemCard: ; 32d22 (c:6d22)
 	db 0
 	db ATK_ANIM_ROCK_THROW ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 4 ; energies
 	tx SelfdestructName ; name
 	tx GolemsSelfdestructDescription ; description
@@ -6517,7 +6517,7 @@ OnixCard: ; 32d63 (c:6d63)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1 ; energies
 	tx RockThrowName ; name
 	dw NONE ; description
@@ -6531,7 +6531,7 @@ OnixCard: ; 32d63 (c:6d63)
 	db 0
 	db ATK_ANIM_ROCK_THROW ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2 ; energies
 	tx HardenName ; name
 	tx OnixsHardenDescription ; description
@@ -6568,7 +6568,7 @@ CuboneCard: ; 32da4 (c:6da4)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx SnivelName ; name
 	tx SnivelDescription ; description
@@ -6582,7 +6582,7 @@ CuboneCard: ; 32da4 (c:6da4)
 	db 10
 	db ATK_ANIM_CRY ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2 ; energies
 	tx RageName ; name
 	tx CubonesRageDescription ; description
@@ -6619,7 +6619,7 @@ Marowak1Card: ; 32de5 (c:6de5)
 	db STAGE1 ; stage
 	tx CuboneName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2 ; energies
 	tx BonemerangName ; name
 	tx DoubleAttackX30Description ; description
@@ -6633,7 +6633,7 @@ Marowak1Card: ; 32de5 (c:6de5)
 	db 0
 	db ATK_ANIM_BONEMERANG ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx CallforFriendName ; name
 	tx CallforFriendDescription ; description
@@ -6670,7 +6670,7 @@ Marowak2Card: ; 32e26 (c:6e26)
 	db STAGE1 ; stage
 	tx CuboneName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1, COLORLESS, 1 ; energies
 	tx BoneAttackName ; name
 	tx BoneAttackDescription ; description
@@ -6684,7 +6684,7 @@ Marowak2Card: ; 32e26 (c:6e26)
 	db 0
 	db ATK_ANIM_BONEMERANG ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 3 ; energies
 	tx WailName ; name
 	tx WailDescription ; description
@@ -6721,7 +6721,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2 ; energies
 	tx StretchKickName ; name
 	tx StretchKickDescription ; description
@@ -6735,7 +6735,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
 	db 3
 	db ATK_ANIM_STRETCH_KICK ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 3 ; energies
 	tx HighJumpKickName ; name
 	dw NONE ; description
@@ -6772,7 +6772,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1 ; energies
 	tx JabName ; name
 	dw NONE ; description
@@ -6786,7 +6786,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
 	db 0
 	db ATK_ANIM_PUNCH ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 2, COLORLESS, 1 ; energies
 	tx SpecialPunch ; name
 	dw NONE ; description
@@ -6823,7 +6823,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx LeerName ; name
 	tx LeerDescription ; description
@@ -6837,7 +6837,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 1, COLORLESS, 2 ; energies
 	tx HornAttackName ; name
 	dw NONE ; description
@@ -6874,7 +6874,7 @@ RhydonCard: ; 32f2a (c:6f2a)
 	db STAGE1 ; stage
 	tx RhyhornName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 1, COLORLESS, 2 ; energies
 	tx HornAttackName ; name
 	dw NONE ; description
@@ -6888,7 +6888,7 @@ RhydonCard: ; 32f2a (c:6f2a)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 4 ; energies
 	tx RamName ; name
 	tx RamDescription ; description
@@ -6925,7 +6925,7 @@ KabutoCard: ; 32f6b (c:6f6b)
 	db STAGE1 ; stage
 	tx MysteriousFossilName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx KabutoArmorName ; name
 	tx KabutoArmorDescription ; description
@@ -6939,7 +6939,7 @@ KabutoCard: ; 32f6b (c:6f6b)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 1 ; energies
 	tx ScratchName ; name
 	dw NONE ; description
@@ -6976,7 +6976,7 @@ KabutopsCard: ; 32fac (c:6fac)
 	db STAGE2 ; stage
 	tx KabutoName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy FIGHTING, 2 ; energies
 	tx SharpSickleName ; name
 	dw NONE ; description
@@ -6990,7 +6990,7 @@ KabutopsCard: ; 32fac (c:6fac)
 	db 0
 	db ATK_ANIM_TEAR ; animation
 
-	; move 2
+	; attack 2
 	energy FIGHTING, 4 ; energies
 	tx AbsorbName ; name
 	tx AbsorbDescription ; description
@@ -7027,7 +7027,7 @@ AerodactylCard: ; 32fed (c:6fed)
 	db STAGE1 ; stage
 	tx MysteriousFossilName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx PrehistoricPowerName ; name
 	tx PrehistoricPowerDescription ; description
@@ -7041,7 +7041,7 @@ AerodactylCard: ; 32fed (c:6fed)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx WingAttackName ; name
 	dw NONE ; description
@@ -7078,7 +7078,7 @@ AbraCard: ; 3302e (c:702e)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx PsyshockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -7092,7 +7092,7 @@ AbraCard: ; 3302e (c:702e)
 	db 0
 	db ATK_ANIM_PSYCHIC_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -7129,7 +7129,7 @@ KadabraCard: ; 3306f (c:706f)
 	db STAGE1 ; stage
 	tx AbraName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 2 ; energies
 	tx RecoverName ; name
 	tx KadabrasRecoverDescription ; description
@@ -7143,7 +7143,7 @@ KadabraCard: ; 3306f (c:706f)
 	db 3
 	db ATK_ANIM_RECOVER ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2, COLORLESS, 1 ; energies
 	tx SuperPsiName ; name
 	dw NONE ; description
@@ -7180,7 +7180,7 @@ AlakazamCard: ; 330b0 (c:70b0)
 	db STAGE2 ; stage
 	tx KadabraName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx DamageSwapName ; name
 	tx DamageSwapDescription ; description
@@ -7194,7 +7194,7 @@ AlakazamCard: ; 330b0 (c:70b0)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 3 ; energies
 	tx ConfuseRayName ; name
 	tx MayInflictConfusionDescription ; description
@@ -7231,7 +7231,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx HeadbuttName ; name
 	dw NONE ; description
@@ -7245,7 +7245,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx AmnesiaName ; name
 	tx SlowpokesAmnesiaDescription ; description
@@ -7282,7 +7282,7 @@ Slowpoke2Card: ; 33132 (c:7132)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx SpacingOutName ; name
 	tx SpacingOutDescription ; description
@@ -7296,7 +7296,7 @@ Slowpoke2Card: ; 33132 (c:7132)
 	db 1
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx ScavengeName ; name
 	tx ScavengeDescription ; description
@@ -7333,7 +7333,7 @@ SlowbroCard: ; 33173 (c:7173)
 	db STAGE1 ; stage
 	tx SlowpokeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx StrangeBehaviorName ; name
 	tx StrangeBehaviorDescription ; description
@@ -7347,7 +7347,7 @@ SlowbroCard: ; 33173 (c:7173)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx PsyshockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -7384,7 +7384,7 @@ Gastly1Card: ; 331b4 (c:71b4)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx SleepingGasName ; name
 	tx MayInflictSleepDescription ; description
@@ -7398,7 +7398,7 @@ Gastly1Card: ; 331b4 (c:71b4)
 	db 0
 	db ATK_ANIM_SLEEPING_GAS ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 1, COLORLESS, 1 ; energies
 	tx DestinyBondName ; name
 	tx DestinyBondDescription ; description
@@ -7435,7 +7435,7 @@ Gastly2Card: ; 331f5 (c:71f5)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx LickName ; name
 	tx MayInflictParalysisDescription ; description
@@ -7449,7 +7449,7 @@ Gastly2Card: ; 331f5 (c:71f5)
 	db 0
 	db ATK_ANIM_GOO ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx EnergyConversionName ; name
 	tx EnergyConversionDescription ; description
@@ -7486,7 +7486,7 @@ Haunter1Card: ; 33236 (c:7236)
 	db STAGE1 ; stage
 	tx GastlyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx TransparencyName ; name
 	tx TransparencyDescription ; description
@@ -7500,7 +7500,7 @@ Haunter1Card: ; 33236 (c:7236)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 1, COLORLESS, 1 ; energies
 	tx NightmareName ; name
 	tx InflictSleepDescription ; description
@@ -7537,7 +7537,7 @@ Haunter2Card: ; 33277 (c:7277)
 	db STAGE1 ; stage
 	tx GastlyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx HypnosisName ; name
 	tx InflictSleepDescription ; description
@@ -7551,7 +7551,7 @@ Haunter2Card: ; 33277 (c:7277)
 	db 0
 	db ATK_ANIM_HYPNOSIS ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx DreamEaterName ; name
 	tx DreamEaterDescription ; description
@@ -7588,7 +7588,7 @@ GengarCard: ; 332b8 (c:72b8)
 	db STAGE2 ; stage
 	tx HaunterName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx CurseName ; name
 	tx CurseDescription ; description
@@ -7602,7 +7602,7 @@ GengarCard: ; 332b8 (c:72b8)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 3 ; energies
 	tx DarkMindName ; name
 	tx DarkMindDescription ; description
@@ -7639,7 +7639,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx PoundName ; name
 	dw NONE ; description
@@ -7653,7 +7653,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx ConfuseRayName ; name
 	tx MayInflictConfusionDescription ; description
@@ -7690,7 +7690,7 @@ HypnoCard: ; 3333a (c:733a)
 	db STAGE1 ; stage
 	tx DrowzeeName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx ProphecyName ; name
 	tx ProphecyDescription ; description
@@ -7704,7 +7704,7 @@ HypnoCard: ; 3333a (c:733a)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 3 ; energies
 	tx DarkMindName ; name
 	tx DarkMindDescription ; description
@@ -7741,7 +7741,7 @@ MrMimeCard: ; 3337b (c:737b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx InvisibleWallName ; name
 	tx InvisibleWallDescription ; description
@@ -7755,7 +7755,7 @@ MrMimeCard: ; 3337b (c:737b)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 1, COLORLESS, 1 ; energies
 	tx MeditateName ; name
 	tx MrMimesMeditateDescription ; description
@@ -7792,7 +7792,7 @@ JynxCard: ; 333bc (c:73bc)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx DoubleslapName ; name
 	tx DoubleAttackX10Description ; description
@@ -7806,7 +7806,7 @@ JynxCard: ; 333bc (c:73bc)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2, COLORLESS, 1 ; energies
 	tx MeditateName ; name
 	tx JynxsMeditateDescription ; description
@@ -7843,7 +7843,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1, COLORLESS, 1 ; energies
 	tx PsychicName ; name
 	tx PsychicDescription ; description
@@ -7857,7 +7857,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
 	db 0
 	db ATK_ANIM_PSYCHIC_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx BarrierName ; name
 	tx BarrierDescription ; description
@@ -7894,7 +7894,7 @@ Mewtwo2Card: ; 3343e (c:743e)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx EnergyAbsorptionName ; name
 	tx EnergyAbsorptionDescription ; description
@@ -7908,7 +7908,7 @@ Mewtwo2Card: ; 3343e (c:743e)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2, COLORLESS, 1 ; energies
 	tx PsyburnName ; name
 	dw NONE ; description
@@ -7945,7 +7945,7 @@ Mewtwo3Card: ; 3347f (c:747f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx EnergyAbsorptionName ; name
 	tx EnergyAbsorptionDescription ; description
@@ -7959,7 +7959,7 @@ Mewtwo3Card: ; 3347f (c:747f)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2, COLORLESS, 1 ; energies
 	tx PsyburnName ; name
 	dw NONE ; description
@@ -7996,7 +7996,7 @@ Mew1Card: ; 334c0 (c:74c0)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx NeutralizingShieldName ; name
 	tx NeutralizingShieldDescription ; description
@@ -8010,7 +8010,7 @@ Mew1Card: ; 334c0 (c:74c0)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 1 ; energies
 	tx PsyshockName ; name
 	tx MayInflictParalysisDescription ; description
@@ -8047,7 +8047,7 @@ Mew2Card: ; 33501 (c:7501)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1, COLORLESS, 1 ; energies
 	tx MysteryAttackName ; name
 	tx MysteryAttackDescription ; description
@@ -8061,7 +8061,7 @@ Mew2Card: ; 33501 (c:7501)
 	db 0
 	db ATK_ANIM_HIT_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -8098,7 +8098,7 @@ Mew3Card: ; 33542 (c:7542)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy PSYCHIC, 1 ; energies
 	tx PsywaveName ; name
 	tx PsywaveDescription ; description
@@ -8112,7 +8112,7 @@ Mew3Card: ; 33542 (c:7542)
 	db 0
 	db ATK_ANIM_PSYCHIC_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy PSYCHIC, 2 ; energies
 	tx DevolutionBeamName ; name
 	tx DevolutionBeamDescription ; description
@@ -8149,7 +8149,7 @@ PidgeyCard: ; 33583 (c:7583)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx WhirlwindName ; name
 	tx WhirlwindDescription ; description
@@ -8163,7 +8163,7 @@ PidgeyCard: ; 33583 (c:7583)
 	db 0
 	db ATK_ANIM_WHIRLWIND ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -8200,7 +8200,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
 	db STAGE1 ; stage
 	tx PidgeyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx WhirlwindName ; name
 	tx WhirlwindDescription ; description
@@ -8214,7 +8214,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
 	db 0
 	db ATK_ANIM_WHIRLWIND ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx MirrorMoveName ; name
 	tx PidgeottosMirrorMoveDescription ; description
@@ -8251,7 +8251,7 @@ Pidgeot1Card: ; 33605 (c:7605)
 	db STAGE2 ; stage
 	tx PidgeottoName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx SlicingWindName ; name
 	tx SlicingWildDescription ; description
@@ -8265,7 +8265,7 @@ Pidgeot1Card: ; 33605 (c:7605)
 	db 2
 	db ATK_ANIM_WHIRLWIND_ZIGZAG ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx GaleName ; name
 	tx GaleDescription ; description
@@ -8302,7 +8302,7 @@ Pidgeot2Card: ; 33646 (c:7646)
 	db STAGE2 ; stage
 	tx PidgeottoName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx WingAttackName ; name
 	dw NONE ; description
@@ -8316,7 +8316,7 @@ Pidgeot2Card: ; 33646 (c:7646)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx HurricaneName ; name
 	tx HurricaneDescription ; description
@@ -8353,7 +8353,7 @@ RattataCard: ; 33687 (c:7687)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx BiteName ; name
 	dw NONE ; description
@@ -8367,7 +8367,7 @@ RattataCard: ; 33687 (c:7687)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -8404,7 +8404,7 @@ RaticateCard: ; 336c8 (c:76c8)
 	db STAGE1 ; stage
 	tx RattataName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx BiteName ; name
 	dw NONE ; description
@@ -8418,7 +8418,7 @@ RaticateCard: ; 336c8 (c:76c8)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx SuperFangName ; name
 	tx SuperFangDescription ; description
@@ -8455,7 +8455,7 @@ SpearowCard: ; 33709 (c:7709)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx PeckName ; name
 	dw NONE ; description
@@ -8469,7 +8469,7 @@ SpearowCard: ; 33709 (c:7709)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx MirrorMoveName ; name
 	tx SpearowsMirrorMoveDescription ; description
@@ -8506,7 +8506,7 @@ FearowCard: ; 3374a (c:774a)
 	db STAGE1 ; stage
 	tx SpearowName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx AgilityName ; name
 	tx FearowsAgilityDescription ; description
@@ -8520,7 +8520,7 @@ FearowCard: ; 3374a (c:774a)
 	db 0
 	db ATK_ANIM_QUICK_ATTACK ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx DrillPeckName ; name
 	dw NONE ; description
@@ -8557,7 +8557,7 @@ ClefairyCard: ; 3378b (c:778b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx SingName ; name
 	tx MayInflictSleepDescription ; description
@@ -8571,7 +8571,7 @@ ClefairyCard: ; 3378b (c:778b)
 	db 0
 	db ATK_ANIM_SING ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx MetronomeName ; name
 	tx ClefairysMetronomeDescription ; description
@@ -8608,7 +8608,7 @@ ClefableCard: ; 337cc (c:77cc)
 	db STAGE1 ; stage
 	tx ClefairyName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx MetronomeName ; name
 	tx ClefablesMetronomeDescription ; description
@@ -8622,7 +8622,7 @@ ClefableCard: ; 337cc (c:77cc)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx MinimizeName ; name
 	tx ClefablesMinimizeDescription ; description
@@ -8659,7 +8659,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx FirstAidName ; name
 	tx FirstAidDescription ; description
@@ -8673,7 +8673,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
 	db 1
 	db ATK_ANIM_RECOVER ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx DoubleEdgeName ; name
 	tx JigglypuffsDoubleEdgeDescription ; description
@@ -8710,7 +8710,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx FriendshipSongName ; name
 	tx FriendshipSongDescription ; description
@@ -8724,7 +8724,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx ExpandName ; name
 	tx ExpandDescription ; description
@@ -8761,7 +8761,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx LullabyName ; name
 	tx InflictSleepDescription ; description
@@ -8775,7 +8775,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
 	db 0
 	db ATK_ANIM_LULLABY ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx PoundName ; name
 	dw NONE ; description
@@ -8812,7 +8812,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
 	db STAGE1 ; stage
 	tx JigglypuffName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx LullabyName ; name
 	tx InflictSleepDescription ; description
@@ -8826,7 +8826,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
 	db 0
 	db ATK_ANIM_LULLABY ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx DoTheWaveName ; name
 	tx DoTheWaveDescription ; description
@@ -8863,7 +8863,7 @@ Meowth1Card: ; 33911 (c:7911)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx CatPunchName ; name
 	tx CatPunchDescription ; description
@@ -8877,7 +8877,7 @@ Meowth1Card: ; 33911 (c:7911)
 	db 2
 	db ATK_ANIM_CAT_PUNCH ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -8914,7 +8914,7 @@ Meowth2Card: ; 33952 (c:7952)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx PayDayName ; name
 	tx PayDayDescription ; description
@@ -8928,7 +8928,7 @@ Meowth2Card: ; 33952 (c:7952)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -8965,7 +8965,7 @@ PersianCard: ; 33993 (c:7993)
 	db STAGE1 ; stage
 	tx MeowthName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx ScratchName ; name
 	dw NONE ; description
@@ -8979,7 +8979,7 @@ PersianCard: ; 33993 (c:7993)
 	db 0
 	db ATK_ANIM_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx PounceName ; name
 	tx PounceDescription ; description
@@ -9016,7 +9016,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx LeekSlapName ; name
 	tx LeekSlapDescription ; description
@@ -9030,7 +9030,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
 	db 0
 	db ATK_ANIM_WHIP ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx PotSmashName ; name
 	dw NONE ; description
@@ -9067,7 +9067,7 @@ DoduoCard: ; 33a15 (c:7a15)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx FuryAttackName ; name
 	tx DoubleAttackX10Description ; description
@@ -9081,7 +9081,7 @@ DoduoCard: ; 33a15 (c:7a15)
 	db 0
 	db ATK_ANIM_MULTIPLE_SLASH ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -9118,7 +9118,7 @@ DodrioCard: ; 33a56 (c:7a56)
 	db STAGE1 ; stage
 	tx DoduoName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx RetreatAidName ; name
 	tx RetreatAidDescription ; description
@@ -9132,7 +9132,7 @@ DodrioCard: ; 33a56 (c:7a56)
 	db 0
 	db ATK_ANIM_PKMN_POWER_1 ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx RageName ; name
 	tx DodriosRageDescription ; description
@@ -9169,7 +9169,7 @@ LickitungCard: ; 33a97 (c:7a97)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx TongueWrapName ; name
 	tx MayInflictParalysisDescription ; description
@@ -9183,7 +9183,7 @@ LickitungCard: ; 33a97 (c:7a97)
 	db 0
 	db ATK_ANIM_GOO ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx SupersonicName ; name
 	tx MayInflictConfusionDescription ; description
@@ -9220,7 +9220,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx ScrunchName ; name
 	tx ScrunchDescription ; description
@@ -9234,7 +9234,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx DoubleEdgeName ; name
 	tx ChanseysDoubleEdgeDescription ; description
@@ -9271,7 +9271,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx FetchName ; name
 	tx FetchDescription ; description
@@ -9285,7 +9285,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx CometPunchName ; name
 	tx QuadrupleAttackX20Description ; description
@@ -9322,7 +9322,7 @@ TaurosCard: ; 33b5a (c:7b5a)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx StompName ; name
 	tx StompDescription ; description
@@ -9336,7 +9336,7 @@ TaurosCard: ; 33b5a (c:7b5a)
 	db 1
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx RampageName ; name
 	tx RampageDescription ; description
@@ -9373,7 +9373,7 @@ DittoCard: ; 33b9b (c:7b9b)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx PoundName ; name
 	dw NONE ; description
@@ -9387,7 +9387,7 @@ DittoCard: ; 33b9b (c:7b9b)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx MorphName ; name
 	tx MorphDescription ; description
@@ -9424,7 +9424,7 @@ EeveeCard: ; 33bdc (c:7bdc)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx TailWagName ; name
 	tx TailWagDescription ; description
@@ -9438,7 +9438,7 @@ EeveeCard: ; 33bdc (c:7bdc)
 	db 0
 	db ATK_ANIM_NONE ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx QuickAttackName ; name
 	tx QuickAttackDescription ; description
@@ -9475,7 +9475,7 @@ PorygonCard: ; 33c1d (c:7c1d)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx Conversion1Name ; name
 	tx Conversion1Description ; description
@@ -9489,7 +9489,7 @@ PorygonCard: ; 33c1d (c:7c1d)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 2 ; energies
 	tx Conversion2Name ; name
 	tx Conversion2Description ; description
@@ -9526,7 +9526,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx ThickSkinnedName ; name
 	tx ThickSkinnedDescription ; description
@@ -9540,7 +9540,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx BodySlamName ; name
 	tx MayInflictParalysisDescription ; description
@@ -9577,7 +9577,7 @@ DratiniCard: ; 33c9f (c:7c9f)
 	db BASIC ; stage
 	dw NONE ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 1 ; energies
 	tx PoundName ; name
 	dw NONE ; description
@@ -9591,7 +9591,7 @@ DratiniCard: ; 33c9f (c:7c9f)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy 0 ; energies
 	dw NONE ; name
 	dw NONE ; description
@@ -9628,7 +9628,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
 	db STAGE1 ; stage
 	tx DratiniName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy COLORLESS, 3 ; energies
 	tx SlamName ; name
 	tx DoubleAttackX30Description ; description
@@ -9642,7 +9642,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
 	db 0
 	db ATK_ANIM_HIT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx HyperBeamName ; name
 	tx Discard1EnergyFromTargetDescription ; description
@@ -9679,7 +9679,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
 	db STAGE2 ; stage
 	tx DragonairName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx HealingWindName ; name
 	tx HealingWindDescription ; description
@@ -9693,7 +9693,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
 	db 0
 	db ATK_ANIM_HEALING_WIND ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 3 ; energies
 	tx SlamName ; name
 	tx DoubleAttackX30Description ; description
@@ -9730,7 +9730,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
 	db STAGE2 ; stage
 	tx DragonairName ; pre-evo name
 
-	; move 1
+	; attack 1
 	energy 0 ; energies
 	tx StepInName ; name
 	tx StepInDescription ; description
@@ -9744,7 +9744,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
 	db 0
 	db ATK_ANIM_GLOW_EFFECT ; animation
 
-	; move 2
+	; attack 2
 	energy COLORLESS, 4 ; energies
 	tx SlamName ; name
 	tx DoubleAttackX40Description ; description
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index e58f2d4..23b72e1 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -1,5 +1,5 @@
 EffectCommands: ; 186f7 (6:46f7)
-; Each move has a two-byte effect pointer (move's 7th param) that points to one of these structures.
+; Each attack has a two-byte effect pointer (attack'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 EFFECTCMDTYPE_* ($01 - $0a)
@@ -8,29 +8,29 @@ EffectCommands: ; 186f7 (6:46f7)
 ;	db $00
 
 ; Commands are associated to a time or a scope (EFFECTCMDTYPE_*) that determines when their function is executed during the turn.
-; - EFFECTCMDTYPE_INITIAL_EFFECT_1: Executed right after move or trainer card is used. Bypasses Smokescreen and Sand Attack effects.
-; - EFFECTCMDTYPE_INITIAL_EFFECT_2: Executed right after move, Pokemon Power, or trainer card is used.
-; - EFFECTCMDTYPE_DISCARD_ENERGY: For moves or trainer cards that require putting one or more attached energy cards into the discard pile.
-; - EFFECTCMDTYPE_REQUIRE_SELECTION: For moves, Pokemon Powers, or trainer cards requiring the user to select a card (from e.g. play area screen or card list).
-; - EFFECTCMDTYPE_BEFORE_DAMAGE: Effect command of a move executed prior to the damage step. For trainer card or Pokemon Power, usually the main effect.
+; - EFFECTCMDTYPE_INITIAL_EFFECT_1: Executed right after attack or trainer card is used. Bypasses Smokescreen and Sand Attack effects.
+; - EFFECTCMDTYPE_INITIAL_EFFECT_2: Executed right after attack, Pokemon Power, or trainer card is used.
+; - EFFECTCMDTYPE_DISCARD_ENERGY: For attacks or trainer cards that require putting one or more attached energy cards into the discard pile.
+; - EFFECTCMDTYPE_REQUIRE_SELECTION: For attacks, Pokemon Powers, or trainer cards requiring the user to select a card (from e.g. play area screen or card list).
+; - EFFECTCMDTYPE_BEFORE_DAMAGE: Effect command of an attack executed prior to the damage step. For trainer card or Pokemon Power, usually the main effect.
 ; - EFFECTCMDTYPE_AFTER_DAMAGE: Effect command executed after the damage step.
-; - EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN: For moves that may result in the defending Pokemon being switched out. Called only for AI-executed moves.
+; - EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN: For attacks that may result in the defending Pokemon being switched out. Called only for AI-executed attacks.
 ; - EFFECTCMDTYPE_PKMN_POWER_TRIGGER: Pokemon Power effects that trigger the moment the Pokemon card is played.
 ; - EFFECTCMDTYPE_AI: Used for AI scoring.
 ; - EFFECTCMDTYPE_AI_SELECTION: When AI is required to select a card
 
-; Moves that have an EFFECTCMDTYPE_REQUIRE_SELECTION also must have either an EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN or an
+; Attacks that have an EFFECTCMDTYPE_REQUIRE_SELECTION also must have either an EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN or an
 ; EFFECTCMDTYPE_AI_SELECTION (for anything not involving switching the defending Pokemon), to handle selections involving the AI.
 
-; Similar move effects of different Pokemon cards all point to a different command list,
+; Similar attack effects of different Pokemon cards all point to a different command list,
 ; even though in some cases their commands and function pointers match.
 
 ; Function name examples
-;	PoisonEffect                     ; generic effect shared by multiple moves.
+;	PoisonEffect                     ; generic effect shared by multiple attacks.
 ;	Paralysis50PercentEffect         ;
-;	KakunaStiffenEffect              ; unique effect from a move known by multiple cards.
+;	KakunaStiffenEffect              ; unique effect from an attack known by multiple cards.
 ;	MetapodStiffenEffect             ;
-;	AcidEffect                       ; unique effect from a move known by a single card
+;	AcidEffect                       ; unique effect from an attack known by a single card
 ;	FoulOdorEffect                   ;
 ;	SpitPoison_Poison50PercentEffect ; unique effect made of more than one command.
 ;	SpitPoison_AIEffect              ;
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 03c5e96..8bf9ab2 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -351,7 +351,7 @@ DuelMainInterface: ; 426d (1:426d)
 	call AIDoAction_Turn
 	ld a, $ff
 	ld [wPlayerAttackingCardIndex], a
-	ld [wPlayerAttackingMoveIndex], a
+	ld [wPlayerAttackingAttackIndex], a
 	ret
 
 PrintDuelMenuAndHandleInput: ; 4295 (1:4295)
@@ -1043,7 +1043,7 @@ DuelMenu_Attack: ; 46fc (1:46fc)
 	xor a
 	ld [wSelectedDuelSubMenuItem], a
 .try_open_attack_menu
-	call PrintAndLoadMovesToDuelTempList
+	call PrintAndLoadAttacksToDuelTempList
 	or a
 	jr nz, .open_attack_menu
 	ldtx hl, NoSelectableAttackText
@@ -1067,13 +1067,13 @@ DuelMenu_Attack: ; 46fc (1:46fc)
 	call DoFrame
 	ldh a, [hKeysPressed]
 	and START
-	jr nz, .display_selected_move_info
+	jr nz, .display_selected_attack_info
 	call HandleMenuInput
 	jr nc, .wait_for_input
 	cp -1 ; was B pressed?
 	jp z, PrintDuelMenuAndHandleInput
 	ld [wSelectedDuelSubMenuItem], a
-	call CheckIfEnoughEnergiesToMove
+	call CheckIfEnoughEnergiesToAttack
 	jr nc, .enough_energy
 	ldtx hl, NotEnoughEnergyCardsText
 	call DrawWideTextBox_WaitForInput
@@ -1089,7 +1089,7 @@ DuelMenu_Attack: ; 46fc (1:46fc)
 	ld d, [hl] ; card's deck index (0 to 59)
 	inc hl
 	ld e, [hl] ; attack index (0 or 1)
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call HandleAmnesiaSubstatus
 	jr c, .cannot_use_due_to_amnesia
 	ld a, PRACTICEDUEL_VERIFY_PLAYER_TURN_ACTIONS
@@ -1104,14 +1104,14 @@ DuelMenu_Attack: ; 46fc (1:46fc)
 	call DrawWideTextBox_WaitForInput
 	jr .try_open_attack_menu
 
-.display_selected_move_info
-	call OpenMovePage
+.display_selected_attack_info
+	call OpenAttackPage
 	call DrawDuelMainScene
 	jp .try_open_attack_menu
 
-; draw the move page of the card at wLoadedCard1 and of the move selected in the Attack
+; draw the attack page of the card at wLoadedCard1 and of the attack selected in the Attack
 ; menu by hCurMenuItem, and listen for input in order to switch the page or to exit.
-OpenMovePage: ; 478b (1:478b)
+OpenAttackPage: ; 478b (1:478b)
 	ld a, CARDPAGE_POKEMON_OVERVIEW
 	ld [wCardPageNumber], a
 	xor a
@@ -1136,23 +1136,23 @@ OpenMovePage: ; 478b (1:478b)
 	add hl, de
 	ld a, [hl]
 	or a
-	jr nz, .move_2
-	xor a ; MOVEPAGE_MOVE1_1
-	jr .move_1
+	jr nz, .attack_2
+	xor a ; ATTACKPAGE_ATTACK1_1
+	jr .attack_1
 
-.move_2
-	ld a, MOVEPAGE_MOVE2_1
+.attack_2
+	ld a, ATTACKPAGE_ATTACK2_1
 
-.move_1
-	ld [wMovePageNumber], a
+.attack_1
+	ld [wAttackPageNumber], a
 
 .open_page
-	call DisplayMovePage
+	call DisplayAttackPage
 	call EnableLCD
 
 .loop
 	call DoFrame
-	; switch page (see SwitchMovePage) if Right or Left pressed
+	; switch page (see SwitchAttackPage) if Right or Left pressed
 	ldh a, [hDPadHeld]
 	and D_RIGHT | D_LEFT
 	jr nz, .open_page
@@ -1170,64 +1170,64 @@ AttackMenuParameters: ; 47e4 (1:47e4)
 	db SYM_SPACE ; tile behind cursor
 	dw NULL ; function pointer if non-0
 
-; display the card page with id at wMovePageNumber of wLoadedCard1
-DisplayMovePage: ; 47ec (1:47ec)
-	ld a, [wMovePageNumber]
-	ld hl, MovePageDisplayPointerTable
+; display the card page with id at wAttackPageNumber of wLoadedCard1
+DisplayAttackPage: ; 47ec (1:47ec)
+	ld a, [wAttackPageNumber]
+	ld hl, AttackPageDisplayPointerTable
 	jp JumpToFunctionInTable
 
-MovePageDisplayPointerTable: ; 47f5 (1:47f5)
-	dw DisplayMovePage_Move1Page1 ; MOVEPAGE_MOVE1_1
-	dw DisplayMovePage_Move1Page2 ; MOVEPAGE_MOVE1_2
-	dw DisplayMovePage_Move2Page1 ; MOVEPAGE_MOVE2_1
-	dw DisplayMovePage_Move2Page2 ; MOVEPAGE_MOVE2_2
-
-; display MOVEPAGE_MOVE1_1
-DisplayMovePage_Move1Page1: ; 47fd (1:47fd)
-	call DisplayCardPage_PokemonMove1Page1
-	jr SwitchMovePage
-
-; display MOVEPAGE_MOVE1_2 if it exists. otherwise return in order
-; to switch back to MOVEPAGE_MOVE1_1 and display it instead.
-DisplayMovePage_Move1Page2: ; 4802 (1:4802)
-	ld hl, wLoadedCard1Move1Description + 2
+AttackPageDisplayPointerTable: ; 47f5 (1:47f5)
+	dw DisplayAttackPage_Attack1Page1 ; ATTACKPAGE_ATTACK1_1
+	dw DisplayAttackPage_Attack1Page2 ; ATTACKPAGE_ATTACK1_2
+	dw DisplayAttackPage_Attack2Page1 ; ATTACKPAGE_ATTACK2_1
+	dw DisplayAttackPage_Attack2Page2 ; ATTACKPAGE_ATTACK2_2
+
+; display ATTACKPAGE_ATTACK1_1
+DisplayAttackPage_Attack1Page1: ; 47fd (1:47fd)
+	call DisplayCardPage_PokemonAttack1Page1
+	jr SwitchAttackPage
+
+; display ATTACKPAGE_ATTACK1_2 if it exists. otherwise return in order
+; to switch back to ATTACKPAGE_ATTACK1_1 and display it instead.
+DisplayAttackPage_Attack1Page2: ; 4802 (1:4802)
+	ld hl, wLoadedCard1Atk1Description + 2
 	ld a, [hli]
 	or [hl]
 	ret z
-	call DisplayCardPage_PokemonMove1Page2
-	jr SwitchMovePage
-
-; display MOVEPAGE_MOVE2_1
-DisplayMovePage_Move2Page1: ; 480d (1:480d)
-	call DisplayCardPage_PokemonMove2Page1
-	jr SwitchMovePage
-
-; display MOVEPAGE_MOVE2_2 if it exists. otherwise return in order
-; to switch back to MOVEPAGE_MOVE2_1 and display it instead.
-DisplayMovePage_Move2Page2: ; 4812 (1:4812)
-	ld hl, wLoadedCard1Move2Description + 2
+	call DisplayCardPage_PokemonAttack1Page2
+	jr SwitchAttackPage
+
+; display ATTACKPAGE_ATTACK2_1
+DisplayAttackPage_Attack2Page1: ; 480d (1:480d)
+	call DisplayCardPage_PokemonAttack2Page1
+	jr SwitchAttackPage
+
+; display ATTACKPAGE_ATTACK2_2 if it exists. otherwise return in order
+; to switch back to ATTACKPAGE_ATTACK2_1 and display it instead.
+DisplayAttackPage_Attack2Page2: ; 4812 (1:4812)
+	ld hl, wLoadedCard1Atk2Description + 2
 	ld a, [hli]
 	or [hl]
 	ret z
-	call DisplayCardPage_PokemonMove2Page2
+	call DisplayCardPage_PokemonAttack2Page2
 ;	fallthrough
 
-; switch to MOVEPAGE_MOVE*_2 if in MOVEPAGE_MOVE*_1 and vice versa.
-; sets the next move page to switch to if Right or Left are pressed.
-SwitchMovePage: ; 481b (1:481b)
-	ld hl, wMovePageNumber
+; switch to ATTACKPAGE_ATTACK*_2 if in ATTACKPAGE_ATTACK*_1 and vice versa.
+; sets the next attack page to switch to if Right or Left are pressed.
+SwitchAttackPage: ; 481b (1:481b)
+	ld hl, wAttackPageNumber
 	ld a, $01
 	xor [hl]
 	ld [hl], a
 	ret
 
-; given the card at hTempCardIndex_ff98, for each non-empty, non-Pokemon Power moveslot,
-; prints its information at lines 13 (first move, if any), and 15 (second move, if any)
+; given the card at hTempCardIndex_ff98, for each non-empty, non-Pokemon Power attack slot,
+; prints its information at lines 13 (first attack, if any), and 15 (second attack, if any)
 ; also, copies zero, one, or both of the following to wDuelTempList, $ff terminated:
-;   if pokemon's first moveslot isn't empty or a Pokemon Power: <card_index>, 0
-;   if pokemon's second moveslot isn't empty or a Pokemon Power: <card_index>, 1
+;   if pokemon's first attack slot isn't empty or a Pokemon Power: <card_index>, 0
+;   if pokemon's second attack slot isn't empty or a Pokemon Power: <card_index>, 1
 ; return the amount of non-empty, non-Pokemon Power attacks in a.
-PrintAndLoadMovesToDuelTempList: ; 4823 (1:4823)
+PrintAndLoadAttacksToDuelTempList: ; 4823 (1:4823)
 	call DrawWideTextBox
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
@@ -1238,9 +1238,9 @@ PrintAndLoadMovesToDuelTempList: ; 4823 (1:4823)
 	ld hl, wDuelTempList
 	xor a
 	ld [wCardPageNumber], a
-	ld de, wLoadedCard1Move1Name
-	call CheckMoveslotEmptyOrPokemonPower
-	jr c, .check_second_moveslot
+	ld de, wLoadedCard1Atk1Name
+	call CheckAttackSlotEmptyOrPokemonPower
+	jr c, .check_second_atk_slot
 	ldh a, [hTempCardIndex_ff98]
 	ld [hli], a
 	xor a
@@ -1249,16 +1249,16 @@ PrintAndLoadMovesToDuelTempList: ; 4823 (1:4823)
 	push hl
 	push bc
 	ld e, b
-	ld hl, wLoadedCard1Move1Name
-	call PrintMoveOrPkmnPowerInformation
+	ld hl, wLoadedCard1Atk1Name
+	call PrintAttackOrPkmnPowerInformation
 	pop bc
 	pop hl
 	inc b
 	inc b ; 15
 
-.check_second_moveslot
-	ld de, wLoadedCard1Move2Name
-	call CheckMoveslotEmptyOrPokemonPower
+.check_second_atk_slot
+	ld de, wLoadedCard1Atk2Name
+	call CheckAttackSlotEmptyOrPokemonPower
 	jr c, .done
 	ldh a, [hTempCardIndex_ff98]
 	ld [hli], a
@@ -1268,8 +1268,8 @@ PrintAndLoadMovesToDuelTempList: ; 4823 (1:4823)
 	push hl
 	push bc
 	ld e, b
-	ld hl, wLoadedCard1Move2Name
-	call PrintMoveOrPkmnPowerInformation
+	ld hl, wLoadedCard1Atk2Name
+	call PrintAttackOrPkmnPowerInformation
 	pop bc
 	pop hl
 
@@ -1277,9 +1277,9 @@ PrintAndLoadMovesToDuelTempList: ; 4823 (1:4823)
 	ld a, c
 	ret
 
-; given de = wLoadedCard*Move*Name, return carry if the move is a
-; Pkmn Power or if the moveslot is empty.
-CheckMoveslotEmptyOrPokemonPower: ; 4872 (1:4872)
+; given de = wLoadedCard*Atk*Name, return carry if the attack is a
+; Pkmn Power or if the attack slot is empty.
+CheckAttackSlotEmptyOrPokemonPower: ; 4872 (1:4872)
 	push hl
 	push de
 	push bc
@@ -1288,27 +1288,27 @@ CheckMoveslotEmptyOrPokemonPower: ; 4872 (1:4872)
 	inc de
 	ld a, [de]
 	or c
-	jr z, .return_no_move_found
-	ld hl, CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_NAME + 1)
+	jr z, .return_no_atk_found
+	ld hl, CARD_DATA_ATTACK1_CATEGORY - (CARD_DATA_ATTACK1_NAME + 1)
 	add hl, de
 	ld a, [hl]
 	and $ff ^ RESIDUAL
 	cp POKEMON_POWER
-	jr z, .return_no_move_found
+	jr z, .return_no_atk_found
 	or a
 .return
 	pop bc
 	pop de
 	pop hl
 	ret
-.return_no_move_found
+.return_no_atk_found
 	scf
 	jr .return
 
 ; check if the arena pokemon card has enough energy attached to it
-; in order to use the selected move.
+; in order to use the selected attack.
 ; returns: carry if not enough energy, nc if enough energy.
-CheckIfEnoughEnergiesToMove: ; 488f (1:488f)
+CheckIfEnoughEnergiesToAttack: ; 488f (1:488f)
 	push hl
 	push bc
 	ld e, PLAY_AREA_ARENA
@@ -1323,36 +1323,36 @@ CheckIfEnoughEnergiesToMove: ; 488f (1:488f)
 	ld d, [hl] ; card's deck index (0 to 59)
 	inc hl
 	ld e, [hl] ; attack index (0 or 1)
-	call _CheckIfEnoughEnergiesToMove
+	call _CheckIfEnoughEnergiesToAttack
 	pop bc
 	pop hl
 	ret
 
-; check if a pokemon card has enough energy attached to it in order to use a move
+; check if a pokemon card has enough energy attached to it in order to use an attack
 ; input:
 ;   d = deck index of card (0 to 59)
 ;   e = attack index (0 or 1)
 ;   wAttachedEnergies and wTotalAttachedEnergies
 ; returns: carry if not enough energy, nc if enough energy.
-_CheckIfEnoughEnergiesToMove: ; 48ac (1:48ac)
+_CheckIfEnoughEnergiesToAttack: ; 48ac (1:48ac)
 	push de
 	ld a, d
 	call LoadCardDataToBuffer1_FromDeckIndex
 	pop bc
 	push bc
-	ld de, wLoadedCard1Move1EnergyCost
+	ld de, wLoadedCard1Atk1EnergyCost
 	ld a, c
 	or a
-	jr z, .got_move
-	ld de, wLoadedCard1Move2EnergyCost
+	jr z, .got_atk
+	ld de, wLoadedCard1Atk2EnergyCost
 
-.got_move
-	ld hl, CARD_DATA_MOVE1_NAME - CARD_DATA_MOVE1_ENERGY_COST
+.got_atk
+	ld hl, CARD_DATA_ATTACK1_NAME - CARD_DATA_ATTACK1_ENERGY_COST
 	add hl, de
 	ld a, [hli]
 	or [hl]
 	jr z, .not_usable_or_not_enough_energies
-	ld hl, CARD_DATA_MOVE1_CATEGORY - CARD_DATA_MOVE1_ENERGY_COST
+	ld hl, CARD_DATA_ATTACK1_CATEGORY - CARD_DATA_ATTACK1_ENERGY_COST
 	add hl, de
 	ld a, [hl]
 	cp POKEMON_POWER
@@ -1394,7 +1394,7 @@ _CheckIfEnoughEnergiesToMove: ; 48ac (1:48ac)
 
 ; given the amount of energies of a specific type required for an attack in the
 ; lower nybble of register a, test if the pokemon card has enough energies of that type
-; to use the move. Return carry if not enough energy, nc if enough energy.
+; to use the attack. Return carry if not enough energy, nc if enough energy.
 CheckIfEnoughEnergiesOfType: ; 4900 (1:4900)
 	and $f
 	push af
@@ -3781,10 +3781,10 @@ LoadSelectedCardGfx: ; 58aa (1:58aa)
 CardPageDisplayPointerTable: ; 58c2 (1:58c2)
 	dw DrawDuelMainScene
 	dw DisplayCardPage_PokemonOverview    ; CARDPAGE_POKEMON_OVERVIEW
-	dw DisplayCardPage_PokemonMove1Page1  ; CARDPAGE_POKEMON_MOVE1_1
-	dw DisplayCardPage_PokemonMove1Page2  ; CARDPAGE_POKEMON_MOVE1_2
-	dw DisplayCardPage_PokemonMove2Page1  ; CARDPAGE_POKEMON_MOVE2_1
-	dw DisplayCardPage_PokemonMove2Page2  ; CARDPAGE_POKEMON_MOVE2_2
+	dw DisplayCardPage_PokemonAttack1Page1  ; CARDPAGE_POKEMON_ATTACK1_1
+	dw DisplayCardPage_PokemonAttack1Page2  ; CARDPAGE_POKEMON_ATTACK1_2
+	dw DisplayCardPage_PokemonAttack2Page1  ; CARDPAGE_POKEMON_ATTACK2_1
+	dw DisplayCardPage_PokemonAttack2Page2  ; CARDPAGE_POKEMON_ATTACK2_2
 	dw DisplayCardPage_PokemonDescription ; CARDPAGE_POKEMON_DESCRIPTION
 	dw DrawDuelMainScene
 	dw DrawDuelMainScene
@@ -3869,10 +3869,10 @@ SwitchCardPage: ; 5930 (1:5930)
 CardPageSwitchPointerTable: ; 5936 (1:5936)
 	dw CardPageSwitch_00
 	dw CardPageSwitch_PokemonOverviewOrDescription ; CARDPAGE_POKEMON_OVERVIEW
-	dw CardPageSwitch_PokemonMove1Page1 ; CARDPAGE_POKEMON_MOVE1_1
-	dw CardPageSwitch_PokemonMove1Page2 ; CARDPAGE_POKEMON_MOVE1_2
-	dw CardPageSwitch_PokemonMove2Page1 ; CARDPAGE_POKEMON_MOVE2_1
-	dw CardPageSwitch_PokemonMove2Page2 ; CARDPAGE_POKEMON_MOVE2_2
+	dw CardPageSwitch_PokemonAttack1Page1 ; CARDPAGE_POKEMON_ATTACK1_1
+	dw CardPageSwitch_PokemonAttack1Page2 ; CARDPAGE_POKEMON_ATTACK1_2
+	dw CardPageSwitch_PokemonAttack2Page1 ; CARDPAGE_POKEMON_ATTACK2_1
+	dw CardPageSwitch_PokemonAttack2Page2 ; CARDPAGE_POKEMON_ATTACK2_2
 	dw CardPageSwitch_PokemonOverviewOrDescription ; CARDPAGE_POKEMON_DESCRIPTION
 	dw CardPageSwitch_PokemonEnd
 	dw CardPageSwitch_08
@@ -3896,28 +3896,28 @@ CardPageSwitch_PokemonOverviewOrDescription: ; 595a (1:595a)
 	or a
 	ret ; nz
 
-; return with current page if [wLoadedCard1Move1Name] non-0
-; (if card has at least one move)
-CardPageSwitch_PokemonMove1Page1: ; 595e (1:595e)
-	ld hl, wLoadedCard1Move1Name
+; return with current page if [wLoadedCard1Atk1Name] non-0
+; (if card has at least one attack)
+CardPageSwitch_PokemonAttack1Page1: ; 595e (1:595e)
+	ld hl, wLoadedCard1Atk1Name
 	jr CheckCardPageExists
 
-; return with current page if [wLoadedCard1Move1Description + 2] non-0
-; (if card's first move has a two-page description)
-CardPageSwitch_PokemonMove1Page2: ; 5963 (1:5963)
-	ld hl, wLoadedCard1Move1Description + 2
+; return with current page if [wLoadedCard1Atk1Description + 2] non-0
+; (if card's first attack has a two-page description)
+CardPageSwitch_PokemonAttack1Page2: ; 5963 (1:5963)
+	ld hl, wLoadedCard1Atk1Description + 2
 	jr CheckCardPageExists
 
-; return with current page if [wLoadedCard1Move2Name] non-0
-; (if card has two moves)
-CardPageSwitch_PokemonMove2Page1: ; 5968 (1:5968)
-	ld hl, wLoadedCard1Move2Name
+; return with current page if [wLoadedCard1Atk2Name] non-0
+; (if card has two attacks)
+CardPageSwitch_PokemonAttack2Page1: ; 5968 (1:5968)
+	ld hl, wLoadedCard1Atk2Name
 	jr CheckCardPageExists
 
-; return with current page if [wLoadedCard1Move1Description + 2] non-0
-; (if card's second move has a two-page description)
-CardPageSwitch_PokemonMove2Page2: ; 596d (1:596d)
-	ld hl, wLoadedCard1Move2Description + 2
+; return with current page if [wLoadedCard1Atk1Description + 2] non-0
+; (if card's second attack has a two-page description)
+CardPageSwitch_PokemonAttack2Page2: ; 596d (1:596d)
+	ld hl, wLoadedCard1Atk2Description + 2
 ;	fallthrough
 
 CheckCardPageExists: ; 5970 (1:5970)
@@ -4369,17 +4369,17 @@ DisplayCardPage_PokemonOverview: ; 5b7d (1:5b7d)
 	lb bc, 16, 16
 	ld a, [wLoadedCard1PokedexNumber]
 	call WriteTwoByteNumberInTxSymbolFormat
-	; print the name, damage, and energy cost of each move and/or Pokemon power that exists
-	; first move at 5,10 and second at 5,12
+	; print the name, damage, and energy cost of each attack and/or Pokemon power that exists
+	; first attack at 5,10 and second at 5,12
 	lb bc, 5, 10
 	ld e, c
-	ld hl, wLoadedCard1Move1Name
-	call PrintMoveOrPkmnPowerInformation
+	ld hl, wLoadedCard1Atk1Name
+	call PrintAttackOrPkmnPowerInformation
 	inc c
 	inc c ; 12
 	ld e, c
-	ld hl, wLoadedCard1Move2Name
-	call PrintMoveOrPkmnPowerInformation
+	ld hl, wLoadedCard1Atk2Name
+	call PrintAttackOrPkmnPowerInformation
 	; print the retreat cost (some amount of colorless energies) at 8,14
 	inc c
 	inc c ; 14
@@ -4422,12 +4422,12 @@ DisplayCardPage_PokemonOverview: ; 5b7d (1:5b7d)
 	call PrintCardPageWeaknessesOrResistances
 	ret
 
-; displays the name, damage, and energy cost of a move or Pokemon power.
+; displays the name, damage, and energy cost of an attack or Pokemon power.
 ; used in the Attack menu and in the card page of a Pokemon.
 ; input:
-   ; hl: pointer to move 1 name in a move_data_struct (which can be inside at card_data_struct)
+   ; hl: pointer to attack 1 name in a atk_data_struct (which can be inside at card_data_struct)
    ; e: Y coordinate to start printing the data at
-PrintMoveOrPkmnPowerInformation: ; 5c33 (1:5c33)
+PrintAttackOrPkmnPowerInformation: ; 5c33 (1:5c33)
 	ld a, [hli]
 	or [hl]
 	ret z
@@ -4447,10 +4447,10 @@ PrintMoveOrPkmnPowerInformation: ; 5c33 (1:5c33)
 	ld a, [hli]
 	or [hl]
 	jr z, .print_damage
-	; if in Attack menu and move 1 description exists, print at 18,e:
+	; if in Attack menu and attack 1 description exists, print at 18,e:
 	ld b, 18
 	ld c, e
-	ld a, SYM_MOVE_DESCR
+	ld a, SYM_ATK_DESCR
 	call WriteByteToBGMap0
 .print_damage
 	inc hl
@@ -4460,7 +4460,7 @@ PrintMoveOrPkmnPowerInformation: ; 5c33 (1:5c33)
 	ld a, [hl]
 	or a
 	jr z, .print_category
-	; print move damage at 15,(e+1) if non-0
+	; print attack damage at 15,(e+1) if non-0
 	ld b, 15 ; unless damage has three digits, this is effectively 16
 	ld c, e
 	inc c
@@ -4482,7 +4482,7 @@ PrintMoveOrPkmnPowerInformation: ; 5c33 (1:5c33)
 	call WriteByteToBGMap0
 	jr .print_energy_cost
 .print_energy_cost
-	ld bc, CARD_DATA_MOVE1_ENERGY_COST - CARD_DATA_MOVE1_CATEGORY
+	ld bc, CARD_DATA_ATTACK1_ENERGY_COST - CARD_DATA_ATTACK1_CATEGORY
 	add hl, bc
 	ld c, e
 	ld b, 2 ; bc = 2, e
@@ -4548,7 +4548,7 @@ PrintCardPageWeaknessesOrResistances: ; 5cac (1:5cac)
 	ret
 
 ; prints surrounding box, card name at 5,1, type, set 2, and rarity.
-; used in all CARDPAGE_POKEMON_* and MOVEPAGE_*, except in
+; used in all CARDPAGE_POKEMON_* and ATTACKPAGE_*, except in
 ; CARDPAGE_POKEMON_OVERVIEW when wCardPageType is CARDPAGETYPE_PLAY_AREA.
 PrintPokemonCardPageGenericInformation: ; 5cc4 (1:5cc4)
 	call DrawCardPageSurroundingBox
@@ -4599,50 +4599,50 @@ CardPageNoTextTileData: ; 5d1a (1:5d1a)
 	db 15, 16, SYM_No, 0
 	db $ff
 
-DisplayCardPage_PokemonMove1Page1: ; 5d1f (1:5d1f)
-	ld hl, wLoadedCard1Move1Name
-	ld de, wLoadedCard1Move1Description
-	jr DisplayPokemonMoveCardPage
+DisplayCardPage_PokemonAttack1Page1: ; 5d1f (1:5d1f)
+	ld hl, wLoadedCard1Atk1Name
+	ld de, wLoadedCard1Atk1Description
+	jr DisplayPokemonAttackCardPage
 
-DisplayCardPage_PokemonMove1Page2: ; 5d27 (1:5d27)
-	ld hl, wLoadedCard1Move1Name
-	ld de, wLoadedCard1Move1Description + 2
-	jr DisplayPokemonMoveCardPage
+DisplayCardPage_PokemonAttack1Page2: ; 5d27 (1:5d27)
+	ld hl, wLoadedCard1Atk1Name
+	ld de, wLoadedCard1Atk1Description + 2
+	jr DisplayPokemonAttackCardPage
 
-DisplayCardPage_PokemonMove2Page1: ; 5d2f (1:5d2f)
-	ld hl, wLoadedCard1Move2Name
-	ld de, wLoadedCard1Move2Description
-	jr DisplayPokemonMoveCardPage
+DisplayCardPage_PokemonAttack2Page1: ; 5d2f (1:5d2f)
+	ld hl, wLoadedCard1Atk2Name
+	ld de, wLoadedCard1Atk2Description
+	jr DisplayPokemonAttackCardPage
 
-DisplayCardPage_PokemonMove2Page2: ; 5d37 (1:5d37)
-	ld hl, wLoadedCard1Move2Name
-	ld de, wLoadedCard1Move2Description + 2
+DisplayCardPage_PokemonAttack2Page2: ; 5d37 (1:5d37)
+	ld hl, wLoadedCard1Atk2Name
+	ld de, wLoadedCard1Atk2Description + 2
 ;	fallthrough
 
 ; input:
-   ; hl = address of the move's name (text id)
-   ; de = address of the move's description (either first or second text id)
-DisplayPokemonMoveCardPage: ; 5d3d (1:5d3d)
+   ; hl = address of the attack's name (text id)
+   ; de = address of the attack's description (either first or second text id)
+DisplayPokemonAttackCardPage: ; 5d3d (1:5d3d)
 	push de
 	push hl
 	; print surrounding box, card name at 5,1, type, set 2, and rarity
 	call PrintPokemonCardPageGenericInformation
-	; print name, damage, and energy cost of move or Pokemon power starting at line 2
+	; print name, damage, and energy cost of attack or Pokemon power starting at line 2
 	ld e, 2
 	pop hl
-	call PrintMoveOrPkmnPowerInformation
+	call PrintAttackOrPkmnPowerInformation
 	pop hl
 ;	fallthrough
 
-; print, if non-null, the description of the trainer card, energy card, move,
+; print, if non-null, the description of the trainer card, energy card, attack,
 ; or Pokemon power, given as a pointer to text id in hl, starting from 1,11
-PrintMoveOrNonPokemonCardDescription: ; 5d49 (1:5d49)
+PrintAttackOrNonPokemonCardDescription: ; 5d49 (1:5d49)
 	ld a, [hli]
 	or [hl]
 	ret z
 	dec hl
 	lb de, 1, 11
-	call PrintMoveOrCardDescription
+	call PrintAttackOrCardDescription
 	ret
 
 DisplayCardPage_PokemonDescription: ; 5d54 (1:5d54)
@@ -4793,7 +4793,7 @@ DisplayEnergyOrTrainerCardPage: ; 5e2d (1:5e2d)
 	; print the set 2 icon and rarity symbol of the card
 	call DrawCardPageSet2AndRarityIcons
 	pop hl
-	call PrintMoveOrNonPokemonCardDescription
+	call PrintAttackOrNonPokemonCardDescription
 	ret
 
 ; display the card details of the card in wLoadedCard1
@@ -5742,7 +5742,7 @@ Func_6435:
 	ldh [hTempCardIndex_ff98], a
 	ld d, a
 	ld e, $00
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call DisplayUsePokemonPowerScreen
 	ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
 	call TryExecuteEffectCommandFunction
@@ -5798,7 +5798,7 @@ Func_64b0: ; 64b0 (1:64b0)
 	call PrintPlayAreaCardHeader
 	call PrintPlayAreaCardLocation
 	call Func_64fc
-	ld a, [wLoadedCard1Move1Category]
+	ld a, [wLoadedCard1Atk1Category]
 	call SetNextElementOfList
 	pop bc
 	pop hl
@@ -5812,14 +5812,14 @@ Func_64b0: ; 64b0 (1:64b0)
 ; 0x64fc
 
 Func_64fc: ; 64fc (1:64fc)
-	ld a, [wLoadedCard1Move1Category]
+	ld a, [wLoadedCard1Atk1Category]
 	cp POKEMON_POWER
 	ret nz
 	ld a, [wCurPlayAreaY]
 	inc a
 	ld e, a
 	ld d, $04
-	ld hl, wLoadedCard1Move1Name
+	ld hl, wLoadedCard1Atk1Name
 	call InitTextPrinting_ProcessTextFromPointerToID
 	ret
 ; 0x6510
@@ -5840,17 +5840,17 @@ DisplayUsePokemonPowerScreen: ; 6510 (1:6510)
 	call PrintPlayAreaCardInformationAndLocation
 	lb de, 1, 4
 	call InitTextPrinting
-	ld hl, wLoadedCard1Move1Name
+	ld hl, wLoadedCard1Atk1Name
 	call InitTextPrinting_ProcessTextFromPointerToID
 	lb de, 1, 6
-	ld hl, wLoadedCard1Move1Description
-	call PrintMoveOrCardDescription
+	ld hl, wLoadedCard1Atk1Description
+	call PrintAttackOrCardDescription
 	ret
 
-; print the description of a move, a Pokemon power, or a trainer or energy card
+; print the description of an attack, a Pokemon power, or a trainer or energy card
 ; x,y coordinates of where to start printing the text are given at de
 ; don't separate lines of text
-PrintMoveOrCardDescription: ; 653e (1:653e)
+PrintAttackOrCardDescription: ; 653e (1:653e)
 	call SetNoLineSeparation
 	ld a, [hli]
 	ld h, [hl]
@@ -6029,8 +6029,8 @@ DrawHPBar: ; 6614 (1:6614)
 	ret
 
 ; when an opponent's Pokemon card attacks, this displays a screen
-; containing the description and information of the used move
-DisplayOpponentUsedMoveScreen: ; 6635 (1:6635)
+; containing the description and information of the used attack
+DisplayOpponentUsedAttackScreen: ; 6635 (1:6635)
 	call ZeroObjectPositionsAndToggleOAMCopy
 	call EmptyScreen
 	call LoadDuelCardSymbolTiles
@@ -6041,17 +6041,17 @@ DisplayOpponentUsedMoveScreen: ; 6635 (1:6635)
 	call LoadCardDataToBuffer1_FromCardID
 	ld a, CARDPAGE_POKEMON_OVERVIEW
 	ld [wCardPageNumber], a
-	ld hl, wLoadedCard1Move1Name
+	ld hl, wLoadedCard1Atk1Name
 	ld a, [wSelectedAttack]
 	or a
-	jr z, .first_move
-	ld hl, wLoadedCard1Move2Name
-.first_move
+	jr z, .first_atk
+	ld hl, wLoadedCard1Atk2Name
+.first_atk
 	ld e, 1
-	call PrintMoveOrPkmnPowerInformation
+	call PrintAttackOrPkmnPowerInformation
 	lb de, 1, 4
-	ld hl, wLoadedMoveDescription
-	call PrintMoveOrCardDescription
+	ld hl, wLoadedAttackDescription
+	call PrintAttackOrCardDescription
 	ret
 
 ; display card detail when a trainer card is used, and print "Used xxx"
@@ -6699,7 +6699,7 @@ OppAction_BeginUseAttack: ; 6a4e (1:6a4e)
 	ld d, a
 	ldh a, [hTemp_ffa0]
 	ld e, a
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call Func_16f6
 	ld a, $01
 	ld [wSkipDuelistIsThinkingDelay], a
@@ -6735,7 +6735,7 @@ OppAction_UseAttack: ; 6a8c (1:6a8c)
 	call TryExecuteEffectCommandFunction
 	call CheckSelfConfusionDamage
 	jr c, .confusion_damage
-	call DisplayOpponentUsedMoveScreen
+	call DisplayOpponentUsedAttackScreen
 	call PrintPokemonsAttackText
 	call WaitForWideTextBoxInput
 	call ExchangeRNG
@@ -6775,13 +6775,13 @@ OppAction_UsePokemonPower: ; 6ad9 (1:6ad9)
 	ldh a, [hTempCardIndex_ff9f]
 	ld d, a
 	ld e, $00
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	ldh a, [hTemp_ffa0]
 	ldh [hTempPlayAreaLocation_ff9d], a
 	call DisplayUsePokemonPowerScreen
 	ldh a, [hTempCardIndex_ff9f]
 	call LoadCardNameToTxRam2
-	ld hl, wLoadedMoveName
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	ld [wTxRam2_b], a
 	ld a, [hl]
@@ -6846,12 +6846,12 @@ OppAction_UseMetronomeAttack: ; 6b3e (1:6b3e)
 	call SerialRecv8Bytes
 	push bc
 	call SwapTurn
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call SwapTurn
 	ldh a, [hTempCardIndex_ff9f]
 	ld [wPlayerAttackingCardIndex], a
 	ld a, [wSelectedAttack]
-	ld [wPlayerAttackingMoveIndex], a
+	ld [wPlayerAttackingAttackIndex], a
 	ld a, [wTempCardID_ccc2]
 	ld [wPlayerAttackingCardID], a
 	call Func_16f6
@@ -7236,13 +7236,13 @@ ConvertSpecialTrainerCardToPokemon: ; 6d84 (1:6d84)
 
 .trainer_to_pkmn_data
 	db 10                 ; CARD_DATA_HP
-	ds $07                ; CARD_DATA_MOVE1_NAME - (CARD_DATA_HP + 1)
-	tx DiscardName        ; CARD_DATA_MOVE1_NAME
-	tx DiscardDescription ; CARD_DATA_MOVE1_DESCRIPTION
-	ds $03                ; CARD_DATA_MOVE1_CATEGORY - (CARD_DATA_MOVE1_DESCRIPTION + 2)
-	db POKEMON_POWER      ; CARD_DATA_MOVE1_CATEGORY
-	dw TrainerCardAsPokemonEffectCommands ; CARD_DATA_MOVE1_EFFECT_COMMANDS
-	ds $18                ; CARD_DATA_RETREAT_COST - (CARD_DATA_MOVE1_EFFECT_COMMANDS + 2)
+	ds $07                ; CARD_DATA_ATTACK1_NAME - (CARD_DATA_HP + 1)
+	tx DiscardName        ; CARD_DATA_ATTACK1_NAME
+	tx DiscardDescription ; CARD_DATA_ATTACK1_DESCRIPTION
+	ds $03                ; CARD_DATA_ATTACK1_CATEGORY - (CARD_DATA_ATTACK1_DESCRIPTION + 2)
+	db POKEMON_POWER      ; CARD_DATA_ATTACK1_CATEGORY
+	dw TrainerCardAsPokemonEffectCommands ; CARD_DATA_ATTACK1_EFFECT_COMMANDS
+	ds $18                ; CARD_DATA_RETREAT_COST - (CARD_DATA_ATTACK1_EFFECT_COMMANDS + 2)
 	db UNABLE_RETREAT     ; CARD_DATA_RETREAT_COST
 	ds $0d                ; PKMN_CARD_DATA_LENGTH - (CARD_DATA_RETREAT_COST + 1)
 
@@ -7595,7 +7595,7 @@ PrintThereWasNoEffectFromStatusText: ; 700a (1:700a)
 	ld a, [wNoEffectFromWhichStatus]
 	or a
 	jr nz, .status
-	ld hl, wLoadedMoveName
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -7717,7 +7717,7 @@ InitVariablesToBeginDuel: ; 70aa (1:70aa)
 	ld a, $ff
 	ld [wcc0f], a
 	ld [wPlayerAttackingCardIndex], a
-	ld [wPlayerAttackingMoveIndex], a
+	ld [wPlayerAttackingAttackIndex], a
 	call EnableSRAM
 	ld a, [s0a009]
 	ld [wSkipDelayAllowed], a
@@ -7860,10 +7860,10 @@ TakeAPrizes: ; 7161 (1:7161)
 	ld [hl], b
 	ret
 
-; clear the non-turn holder's duelvars starting at DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX
+; clear the non-turn holder's duelvars starting at DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX
 ; these duelvars only last a two-player turn at most.
 ClearNonTurnTemporaryDuelvars: ; 717a (1:717a)
-	ld a, DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX
+	ld a, DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX
 	call GetNonTurnDuelistVariable
 	xor a
 	ld [hli], a
@@ -8320,7 +8320,7 @@ Func_741a: ; 741a (1:741a)
 	ld e, ATK_ANIM_IMAKUNI_CONFUSION
 .got_anim
 	ld a, e
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	xor a
 	ld [wDuelAnimLocationParam], a
 	push hl
@@ -8336,8 +8336,8 @@ Func_741a: ; 741a (1:741a)
 PlayAttackAnimation_DealAttackDamageSimple: ; 7469 (1:7469)
 	push hl
 	push de
-	call PlayMoveAnimation
-	call WaitMoveAnimation
+	call PlayAttackAnimation
+	call WaitAttackAnimation
 	pop de
 	pop hl
 	call SubtractHP
@@ -8351,9 +8351,9 @@ PlayAttackAnimation_DealAttackDamageSimple: ; 7469 (1:7469)
 	pop hl
 	ret
 
-; if [wLoadedMoveAnimation] != 0, wait until the animation is over
-WaitMoveAnimation: ; 7484 (1:7484)
-	ld a, [wLoadedMoveAnimation]
+; if [wLoadedAttackAnimation] != 0, wait until the animation is over
+WaitAttackAnimation: ; 7484 (1:7484)
+	ld a, [wLoadedAttackAnimation]
 	or a
 	ret z
 	push de
@@ -8364,12 +8364,12 @@ WaitMoveAnimation: ; 7484 (1:7484)
 	pop de
 	ret
 
-; play move animation
+; play attack animation
 ; input:
-; - [wLoadedMoveAnimation]: animation to play
-; - de: damage dealt by the move (to display the animation with the number)
+; - [wLoadedAttackAnimation]: animation to play
+; - de: damage dealt by the attack (to display the animation with the number)
 ; - c: a wDamageEffectiveness constant (to print WEAK or RESIST if necessary)
-PlayMoveAnimation: ; 7494 (1:7494)
+PlayAttackAnimation: ; 7494 (1:7494)
 	ldh a, [hWhoseTurn]
 	push af
 	push hl
@@ -8396,14 +8396,14 @@ PlayMoveAnimation: ; 7494 (1:7494)
 	ld [hl], d
 
 ; if damage >= 70, ATK_ANIM_HIT becomes ATK_ANIM_BIG_HIT
-	ld a, [wLoadedMoveAnimation]
+	ld a, [wLoadedAttackAnimation]
 	cp ATK_ANIM_HIT
 	jr nz, .got_anim
 	ld a, e
 	cp 70
 	jr c, .got_anim
 	ld a, ATK_ANIM_BIG_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 
 .got_anim
 	farcall PlayAttackAnimationCommands
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm
index a1c6f0d..81964a9 100644
--- a/src/engine/bank05.asm
+++ b/src/engine/bank05.asm
@@ -44,20 +44,20 @@ AIActionTable_Unreferenced: ; 1406a (5:406a)
 	ret
 
 ; returns carry if damage dealt from any of
-; a card's moves KOs defending Pokémon
-; outputs index of the move that KOs
+; a card's attacks KOs defending Pokémon
+; outputs index of the attack that KOs
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of attacking card to consider
 ; output:
-;	[wSelectedAttack] = move index that KOs
-CheckIfAnyMoveKnocksOutDefendingCard: ; 140ae (5:40ae)
-	xor a ; first move
-	call CheckIfMoveKnocksOutDefendingCard
+;	[wSelectedAttack] = attack index that KOs
+CheckIfAnyAttackKnocksOutDefendingCard: ; 140ae (5:40ae)
+	xor a ; first attack
+	call CheckIfAttackKnocksOutDefendingCard
 	ret c
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 ;	fallthrough
 
-CheckIfMoveKnocksOutDefendingCard: ; 140b5 (5:40b5)
+CheckIfAttackKnocksOutDefendingCard: ; 140b5 (5:40b5)
 	call EstimateDamage_VersusDefendingCard
 	ld a, DUELVARS_ARENA_CARD_HP
 	call GetNonTurnDuelistVariable
@@ -71,7 +71,7 @@ CheckIfMoveKnocksOutDefendingCard: ; 140b5 (5:40b5)
 ; returns carry if any of the defending Pokémon's attacks
 ; brings card at hTempPlayAreaLocation_ff9d down
 ; to exactly 0 HP.
-; outputs that attack index in wSelectedMove.
+; outputs that attack index in wSelectedAttack.
 CheckIfAnyDefendingPokemonAttackDealsSameDamageAsHP: ; 140c5 (5:40c5)
 	xor a ; FIRST_ATTACK_OR_PKMN_POWER
 	call .check_damage
@@ -183,7 +183,7 @@ AITryUseAttack: ; 14145 (5:4145)
 	call GetTurnDuelistVariable
 	ldh [hTempCardIndex_ff9f], a
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	ld a, OPPACTION_BEGIN_ATTACK
 	bank1call AIMakeDecision
 	ret c
@@ -199,7 +199,7 @@ AITryUseAttack: ; 14145 (5:4145)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	ld a, OPPACTION_USE_ATTACK
 	bank1call AIMakeDecision
 	ret c
@@ -214,7 +214,7 @@ AITryUseAttack: ; 14145 (5:4145)
 ;	- deck index in a corresponds to a double colorless energy card;
 ;	- card type in wTempCardType is colorless;
 ;	- card ID in wTempCardID is a Pokémon card that has
-;	  moves that require energy other than its color and
+;	  attacks that require energy other than its color and
 ;	  the deck index in a corresponds to that energy type;
 ;	- card ID is Eevee and a corresponds to an energy type
 ;	  of water, fire or lightning;
@@ -380,11 +380,11 @@ AIPlayInitialBasicCards: ; 14226 (5:4226)
 	jr .check_for_next_card
 
 ; returns carry if Pokémon at hTempPlayAreaLocation_ff9d
-; can't use a move or if that selected move doesn't have enough energy
+; can't use an attack or if that selected attack doesn't have enough energy
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of Pokémon card
-;	[wSelectedAttack]         = selected move to examine
-CheckIfSelectedMoveIsUnusable: ; 1424b (5:424b)
+;	[wSelectedAttack]         = selected attack to examine
+CheckIfSelectedAttackIsUnusable: ; 1424b (5:424b)
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	or a
 	jr nz, .bench
@@ -399,7 +399,7 @@ CheckIfSelectedMoveIsUnusable: ; 1424b (5:424b)
 	ld d, a
 	ld a, [wSelectedAttack]
 	ld e, a
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call HandleAmnesiaSubstatus
 	ret c
 	ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
@@ -409,22 +409,22 @@ CheckIfSelectedMoveIsUnusable: ; 1424b (5:424b)
 .bench
 	call CheckEnergyNeededForAttack
 	ret c ; can't be used
-	ld a, MOVE_FLAG2_ADDRESS | FLAG_2_BIT_5_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | FLAG_2_BIT_5_F
+	call CheckLoadedAttackFlag
 	ret
 
-; load selected move from Pokémon in hTempPlayAreaLocation_ff9d
-; and checks if there is enough energy to execute the selected move
+; load selected attack from Pokémon in hTempPlayAreaLocation_ff9d
+; and checks if there is enough energy to execute the selected attack
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of Pokémon card
-;	[wSelectedAttack]         = selected move to examine
+;	[wSelectedAttack]         = selected attack to examine
 ; output:
 ;	b = basic energy still needed
 ;	c = colorless energy still needed
-;	e = output of ConvertColorToEnergyCardID, or $0 if not a move
-;	carry set if no move
+;	e = output of ConvertColorToEnergyCardID, or $0 if not an attack
+;	carry set if no attack
 ;	       OR if it's a Pokémon Power
-;	       OR if not enough energy for move
+;	       OR if not enough energy for attack
 CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
@@ -432,12 +432,12 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	ld d, a
 	ld a, [wSelectedAttack]
 	ld e, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld hl, wLoadedMoveName
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	or [hl]
 	jr z, .no_attack
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr nz, .is_attack
 .no_attack
@@ -453,12 +453,12 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	bank1call HandleEnergyBurn
 
 	xor a
-	ld [wTempLoadedMoveEnergyCost], a
-	ld [wTempLoadedMoveEnergyNeededAmount], a
-	ld [wTempLoadedMoveEnergyNeededType], a
+	ld [wTempLoadedAttackEnergyCost], a
+	ld [wTempLoadedAttackEnergyNeededAmount], a
+	ld [wTempLoadedAttackEnergyNeededType], a
 
 	ld hl, wAttachedEnergies
-	ld de, wLoadedMoveEnergyCost
+	ld de, wLoadedAttackEnergyCost
 	ld b, 0
 	ld c, (NUM_TYPES / 2) - 1
 
@@ -475,11 +475,11 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 
 ; running CheckIfEnoughParticularAttachedEnergy back to back like this
 ; overwrites the results of a previous call of this function,
-; however, no move in the game has energy requirements for two
+; however, no attack in the game has energy requirements for two
 ; different energy types (excluding colorless), so this routine
 ; will always just return the result for one type of basic energy,
 ; while all others will necessarily have an energy cost of 0
-; if moves are added to the game with energy requirements of
+; if attacks are added to the game with energy requirements of
 ; two different basic energy types, then this routine only accounts
 ; for the type with the highest index
 
@@ -488,8 +488,8 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	swap a
 	and %00001111
 	ld b, a ; colorless energy still needed
-	ld a, [wTempLoadedMoveEnergyCost]
-	ld hl, wTempLoadedMoveEnergyNeededAmount
+	ld a, [wTempLoadedAttackEnergyCost]
+	ld hl, wTempLoadedAttackEnergyNeededAmount
 	sub [hl]
 	ld c, a ; basic energy still needed
 	ld a, [wTotalAttachedEnergies]
@@ -497,7 +497,7 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	sub b
 	jr c, .not_enough
 
-	ld a, [wTempLoadedMoveEnergyNeededAmount]
+	ld a, [wTempLoadedAttackEnergyNeededAmount]
 	or a
 	ret z
 
@@ -508,22 +508,22 @@ CheckEnergyNeededForAttack: ; 14279 (5:4279)
 	cpl
 	inc a
 	ld c, a ; colorless energy still needed
-	ld a, [wTempLoadedMoveEnergyNeededAmount]
+	ld a, [wTempLoadedAttackEnergyNeededAmount]
 	ld b, a ; basic energy still needed
-	ld a, [wTempLoadedMoveEnergyNeededType]
+	ld a, [wTempLoadedAttackEnergyNeededType]
 	call ConvertColorToEnergyCardID
 	ld e, a
 	ld d, 0
 	scf
 	ret
 
-; takes as input the energy cost of a move for a
+; takes as input the energy cost of an attack for a
 ; particular energy, stored in the lower nibble of a
-; if the move costs some amount of this energy, the lower nibble of a != 0,
-; and this amount is stored in wTempLoadedMoveEnergyCost
+; if the attack costs some amount of this energy, the lower nibble of a != 0,
+; and this amount is stored in wTempLoadedAttackEnergyCost
 ; sets carry flag if not enough energy of this type attached
 ; input:
-;	a    = this energy cost of move (lower nibble)
+;	a    = this energy cost of attack (lower nibble)
 ;	[hl] = attached energy
 ; output:
 ;	carry set if not enough of this energy type attached
@@ -537,15 +537,15 @@ CheckIfEnoughParticularAttachedEnergy: ; 142f4 (5:42f4)
 	ret
 
 .check
-	ld [wTempLoadedMoveEnergyCost], a
+	ld [wTempLoadedAttackEnergyCost], a
 	sub [hl]
 	jr z, .has_enough
 	jr c, .has_enough
 
 	; not enough energy
-	ld [wTempLoadedMoveEnergyNeededAmount], a
+	ld [wTempLoadedAttackEnergyNeededAmount], a
 	ld a, b
-	ld [wTempLoadedMoveEnergyNeededType], a
+	ld [wTempLoadedAttackEnergyNeededType], a
 	inc hl
 	inc b
 	scf
@@ -732,9 +732,9 @@ LookForCardIDInHand: ; 143bf (5:43bf)
 	ret
 
 ; stores in wDamage, wAIMinDamage and wAIMaxDamage the calculated damage
-; done to the defending Pokémon by a given card and move
+; done to the defending Pokémon by a given card and attack
 ; input:
-;	a = move index to take into account
+;	a = attack index to take into account
 ;	[hTempPlayAreaLocation_ff9d] = location of attacking card to consider
 EstimateDamage_VersusDefendingCard: ; 143e5 (5:43e5)
 	ld [wSelectedAttack], a
@@ -743,8 +743,8 @@ EstimateDamage_VersusDefendingCard: ; 143e5 (5:43e5)
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, [wLoadedMoveCategory]
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr nz, .is_attack
 
@@ -761,9 +761,9 @@ EstimateDamage_VersusDefendingCard: ; 143e5 (5:43e5)
 	ret
 
 .is_attack
-; set wAIMinDamage and wAIMaxDamage to damage of move
+; set wAIMinDamage and wAIMaxDamage to damage of attack
 ; these values take into account the range of damage
-; that the move can span (e.g. min and max number of hits)
+; that the attack can span (e.g. min and max number of hits)
 	ld a, [wDamage]
 	ld [wAIMinDamage], a
 	ld [wAIMaxDamage], a
@@ -944,9 +944,9 @@ _CalculateDamage_VersusDefendingPokemon: ; 14462 (5:4462)
 
 ; stores in wDamage, wAIMinDamage and wAIMaxDamage the calculated damage
 ; done to the Pokémon at hTempPlayAreaLocation_ff9d
-; by the defending Pokémon, using the move index at a
+; by the defending Pokémon, using the attack index at a
 ; input:
-;	a = move index
+;	a = attack index
 ;	[hTempPlayAreaLocation_ff9d] = location of card to calculate
 ;	                               damage as the receiver
 EstimateDamage_FromDefendingPokemon: ; 1450b (5:450b)
@@ -956,9 +956,9 @@ EstimateDamage_FromDefendingPokemon: ; 1450b (5:450b)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call SwapTurn
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr nz, .is_attack
 
@@ -975,9 +975,9 @@ EstimateDamage_FromDefendingPokemon: ; 1450b (5:450b)
 	ret
 
 .is_attack
-; set wAIMinDamage and wAIMaxDamage to damage of move
+; set wAIMinDamage and wAIMaxDamage to damage of attack
 ; these values take into account the range of damage
-; that the move can span (e.g. min and max number of hits)
+; that the attack can span (e.g. min and max number of hits)
 	ld a, [wDamage]
 	ld [wAIMinDamage], a
 	ld [wAIMaxDamage], a
@@ -1315,7 +1315,7 @@ InitAITurnVars: ; 15649 (5:5649)
 
 ; checks if the Player used an attack last turn
 ; and if it was the second attack of their card.
-	ld a, [wPlayerAttackingMoveIndex]
+	ld a, [wPlayerAttackingAttackIndex]
 	cp $ff
 	jr z, .check_flag
 	or a
@@ -1387,20 +1387,20 @@ InitAITurnVars: ; 15649 (5:5649)
 .done
 	ret
 
-; load selected move from Pokémon in hTempPlayAreaLocation_ff9d,
+; load selected attack from Pokémon in hTempPlayAreaLocation_ff9d,
 ; gets an energy card to discard and subsequently
-; check if there is enough energy to execute the selected move
+; check if there is enough energy to execute the selected attack
 ; after removing that attached energy card.
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of Pokémon card
-;	[wSelectedAttack]         = selected move to examine
+;	[wSelectedAttack]         = selected attack to examine
 ; output:
 ;	b = basic energy still needed
 ;	c = colorless energy still needed
-;	e = output of ConvertColorToEnergyCardID, or $0 if not a move
-;	carry set if no move
+;	e = output of ConvertColorToEnergyCardID, or $0 if not an attack
+;	carry set if no attack
 ;	       OR if it's a Pokémon Power
-;	       OR if not enough energy for move
+;	       OR if not enough energy for attack
 CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
@@ -1408,12 +1408,12 @@ CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 	ld d, a
 	ld a, [wSelectedAttack]
 	ld e, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld hl, wLoadedMoveName
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	or [hl]
 	jr z, .no_attack
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr nz, .is_attack
 .no_attack
@@ -1452,11 +1452,11 @@ CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 .asm_1570c
 	bank1call HandleEnergyBurn
 	xor a
-	ld [wTempLoadedMoveEnergyCost], a
-	ld [wTempLoadedMoveEnergyNeededAmount], a
-	ld [wTempLoadedMoveEnergyNeededType], a
+	ld [wTempLoadedAttackEnergyCost], a
+	ld [wTempLoadedAttackEnergyNeededAmount], a
+	ld [wTempLoadedAttackEnergyNeededType], a
 	ld hl, wAttachedEnergies
-	ld de, wLoadedMoveEnergyCost
+	ld de, wLoadedAttackEnergyCost
 	ld b, 0
 	ld c, (NUM_TYPES / 2) - 1
 .loop
@@ -1474,8 +1474,8 @@ CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 	swap a
 	and $0f
 	ld b, a ; colorless energy still needed
-	ld a, [wTempLoadedMoveEnergyCost]
-	ld hl, wTempLoadedMoveEnergyNeededAmount
+	ld a, [wTempLoadedAttackEnergyCost]
+	ld hl, wTempLoadedAttackEnergyNeededAmount
 	sub [hl]
 	ld c, a ; basic energy still needed
 	ld a, [wTotalAttachedEnergies]
@@ -1483,7 +1483,7 @@ CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 	sub b
 	jr c, .not_enough_energy
 
-	ld a, [wTempLoadedMoveEnergyNeededAmount]
+	ld a, [wTempLoadedAttackEnergyNeededAmount]
 	or a
 	ret z
 
@@ -1494,9 +1494,9 @@ CheckEnergyNeededForAttackAfterDiscard: ; 156c3 (5:56c3)
 	cpl
 	inc a
 	ld c, a ; colorless energy still needed
-	ld a, [wTempLoadedMoveEnergyNeededAmount]
+	ld a, [wTempLoadedAttackEnergyNeededAmount]
 	ld b, a ; basic energy still needed
-	ld a, [wTempLoadedMoveEnergyNeededType]
+	ld a, [wTempLoadedAttackEnergyNeededType]
 	call ConvertColorToEnergyCardID
 	ld e, a
 	ld d, 0
@@ -1827,14 +1827,14 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 .check_ko_1
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .active_cant_ko_1
-	call CheckIfSelectedMoveIsUnusable
-	jp nc, .active_cant_use_move
-	call LookForEnergyNeededForMoveInHand
+	call CheckIfSelectedAttackIsUnusable
+	jp nc, .active_cant_use_atk
+	call LookForEnergyNeededForAttackInHand
 	jr nc, .active_cant_ko_1
 
-.active_cant_use_move
+.active_cant_use_atk
 	ld a, 5
 	call SubFromAIScore
 	ld a, [wAIOpponentPrizeCount]
@@ -2028,11 +2028,11 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 	ldh [hTempPlayAreaLocation_ff9d], a
 	push hl
 	push bc
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .no_ko
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr nc, .success
-	call LookForEnergyNeededForMoveInHand
+	call LookForEnergyNeededForAttackInHand
 	jr c, .success
 .no_ko
 	pop bc
@@ -2057,9 +2057,9 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .active_cant_ko_2
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jp nc, .check_defending_id
 .active_cant_ko_2
 	ld a, 40
@@ -2113,7 +2113,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 
 ; subtract from wAIScore if retreat cost is larger than 1
 ; then check if any cards have at least half HP,
-; are final evolutions and can use second move in the bench
+; are final evolutions and can use second attack in the bench
 ; and adds to wAIScore if the active Pokémon doesn't meet
 ; these conditions
 .check_retreat_cost
@@ -2134,7 +2134,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 	call SubFromAIScore
 
 .one_or_none
-	call CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondMove
+	call CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondAttack
 	jr c, .check_defending_can_ko
 	call CountNumberOfSetUpBenchPokemon
 	cp 2
@@ -2223,7 +2223,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
 	jr nc, .loop_ko_3
 	jr .set_carry
 
-; if player's turn and loaded move is not a Pokémon Power OR
+; if player's turn and loaded attack is not a Pokémon Power OR
 ; if opponent's turn and wcddb == 0
 ; set wcdda's bit 7 flag
 Func_15b54: ; 15b54 (5:5b54)
@@ -2234,7 +2234,7 @@ Func_15b54: ; 15b54 (5:5b54)
 	jr z, .opponent
 
 ; player
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret z
 	jr .set_flag
@@ -2283,10 +2283,10 @@ AIDecideBenchPokemonToSwitchTo: ; 15b72 (5:5b72)
 ; check if card can KO defending Pokémon
 ; if it can, raise AI score
 ; if on last prize card, raise AI score again
-	call CheckIfAnyMoveKnocksOutDefendingCard
-	jr nc, .check_can_use_moves
-	call CheckIfSelectedMoveIsUnusable
-	jr c, .check_can_use_moves
+	call CheckIfAnyAttackKnocksOutDefendingCard
+	jr nc, .check_can_use_atks
+	call CheckIfSelectedAttackIsUnusable
+	jr c, .check_can_use_atks
 	ld a, 10
 	call AddToAIScore
 	ld a, [wcdda]
@@ -2298,16 +2298,16 @@ AIDecideBenchPokemonToSwitchTo: ; 15b72 (5:5b72)
 	ld a, 10
 	call AddToAIScore
 
-; calculates damage of both moves
+; calculates damage of both attacks
 ; to raise AI score accordingly
-.check_can_use_moves
+.check_can_use_atks
 	xor a
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	call nc, .HandleAttackDamageScore
 	ld a, $01
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	call nc, .HandleAttackDamageScore
 	jr .check_energy_card
 
@@ -2862,10 +2862,10 @@ AIDecidePlayPokemonCard: ; 15eae (5:5eae)
 	call AddToAIScore
 
 ; if energy cards are found in hand
-; for this card's moves, raise AI score
+; for this card's attacks, raise AI score
 .check_energy_cards
 	ld a, [wTempAIPokemonCard]
-	call GetMovesEnergyCostBits
+	call GetAttacksEnergyCostBits
 	call CheckEnergyFlagsNeededInList
 	jr nc, .check_evolution_hand
 	ld a, 20
@@ -2966,22 +2966,22 @@ AIDecideEvolution: ; 15f4c (5:5f4c)
 	ld [wAIScore], a
 	call Func_16120
 
-; check if the card can use any moves
-; and if any of those moves can KO
+; check if the card can use any attacks
+; and if any of those attacks can KO
 	xor a
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr nc, .can_attack
 	ld a, $01
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .cant_attack_or_ko
 .can_attack
 	ld a, $01
 	ld [wCurCardCanAttack], a
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .check_evolution_attacks
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .check_evolution_attacks
 	ld a, $01
 	ld [wCurCardCanKO], a
@@ -3004,11 +3004,11 @@ AIDecideEvolution: ; 15f4c (5:5f4c)
 	ld [hl], a
 	xor a
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr nc, .evolution_can_attack
 	ld a, $01
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .evolution_cant_attack
 .evolution_can_attack
 	ld a, 5
@@ -3038,9 +3038,9 @@ AIDecideEvolution: ; 15f4c (5:5f4c)
 	ld a, [wTempAI]
 	or a
 	jr nz, .check_defending_can_ko_evolution
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .evolution_cant_ko
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .evolution_cant_ko
 	ld a, 5
 	call AddToAIScore
@@ -3365,7 +3365,7 @@ Func_161d5: ; 161d5 (5:61d5)
 
 	call CheckIfActiveCardCanKnockOut
 	jr c, .subtract
-	call CheckIfActivePokemonCanUseAnyNonResidualMove
+	call CheckIfActivePokemonCanUseAnyNonResidualAttack
 	jr nc, .subtract
 	call AIDecideWhetherToRetreat
 	jr c, .subtract
@@ -3383,9 +3383,9 @@ Func_161d5: ; 161d5 (5:61d5)
 	call GetTurnDuelistVariable
 	ld d, a
 	ld e, $00
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call SwapTurn
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr z, .check_muk_and_snorlax
 
@@ -3466,9 +3466,9 @@ CheckDamageToMrMime: ; 16270 (5:6270)
 CheckIfActiveCardCanKnockOut: ; 1628f (5:628f)
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
-	call CheckIfAnyMoveKnocksOutDefendingCard
+	call CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .fail
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jp c, .fail
 	scf
 	ret
@@ -3479,24 +3479,24 @@ CheckIfActiveCardCanKnockOut: ; 1628f (5:628f)
 
 ; outputs carry if any of the active Pokémon attacks
 ; can be used and are not residual
-CheckIfActivePokemonCanUseAnyNonResidualMove: ; 162a1 (5:62a1)
+CheckIfActivePokemonCanUseAnyNonResidualAttack: ; 162a1 (5:62a1)
 	xor a ; active card
 	ldh [hTempPlayAreaLocation_ff9d], a
-; first move
+; first atk
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
-	jr c, .next_move
-	ld a, [wLoadedMoveCategory]
+	call CheckIfSelectedAttackIsUnusable
+	jr c, .next_atk
+	ld a, [wLoadedAttackCategory]
 	and RESIDUAL
 	jr z, .ok
 
-.next_move
-; second move
+.next_atk
+; second atk
 	ld a, $01
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .fail
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	and RESIDUAL
 	jr z, .ok
 .fail
@@ -3508,7 +3508,7 @@ CheckIfActivePokemonCanUseAnyNonResidualMove: ; 162a1 (5:62a1)
 	ret
 
 ; looks for energy card(s) in hand depending on
-; what is needed for selected card, for both moves
+; what is needed for selected card, for both attacks
 ;	- if one basic energy is required, look for that energy;
 ;	- if one colorless is required, create a list at wDuelTempList
 ;	  of all energy cards;
@@ -3517,7 +3517,7 @@ CheckIfActivePokemonCanUseAnyNonResidualMove: ; 162a1 (5:62a1)
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of Pokémon card
 LookForEnergyNeededInHand: ; 162c8 (5:62c8)
-	xor a ; first move
+	xor a ; first attack
 	ld [wSelectedAttack], a
 	call CheckEnergyNeededForAttack
 	ld a, b
@@ -3531,7 +3531,7 @@ LookForEnergyNeededInHand: ; 162c8 (5:62c8)
 	jr z, .two_colorless
 
 .second_attack
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
 	call CheckEnergyNeededForAttack
 	ld a, b
@@ -3569,7 +3569,7 @@ LookForEnergyNeededInHand: ; 162c8 (5:62c8)
 	jr .no_carry
 
 ; looks for energy card(s) in hand depending on
-; what is needed for selected card and move
+; what is needed for selected card and attack
 ;	- if one basic energy is required, look for that energy;
 ;	- if one colorless is required, create a list at wDuelTempList
 ;	  of all energy cards;
@@ -3577,8 +3577,8 @@ LookForEnergyNeededInHand: ; 162c8 (5:62c8)
 ; return carry if successful in finding card
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of Pokémon card
-;	[wSelectedAttack]         = selected move to examine
-LookForEnergyNeededForMoveInHand: ; 16311 (5:6311)
+;	[wSelectedAttack]         = selected attack to examine
+LookForEnergyNeededForAttackInHand: ; 16311 (5:6311)
 	call CheckEnergyNeededForAttack
 	ld a, b
 	add c
@@ -3738,7 +3738,7 @@ CheckEnergyFlagsNeededInList: ; 1637b (5:637b)
 	or a
 	ret
 
-; returns in a the energy cost of both moves from card index in a
+; returns in a the energy cost of both attacks from card index in a
 ; represented by energy flags
 ; i.e. each bit represents a different energy type cost
 ; if any colorless energy is required, all bits are set
@@ -3746,25 +3746,25 @@ CheckEnergyFlagsNeededInList: ; 1637b (5:637b)
 ;	a = card index
 ; output:
 ;	a = bits of each energy requirement
-GetMovesEnergyCostBits: ; 163c9 (5:63c9)
+GetAttacksEnergyCostBits: ; 163c9 (5:63c9)
 	call LoadCardDataToBuffer2_FromDeckIndex
-	ld hl, wLoadedCard2Move1EnergyCost
+	ld hl, wLoadedCard2Atk1EnergyCost
 	call GetEnergyCostBits
 	ld b, a
 
 	push bc
-	ld hl, wLoadedCard2Move2EnergyCost
+	ld hl, wLoadedCard2Atk2EnergyCost
 	call GetEnergyCostBits
 	pop bc
 	or b
 	ret
 
-; returns in a the energy cost of a move in [hl]
+; returns in a the energy cost of an attack in [hl]
 ; represented by energy flags
 ; i.e. each bit represents a different energy type cost
 ; if any colorless energy is required, all bits are set
 ; input:
-;	[hl] = Loaded card move energy cost
+;	[hl] = Loaded card attack energy cost
 ; output:
 ;	a = bits of each energy requirement
 GetEnergyCostBits: ; 163dd (5:63dd)
@@ -4048,7 +4048,7 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld [wCurCardCanAttack], a
-	call GetMovesEnergyCostBits
+	call GetAttacksEnergyCostBits
 	ld hl, wDuelTempList
 	call CheckEnergyFlagsNeededInList
 	jp nc, .store_score
@@ -4247,12 +4247,12 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	ld a, 1
 	call AddToAIScore
 
-; add AI score for both moves,
+; add AI score for both attacks,
 ; according to their energy requirements.
-	xor a ; first move
-	call DetermineAIScoreOfMoveEnergyRequirement
-	ld a, $01 ; second move
-	call DetermineAIScoreOfMoveEnergyRequirement
+	xor a ; first attack
+	call DetermineAIScoreOfAttackEnergyRequirement
+	ld a, SECOND_ATTACK
+	call DetermineAIScoreOfAttackEnergyRequirement
 
 ; store bench score for this card.
 .store_score
@@ -4293,25 +4293,25 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	or a
 	ret
 
-; checks score related to selected move,
+; checks score related to selected attack,
 ; in order to determine whether to play energy card.
 ; the AI score is increased/decreased accordingly.
 ; input:
-;	[wSelectedAttack] = move to check.
-DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
+;	[wSelectedAttack] = attack to check.
+DetermineAIScoreOfAttackEnergyRequirement: ; 16695 (5:6695)
 	ld [wSelectedAttack], a
 	call CheckEnergyNeededForAttack
 	jp c, .not_enough_energy
-	ld a, MOVE_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
+	call CheckLoadedAttackFlag
 	jr c, .attached_energy_boost
-	ld a, MOVE_FLAG2_ADDRESS | DISCARD_ENERGY_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | DISCARD_ENERGY_F
+	call CheckLoadedAttackFlag
 	jr c, .discard_energy
 	jp .check_evolution
 
 .attached_energy_boost
-	ld a, [wLoadedMoveEffectParam]
+	ld a, [wLoadedAttackEffectParam]
 	cp MAX_ENERGY_BOOST_IS_LIMITED
 	jr z, .check_surplus_energy
 
@@ -4321,7 +4321,7 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	jp .check_evolution
 
 .check_surplus_energy
-	call CheckIfNoSurplusEnergyForMove
+	call CheckIfNoSurplusEnergyForAttack
 	jr c, .asm_166cd
 	cp 3 ; check how much surplus energy
 	jr c, .asm_166cd
@@ -4335,12 +4335,12 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	ld a, 2
 	call AddToAIScore
 
-; check whether move has ATTACHED_ENERGY_BOOST flag
+; check whether attack has ATTACHED_ENERGY_BOOST flag
 ; and add to AI score if attaching another energy
 ; will KO defending Pokémon.
 ; add more to score if this is currently active Pokémon.
-	ld a, MOVE_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
+	call CheckLoadedAttackFlag
 	jp nc, .check_evolution
 	ld a, [wSelectedAttack]
 	call EstimateDamage_VersusDefendingCard
@@ -4369,7 +4369,7 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	call AddToAIScore
 	jr .check_evolution
 
-; checks if there is surplus energy for move
+; checks if there is surplus energy for attack
 ; that discards attached energy card.
 ; if current card is Zapdos2, don't add to score.
 ; if there is no surplus energy, encourage playing energy.
@@ -4377,13 +4377,13 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	ld a, [wLoadedCard1ID]
 	cp ZAPDOS2
 	jr z, .check_evolution
-	call CheckIfNoSurplusEnergyForMove
+	call CheckIfNoSurplusEnergyForAttack
 	jr c, .asm_166cd
 	jr .asm_166c5
 
 .not_enough_energy
-	ld a, MOVE_FLAG2_ADDRESS | FLAG_2_BIT_5_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | FLAG_2_BIT_5_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_color_needed
 	ld a, 5
 	call SubFromAIScore
@@ -4407,7 +4407,7 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	ld a, 3
 	call AddToAIScore
 
-; if only one energy card is needed for move,
+; if only one energy card is needed for attack,
 ; encourage playing energy card.
 .check_total_needed
 	ld a, b
@@ -4417,7 +4417,7 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	ld a, 3
 	call AddToAIScore
 
-; if the move KOs player and this is the active card, add to AI score.
+; if the attack KOs player and this is the active card, add to AI score.
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	or a
 	jr nz, .check_evolution
@@ -4427,9 +4427,9 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 	call GetNonTurnDuelistVariable
 	ld hl, wDamage
 	sub [hl]
-	jr z, .move_kos_defending
+	jr z, .atk_kos_defending
 	jr nc, .check_evolution
-.move_kos_defending
+.atk_kos_defending
 	ld a, 20
 	call AddToAIScore
 
@@ -4464,8 +4464,8 @@ DetermineAIScoreOfMoveEnergyRequirement: ; 16695 (5:6695)
 ; if a colorless card is needed, increase AI score.
 	call CheckEnergyNeededForAttack
 	jr nc, .done
-	ld a, MOVE_FLAG2_ADDRESS | FLAG_2_BIT_5_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | FLAG_2_BIT_5_F
+	call CheckLoadedAttackFlag
 	jr c, .done
 	ld a, b
 	or a
@@ -4571,8 +4571,8 @@ FindPlayAreaCardWithHighestAIScore: ; 167b5 (5:67b5)
 
 ; returns carry if there's an evolution card
 ; that can evolve card in hTempPlayAreaLocation_ff9d,
-; and that card needs energy to use wSelectedMove.
-CheckIfEvolutionNeedsEnergyForMove: ; 16805 (5:6805)
+; and that card needs energy to use wSelectedAttack.
+CheckIfEvolutionNeedsEnergyForAttack: ; 16805 (5:6805)
 	call CreateHandCardList
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
@@ -4618,7 +4618,7 @@ CheckIfEvolutionNeedsEnergyForMove: ; 16805 (5:6805)
 ;	c = 1 if only needs colorless energy, 0 otherwise;
 ;	carry set if not Zapdos2's Thunderbolt attack.
 GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
-; load card ID and check selected move index.
+; load card ID and check selected attack index.
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
@@ -4639,12 +4639,12 @@ GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
 	jr z, .charizard_or_exeggutor
 	cp EXEGGUTOR
 	jr z, .charizard_or_exeggutor
-	ld hl, wLoadedCard2Move2EnergyCost
+	ld hl, wLoadedCard2Atk2EnergyCost
 	jr .fire
 .first_attack
-	ld hl, wLoadedCard2Move1EnergyCost
+	ld hl, wLoadedCard2Atk1EnergyCost
 
-; check which energy color the move requires,
+; check which energy color the attack requires,
 ; and load in e the card ID of corresponding energy card,
 ; then return carry flag set.
 .fire
@@ -4744,34 +4744,34 @@ AITryToPlayEnergyCard: ; 1689f (5:689f)
 	xor a ; FIRST_ATTACK_OR_PKMN_POWER
 	ld [wSelectedAttack], a
 	call CheckEnergyNeededForAttack
-	ld a, MOVE_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
+	call CheckLoadedAttackFlag
 	jr c, .energy_boost_or_discard_energy
-	ld a, MOVE_FLAG2_ADDRESS | DISCARD_ENERGY_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | DISCARD_ENERGY_F
+	call CheckLoadedAttackFlag
 	jr c, .energy_boost_or_discard_energy
 
 	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
 	call CheckEnergyNeededForAttack
-	ld a, MOVE_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | ATTACHED_ENERGY_BOOST_F
+	call CheckLoadedAttackFlag
 	jr c, .energy_boost_or_discard_energy
-	ld a, MOVE_FLAG2_ADDRESS | DISCARD_ENERGY_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | DISCARD_ENERGY_F
+	call CheckLoadedAttackFlag
 	jr c, .energy_boost_or_discard_energy
 
 ; if none of the attacks have those flags, do an additional
 ; check to ascertain whether evolution card needs energy
 ; to use second attack. Return if all these checks fail.
-	call CheckIfEvolutionNeedsEnergyForMove
+	call CheckIfEvolutionNeedsEnergyForAttack
 	ret nc
 	call CreateEnergyCardListFromHand
 	jr .check_deck
 
 ; for attacks that discard energy or get boost for
-; additional energy cards, get the energy card ID required by move.
-; if it's Zapdos2's Thunderbolt move, return.
+; additional energy cards, get the energy card ID required by attack.
+; if it's Zapdos2's Thunderbolt attack, return.
 .energy_boost_or_discard_energy
 	call GetEnergyCardForDiscardOrEnergyBoostAttack
 	ret nc
@@ -4867,7 +4867,7 @@ AITryToPlayEnergyCard: ; 1689f (5:689f)
 
 ; check if playing certain decks so that AI can decide whether to play
 ; double colorless to some specific cards.
-; these are cards that do not need double colorless to any of their moves
+; these are cards that do not need double colorless to any of their attacks
 ; but are required by their evolutions.
 ; return carry if there's a double colorless in hand to attach
 ; and it's one of the card IDs from these decks.
@@ -5089,8 +5089,8 @@ AIProcessAttacks: ; 169fc (5:69fc)
 
 .check_damage_bench
 ; check if it can otherwise damage player's bench
-	ld a, MOVE_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
+	call CheckLoadedAttackFlag
 	jr c, .can_damage
 
 ; cannot damage either Defending Pokemon or Bench
@@ -5132,7 +5132,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr nc, .usable
 
 ; return zero AI score.
@@ -5158,9 +5158,9 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld [wTempNonTurnDuelistCardID], a
 
 ; handle the case where the player has No Damage substatus.
-; in the case the player does, check if this move
+; in the case the player does, check if this attack
 ; has a residual effect, or if it can damage the opposing bench.
-; If none of those are true, render the move unusable.
+; If none of those are true, render the attack unusable.
 ; also if it's a PKMN power, consider it unusable as well.
 	bank1call HandleNoDamageOrEffectSubstatus
 	call SwapTurn
@@ -5171,17 +5171,17 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld [wAICannotDamage], a
 	ld a, [wSelectedAttack]
 	call EstimateDamage_VersusDefendingCard
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr z, .unusable
 	and RESIDUAL
 	jr nz, .check_if_can_ko
-	ld a, MOVE_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
+	call CheckLoadedAttackFlag
 	jr nc, .unusable
 
-; calculate damage to player to check if move can KO.
-; encourage move if it's able to KO.
+; calculate damage to player to check if attack can KO.
+; encourage attack if it's able to KO.
 .check_if_can_ko
 	ld a, [wSelectedAttack]
 	call EstimateDamage_VersusDefendingCard
@@ -5196,14 +5196,14 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 20
 	call AddToAIScore
 
-; raise AI score by the number of damage counters that this move deals.
+; raise AI score by the number of damage counters that this attack deals.
 ; if no damage is dealt, subtract AI score. in case wDamage is zero
-; but wMaxDamage is not, then encourage move afterwards.
+; but wMaxDamage is not, then encourage attack afterwards.
 ; otherwise, if wMaxDamage is also zero, check for damage against
-; player's bench, and encourage move in case there is.
+; player's bench, and encourage attack in case there is.
 .check_damage
 	xor a
-	ld [wAIMoveIsNonDamaging], a
+	ld [wAIAttackIsNonDamaging], a
 	ld a, [wDamage]
 	ld [wTempAI], a
 	or a
@@ -5213,7 +5213,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	jr .check_recoil
 .no_damage
 	ld a, $01
-	ld [wAIMoveIsNonDamaging], a
+	ld [wAIAttackIsNonDamaging], a
 	call SubFromAIScore
 	ld a, [wAIMaxDamage]
 	or a
@@ -5221,26 +5221,26 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 2
 	call AddToAIScore
 	xor a
-	ld [wAIMoveIsNonDamaging], a
+	ld [wAIAttackIsNonDamaging], a
 .no_max_damage
-	ld a, MOVE_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | DAMAGE_TO_OPPONENT_BENCH_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_recoil
 	ld a, 2
 	call AddToAIScore
 
-; handle recoil moves (low and high recoil).
+; handle recoil attacks (low and high recoil).
 .check_recoil
-	ld a, MOVE_FLAG1_ADDRESS | LOW_RECOIL_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | LOW_RECOIL_F
+	call CheckLoadedAttackFlag
 	jr c, .is_recoil
-	ld a, MOVE_FLAG1_ADDRESS | HIGH_RECOIL_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | HIGH_RECOIL_F
+	call CheckLoadedAttackFlag
 	jp nc, .check_defending_can_ko
 .is_recoil
 	; sub from AI score number of damage counters
-	; that move deals to itself.
-	ld a, [wLoadedMoveEffectParam]
+	; that attack deals to itself.
+	ld a, [wLoadedAttackEffectParam]
 	or a
 	jp z, .check_defending_can_ko
 	ld [wDamage], a
@@ -5250,8 +5250,8 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	call SubFromAIScore
 
 	push de
-	ld a, MOVE_FLAG1_ADDRESS | HIGH_RECOIL_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | HIGH_RECOIL_F
+	call CheckLoadedAttackFlag
 	pop de
 	jr c, .high_recoil
 
@@ -5266,14 +5266,14 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	call SubFromAIScore
 
 .high_recoil
-	; dismiss this move if no benched Pokémon
+	; dismiss this attack if no benched Pokémon
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
 	cp 2
-	jr c, .dismiss_high_recoil_move
+	jr c, .dismiss_high_recoil_atk
 	; has benched Pokémon
 
-; here the AI handles high recoil moves differently
+; here the AI handles high recoil attacks differently
 ; depending on what deck it's playing.
 	ld a, [wOpponentDeckID]
 	cp ROCK_CRUSHER_DECK_ID
@@ -5281,23 +5281,23 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	cp ZAPPING_SELFDESTRUCT_DECK_ID
 	jr z, .zapping_selfdestruct_deck
 	cp BOOM_BOOM_SELFDESTRUCT_DECK_ID
-	jr z, .encourage_high_recoil_move
+	jr z, .encourage_high_recoil_atk
 	; Boom Boom Selfdestruct deck always encourages
 	cp POWER_GENERATOR_DECK_ID
 	jr nz, .high_recoil_generic_checks
 	; Power Generator deck always dismisses
 
-.dismiss_high_recoil_move
+.dismiss_high_recoil_atk
 	xor a
 	ld [wAIScore], a
 	jp .done
 
-.encourage_high_recoil_move
+.encourage_high_recoil_atk
 	ld a, 20
 	call AddToAIScore
 	jp .done
 
-; Zapping Selfdestruct deck only uses this move
+; Zapping Selfdestruct deck only uses this attack
 ; if number of cards in deck >= 30 and
 ; HP of active card is < half max HP.
 .zapping_selfdestruct_deck
@@ -5323,30 +5323,30 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	add b
 	ld b, a ; 20 bench damage if not Magnemite1
 
-; if this move causes player to win the duel by
-; knocking out own Pokémon, dismiss move.
+; if this attack causes player to win the duel by
+; knocking out own Pokémon, dismiss attack.
 	ld a, 1 ; count active Pokémon as KO'd
 	call .check_if_kos_bench
-	jr c, .dismiss_high_recoil_move
-	jr .encourage_high_recoil_move
+	jr c, .dismiss_high_recoil_atk
+	jr .encourage_high_recoil_atk
 
-; Rock Crusher Deck only uses this move if
-; prize count is below 4 and move wins (or potentially draws) the duel,
+; Rock Crusher Deck only uses this attack if
+; prize count is below 4 and attack wins (or potentially draws) the duel,
 ; (i.e. at least gets KOs equal to prize cards left).
 .rock_crusher_deck
 	call CountPrizes
 	cp 4
-	jr nc, .dismiss_high_recoil_move
+	jr nc, .dismiss_high_recoil_atk
 	; prize count < 4
 	ld b, 20 ; damage dealt to bench
 	call SwapTurn
 	xor a
 	call .check_if_kos_bench
 	call SwapTurn
-	jr c, .encourage_high_recoil_move
+	jr c, .encourage_high_recoil_atk
 
 ; generic checks for all other deck IDs.
-; encourage move if it wins (or potentially draws) the duel,
+; encourage attack if it wins (or potentially draws) the duel,
 ; (i.e. at least gets KOs equal to prize cards left).
 ; dismiss it if it causes the player to win.
 .high_recoil_generic_checks
@@ -5382,12 +5382,12 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	pop bc
 	jr nc, .count_own_ko_bench
 
-; move causes player to draw all prize cards
+; attack causes player to draw all prize cards
 	xor a
 	ld [wAIScore], a
 	jp .done
 
-; move causes CPU to draw all prize cards
+; attack causes CPU to draw all prize cards
 .wins_the_duel
 	ld a, 20
 	call AddToAIScore
@@ -5410,15 +5410,15 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	jr .check_defending_can_ko
 
 ; local function that gets called to determine damage to
-; benched Pokémon caused by a HIGH_RECOIL move.
-; return carry if using move causes number of benched Pokémon KOs
+; benched Pokémon caused by a HIGH_RECOIL attack.
+; return carry if using attack causes number of benched Pokémon KOs
 ; equal to or larger than remaining prize cards.
 ; this function is independent on duelist turn, so whatever
 ; turn it is when this is called, it's that duelist's
 ; bench/prize cards that get checked.
 ; input:
 ;	a = initial number of KO's beside benched Pokémon,
-;		so that if the active Pokémon is KO'd by the move,
+;		so that if the active Pokémon is KO'd by the attack,
 ;		this counts towards the prize cards collected
 ;	b = damage dealt to bench Pokémon
 .check_if_kos_bench
@@ -5458,8 +5458,8 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	scf
 	ret
 
-; if defending card can KO, encourage move
-; unless move is non-damaging.
+; if defending card can KO, encourage attack
+; unless attack is non-damaging.
 .check_defending_can_ko
 	ld a, [wSelectedAttack]
 	push af
@@ -5470,13 +5470,13 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	jr nc, .check_discard
 	ld a, 5
 	call AddToAIScore
-	ld a, [wAIMoveIsNonDamaging]
+	ld a, [wAIAttackIsNonDamaging]
 	or a
 	jr z, .check_discard
 	ld a, 5
 	call SubFromAIScore
 
-; subtract from AI score if this move requires
+; subtract from AI score if this attack requires
 ; discarding any energy cards.
 .check_discard
 	ld a, [wSelectedAttack]
@@ -5484,49 +5484,49 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, MOVE_FLAG2_ADDRESS | DISCARD_ENERGY_F
-	call CheckLoadedMoveFlag
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, ATTACK_FLAG2_ADDRESS | DISCARD_ENERGY_F
+	call CheckLoadedAttackFlag
 	jr nc, .asm_16ca6
 	ld a, 1
 	call SubFromAIScore
-	ld a, [wLoadedMoveEffectParam]
+	ld a, [wLoadedAttackEffectParam]
 	call SubFromAIScore
 
 .asm_16ca6
-	ld a, MOVE_FLAG2_ADDRESS | FLAG_2_BIT_6_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | FLAG_2_BIT_6_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_nullify_flag
-	ld a, [wLoadedMoveEffectParam]
+	ld a, [wLoadedAttackEffectParam]
 	call AddToAIScore
 
-; encourage move if it has a nullify or weaken attack effect.
+; encourage attack if it has a nullify or weaken attack effect.
 .check_nullify_flag
-	ld a, MOVE_FLAG2_ADDRESS | NULLIFY_OR_WEAKEN_ATTACK_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | NULLIFY_OR_WEAKEN_ATTACK_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_draw_flag
 	ld a, 1
 	call AddToAIScore
 
-; encourage move if it has an effect to draw a card.
+; encourage attack if it has an effect to draw a card.
 .check_draw_flag
-	ld a, MOVE_FLAG1_ADDRESS | DRAW_CARD_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | DRAW_CARD_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_heal_flag
 	ld a, 1
 	call AddToAIScore
 
 .check_heal_flag
-	ld a, MOVE_FLAG2_ADDRESS | HEAL_USER_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | HEAL_USER_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_status_effect
-	ld a, [wLoadedMoveEffectParam]
+	ld a, [wLoadedAttackEffectParam]
 	cp 1
 	jr z, .tally_heal_score
 	ld a, [wTempAI]
 	call CalculateByteTensDigit
 	ld b, a
-	ld a, [wLoadedMoveEffectParam]
+	ld a, [wLoadedAttackEffectParam]
 	cp 3
 	jr z, .asm_16cec
 	srl b
@@ -5545,7 +5545,7 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	call GetCardDamageAndMaxHP
 	call CalculateByteTensDigit
 	pop bc
-	cp b ; wLoadedMoveEffectParam
+	cp b ; wLoadedAttackEffectParam
 	jr c, .add_heal_score
 	ld a, b
 .add_heal_score
@@ -5566,22 +5566,22 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	call GetNonTurnDuelistVariable
 	ld [wTempAI], a
 
-; encourage a poison inflicting move if opposing Pokémon
+; encourage a poison inflicting attack if opposing Pokémon
 ; isn't (doubly) poisoned already.
 ; if opposing Pokémon is only poisoned and not double poisoned,
-; and this move has FLAG_2_BIT_6 set, discourage it
+; and this attack has FLAG_2_BIT_6 set, discourage it
 ; (possibly to make Nidoking's Toxic attack less likely to be chosen
 ; if the other Pokémon is poisoned.)
-	ld a, MOVE_FLAG1_ADDRESS | INFLICT_POISON_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | INFLICT_POISON_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_sleep
 	ld a, [wTempAI]
 	and DOUBLE_POISONED
 	jr z, .add_poison_score
 	and $40 ; only double poisoned?
 	jr z, .check_sleep
-	ld a, MOVE_FLAG2_ADDRESS | FLAG_2_BIT_6_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | FLAG_2_BIT_6_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_sleep
 	ld a, 2
 	call SubFromAIScore
@@ -5590,10 +5590,10 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 2
 	call AddToAIScore
 
-; encourage sleep-inducing move if other Pokémon isn't asleep.
+; encourage sleep-inducing attack if other Pokémon isn't asleep.
 .check_sleep
-	ld a, MOVE_FLAG1_ADDRESS | INFLICT_SLEEP_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | INFLICT_SLEEP_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_paralysis
 	ld a, [wTempAI]
 	and CNF_SLP_PRZ
@@ -5602,11 +5602,11 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 1
 	call AddToAIScore
 
-; encourage paralysis-inducing move if other Pokémon isn't asleep.
-; otherwise, if other Pokémon is asleep, discourage move.
+; encourage paralysis-inducing attack if other Pokémon isn't asleep.
+; otherwise, if other Pokémon is asleep, discourage attack.
 .check_paralysis
-	ld a, MOVE_FLAG1_ADDRESS | INFLICT_PARALYSIS_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | INFLICT_PARALYSIS_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_confusion
 	ld a, [wTempAI]
 	and CNF_SLP_PRZ
@@ -5619,13 +5619,13 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 1
 	call SubFromAIScore
 
-; encourage confuse-inducing move if other Pokémon isn't asleep
+; encourage confuse-inducing attack if other Pokémon isn't asleep
 ; or confused already.
 ; otherwise, if other Pokémon is asleep or confused,
-; discourage move instead.
+; discourage attack instead.
 .check_confusion
-	ld a, MOVE_FLAG1_ADDRESS | INFLICT_CONFUSION_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | INFLICT_CONFUSION_F
+	call CheckLoadedAttackFlag
 	jr nc, .check_if_confused
 	ld a, [wTempAI]
 	and CNF_SLP_PRZ
@@ -5652,13 +5652,13 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 	ld a, 1
 	call SubFromAIScore
 
-; flag3_bit1 marks moves that the AI handles individually.
-; each move has its own checks and modifies AI score accordingly.
+; flag3_bit1 marks attacks that the AI handles individually.
+; each attack has its own checks and modifies AI score accordingly.
 .handle_flag3_bit1
-	ld a, MOVE_FLAG3_ADDRESS | FLAG_3_BIT_1_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG3_ADDRESS | FLAG_3_BIT_1_F
+	call CheckLoadedAttackFlag
 	jr nc, .done
-	call HandleSpecialAIMoves
+	call HandleSpecialAIAttacks
 	cp $80
 	jr c, .negative_score
 	sub $80
@@ -5673,13 +5673,13 @@ GetAIScoreOfAttack: ; 16a86 (5:6a86)
 .done
 	ret
 
-; this function handles moves with the FLAG_3_BIT_1 set,
-; and makes specific checks in each of these moves
+; this function handles attacks with the FLAG_3_BIT_1 set,
+; and makes specific checks in each of these attacks
 ; to either return a positive score (value above $80)
 ; or a negative score (value below $80).
 ; input:
-;	hTempPlayAreaLocation_ff9d = location of card with move.
-HandleSpecialAIMoves: ; 16dcd (5:6dcd)
+;	hTempPlayAreaLocation_ff9d = location of card with attack.
+HandleSpecialAIAttacks: ; 16dcd (5:6dcd)
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
@@ -5739,11 +5739,11 @@ HandleSpecialAIMoves: ; 16dcd (5:6dcd)
 HandleCallForFamily: ; 16e3e (5:6e3e)
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
 	cp MAX_BENCH_POKEMON
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld b, a
 	ld a, MAX_BENCH_POKEMON
 	sub b
@@ -5760,12 +5760,12 @@ HandleNidoranFCallForFamily: ; 16e55 (5:6e55)
 	ld e, NIDORANF
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 .found
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
 	cp MAX_PLAY_AREA_POKEMON
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld b, a
 	ld a, MAX_PLAY_AREA_POKEMON
 	sub b
@@ -5792,12 +5792,12 @@ HandleMarowak1CallForFriend: ; 16e77 (5:6e77)
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
 	jr c, .found
-	jr HandleSpecialAIMoves.zero
+	jr HandleSpecialAIAttacks.zero
 .found
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
 	cp MAX_BENCH_POKEMON
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld b, a
 	ld a, MAX_BENCH_POKEMON
 	sub b
@@ -5808,11 +5808,11 @@ HandleMarowak1CallForFriend: ; 16e77 (5:6e77)
 ; return a score of $80 + slots available in bench.
 HandleJigglypuff2FriendshipSong: ; 16ead (5:6ead)
 	call CheckIfAnyBasicPokemonInDeck
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
 	cp MAX_PLAY_AREA_POKEMON
-	jr nc, HandleSpecialAIMoves.zero
+	jr nc, HandleSpecialAIAttacks.zero
 	ld b, a
 	ld a, MAX_PLAY_AREA_POKEMON
 	sub b
@@ -5822,28 +5822,28 @@ HandleJigglypuff2FriendshipSong: ; 16ead (5:6ead)
 ; if AI decides to retreat, return a score of $80 + 10.
 HandleExeggutorTeleport: ; 16ec2 (5:6ec2)
 	call AIDecideWhetherToRetreat
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	ld a, $8a
 	ret
 
 ; tests for the following conditions:
 ; - player is under No Damage substatus;
-; - second move is unusable;
-; - second move deals no damage;
+; - second attack is unusable;
+; - second attack deals no damage;
 ; if any are true, returns score of $80 + 5.
 HandleSwordsDanceAndFocusEnergy: ; 16ecb (5:6ecb)
 	ld a, [wAICannotDamage]
 	or a
 	jr nz, .success
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .success
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	call EstimateDamage_VersusDefendingCard
 	ld a, [wDamage]
 	or a
-	jp nz, HandleSpecialAIMoves.zero
+	jp nz, HandleSpecialAIAttacks.zero
 .success
 	ld a, $85
 	ret
@@ -5869,21 +5869,21 @@ HandleElectrode2ChainLightning: ; 16eea (5:6eea)
 	pop bc
 	cp b
 	jr nz, .loop
-	jp HandleSpecialAIMoves.zero
+	jp HandleSpecialAIAttacks.zero
 .success
 	ld a, $82
 	ret
 
 HandleMew3DevolutionBeam: ; 16f0f (5:6f0f)
 	call LookForCardThatIsKnockedOutOnDevolution
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	ld a, $85
 	ret
 
 ; first checks if card is confused, and if so return 0.
 ; then checks number of Pokémon in bench that are viable to use:
-; - if that number is < 2  and this move is Conversion 1 OR
-; - if that number is >= 2 and this move is Conversion 2
+; - if that number is < 2  and this attack is Conversion 1 OR
+; - if that number is >= 2 and this attack is Conversion 2
 ; then return score of $80 + 2.
 ; otherwise return score of $80 + 1.
 HandlePorygonConversion: ; 16f18 (5:6f18)
@@ -5891,7 +5891,7 @@ HandlePorygonConversion: ; 16f18 (5:6f18)
 	call GetTurnDuelistVariable
 	and CNF_SLP_PRZ
 	cp CONFUSED
-	jp z, HandleSpecialAIMoves.zero
+	jp z, HandleSpecialAIAttacks.zero
 
 	ld a, [wSelectedAttack]
 	or a
@@ -5921,16 +5921,16 @@ HandleEnergyAbsorption: ; 16f41 (5:6f41)
 	ld e, PSYCHIC_ENERGY
 	ld a, CARD_LOCATION_DISCARD_PILE
 	call CheckIfAnyCardIDinLocation
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	ld a, $82
 	ret
 
 ; if player has cards in hand, AI calls Random:
-; - 1/3 chance to encourage move regardless;
-; - 1/3 chance to dismiss move regardless;
+; - 1/3 chance to encourage attack regardless;
+; - 1/3 chance to dismiss attack regardless;
 ; - 1/3 change to make some checks to player's hand.
 ; AI tallies number of basic cards in hand, and if this
-; number is >= 2, encourage move.
+; number is >= 2, encourage attack.
 ; otherwise, if it finds an evolution card in hand that
 ; can evolve a card in player's deck, encourage.
 ; if encouraged, returns a score of $80 + 3.
@@ -5988,7 +5988,7 @@ HandleNinetalesMixUp: ; 16f4e (5:6f4e)
 .loop_play_area
 	ld a, [hli]
 	cp $ff
-	jp z, HandleSpecialAIMoves.zero
+	jp z, HandleSpecialAIAttacks.zero
 	push hl
 	call SwapTurn
 	call CheckForEvolutionInList
@@ -6005,17 +6005,17 @@ HandleZapdos3BigThunder: ; 16fb8 (5:6fb8)
 	ld a, $83
 	ret
 
-; dismiss move if cards in deck <= 20.
+; dismiss attack if cards in deck <= 20.
 ; otherwise return a score of $80 + 0.
 HandleKangaskhanFetch: ; 16fbb (5:6fbb)
 	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK
 	call GetTurnDuelistVariable
 	cp 41
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	ld a, $80
 	ret
 
-; dismiss move if number of own benched cards which would
+; dismiss attack if number of own benched cards which would
 ; be KOd is greater than or equal to the number
 ; of prize cards left for player.
 HandleDugtrioEarthquake: ; 16fc8 (5:6fc8)
@@ -6041,8 +6041,8 @@ HandleDugtrioEarthquake: ; 16fc8 (5:6fc8)
 	call CountPrizes
 	pop de
 	cp d
-	jp c, HandleSpecialAIMoves.zero
-	jp z, HandleSpecialAIMoves.zero
+	jp c, HandleSpecialAIAttacks.zero
+	jp z, HandleSpecialAIAttacks.zero
 	ld a, $80
 	ret
 
@@ -6052,13 +6052,13 @@ HandleElectrode1EnergySpike: ; 16ff2 (5:6ff2)
 	ld a, CARD_LOCATION_DECK
 	ld e, LIGHTNING_ENERGY
 	call CheckIfAnyCardIDinLocation
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	call AIProcessButDontPlayEnergy_SkipEvolution
-	jp nc, HandleSpecialAIMoves.zero
+	jp nc, HandleSpecialAIAttacks.zero
 	ld a, $83
 	ret
 
-; only incentivize move if player's active card,
+; only incentivize attack if player's active card,
 ; has any energy cards attached, and if so,
 ; return a score of $80 + 3.
 HandleHyperBeam: ; 17005 (5:7005)
@@ -6101,19 +6101,19 @@ CheckWhetherToSwitchToFirstAttack: ; 17019 (5:7019)
 
 ; second attack can ko, check its flag.
 ; in case its effect is to heal user or nullify/weaken damage
-; next turn, keep second move as the option.
+; next turn, keep second attack as the option.
 ; otherwise switch to the first attack.
 .check_flag
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	ld e, $01 ; second attack
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, MOVE_FLAG2_ADDRESS | HEAL_USER_F
-	call CheckLoadedMoveFlag
+	ld e, SECOND_ATTACK
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, ATTACK_FLAG2_ADDRESS | HEAL_USER_F
+	call CheckLoadedAttackFlag
 	jr c, .keep_second_attack
-	ld a, MOVE_FLAG2_ADDRESS | NULLIFY_OR_WEAKEN_ATTACK_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG2_ADDRESS | NULLIFY_OR_WEAKEN_ATTACK_F
+	call CheckLoadedAttackFlag
 	jr c, .keep_second_attack
 ; switch to first attack
 	xor a
@@ -6220,8 +6220,8 @@ LookForCardThatIsKnockedOutOnDevolution: ; 17080 (5:7080)
 ;	- arena card HP >= half max HP
 ;	- arena card Unknown2's 4 bit is not set or
 ;	  is set but there's no evolution of card in hand/deck
-;	- arena card can use second move
-CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondMove: ; 170c9 (5:70c9)
+;	- arena card can use second attack
+CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondAttack: ; 170c9 (5:70c9)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
@@ -6246,10 +6246,10 @@ CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondMove: ; 170c9 (5:70c9)
 .check_second_attack
 	xor a ; active card
 	ldh [hTempPlayAreaLocation_ff9d], a
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
 	push hl
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	pop hl
 	jr c, .no_carry
 	scf
@@ -6263,7 +6263,7 @@ CheckIfArenaCardIsAtHalfHPCanEvolveAndUseSecondMove: ; 170c9 (5:70c9)
 ;	- card HP > half max HP
 ;	- card Unknown2's 4 bit is not set or
 ;	  is set but there's no evolution of card in hand/deck
-;	- card can use second move
+;	- card can use second attack
 ; Outputs the number of Pokémon in bench
 ; that meet these requirements in a
 ; and returns carry if at least one is found
@@ -6320,11 +6320,11 @@ CountNumberOfSetUpBenchPokemon: ; 17101 (5:7101)
 .check_second_attack
 	ld a, c
 	ldh [hTempPlayAreaLocation_ff9d], a
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
 	push bc
 	push hl
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	pop hl
 	pop bc
 	jr c, .next
@@ -6416,7 +6416,7 @@ AISelectSpecialAttackParameters: ; 17161 (5:7161)
 
 ; find any energy card different from
 ; the one found by CheckIfAnyCardIDinLocation.
-; since using this move requires a Psychic energy card,
+; since using this attack requires a Psychic energy card,
 ; and another one is in hTemp_ffa0,
 ; then any other energy card would account
 ; for the Energy Cost of Psyburn.
@@ -6477,26 +6477,26 @@ AISelectSpecialAttackParameters: ; 17161 (5:7161)
 
 ; return carry if Pokémon at play area location
 ; in hTempPlayAreaLocation_ff9d does not have
-; energy required for the move index in wSelectedAttack
+; energy required for the attack index in wSelectedAttack
 ; or has exactly the same amount of energy needed
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = play area location
-;	[wSelectedAttack]         = move index to check
+;	[wSelectedAttack]         = attack index to check
 ; output:
 ;	a = number of extra energy cards attached
-CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
+CheckIfNoSurplusEnergyForAttack: ; 171fb (5:71fb)
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
 	ld a, [wSelectedAttack]
 	ld e, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld hl, wLoadedMoveName
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	or [hl]
 	jr z, .not_attack
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr nz, .is_attack
 .not_attack
@@ -6509,11 +6509,11 @@ CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
 	call GetPlayAreaCardAttachedEnergies
 	bank1call HandleEnergyBurn
 	xor a
-	ld [wTempLoadedMoveEnergyCost], a
-	ld [wTempLoadedMoveEnergyNeededAmount], a
-	ld [wTempLoadedMoveEnergyNeededType], a
+	ld [wTempLoadedAttackEnergyCost], a
+	ld [wTempLoadedAttackEnergyNeededAmount], a
+	ld [wTempLoadedAttackEnergyNeededType], a
 	ld hl, wAttachedEnergies
-	ld de, wLoadedMoveEnergyCost
+	ld de, wLoadedAttackEnergyCost
 	ld b, 0
 	ld c, (NUM_TYPES / 2) - 1
 .loop
@@ -6532,7 +6532,7 @@ CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
 	swap a
 	and %00001111
 	ld b, a
-	ld hl, wTempLoadedMoveEnergyCost
+	ld hl, wTempLoadedAttackEnergyCost
 	ld a, [wTotalAttachedEnergies]
 	sub [hl]
 	sub b
@@ -6545,14 +6545,14 @@ CheckIfNoSurplusEnergyForMove: ; 171fb (5:71fb)
 	scf
 	ret
 
-; takes as input the energy cost of a move for a
+; takes as input the energy cost of an attack for a
 ; particular energy, stored in the lower nibble of a
-; if the move costs some amount of this energy, the lower nibble of a != 0,
-; and this amount is stored in wTempLoadedMoveEnergyCost
+; if the attack costs some amount of this energy, the lower nibble of a != 0,
+; and this amount is stored in wTempLoadedAttackEnergyCost
 ; also adds the amount of energy still needed
-; to wTempLoadedMoveEnergyNeededAmount
+; to wTempLoadedAttackEnergyNeededAmount
 ; input:
-;	a    = this energy cost of move (lower nibble)
+;	a    = this energy cost of attack (lower nibble)
 ;	[hl] = attached energy
 ; output:
 ;	carry set if not enough of this energy type attached
@@ -6565,17 +6565,17 @@ CalculateParticularAttachedEnergyNeeded: ; 17258 (5:7258)
 	ret
 
 .check
-	ld [wTempLoadedMoveEnergyCost], a
+	ld [wTempLoadedAttackEnergyCost], a
 	sub [hl]
 	jr z, .done
 	jr nc, .done
 	push bc
-	ld a, [wTempLoadedMoveEnergyCost]
+	ld a, [wTempLoadedAttackEnergyCost]
 	ld b, a
 	ld a, [hl]
 	sub b
 	pop bc
-	ld [wTempLoadedMoveEnergyNeededAmount], a
+	ld [wTempLoadedAttackEnergyNeededAmount], a
 	jr .done
 
 ; return carry if there is a card that
@@ -6799,14 +6799,14 @@ SetUpBossStartingHandAndDeck: ; 172af (5:72af)
 	ret
 
 ; returns carry if Pokemon at PLAY_AREA* in a
-; can damage defending Pokémon with any of its moves
+; can damage defending Pokémon with any of its attacks
 ; input:
 ;	a = location of card to check
 CheckIfCanDamageDefendingPokemon: ; 17383 (5:7383)
 	ldh [hTempPlayAreaLocation_ff9d], a
-	xor a ; first move
+	xor a ; first attack
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .second_attack
 	xor a
 	call EstimateDamage_VersusDefendingCard
@@ -6815,9 +6815,9 @@ CheckIfCanDamageDefendingPokemon: ; 17383 (5:7383)
 	jr nz, .set_carry
 
 .second_attack
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .no_carry
 	ld a, $01
 	call EstimateDamage_VersusDefendingCard
@@ -6833,27 +6833,27 @@ CheckIfCanDamageDefendingPokemon: ; 17383 (5:7383)
 	ret
 
 ; checks if defending Pokémon can knock out
-; card at hTempPlayAreaLocation_ff9d with any of its moves
+; card at hTempPlayAreaLocation_ff9d with any of its attacks
 ; and if so, stores the damage to wce00 and wce01
-; sets carry if any on the moves knocks out
+; sets carry if any on the attacks knocks out
 ; also outputs the largest damage dealt in a
 ; input:
 ;	[hTempPlayAreaLocation_ff9d] = location of card to check
 ; output:
-;	a = largest damage of both moves
+;	a = largest damage of both attacks
 ;	carry set if can knock out
 CheckIfDefendingPokemonCanKnockOut: ; 173b1 (5:73b1)
-	xor a ; first move
+	xor a ; first attack
 	ld [wce00], a
 	ld [wce01], a
-	call CheckIfDefendingPokemonCanKnockOutWithMove
+	call CheckIfDefendingPokemonCanKnockOutWithAttack
 	jr nc, .second_attack
 	ld a, [wDamage]
 	ld [wce00], a
 
 .second_attack
-	ld a, $01 ; second move
-	call CheckIfDefendingPokemonCanKnockOutWithMove
+	ld a, SECOND_ATTACK
+	call CheckIfDefendingPokemonCanKnockOutWithAttack
 	jr nc, .return_if_neither_kos
 	ld a, [wDamage]
 	ld [wce01], a
@@ -6878,23 +6878,23 @@ CheckIfDefendingPokemonCanKnockOut: ; 173b1 (5:73b1)
 ; return carry if defending Pokémon can knock out
 ; card at hTempPlayAreaLocation_ff9d
 ; input:
-;	a = move index
+;	a = attack index
 ;	[hTempPlayAreaLocation_ff9d] = location of card to check
-CheckIfDefendingPokemonCanKnockOutWithMove: ; 173e4 (5:73e4)
+CheckIfDefendingPokemonCanKnockOutWithAttack: ; 173e4 (5:73e4)
 	ld [wSelectedAttack], a
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	push af
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
 	call SwapTurn
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	call SwapTurn
 	pop bc
 	ld a, b
 	ldh [hTempPlayAreaLocation_ff9d], a
 	jr c, .done
 
-; player's active Pokémon can use move
+; player's active Pokémon can use attack
 	ld a, [wSelectedAttack]
 	call EstimateDamage_FromDefendingPokemon
 	ldh a, [hTempPlayAreaLocation_ff9d]
@@ -7000,12 +7000,12 @@ AIChooseRandomlyNotToDoAction: ; 1743b (5:743b)
 
 ; checks if any bench Pokémon has same ID
 ; as input, and sets carry if it has more than
-; half health and can use its second move
+; half health and can use its second attack
 ; input:
 ;	a = card ID to check for
 ; output:
 ;	carry set if the above requirements are met
-CheckForBenchIDAtHalfHPAndCanUseSecondMove: ; 17474 (5:7474)
+CheckForBenchIDAtHalfHPAndCanUseSecondAttack: ; 17474 (5:7474)
 	ld [wcdf9], a
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld d, a
@@ -7046,10 +7046,10 @@ CheckForBenchIDAtHalfHPAndCanUseSecondMove: ; 17474 (5:7474)
 
 	ld a, c
 	ldh [hTempPlayAreaLocation_ff9d], a
-	ld a, $01 ; second move
+	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
 	push bc
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	pop bc
 	jr c, .loop
 	inc b
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 5c8fbda..fb5b6b6 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -1052,9 +1052,9 @@ Func_18661: ; 18661 (6:4661)
 INCLUDE "data/effect_commands.asm"
 
 ; reads the animation commands from PointerTable_AttackAnimation
-; of attack in wLoadedMoveAnimation and plays them
+; of attack in wLoadedAttackAnimation and plays them
 PlayAttackAnimationCommands: ; 18f9c (6:4f9c)
-	ld a, [wLoadedMoveAnimation]
+	ld a, [wLoadedAttackAnimation]
 	or a
 	ret z
 
@@ -1333,7 +1333,7 @@ PrintDamageText: ; 19132 (6:5132)
 	push hl
 	push bc
 	push de
-	ld a, [wLoadedMoveAnimation]
+	ld a, [wLoadedAttackAnimation]
 	cp ATK_ANIM_HEAL
 	jr z, .skip
 	cp ATK_ANIM_HEALING_WIND_PLAY_AREA
diff --git a/src/engine/bank08.asm b/src/engine/bank08.asm
index cfcc178..22c5199 100644
--- a/src/engine/bank08.asm
+++ b/src/engine/bank08.asm
@@ -216,7 +216,7 @@ AIPlay_Potion: ; 201b5 (8:41b5)
 ; check if defending Pokémon can KO active card
 ; next turn after using Potion.
 ; if it cannot, return carry.
-; also take into account whether move is high recoil.
+; also take into account whether attack is high recoil.
 AIDecide_Potion1: ; 201d1 (8:41d1)
 	farcall AIDecideWhetherToRetreat
 	jr c, .no_carry
@@ -360,18 +360,18 @@ AIDecide_Potion2: ; 20204 (8:4204)
 	push de
 	xor a ; FIRST_ATTACK_OR_PKMN_POWER
 	ld [wSelectedAttack], a
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .second_attack
-	ld a, MOVE_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
+	call CheckLoadedAttackFlag
 	jr c, .set_carry
 .second_attack
 	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .false
-	ld a, MOVE_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
+	call CheckLoadedAttackFlag
 	jr c, .set_carry
 .false
 	pop de
@@ -406,7 +406,7 @@ AIPlay_SuperPotion: ; 202a8 (8:42a8)
 ; any energy cards attached,  check if defending Pokémon can KO
 ; active card next turn after using Super Potion.
 ; if it cannot, return carry.
-; also take into account whether move is high recoil.
+; also take into account whether attack is high recoil.
 AIDecide_SuperPotion1: ; 202cc (8:42cc)
 	farcall AIDecideWhetherToRetreat
 	jr c, .no_carry
@@ -576,18 +576,18 @@ AIDecide_SuperPotion2: ; 2030f (8:430f)
 	push de
 	xor a ; FIRST_ATTACK_OR_PKMN_POWER
 	ld [wSelectedAttack], a
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .second_attack_1
-	ld a, MOVE_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
+	call CheckLoadedAttackFlag
 	jr c, .true_1
 .second_attack_1
 	ld a, SECOND_ATTACK
 	ld [wSelectedAttack], a
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .false_1
-	ld a, MOVE_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG3_ADDRESS | BOOST_IF_TAKEN_DAMAGE_F
+	call CheckLoadedAttackFlag
 	jr c, .true_1
 .false_1
 	pop de
@@ -647,21 +647,21 @@ AIPlay_Defender: ; 203f8 (8:43f8)
 AIDecide_Defender1: ; 20406 (8:4406)
 	xor a ; PLAY_AREA_ARENA
 	ldh [hTempPlayAreaLocation_ff9d], a
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .cannot_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .no_carry
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry
 
 .cannot_ko
 ; check if any of the defending Pokémon's attacks deal
 ; damage exactly equal to current HP, and if so,
-; only continue if that move is useable.
+; only continue if that attack is useable.
 	farcall CheckIfAnyDefendingPokemonAttackDealsSameDamageAsHP
 	jr nc, .no_carry
 	call SwapTurn
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	call SwapTurn
 	jr c, .no_carry
 
@@ -680,13 +680,13 @@ AIDecide_Defender1: ; 20406 (8:4406)
 	ld [wSelectedAttack], a
 	push de
 	call SwapTurn
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	call SwapTurn
 	pop de
 	jr c, .switch_back
 
 ; the other attack is useable.
-; compare its damage to the selected move.
+; compare its damage to the selected attack.
 	ld a, [wSelectedAttack]
 	push de
 	farcall EstimateDamage_FromDefendingPokemon
@@ -695,8 +695,8 @@ AIDecide_Defender1: ; 20406 (8:4406)
 	cp d
 	jr nc, .subtract
 
-; in case the non-selected move is useable
-; and deals less damage than the selected move,
+; in case the non-selected attack is useable
+; and deals less damage than the selected attack,
 ; switch back to the other attack.
 .switch_back
 	ld a, [wSelectedAttack]
@@ -729,11 +729,11 @@ AIDecide_Defender1: ; 20406 (8:4406)
 ; return carry if using Defender prevents Pokémon
 ; from being knocked out by an attack with recoil.
 AIDecide_Defender2: ; 20486 (8:4486)
-	ld a, MOVE_FLAG1_ADDRESS | HIGH_RECOIL_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | HIGH_RECOIL_F
+	call CheckLoadedAttackFlag
 	jr c, .recoil
-	ld a, MOVE_FLAG1_ADDRESS | LOW_RECOIL_F
-	call CheckLoadedMoveFlag
+	ld a, ATTACK_FLAG1_ADDRESS | LOW_RECOIL_F
+	call CheckLoadedAttackFlag
 	jr c, .recoil
 	or a
 	ret
@@ -746,10 +746,10 @@ AIDecide_Defender2: ; 20486 (8:4486)
 	or a
 	jr nz, .second_attack
 ; first attack
-	ld a, [wLoadedCard2Move1EffectParam]
+	ld a, [wLoadedCard2Atk1EffectParam]
 	jr .check_weak
 .second_attack
-	ld a, [wLoadedCard2Move2EffectParam]
+	ld a, [wLoadedCard2Atk2EffectParam]
 
 ; double recoil damage if card is weak to its own color.
 .check_weak
@@ -826,11 +826,11 @@ AIDecide_Pluspower1: ; 20501 (8:4501)
 ; if there's an attack that can, only continue
 ; if it's unusable and there's no card in hand
 ; to fulfill its energy cost.
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .cannot_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .no_carry
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry
 
 ; cannot use an attack that knocks out.
@@ -886,10 +886,10 @@ AIDecide_Pluspower1: ; 20501 (8:4501)
 	scf
 	ret
 
-; return carry if move is useable and KOs
+; return carry if attack is useable and KOs
 ; defending Pokémon with Pluspower boost.
 .check_ko_with_pluspower ; 20562 (8:4562)
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .unusable
 	ld a, [wSelectedAttack]
 	farcall EstimateDamage_VersusDefendingCard
@@ -933,7 +933,7 @@ AIDecide_Pluspower1: ; 20501 (8:4501)
 	ret
 
 ; returns carry 7/10 of the time
-; if selected move is useable, can't KO without Pluspower boost
+; if selected attack is useable, can't KO without Pluspower boost
 ; can damage Mr. Mime even with Pluspower boost
 ; and has a minimum damage > 0.
 ; outputs in a the attack to use.
@@ -971,9 +971,9 @@ AIDecide_Pluspower2: ; 205a5 (8:45a5)
 	scf
 	ret
 
-; return carry if move is useable but cannot KO.
+; return carry if attack is useable but cannot KO.
 .check_can_ko ; 205d7 (8:45d7)
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .unusable
 	ld a, [wSelectedAttack]
 	farcall EstimateDamage_VersusDefendingCard
@@ -992,9 +992,9 @@ AIDecide_Pluspower2: ; 205a5 (8:45a5)
 	ret
 
 ; return carry 7/10 of the time if
-; move is useable and minimum damage > 0.
+; attack is useable and minimum damage > 0.
 .check_random ; 205f6 (8:45f6)
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr c, .unusable
 	ld a, [wSelectedAttack]
 	farcall EstimateDamage_VersusDefendingCard
@@ -1094,16 +1094,16 @@ AIDecide_GustOfWind: ; 2067e (8:467e)
 	and AI_FLAG_USED_GUST_OF_WIND
 	ret nz
 
-	farcall CheckIfActivePokemonCanUseAnyNonResidualMove
-	ret nc ; no non-residual move can be used
+	farcall CheckIfActivePokemonCanUseAnyNonResidualAttack
+	ret nc ; no non-residual attack can be used
 
 	xor a ; PLAY_AREA_ARENA
 	ldh [hTempPlayAreaLocation_ff9d], a
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .check_id ; if can't KO
-	farcall CheckIfSelectedMoveIsUnusable
-	jr nc, .no_carry ; if KO move is useable
-	farcall LookForEnergyNeededForMoveInHand
+	farcall CheckIfSelectedAttackIsUnusable
+	jr nc, .no_carry ; if KO attack is useable
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry ; if energy card is in hand
 
 .check_id
@@ -1275,10 +1275,10 @@ AIDecide_GustOfWind: ; 2067e (8:467e)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, [wLoadedMoveCategory]
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, [wLoadedAttackCategory]
 
-	; skip if move is a Power or has 0 damage
+	; skip if attack is a Power or has 0 damage
 	cp POKEMON_POWER
 	jr z, .no_damage
 	ld a, [wDamage]
@@ -1330,9 +1330,9 @@ AIDecide_GustOfWind: ; 2067e (8:467e)
 	ldh [hTempPlayAreaLocation_ff9d], a
 	call .CheckIfAnyAttackKnocksOut
 	jr nc, .next
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .found
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .found
 
 ; the following two local routines can be condensed into one
@@ -1488,11 +1488,11 @@ AIDecide_EnergyRemoval: ; 20895 (8:4895)
 ; active card to remove its attached energy
 	xor a ; PLAY_AREA_ARENA
 	ldh [hTempPlayAreaLocation_ff9d], a
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .cannot_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .can_ko
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr nc, .cannot_ko
 
 .can_ko
@@ -1627,7 +1627,7 @@ AIDecide_EnergyRemoval: ; 20895 (8:4895)
 ; but second attack has enough energy to be used
 ; check if there's surplus energy for attack and, if so, return carry
 .check_surplus
-	farcall CheckIfNoSurplusEnergyForMove
+	farcall CheckIfNoSurplusEnergyForAttack
 	pop de
 	ccf
 	ret
@@ -1755,11 +1755,11 @@ AIDecide_SuperEnergyRemoval: ; 209bc (8:49bc)
 ; active card to remove its attached energy
 	xor a ; PLAY_AREA_ARENA
 	ldh [hTempPlayAreaLocation_ff9d], a
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .cannot_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .can_ko
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr nc, .cannot_ko
 
 .can_ko
@@ -1911,7 +1911,7 @@ AIDecide_SuperEnergyRemoval: ; 209bc (8:49bc)
 ; check if there's surplus energy for attack and, if so,
 ; return carry if this surplus energy is at least 2
 .check_surplus
-	farcall CheckIfNoSurplusEnergyForMove
+	farcall CheckIfNoSurplusEnergyForAttack
 	cp 2
 	jr c, .enough_energy
 	pop de
@@ -3144,11 +3144,11 @@ AIDecide_PokemonCenter: ; 210eb (8:50eb)
 	ldh [hTempPlayAreaLocation_ff9d], a
 
 ; return if active Pokemon can KO player's card.
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .start
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .no_carry
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry
 
 .start
@@ -4018,11 +4018,11 @@ AIDecide_ScoopUp: ; 21506 (8:5506)
 
 ; if it can KO the defending Pokemon this turn,
 ; return no carry.
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .cannot_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .no_carry
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry
 
 .cannot_ko
@@ -4120,11 +4120,11 @@ AIDecide_ScoopUp: ; 21506 (8:5506)
 
 ; if it can KO the defending Pokemon this turn,
 ; return no carry.
-	farcall CheckIfAnyMoveKnocksOutDefendingCard
+	farcall CheckIfAnyAttackKnocksOutDefendingCard
 	jr nc, .check_ko
-	farcall CheckIfSelectedMoveIsUnusable
+	farcall CheckIfSelectedAttackIsUnusable
 	jr nc, .no_carry
-	farcall LookForEnergyNeededForMoveInHand
+	farcall LookForEnergyNeededForAttackInHand
 	jr c, .no_carry
 .check_ko
 	farcall CheckIfDefendingPokemonCanKnockOut
@@ -6504,7 +6504,7 @@ AIEnergyTransTransferEnergyToBench: ; 222ca (8:62ca)
 	ldh [hTempCardIndex_ff9f], a
 	ld d, a
 	ld e, FIRST_ATTACK_OR_PKMN_POWER
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	ld a, OPPACTION_6B15
 	bank1call AIMakeDecision
 	jr .loop_energy
@@ -6560,8 +6560,8 @@ HandleAIPkmnPowers: ; 2237f (8:637f)
 	ld a, c
 	ldh [hTempPlayAreaLocation_ff9d], a
 	ld e, FIRST_ATTACK_OR_PKMN_POWER
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, [wLoadedMoveCategory]
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr z, .execute_effect
 	pop bc
@@ -8303,7 +8303,7 @@ FindDuplicatePokemonCards: ; 22b6f (8:6b6f)
 	or a
 	ret
 
-; return carry flag if move is not high recoil.
+; return carry flag if attack is not high recoil.
 Func_22bad: ; 22bad (8:6bad)
 	farcall AIProcessButDontUseAttack
 	ret nc
@@ -8312,9 +8312,9 @@ Func_22bad: ; 22bad (8:6bad)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	ld d, a
-	call CopyMoveDataAndDamage_FromDeckIndex
-	ld a, MOVE_FLAG1_ADDRESS | HIGH_RECOIL_F
-	call CheckLoadedMoveFlag
+	call CopyAttackDataAndDamage_FromDeckIndex
+	ld a, ATTACK_FLAG1_ADDRESS | HIGH_RECOIL_F
+	call CheckLoadedAttackFlag
 	ccf
 	ret
 
diff --git a/src/engine/deck_ai/decks/legendary_articuno.asm b/src/engine/deck_ai/decks/legendary_articuno.asm
index 562e7c5..6b3b9f8 100644
--- a/src/engine/deck_ai/decks/legendary_articuno.asm
+++ b/src/engine/deck_ai/decks/legendary_articuno.asm
@@ -91,18 +91,18 @@ ScoreLegendaryArticunoCards: ; 14c91 (5:4c91)
 
 ; player prizes >= 3
 ; if Lapras has more than half HP and
-; can use second move, check next for Articuno
+; can use second attack, check next for Articuno
 ; otherwise, check if Articuno or Dewgong
-; have more than half HP and can use second move
+; have more than half HP and can use second attack
 ; and if so, the next Pokémon to check is Lapras
 	ld a, LAPRAS
-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	call CheckForBenchIDAtHalfHPAndCanUseSecondAttack
 	jr c, .articuno
 	ld a, ARTICUNO1
-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	call CheckForBenchIDAtHalfHPAndCanUseSecondAttack
 	jr c, .lapras
 	ld a, DEWGONG
-	call CheckForBenchIDAtHalfHPAndCanUseSecondMove
+	call CheckForBenchIDAtHalfHPAndCanUseSecondAttack
 	jr c, .lapras
 	jr .articuno
 
diff --git a/src/engine/deck_ai/decks/sams_practice.asm b/src/engine/deck_ai/decks/sams_practice.asm
index 10ce811..b92253d 100644
--- a/src/engine/deck_ai/decks/sams_practice.asm
+++ b/src/engine/deck_ai/decks/sams_practice.asm
@@ -104,7 +104,7 @@ AIPerformScriptedTurn: ; 1483a (5:483a)
 	xor a
 	ldh [hTempPlayAreaLocation_ff9d], a
 	ld [wSelectedAttack], a
-	call CheckIfSelectedMoveIsUnusable
+	call CheckIfSelectedAttackIsUnusable
 	jr c, .unusable
 	call AITryUseAttack
 	ret
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 45e71a2..daaf402 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -241,14 +241,14 @@ DealDamageToAllBenchedPokemon: ; 2c117 (b:4117)
 	ret
 
 Func_2c12e: ; 2c12e (b:412e)
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld b, a
 	ld c, $0 ; neither WEAKNESS nor RESISTANCE
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 	ret
 
 ; apply a status condition of type 1 identified by register a to the target
@@ -478,9 +478,9 @@ ApplyAndAnimateHPRecovery: ; 2c221 (b:4221)
 ; load correct animation
 	push de
 	ld a, ATK_ANIM_HEAL
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld bc, $01 ; arrow
-	bank1call PlayMoveAnimation
+	bank1call PlayAttackAnimation
 
 ; compare HP to be restored with max HP
 ; if HP to be restored would cause HP to
@@ -506,7 +506,7 @@ ApplyAndAnimateHPRecovery: ; 2c221 (b:4221)
 
 .skip_cap
 	ld [hl], e ; apply new HP to arena card
-	bank1call WaitMoveAnimation
+	bank1call WaitAttackAnimation
 	ret
 ; 0x2c25b
 
@@ -818,7 +818,7 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391)
 	ldh [hCurSelectionItem], a
 
 .start
-	bank1call PrintAndLoadMovesToDuelTempList
+	bank1call PrintAndLoadAttacksToDuelTempList
 	push af
 	ldh a, [hCurSelectionItem]
 	ld hl, .menu_parameters
@@ -833,13 +833,13 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391)
 	bit B_BUTTON_F, a
 	jr nz, .set_carry
 	and START
-	jr nz, .open_move_page
+	jr nz, .open_atk_page
 	call HandleMenuInput
 	jr nc, .loop_input
 	cp -1
 	jr z, .loop_input
 
-; a move was selected
+; an attack was selected
 	ldh a, [hCurMenuItem]
 	add a
 	ld e, a
@@ -858,13 +858,13 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391)
 	scf
 	ret
 
-.open_move_page
+.open_atk_page
 	ldh a, [hCurMenuItem]
 	ldh [hCurSelectionItem], a
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	call LoadCardDataToBuffer1_FromDeckIndex
-	bank1call OpenMovePage
+	bank1call OpenAttackPage
 	call SwapTurn
 	bank1call DrawDuelMainScene
 	call SwapTurn
@@ -887,11 +887,11 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391)
 GetAttackName: ; 2c3fc (b:43fc)
 	ld a, d
 	call LoadCardDataToBuffer1_FromDeckIndex
-	ld hl, wLoadedCard1Move1Name
+	ld hl, wLoadedCard1Atk1Name
 	inc e
 	dec e
 	jr z, .load_name
-	ld hl, wLoadedCard1Move2Name
+	ld hl, wLoadedCard1Atk2Name
 .load_name
 	ld a, [hli]
 	ld h, [hl]
@@ -906,10 +906,10 @@ CheckIfDefendingPokemonHasAnyAttack: ; 2c40e (b:440e)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	call LoadCardDataToBuffer2_FromDeckIndex
-	ld a, [wLoadedCard2Move1Category]
+	ld a, [wLoadedCard2Atk1Category]
 	cp POKEMON_POWER
 	jr nz, .has_attack
-	ld hl, wLoadedCard2Move2Name
+	ld hl, wLoadedCard2Atk2Name
 	ld a, [hli]
 	or [hl]
 	jr nz, .has_attack
@@ -1021,12 +1021,12 @@ DuelistSelectForcedSwitch: ; 2c487 (b:4487)
 	bank1call AIDoAction_ForcedSwitch
 	call SwapTurn
 
-	ld a, [wPlayerAttackingMoveIndex]
+	ld a, [wPlayerAttackingAttackIndex]
 	ld e, a
 	ld a, [wPlayerAttackingCardIndex]
 	ld d, a
 	ld a, [wPlayerAttackingCardID]
-	call CopyMoveDataAndDamage_FromCardID
+	call CopyAttackDataAndDamage_FromCardID
 	call Func_16f6
 	ret
 
@@ -1142,18 +1142,18 @@ AIPickAttackForAmnesia: ; 2c532 (b:4532)
 	ld d, a
 	call LoadCardDataToBuffer2_FromDeckIndex
 ; if has no attack 1 name, return
-	ld hl, wLoadedCard2Move1Name
+	ld hl, wLoadedCard2Atk1Name
 	ld a, [hli]
 	or [hl]
 	jr z, .chosen
 
 ; if Defending Pokemon has enough energy for second attack, choose it
 	ld e, SECOND_ATTACK
-	bank1call _CheckIfEnoughEnergiesToMove
+	bank1call _CheckIfEnoughEnergiesToAttack
 	jr nc, .chosen
 ; otherwise if first attack isn't a Pkmn Power, choose it instead.
 	ld e, FIRST_ATTACK_OR_PKMN_POWER
-	ld a, [wLoadedCard2Move1Category]
+	ld a, [wLoadedCard2Atk1Category]
 	cp POKEMON_POWER
 	jr nz, .chosen
 ; if it is a Pkmn Power, choose second attack.
@@ -1467,7 +1467,7 @@ SpitPoison_Poison50PercentEffect: ; 2c6f8 (b:46f8)
 	call TossCoin_BankB
 	jp c, PoisonEffect
 	ld a, ATK_ANIM_SPIT_POISON_SUCCESS
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	call SetNoEffectFromStatus
 	ret
 
@@ -1591,7 +1591,7 @@ KakunaStiffenEffect: ; 2c7a0 (b:47a0)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_STIFFEN
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -1700,7 +1700,7 @@ MetapodStiffenEffect: ; 2c836 (b:4836)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_STIFFEN
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -2111,7 +2111,7 @@ HornHazard_NoDamage50PercentEffect: ; 2ca96 (b:4a96)
 	ret
 .heads
 	ld a, ATK_ANIM_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2caac
 
@@ -2798,15 +2798,15 @@ SolarPower_CheckUse: ; 2ce53 (b:4e53)
 
 SolarPower_RemoveStatusEffect: ; 2ce82 (b:4e82)
 	ld a, ATK_ANIM_HEAL_BOTH_SIDES
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	bank1call Func_7415
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld b, a
 	ld c, $00
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 
 	ldh a, [hTemp_ffa0]
 	add DUELVARS_ARENA_CARD_FLAGS
@@ -2941,7 +2941,7 @@ WartortleWithdrawEffect: ; 2cf32 (b:4f32)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_10
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -3181,7 +3181,7 @@ SeadraAgilityEffect: ; 2d08b (b:508b)
 	call TossCoin_BankB
 	ret nc ; return if tails
 	ld a, ATK_ANIM_AGILITY_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_AGILITY
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -3198,7 +3198,7 @@ HideInShellEffect: ; 2d0a4 (b:50a4)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_11
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -3282,7 +3282,7 @@ SquirtleWithdrawEffect: ; 2d120 (b:5120)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_10
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -3312,10 +3312,10 @@ PoliwhirlAmnesia_CheckAttacks: ; 2d149 (b:5149)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
 	call LoadCardDataToBuffer2_FromDeckIndex
-	ld a, [wLoadedCard2Move1Category]
+	ld a, [wLoadedCard2Atk1Category]
 	cp POKEMON_POWER
 	jr nz, .has_attack
-	ld hl, wLoadedCard2Move2Name
+	ld hl, wLoadedCard2Atk2Name
 	ld a, [hli]
 	or [hl]
 	jr nz, .has_attack
@@ -3365,7 +3365,7 @@ ApplyAmnesiaToAttack: ; 2d18a (b:518a)
 	ret nz ; no effect
 
 ; set selected attack as disabled
-	ld a, DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX
+	ld a, DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX
 	call GetNonTurnDuelistVariable
 	ldh a, [hTemp_ffa0]
 	ld [hl], a
@@ -3377,7 +3377,7 @@ ApplyAmnesiaToAttack: ; 2d18a (b:518a)
 	ret c ; return if Player
 
 ; the rest of the routine if for Opponent
-; to announce which move was used for Amnesia.
+; to announce which attack was used for Amnesia.
 	call SwapTurn
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
@@ -3474,13 +3474,13 @@ PoliwagWaterGunEffect: ; 2d227 (b:5227)
 
 ClampEffect: ; 2d22d (b:522d)
 	ld a, ATK_ANIM_HIT_EFFECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText
 	call TossCoin_BankB
 	jp c, ParalysisEffect
 ; unsuccessful
 	xor a ; ATK_ANIM_NONE
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	call SetDefiniteDamage
 	call SetWasUnsuccessful
 	ret
@@ -3634,9 +3634,9 @@ Quickfreeze_Paralysis50PercentEffect: ; 2d2f3 (b:52f3)
 	ld c, $00
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
+	bank1call PlayAttackAnimation
 	bank1call Func_741a
-	bank1call WaitMoveAnimation
+	bank1call WaitAttackAnimation
 	bank1call Func_6df1
 	bank1call DrawDuelHUDs
 	bank1call Func_1bca
@@ -3817,7 +3817,7 @@ RapidashAgilityEffect: ; 2d413 (b:5413)
 	call TossCoin_BankB
 	ret nc ; return if tails
 	ld a, ATK_ANIM_AGILITY_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_AGILITY
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -4044,7 +4044,7 @@ Moltres1DiveBomb_Success50PercentEffect: ; 2d52b (b:552b)
 	ret
 .heads
 	ld a, ATK_ANIM_DIVE_BOMB
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2d541
 
@@ -4413,7 +4413,7 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2)
 	ld d, ATK_ANIM_FIREGIVER_OPP
 .player_1
 	ld a, d
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 
 ; start loop for adding Energy cards to hand
 	ldh a, [hCurSelectionItem]
@@ -4425,14 +4425,14 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2)
 	ld bc, $0
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 
 ; load correct coordinates to update the number of cards
 ; in hand and deck during animation.
 	lb bc, 18, 7 ; x, y for hand number
 	ld e, 3 ; y for deck number
-	ld a, [wLoadedMoveAnimation]
+	ld a, [wLoadedAttackAnimation]
 	cp ATK_ANIM_FIREGIVER_PLAYER
 	jr z, .player_2
 	lb bc, 4, 5 ; x, y for hand number
@@ -4489,7 +4489,7 @@ Moltres2DiveBomb_Success50PercentEffect: ; 2d776 (b:5776)
 	ret
 .heads
 	ld a, ATK_ANIM_DIVE_BOMB
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2d78c
 
@@ -5493,7 +5493,7 @@ DevolutionBeam_AISelectEffect: ; 2dc9e (b:5c9e)
 
 DevolutionBeam_LoadAnimation: ; 2dcb6 (b:5cb6)
 	xor a ; ATK_ANIM_NONE
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2dcbb
 
@@ -5518,14 +5518,14 @@ DevolutionBeam_DevolveEffect: ; 2dcbb (b:5cbb)
 
 .DevolvePokemon
 	ld a, ATK_ANIM_DEVOLUTION_BEAM
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ldh a, [hTempPlayAreaLocation_ffa1]
 	ld b, a
 	ld c, $00
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 
 ; load selected card's data
 	ldh a, [hTempPlayAreaLocation_ffa1]
@@ -5924,7 +5924,7 @@ SpacingOut_Success50PercentEffect: ; 2dee0 (b:5ee0)
 	ldh [hTemp_ffa0], a
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_RECOVER
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2def1
 
@@ -6153,7 +6153,7 @@ MysteryAttack_RandomEffect: ; 2e009 (b:6009)
 
 .no_damage
 	ld a, ATK_ANIM_GLOW_EFFECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	xor a
 	call SetDefiniteDamage
 	call SetNoEffectFromStatus
@@ -6235,7 +6235,7 @@ TantrumEffect: ; 2e099 (b:6099)
 	ret c ; return if heads
 ; confuse Pokemon
 	ld a, ATK_ANIM_MULTIPLE_SLASH
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	call SwapTurn
 	call ConfusionEffect
 	call SwapTurn
@@ -6506,7 +6506,7 @@ LeerEffect: ; 2e21d (b:621d)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_LEER
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS2_LEER
 	call ApplySubstatus2ToDefendingCard
 	ret
@@ -7002,13 +7002,13 @@ Fly_Success50PercentEffect: ; 2e4fc (b:64fc)
 	call TossCoin_BankB
 	jr c, .heads
 	xor a ; ATK_ANIM_NONE
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	call SetDefiniteDamage
 	call SetWasUnsuccessful
 	ret
 .heads
 	ld a, ATK_ANIM_AGILITY_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_FLY
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -7154,7 +7154,7 @@ RaichuAgilityEffect: ; 2e5dc (b:65dc)
 	call TossCoin_BankB
 	ret nc ; skip if got tails
 	ld a, ATK_ANIM_AGILITY_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_AGILITY
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -7507,7 +7507,7 @@ RandomlyDamagePlayAreaPokemon: ; 2e78d (b:678d)
 
 .damage
 	ld a, ATK_ANIM_THUNDER_PLAY_AREA
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	call DealDamageToPlayAreaPokemon
 	ret
 
@@ -7819,7 +7819,7 @@ TailWagEffect: ; 2e94e (b:694e)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_LURE
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS2_TAIL_WAG
 	call ApplySubstatus2ToDefendingCard
 	ret
@@ -7965,7 +7965,7 @@ MirrorMoveEffects: ; 2e98c (b:698c)
 	or [hl]
 	jr z, .no_damage
 	ld a, ATK_ANIM_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 .no_damage
 	inc hl
 	inc hl ; DUELVARS_ARENA_CARD_LAST_TURN_STATUS
@@ -8095,7 +8095,7 @@ FearowAgilityEffect: ; 2eab8 (b:6ab8)
 	call TossCoin_BankB
 	ret nc
 	ld a, ATK_ANIM_AGILITY_PROTECT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_AGILITY
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -8556,16 +8556,16 @@ HandlePlayerMetronomeEffect: ; 2ed18 (b:6d18)
 ; the attack that is loaded, which is Metronome.
 ; if equal, then cannot select it.
 ; (i.e. cannot use Metronome with Metronome.)
-	ld hl, wLoadedMoveName
+	ld hl, wLoadedAttackName
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	push hl
 	call SwapTurn
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call SwapTurn
 	pop de
-	ld hl, wLoadedMoveName
+	ld hl, wLoadedAttackName
 	ld a, e
 	cp [hl]
 	jr nz, .try_use
@@ -8607,7 +8607,7 @@ HandlePlayerMetronomeEffect: ; 2ed18 (b:6d18)
 	ldh a, [hTempCardIndex_ff9f]
 	ld [wPlayerAttackingCardIndex], a
 	ld a, [wSelectedAttack]
-	ld [wPlayerAttackingMoveIndex], a
+	ld [wPlayerAttackingAttackIndex], a
 	ld a, [wTempCardID_ccc2]
 	ld [wPlayerAttackingCardID], a
 	or a
@@ -8832,10 +8832,10 @@ AISelectConversionColor: ; 2ee7f (b:6e7f)
 	cp COLORLESS
 	jr z, .skip_pkmn_atk ; skip colorless Pokemon
 	ld e, FIRST_ATTACK_OR_PKMN_POWER
-	bank1call _CheckIfEnoughEnergiesToMove
+	bank1call _CheckIfEnoughEnergiesToAttack
 	jr nc, .found
 	ld e, SECOND_ATTACK
-	bank1call _CheckIfEnoughEnergiesToMove
+	bank1call _CheckIfEnoughEnergiesToAttack
 	jr nc, .found
 .skip_pkmn_atk
 	pop de
@@ -8891,7 +8891,7 @@ ScrunchEffect: ; 2eee7 (b:6ee7)
 	call TossCoin_BankB
 	jp nc, SetWasUnsuccessful
 	ld a, ATK_ANIM_SCRUNCH
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, SUBSTATUS1_NO_DAMAGE_17
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -8973,10 +8973,10 @@ HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53)
 	ld c, $00
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 	ld a, ATK_ANIM_HEALING_WIND_PLAY_AREA
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 
 
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
@@ -9011,8 +9011,8 @@ HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53)
 	ld c, $01
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 .next_pkmn
 	pop de
 	inc e
@@ -9079,7 +9079,7 @@ CatPunchEffect: ; 2efe0 (b:6fe0)
 	call PickRandomPlayAreaCard
 	ld b, a
 	ld a, ATK_ANIM_CAT_PUNCH_PLAY_AREA
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld de, 20
 	call DealDamageToPlayAreaPokemon
 	call SwapTurn
@@ -9235,7 +9235,7 @@ SlicingWindEffect: ; 2f0bf (b:70bf)
 
 Gale_LoadAnimation: ; 2f0d0 (b:70d0)
 	ld a, ATK_ANIM_GALE
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ret
 ; 0x2f0d6
 
@@ -11757,13 +11757,13 @@ GustOfWind_SwitchEffect: ; 2fe90 (b:7e90)
 ; input:
 ;	a = attack animation to play
 Func_2fea9: ; 2fea9 (b:7ea9)
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	bank1call Func_7415
 	ld bc, $0
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 	ret
 ; 0x2febc
 
@@ -11781,14 +11781,14 @@ HealPlayAreaCardHP: ; 2febc (b:7ebc)
 	push de
 	bank1call Func_7415
 	ld a, ATK_ANIM_HEALING_WIND_PLAY_AREA
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld b, a
 	ld c, $01
 	ldh a, [hWhoseTurn]
 	ld h, a
-	bank1call PlayMoveAnimation
-	bank1call WaitMoveAnimation
+	bank1call PlayAttackAnimation
+	bank1call WaitAttackAnimation
 	pop hl
 
 ; print Pokemon card name and damage healed
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 944a99f..7a63b7e 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -3871,7 +3871,7 @@ ClearAllStatusConditions: ; 1461 (0:1461)
 	ld [hl], a
 	ld l, DUELVARS_ARENA_CARD_SUBSTATUS3
 	res SUBSTATUS3_THIS_TURN_DOUBLE_DAMAGE, [hl]
-	ld l, DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX
+	ld l, DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -4237,14 +4237,14 @@ Func_161e: ; 161e (0:161e)
 	ldh a, [hTempCardIndex_ff98]
 	ld d, a
 	ld e, $00
-	call CopyMoveDataAndDamage_FromDeckIndex
+	call CopyAttackDataAndDamage_FromDeckIndex
 	call Func_16f6
 	ldh a, [hTempCardIndex_ff98]
 	ldh [hTempCardIndex_ff9f], a
 	call GetCardIDFromDeckIndex
 	ld a, e
 	ld [wTempTurnDuelistCardID], a
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret nz
 	call DisplayUsePokemonPowerScreen
@@ -4271,7 +4271,7 @@ Func_161e: ; 161e (0:161e)
 	ret
 
 .use_pokemon_power
-	ld hl, wLoadedMoveEffectCommands
+	ld hl, wLoadedAttackEffectCommands
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -4288,7 +4288,7 @@ Func_161e: ; 161e (0:161e)
 	ld [hli], a
 	ld a, [de]
 	ld [hli], a
-	ld de, wLoadedMoveName
+	ld de, wLoadedAttackName
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -4304,10 +4304,10 @@ Func_161e: ; 161e (0:161e)
 
 ; copies, given a card identified by register a (card ID):
 ; - e into wSelectedAttack and d into hTempCardIndex_ff9f
-; - Move1 (if e == 0) or Move2 (if e == 1) data into wLoadedMove
-; - Also from that move, its Damage field into wDamage
+; - Attack1 (if e == 0) or Attack2 (if e == 1) data into wLoadedAttack
+; - Also from that attack, its Damage field into wDamage
 ; finally, clears wNoDamageOrEffect and wDealtDamage
-CopyMoveDataAndDamage_FromCardID: ; 16ad (0:16ad)
+CopyAttackDataAndDamage_FromCardID: ; 16ad (0:16ad)
 	push de
 	push af
 	ld a, e
@@ -4319,14 +4319,14 @@ CopyMoveDataAndDamage_FromCardID: ; 16ad (0:16ad)
 	ld d, $00
 	call LoadCardDataToBuffer1_FromCardID
 	pop de
-	jr CopyMoveDataAndDamage
+	jr CopyAttackDataAndDamage
 
 ; copies, given a card identified by register d (0-59 deck index):
 ; - e into wSelectedAttack and d into hTempCardIndex_ff9f
-; - Move1 (if e == 0) or Move2 (if e == 1) data into wLoadedMove
-; - Also from that move, its Damage field into wDamage
+; - Attack1 (if e == 0) or Attack2 (if e == 1) data into wLoadedAttack
+; - Also from that attack, its Damage field into wDamage
 ; finally, clears wNoDamageOrEffect and wDealtDamage
-CopyMoveDataAndDamage_FromDeckIndex: ; 16c0 (0:16c0)
+CopyAttackDataAndDamage_FromDeckIndex: ; 16c0 (0:16c0)
 	ld a, e
 	ld [wSelectedAttack], a
 	ld a, d
@@ -4334,23 +4334,23 @@ CopyMoveDataAndDamage_FromDeckIndex: ; 16c0 (0:16c0)
 	call LoadCardDataToBuffer1_FromDeckIndex
 ;	fallthrough
 
-CopyMoveDataAndDamage: ; 16ca (0:16ca)
+CopyAttackDataAndDamage: ; 16ca (0:16ca)
 	ld a, [wLoadedCard1ID]
 	ld [wTempCardID_ccc2], a
-	ld hl, wLoadedCard1Move1
+	ld hl, wLoadedCard1Atk1
 	dec e
-	jr nz, .got_move
-	ld hl, wLoadedCard1Move2
-.got_move
-	ld de, wLoadedMove
-	ld c, CARD_DATA_MOVE2 - CARD_DATA_MOVE1
+	jr nz, .got_atk
+	ld hl, wLoadedCard1Atk2
+.got_atk
+	ld de, wLoadedAttack
+	ld c, CARD_DATA_ATTACK2 - CARD_DATA_ATTACK1
 .copy_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
 	jr nz, .copy_loop
-	ld a, [wLoadedMoveDamage]
+	ld a, [wLoadedAttackDamage]
 	ld hl, wDamage
 	ld [hli], a
 	xor a
@@ -4393,12 +4393,12 @@ Func_16f6: ; 16f6 (0:16f6)
 ; Use an attack (from DuelMenu_Attack) or a Pokemon Power (from DuelMenu_PkmnPower)
 UseAttackOrPokemonPower: ; 1730 (0:1730)
 	ld a, [wSelectedAttack]
-	ld [wPlayerAttackingMoveIndex], a
+	ld [wPlayerAttackingAttackIndex], a
 	ldh a, [hTempCardIndex_ff9f]
 	ld [wPlayerAttackingCardIndex], a
 	ld a, [wTempCardID_ccc2]
 	ld [wPlayerAttackingCardID], a
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jp z, UsePokemonPower
 	call Func_16f6
@@ -4437,7 +4437,7 @@ UseAttackOrPokemonPower: ; 1730 (0:1730)
 
 PlayAttackAnimation_DealAttackDamage: ; 179a (0:179a)
 	call Func_7415
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	and RESIDUAL
 	jr nz, .deal_damage
 	call SwapTurn
@@ -4461,9 +4461,9 @@ PlayAttackAnimation_DealAttackDamage: ; 179a (0:179a)
 	call GetNonTurnDuelistVariable
 	push de
 	push hl
-	call PlayMoveAnimation
+	call PlayAttackAnimation
 	call Func_741a
-	call WaitMoveAnimation
+	call WaitAttackAnimation
 	pop hl
 	pop de
 	call SubtractHP
@@ -4494,7 +4494,7 @@ Func_17fb: ; 17fb (0:17fb)
 	call TryExecuteEffectCommandFunction
 	pop af
 	ld [wTempNonTurnDuelistCardID], a
-	call HandleStrikesBack_AgainstResidualMove
+	call HandleStrikesBack_AgainstResidualAttack
 	bank1call Func_6df1
 	call Func_1bb4
 	bank1call Func_7195
@@ -4530,7 +4530,7 @@ HandleConfusionDamageToSelf: ; 1828 (0:1828)
 	ldtx hl, DamageToSelfDueToConfusionText
 	call DrawWideTextBox_PrintText
 	ld a, ATK_ANIM_CONFUSION_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	ld a, 20 ; damage
 	call DealConfusionDamageToSelf
 	call Func_1bb4
@@ -4574,7 +4574,7 @@ SendAttackDataToLinkOpponent: ; 1874 (0:1874)
 	ld [wccec], a
 	ld a, [wPlayerAttackingCardIndex]
 	ldh [hTempCardIndex_ff9f], a
-	ld a, [wPlayerAttackingMoveIndex]
+	ld a, [wPlayerAttackingAttackIndex]
 	ldh [hTemp_ffa0], a
 	ld a, OPPACTION_BEGIN_ATTACK
 	call SetOppAction_SerialSendDuelData
@@ -4586,7 +4586,7 @@ SendAttackDataToLinkOpponent: ; 1874 (0:1874)
 	ret
 
 Func_189d: ; 189d (0:189d)
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	bit RESIDUAL_F, a
 	ret nz
 	ld a, [wNoDamageOrEffect]
@@ -4642,7 +4642,7 @@ CheckSelfConfusionDamage: ; 18d7 (0:18d7)
 	ret
 
 ; play the trainer card with deck index at hTempCardIndex_ff98.
-; a trainer card is like a move effect, with its own effect commands.
+; a trainer card is like an attack effect, with its own effect commands.
 ; return nc if the card was played, carry if it wasn't.
 PlayTrainerCard: ; 18f9 (0:18f9)
 	call CheckCantUseTrainerDueToHeadache
@@ -4683,12 +4683,12 @@ PlayTrainerCard: ; 18f9 (0:18f9)
 	ret
 
 ; loads the effect commands of a (trainer or energy) card with deck index (0-59) at hTempCardIndex_ff9f
-; into wLoadedMoveEffectCommands. in practice, only used for trainer cards
+; into wLoadedAttackEffectCommands. in practice, only used for trainer cards
 LoadNonPokemonCardEffectCommands: ; 1944 (0:1944)
 	ldh a, [hTempCardIndex_ff9f]
 	call LoadCardDataToBuffer1_FromDeckIndex
 	ld hl, wLoadedCard1EffectCommands
-	ld de, wLoadedMoveEffectCommands
+	ld de, wLoadedAttackEffectCommands
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -4701,12 +4701,12 @@ LoadNonPokemonCardEffectCommands: ; 1944 (0:1944)
 DealRecoilDamageToSelf: ; 1955 (0:1955)
 	push af
 	ld a, ATK_ANIM_RECOIL_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 	pop af
 ;	fallthrough
 
 ; Make turn holder deal A damage to self due to confusion
-; display animation at wLoadedMoveAnimation
+; display animation at wLoadedAttackAnimation
 DealConfusionDamageToSelf: ; 195c (0:195c)
 	ld hl, wDamage
 	ld [hli], a
@@ -4978,14 +4978,14 @@ PrintKnockedOut: ; 1ad3 (0:1ad3)
 ; instead of the main duel interface with regular attack animation.
 DealDamageToPlayAreaPokemon_RegularAnim: ; 1af3 (0:1af3)
 	ld a, ATK_ANIM_BENCH_HIT
-	ld [wLoadedMoveAnimation], a
+	ld [wLoadedAttackAnimation], a
 ;	fallthrough
 
 ; deal damage to turn holder's Pokemon card at play area location at b (PLAY_AREA_*).
 ; damage to deal is given in de.
 ; shows the defending player's play area screen when dealing the damage
 ; instead of the main duel interface.
-; plays animation that is loaded in wLoadedMoveAnimation.
+; plays animation that is loaded in wLoadedAttackAnimation.
 DealDamageToPlayAreaPokemon: ; 1af8 (0:1af8)
 	ld a, b
 	ld [wTempPlayAreaLocation_cceb], a
@@ -5023,7 +5023,7 @@ DealDamageToPlayAreaPokemon: ; 1af8 (0:1af8)
 	call ApplyAttachedPluspower
 	call SwapTurn
 .next
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr z, .skip_defender
 	ld a, [wTempPlayAreaLocation_cceb]
@@ -5069,7 +5069,7 @@ DealDamageToPlayAreaPokemon: ; 1af8 (0:1af8)
 	call PrintKnockedOutIfHLZero
 	pop de
 .skip_knocked_out
-	call HandleStrikesBack_AgainstDamagingMove
+	call HandleStrikesBack_AgainstDamagingAttack
 	pop bc
 	pop de
 	pop hl
@@ -5077,14 +5077,14 @@ DealDamageToPlayAreaPokemon: ; 1af8 (0:1af8)
 
 ; draw duel main scene, then print the "<Pokemon Lvxx>'s <attack>" text
 ; The Pokemon's name is the turn holder's arena Pokemon, and the
-; attack's name is taken from wLoadedMoveName.
+; attack's name is taken from wLoadedAttackName.
 DrawDuelMainScene_PrintPokemonsAttackText: ; 1b8d (0:1b8d)
 	bank1call DrawDuelMainScene
 ;	fallthrough
 
 ; print the "<Pokemon Lvxx>'s <attack>" text
 ; The Pokemon's name is the turn holder's arena Pokemon, and the
-; attack's name is taken from wLoadedMoveName.
+; attack's name is taken from wLoadedAttackName.
 PrintPokemonsAttackText: ; 1b90 (0:1b90)
 	ld a, DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
@@ -5097,9 +5097,9 @@ PrintPokemonsAttackText: ; 1b90 (0:1b90)
 	xor a
 	ld [hli], a
 	ld [hli], a
-	ld a, [wLoadedMoveName]
+	ld a, [wLoadedAttackName]
 	ld [hli], a ; wTxRam2_b
-	ld a, [wLoadedMoveName + 1]
+	ld a, [wLoadedAttackName + 1]
 	ld [hli], a
 	ldtx hl, PokemonsAttackText
 	call DrawWideTextBox_PrintText
@@ -5134,7 +5134,7 @@ Func_1bca: ; 1bca (0:1bca)
 	ld [hl], $0
 	ld hl, $0000
 	call LoadTxRam2
-	ld hl, wLoadedMoveName
+	ld hl, wLoadedAttackName
 	ld de, wTxRam2_b
 	ld a, [hli]
 	ld [de], a
@@ -5215,13 +5215,13 @@ GetCardDamageAndMaxHP: ; 1c35 (0:1c35)
 	pop hl
 	ret
 
-; check if a flag of wLoadedMove is set
+; check if a flag of wLoadedAttack is set
 ; input:
    ; a = %fffffbbb, where
-      ; fffff = flag address counting from wLoadedMoveFlag1
+      ; fffff = flag address counting from wLoadedAttackFlag1
       ; bbb = flag bit
 ; return carry if the flag is set
-CheckLoadedMoveFlag: ; 1c50 (0:1c50)
+CheckLoadedAttackFlag: ; 1c50 (0:1c50)
 	push hl
 	push de
 	push bc
@@ -5238,12 +5238,12 @@ CheckLoadedMoveFlag: ; 1c50 (0:1c50)
 	rra
 	and $1f
 	ld e, a ; %000fffff
-	ld hl, wLoadedMoveFlag1
+	ld hl, wLoadedAttackFlag1
 	add hl, de
 	ld a, [hl]
 	and b
 	jr z, .done
-	scf ; set carry if the move has this flag set
+	scf ; set carry if the attack has this flag set
 .done
 	pop bc
 	pop de
@@ -9006,15 +9006,15 @@ CopyFontsOrDuelGraphicsTiles2: ; 2fcb (0:2fcb)
 	call BankpopROM
 	ret
 
-; Checks if the command type at a is one of the commands of the move or
+; Checks if the command type at a is one of the commands of the attack or
 ; card effect currently in use, and executes its associated function if so.
 ; input:
    ; a = command type to check
-   ; [wLoadedMoveEffectCommands] = pointer to list of commands of current move or trainer card
+   ; [wLoadedAttackEffectCommands] = pointer to list of commands of current attack or trainer card
 TryExecuteEffectCommandFunction: ; 2fd9 (0:2fd9)
 	push af
-	; grab pointer to command list from wLoadedMoveEffectCommands
-	ld hl, wLoadedMoveEffectCommands
+	; grab pointer to command list from wLoadedAttackEffectCommands
+	ld hl, wLoadedAttackEffectCommands
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -9044,7 +9044,7 @@ TryExecuteEffectCommandFunction: ; 2fd9 (0:2fd9)
 
 ; input:
    ; a = command type to check
-   ; hl = list of commands of current move or trainer card
+   ; hl = list of commands of current attack or trainer card
 ; return nc if command type matching a is found, carry otherwise
 CheckMatchingCommand: ; 2ffe (0:2ffe)
 	ld c, a
@@ -9553,7 +9553,7 @@ HandleDamageReductionExceptSubstatus2: ; 3269 (0:3269)
 	call CheckCannotUseDueToStatus
 	ret c
 .pkmn_power
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret z
 	ld a, [wTempNonTurnDuelistCardID]
@@ -9594,7 +9594,7 @@ HandleDamageReductionExceptSubstatus2: ; 3269 (0:3269)
 	ld d, h
 	ret
 .prevent_less_than_30_damage
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret z
 	ld bc, 30
@@ -9616,7 +9616,7 @@ HandleDamageReductionExceptSubstatus2: ; 3269 (0:3269)
 ; check for Invisible Wall, Kabuto Armor, NShield, or Transparency, in order to
 ; possibly reduce or make zero the damage at de.
 HandleDamageReductionOrNoDamageFromPkmnPowerEffects: ; 32f7 (0:32f7)
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret z
 	ld a, MUK
@@ -9637,8 +9637,8 @@ HandleDamageReductionOrNoDamageFromPkmnPowerEffects: ; 32f7 (0:32f7)
 ; when MACHAMP is damaged, if its Strikes Back is active, the
 ; attacking Pokemon (turn holder's arena Pokemon) takes 10 damage.
 ; ignore if damage taken at de is 0.
-; used to bounce back a damaging move.
-HandleStrikesBack_AgainstDamagingMove: ; 3317 (0:3317)
+; used to bounce back a damaging attack.
+HandleStrikesBack_AgainstDamagingAttack: ; 3317 (0:3317)
 	ld a, e
 	or d
 	ret z
@@ -9651,7 +9651,7 @@ HandleStrikesBack_AgainstDamagingMove: ; 3317 (0:3317)
 	ld a, MUK
 	call CountPokemonIDInBothPlayAreas
 	ret c
-	ld a, [wLoadedMoveCategory] ; category of attack used
+	ld a, [wLoadedAttackCategory] ; category of attack used
 	cp POKEMON_POWER
 	ret z
 	ld a, [wTempPlayAreaLocation_cceb] ; defending Pokemon's PLAY_AREA_*
@@ -9760,7 +9760,7 @@ HandleCantAttackSubstatus: ; 33c1 (0:33c1)
 	ret
 
 ; return carry if the turn holder's arena Pokemon cannot use
-; selected move at wSelectedAttack due to amnesia
+; selected attack at wSelectedAttack due to amnesia
 HandleAmnesiaSubstatus: ; 33e1 (0:33e1)
 	ld a, DUELVARS_ARENA_CARD_SUBSTATUS2
 	call GetTurnDuelistVariable
@@ -9770,15 +9770,15 @@ HandleAmnesiaSubstatus: ; 33e1 (0:33e1)
 .check_amnesia
 	cp SUBSTATUS2_AMNESIA
 	jr z, .affected_by_amnesia
-.not_the_disabled_move
+.not_the_disabled_atk
 	or a
 	ret
 .affected_by_amnesia
-	ld a, DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX
+	ld a, DUELVARS_ARENA_CARD_DISABLED_ATTACK_INDEX
 	call GetTurnDuelistVariable
 	ld a, [wSelectedAttack]
 	cp [hl]
-	jr nz, .not_the_disabled_move
+	jr nz, .not_the_disabled_atk
 	ldtx hl, UnableToUseAttackDueToAmnesiaText
 	scf
 	ret
@@ -9823,7 +9823,7 @@ CheckSandAttackOrSmokescreenSubstatus: ; 3414 (0:3414)
 HandleNoDamageOrEffectSubstatus: ; 3432 (0:3432)
 	xor a
 	ld [wNoDamageOrEffect], a
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	ret z
 	ld a, DUELVARS_ARENA_CARD_SUBSTATUS1
@@ -9881,7 +9881,7 @@ HandleTransparency: ; 348a (0:348a)
 	or a
 	ret
 .transparency
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	cp POKEMON_POWER
 	jr z, .done ; Transparency has no effect against Pkmn Powers
 	ld a, [wTempPlayAreaLocation_cceb]
@@ -9944,7 +9944,7 @@ IsClairvoyanceActive: ; 34e2 (0:34e2)
 	ret
 
 ; returns carry if turn holder's arena card is paralyzed, asleep, confused,
-; and/or toxic gas in play, meaning that move and/or pkmn power cannot be used
+; and/or toxic gas in play, meaning that attack and/or pkmn power cannot be used
 CheckCannotUseDueToStatus: ; 34ef (0:34ef)
 	xor a
 
@@ -10232,14 +10232,14 @@ HandleDestinyBondSubstatus: ; 363b (0:363b)
 
 ; when MACHAMP is damaged, if its Strikes Back is active, the
 ; attacking Pokemon (turn holder's arena Pokemon) takes 10 damage.
-; used to bounce back a move of the RESIDUAL category
-HandleStrikesBack_AgainstResidualMove: ; 367b (0:367b)
+; used to bounce back an attack of the RESIDUAL category
+HandleStrikesBack_AgainstResidualAttack: ; 367b (0:367b)
 	ld a, [wTempNonTurnDuelistCardID]
 	cp MACHAMP
 	jr z, .strikes_back
 	ret
 .strikes_back
-	ld a, [wLoadedMoveCategory]
+	ld a, [wLoadedAttackCategory]
 	and RESIDUAL
 	ret nz
 	ld a, [wDealtDamage]
@@ -10250,11 +10250,11 @@ HandleStrikesBack_AgainstResidualMove: ; 367b (0:367b)
 	call SwapTurn
 	ret c
 	ld hl, 10 ; damage to be dealt to attacker
-	call ApplyStrikesBack_AgainstResidualMove
+	call ApplyStrikesBack_AgainstResidualAttack
 	call nc, WaitForWideTextBoxInput
 	ret
 
-ApplyStrikesBack_AgainstResidualMove: ; 36a2 (0:36a2)
+ApplyStrikesBack_AgainstResidualAttack: ; 36a2 (0:36a2)
 	push hl
 	call LoadTxRam3
 	ld a, [wTempTurnDuelistCardID]
diff --git a/src/hram.asm b/src/hram.asm
index 9aa1504..b5255dd 100644
--- a/src/hram.asm
+++ b/src/hram.asm
@@ -79,7 +79,7 @@ hTempCardIndex_ff9f:: ; ff9f
 
 UNION
 
-; multipurpose temp storage (card's deck index, selected move index, status condition...)
+; multipurpose temp storage (card's deck index, selected attack index, status condition...)
 hTemp_ffa0:: ; ffa0
 	ds $1
 
diff --git a/src/macros/wram.asm b/src/macros/wram.asm
index d17c505..5e7eb1c 100644
--- a/src/macros/wram.asm
+++ b/src/macros/wram.asm
@@ -10,8 +10,8 @@ card_data_struct: MACRO
 \1Stage::         ds 1
 \1NonPokemonDescription:: ; ds 2
 \1PreEvoName::    ds 2
-\1Move1::         move_data_struct \1Move1
-\1Move2::         move_data_struct \1Move2
+\1Atk1::         atk_data_struct \1Atk1
+\1Atk2::         atk_data_struct \1Atk2
 \1RetreatCost::   ds 1
 \1Weakness::      ds 1
 \1Resistance::    ds 1
@@ -25,7 +25,7 @@ card_data_struct: MACRO
 \1Unknown2::      ds 1
 ENDM
 
-move_data_struct: MACRO
+atk_data_struct: MACRO
 \1EnergyCost::     ds NUM_TYPES / 2
 \1Name::           ds 2
 \1Description::    ds 4
diff --git a/src/wram.asm b/src/wram.asm
index 7ea2def..753923a 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -187,8 +187,8 @@ wPlayerArenaCardStatus:: ; c2f0
 wPlayerDuelistType:: ; c2f1
 	ds $1
 
-; if under the effects of amnesia, which move (0 or 1) can't be used
-wPlayerArenaCardDisabledMoveIndex:: ; c2f2
+; if under the effects of amnesia, which attack (0 or 1) can't be used
+wPlayerArenaCardDisabledAttackIndex:: ; c2f2
 	ds $1
 
 ; damage taken the last time the opponent attacked (0 if no damage)
@@ -347,7 +347,7 @@ wOpponentArenaCardStatus:: ; c3f0
 wOpponentDuelistType:: ; c3f1
 	ds $1
 
-wOpponentArenaCardDisabledMoveIndex:: ; c3f2
+wOpponentArenaCardDisabledAttackIndex:: ; c3f2
 	ds $1
 
 wOpponentArenaCardLastTurnDamage:: ; c3f3
@@ -655,7 +655,7 @@ wCurrentDuelMenuItem:: ; cbc6
 	ds $1
 
 ; When we're viewing a card's information, the page we are currently at.
-; For Pokemon cards, values from $1 to $6 (two pages for move descriptions)
+; For Pokemon cards, values from $1 to $6 (two pages for attack descriptions)
 ; For Energy cards, it's always $9
 ; For Trainer cards, $d or $e (two pages for trainer card descriptions)
 ; see CARDPAGE_* constants
@@ -699,7 +699,7 @@ wEnergyCardsRequiredToRetreat:: ; cbcc
 wcbcd:: ; cbcd
 	ds $1
 
-; used in CheckIfEnoughEnergiesToMove for the calculation
+; used in CheckIfEnoughEnergiesToAttack for the calculation
 wAttachedEnergiesAccum:: ; cbce
 	ds $1
 
@@ -840,9 +840,10 @@ wcc01:: ; cc01
 wPokemonLengthPrintOffset:: ; cc03
 	ds $1
 
-; used when opening the card page of a move when attacking, serving as an index for MovePageDisplayPointerTable.
-; see MOVEPAGE_* constants
-wMovePageNumber:: ; cc04
+; used when opening the card page of an attack when attacking,
+; serving as an index for AttackPageDisplayPointerTable.
+; see ATTACKPAGE_* constants
+wAttackPageNumber:: ; cc04
 	ds $1
 
 ; the value of hWhoseTurn gets loaded here at the beginning of each duelist's turn.
@@ -895,9 +896,9 @@ wOpponentDeckID:: ; cc0e
 wcc0f:: ; cc0f
 	ds $1
 
-; index (0-1) of the move or Pokemon Power being used by the player's arena card
+; index (0-1) of the attack or Pokemon Power being used by the player's arena card
 ; set to $ff when the duel starts and at the end of the opponent's turn
-wPlayerAttackingMoveIndex:: ; cc10
+wPlayerAttackingAttackIndex:: ; cc10
 	ds $1
 
 ; deck index of the player's arena card that is attacking or using a Pokemon Power
@@ -948,10 +949,10 @@ wLoadedCard1:: ; cc24
 	card_data_struct wLoadedCard1
 wLoadedCard2:: ; cc65
 	card_data_struct wLoadedCard2
-wLoadedMove:: ; cca6
-	move_data_struct wLoadedMove
+wLoadedAttack:: ; cca6
+	atk_data_struct wLoadedAttack
 
-; the damage field of an used move is loaded here
+; the damage field of a used attack is loaded here
 ; doubles as "wAIAverageDamage" when complementing wAIMinDamage and wAIMaxDamage
 ; little-endian
 ; second byte may have UNAFFECTED_BY_WEAKNESS_RESISTANCE_F set/unset
@@ -959,8 +960,8 @@ wDamage:: ; ccb9
 	ds $2
 
 ; wAIMinDamage and wAIMaxDamage appear to be used for AI scoring
-; they are updated with the minimum (or floor) damage of the current move
-; and with the maximum (or ceiling) damage of the current move
+; they are updated with the minimum (or floor) damage of the current attack
+; and with the maximum (or ceiling) damage of the current attack
 wAIMinDamage:: ; ccbb
 	ds $1
 
@@ -1292,12 +1293,12 @@ wcdb4:: ; cdb4
 	ds $1
 
 ; information about various properties of
-; loaded move for AI calculations
-wTempLoadedMoveEnergyCost:: ; cdb5
+; loaded attack for AI calculations
+wTempLoadedAttackEnergyCost:: ; cdb5
 	ds $1
-wTempLoadedMoveEnergyNeededType:: ; cdb6
+wTempLoadedAttackEnergyNeededType:: ; cdb6
 	ds $1
-wTempLoadedMoveEnergyNeededAmount:: ; cdb7
+wTempLoadedAttackEnergyNeededAmount:: ; cdb7
 	ds $1
 
 ; used for the AI to store various
@@ -1450,11 +1451,11 @@ wce00:: ; ce00
 wce01:: ; ce01
 	ds $1
 
-; whether AI's move is a damaging move or not
-; (move that only damages bench is treated as non-damaging)
-; $00 = is a damaging move
-; $01 = is a non damaging move
-wAIMoveIsNonDamaging:: ; ce02
+; whether AI's attack is damaging or not
+; (attacks that only damages bench are treated as non-damaging)
+; $00 = is a damaging attack
+; $01 = is a non damaging attack
+wAIAttackIsNonDamaging:: ; ce02
 	ds $1
 
 ; whether AI already retreated this turn or not.
author	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-03 11:41:26 +0000
committer	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-03 11:50:15 +0000
commit	91ecded7f6d4727dbd017e3188a4834fe9926f79 (patch)
tree	ea501a09e2a23b015372e0d88a78f138af54f2b0
parent	68b8291b1920bcae99750f4bb97b7c01b73f786c (diff)