Removed underscores I used in my last commit for PascalCase names

Changed alternate art cards (pikachu, pikachu, and mewtwo) to have "_ALT_" or "Alt" in the name instead of ending in "A".
2026-10-02 05:46:45 -05:00 · 2022-08-26 21:55:33 -07:00
parent 18623a0062
commit 75d13222ee
36 changed files with 578 additions and 578 deletions
--- a/src/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
@@ -97,10 +97,10 @@
 	const PIKACHU_LV12                ; $60
 	const PIKACHU_LV14                ; $61
 	const PIKACHU_LV16                ; $62
-	const PIKACHU_LV16A               ; $63
+	const PIKACHU_ALT_LV16            ; $63
 	const FLYING_PIKACHU              ; $64
 	const SURFING_PIKACHU_LV13        ; $65
-	const SURFING_PIKACHU_LV13A       ; $66
+	const SURFING_PIKACHU_ALT_LV13    ; $66
 	const RAICHU_LV40                 ; $67
 	const RAICHU_LV45                 ; $68
 	const MAGNEMITE_LV13              ; $69
@@ -157,7 +157,7 @@
 	const JYNX                        ; $9c
 	const MEWTWO_LV53                 ; $9d
 	const MEWTWO_LV60                 ; $9e
-	const MEWTWO_LV60A                ; $9f
+	const MEWTWO_ALT_LV60             ; $9f
 	const MEW_LV8                     ; $a0
 	const MEW_LV15                    ; $a1
 	const MEW_LV23                    ; $a2
--- a/src/constants/deck_ai_constants.asm
+++ b/src/constants/deck_ai_constants.asm
@@ -40,7 +40,7 @@ DEF AI_ENERGY_FLAG_SKIP_ARENA_CARD EQU 1 << 7 ; whether to include Arena card in
 	const AI_TRAINER_CARD_PHASE_15 ; $f, for Professor Oak

 ; used by wAIBarrierFlagCounter to determine
-; whether Player is running Mewtwo_Lv53 mill deck.
+; whether Player is running MewtwoLv53 mill deck.
 ; flag set means true, flag not set means false.
 DEF AI_MEWTWO_MILL_F EQU 7
 DEF AI_MEWTWO_MILL   EQU 1 << AI_MEWTWO_MILL_F
--- a/src/data/auto_deck_card_lists.asm
+++ b/src/data/auto_deck_card_lists.asm
@@ -330,10 +330,10 @@ CutePokemonCardList: ; 1b30d (6:730d)
 	db  1, PIKACHU_LV12
 	db  1, PIKACHU_LV14
 	db  1, PIKACHU_LV16
-	db  1, PIKACHU_LV16A
+	db  1, PIKACHU_ALT_LV16
 	db  1, FLYING_PIKACHU
 	db  1, SURFING_PIKACHU_LV13
-	db  1, SURFING_PIKACHU_LV13A
+	db  1, SURFING_PIKACHU_ALT_LV13
 	db  1, RAICHU_LV40
 	db  1, RAICHU_LV45
 	db  1, JOLTEON_LV29
@@ -408,7 +408,7 @@ ElectricShockCardList: ; 1b3a4 (6:73a4)
 	db  1, DOUBLE_COLORLESS_ENERGY
 	db  2, PIKACHU_LV14
 	db  1, PIKACHU_LV16
-	db  1, PIKACHU_LV16A
+	db  1, PIKACHU_ALT_LV16
 	db  2, RAICHU_LV40
 	db  2, MAGNEMITE_LV13
 	db  2, MAGNEMITE_LV15
@@ -764,7 +764,7 @@ WondersOfScienceCardList: ; 1b616 (6:7616)
 	db  4, KOFFING
 	db  3, WEEZING
 	db  2, MEWTWO_LV53
-	db  1, MEWTWO_LV60A
+	db  1, MEWTWO_ALT_LV60
 	db  1, MEWTWO_LV60
 	db  2, PORYGON
 	db  1, IMPOSTER_PROFESSOR_OAK
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
@@ -253,7 +253,7 @@ UnnamedDeck: ; 30070 (c:4070)
 	db 4, JOLTEON_LV29
 	db 4, FLYING_PIKACHU
 	db 4, PIKACHU_LV16
-	db 4, PIKACHU_LV16A
+	db 4, PIKACHU_ALT_LV16
 	db 4, PIKACHU_LV12
 	db 4, PIKACHU_LV14
 	db 4, RAICHU_LV40
@@ -451,7 +451,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 	db 4, JOLTEON_LV29
 	db 4, FLYING_PIKACHU
 	db 4, PIKACHU_LV16
-	db 4, PIKACHU_LV16A
+	db 4, PIKACHU_ALT_LV16
 	db 4, PIKACHU_LV12
 	db 4, PIKACHU_LV14
 	db 4, RAICHU_LV40
@@ -1076,7 +1076,7 @@ WondersofScienceDeck: ; 30769 (c:4769)
 	db 4, KOFFING
 	db 3, WEEZING
 	db 2, MEWTWO_LV53
-	db 1, MEWTWO_LV60A
+	db 1, MEWTWO_ALT_LV60
 	db 1, MEWTWO_LV60
 	db 2, PORYGON
 	db 1, IMPOSTER_PROFESSOR_OAK
@@ -1425,10 +1425,10 @@ PikachuDeck: ; 309dc (c:49dc)
 	db 1, PIKACHU_LV12
 	db 1, PIKACHU_LV14
 	db 1, PIKACHU_LV16
-	db 1, PIKACHU_LV16A
+	db 1, PIKACHU_ALT_LV16
 	db 4, FLYING_PIKACHU
 	db 2, SURFING_PIKACHU_LV13
-	db 2, SURFING_PIKACHU_LV13A
+	db 2, SURFING_PIKACHU_ALT_LV13
 	db 2, RAICHU_LV40
 	db 2, RAICHU_LV45
 	db 4, BILL
--- a/src/engine/duel/ai/attacks.asm
+++ b/src/engine/duel/ai/attacks.asm
@@ -61,7 +61,7 @@ AIProcessAttacks:
 	jr .attack_chosen

 .no_pluspower
-; if Player is running Mewtwo_Lv53 mill deck,
+; if Player is running MewtwoLv53 mill deck,
 ; skip attack if Barrier counter is 0.
 	ld a, [wAIBarrierFlagCounter]
 	cp AI_MEWTWO_MILL + 0
@@ -367,7 +367,7 @@ GetAIScoreOfAttack:
 .magnemite1
 	ld a, 10
 	add b
-	ld b, a ; 20 bench damage if not Magnemite_Lv13
+	ld b, a ; 20 bench damage if not MagnemiteLv13

 ; if this attack causes player to win the duel by
 ; knocking out own Pokémon, dismiss attack.
--- a/src/engine/duel/ai/common.asm
+++ b/src/engine/duel/ai/common.asm
@@ -1,7 +1,7 @@
 ; runs through Player's whole deck and
 ; sets carry if there's any Pokemon other
-; than Mewtwo_Lv53.
-CheckIfPlayerHasPokemonOtherThanMewtwo_Lv53:
+; than MewtwoLv53.
+CheckIfPlayerHasPokemonOtherThanMewtwoLv53:
 	call SwapTurn
 	ld e, 0
 .loop_deck
@@ -31,13 +31,13 @@ CheckIfPlayerHasPokemonOtherThanMewtwo_Lv53:
 	scf
 	ret

-; returns no carry if, given the Player is using a Mewtwo_Lv53 mill deck,
+; returns no carry if, given the Player is using a MewtwoLv53 mill deck,
 ; the AI already has a Bench fully set up, in which case it
 ; will process some Trainer cards in hand (namely Energy Removals).
 ; this is used to check whether to skip some normal AI routines
 ; this turn and jump right to the attacking phase.
 HandleAIAntiMewtwoDeckStrategy: ; 227d3 (8:67d3)
-; return carry if Player is not playing Mewtwo_Lv53 mill deck
+; return carry if Player is not playing MewtwoLv53 mill deck
 	ld a, [wAIBarrierFlagCounter]
 	bit AI_MEWTWO_MILL_F, a
 	jr z, .set_carry
--- a/src/engine/duel/ai/core.asm
+++ b/src/engine/duel/ai/core.asm
@@ -206,7 +206,7 @@ CheckIfEnergyIsUseful:
 	ld d, WATER_ENERGY
 	cp SURFING_PIKACHU_LV13
 	jr z, .check_energy
-	cp SURFING_PIKACHU_LV13A
+	cp SURFING_PIKACHU_ALT_LV13
 	jr z, .check_energy

 	cp EEVEE
@@ -2020,7 +2020,7 @@ AISelectSpecialAttackParameters:
 	ld a, e
 	cp MEW_LV23
 	jr z, .DevolutionBeam
-	cp MEWTWO_LV60A
+	cp MEWTWO_ALT_LV60
 	jr z, .EnergyAbsorption
 	cp MEWTWO_LV60
 	jr z, .EnergyAbsorption
--- a/src/engine/duel/ai/decks/legendary_moltres.asm
+++ b/src/engine/duel/ai/decks/legendary_moltres.asm
@@ -99,7 +99,7 @@ AIDoTurn_LegendaryMoltres:
 	ld a, AI_TRAINER_CARD_PHASE_04
 	call AIProcessHandTrainerCards

-; check if AI can play Moltres_Lv37
+; check if AI can play MoltresLv37
 ; from hand and if so, play it.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
@@ -114,7 +114,7 @@ AIDoTurn_LegendaryMoltres:
 	jr c, .skip_moltres ; skip if Muk in play
 	ld a, MOLTRES_LV37
 	call LookForCardIDInHandList_Bank5
-	jr nc, .skip_moltres ; skip if no Moltres_Lv37 in hand
+	jr nc, .skip_moltres ; skip if no MoltresLv37 in hand
 	ldh [hTemp_ffa0], a
 	ld a, OPPACTION_PLAY_BASIC_PKMN
 	bank1call AIMakeDecision
@@ -136,7 +136,7 @@ AIDoTurn_LegendaryMoltres:
 	or a
 	jr nz, .skip_attach_energy

-; if Magmar_Lv31 is the Arena card and has no energy attached,
+; if MagmarLv31 is the Arena card and has no energy attached,
 ; try attaching an energy card to it from the hand.
 ; otherwise, run normal AI energy attach routine.
 	ld a, DUELVARS_ARENA_CARD
@@ -145,7 +145,7 @@ AIDoTurn_LegendaryMoltres:
 	ld a, MAGMAR_LV31
 	cp e
 	jr nz, .attach_normally
-	; Magmar_Lv31 is the Arena card
+	; MagmarLv31 is the Arena card
 	call CreateEnergyCardListFromHand
 	jr c, .skip_attach_energy
 	ld e, PLAY_AREA_ARENA
--- a/src/engine/duel/ai/decks/legendary_ronald.asm
+++ b/src/engine/duel/ai/decks/legendary_ronald.asm
@@ -101,7 +101,7 @@ AIDoTurn_LegendaryRonald:
 	ld a, AI_TRAINER_CARD_PHASE_04
 	call AIProcessHandTrainerCards

-; check if AI can play Moltres_Lv37
+; check if AI can play MoltresLv37
 ; from hand and if so, play it.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
@@ -116,7 +116,7 @@ AIDoTurn_LegendaryRonald:
 	jr c, .skip_moltres_1 ; skip if Muk in play
 	ld a, MOLTRES_LV37
 	call LookForCardIDInHandList_Bank5
-	jr nc, .skip_moltres_1 ; skip if no Moltres_Lv37 in hand
+	jr nc, .skip_moltres_1 ; skip if no MoltresLv37 in hand
 	ldh [hTemp_ffa0], a
 	ld a, OPPACTION_PLAY_BASIC_PKMN
 	bank1call AIMakeDecision
@@ -156,7 +156,7 @@ AIDoTurn_LegendaryRonald:
 	ld a, AI_TRAINER_CARD_PHASE_04
 	call AIProcessHandTrainerCards

-; check if AI can play Moltres_Lv37
+; check if AI can play MoltresLv37
 ; from hand and if so, play it.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
@@ -171,7 +171,7 @@ AIDoTurn_LegendaryRonald:
 	jr c, .skip_moltres_2 ; skip if Muk in play
 	ld a, MOLTRES_LV37
 	call LookForCardIDInHandList_Bank5
-	jr nc, .skip_moltres_2 ; skip if no Moltres_Lv37 in hand
+	jr nc, .skip_moltres_2 ; skip if no MoltresLv37 in hand
 	ldh [hTemp_ffa0], a
 	ld a, OPPACTION_PLAY_BASIC_PKMN
 	bank1call AIMakeDecision
--- a/src/engine/duel/ai/decks/legendary_zapdos.asm
+++ b/src/engine/duel/ai/decks/legendary_zapdos.asm
@@ -102,7 +102,7 @@ AIDoTurn_LegendaryZapdos:
 	or a
 	jr nz, .skip_energy_attach

-; if Arena card is Voltorb and there's Electrode_Lv35 in hand,
+; if Arena card is Voltorb and there's ElectrodeLv35 in hand,
 ; or if it's Electabuzz, try attaching Energy card
 ; to the Arena card if it doesn't have any energy attached.
 ; Otherwise if Energy card is not needed,
--- a/src/engine/duel/ai/decks/wonders_of_science.asm
+++ b/src/engine/duel/ai/decks/wonders_of_science.asm
@@ -33,7 +33,7 @@ AIActionTable_WondersOfScience:

 .list_arena
 	db MEWTWO_LV53
-	db MEWTWO_LV60A
+	db MEWTWO_ALT_LV60
 	db MEWTWO_LV60
 	db GRIMER
 	db KOFFING
@@ -43,7 +43,7 @@ AIActionTable_WondersOfScience:
 .list_bench
 	db GRIMER
 	db KOFFING
-	db MEWTWO_LV60A
+	db MEWTWO_ALT_LV60
 	db MEWTWO_LV60
 	db MEWTWO_LV53
 	db PORYGON
@@ -53,14 +53,14 @@ AIActionTable_WondersOfScience:
 	db $00

 .list_energy
-	ai_energy GRIMER,       3, +0
-	ai_energy MUK,          4, +0
-	ai_energy KOFFING,      2, +0
-	ai_energy WEEZING,      3, +0
-	ai_energy MEWTWO_LV53,  2, -1
-	ai_energy MEWTWO_LV60A, 2, -1
-	ai_energy MEWTWO_LV60,  2, -1
-	ai_energy PORYGON,      2, -1
+	ai_energy GRIMER,          3, +0
+	ai_energy MUK,             4, +0
+	ai_energy KOFFING,         2, +0
+	ai_energy WEEZING,         3, +0
+	ai_energy MEWTWO_LV53,     2, -1
+	ai_energy MEWTWO_ALT_LV60, 2, -1
+	ai_energy MEWTWO_LV60,     2, -1
+	ai_energy PORYGON,         2, -1
 	db $00

 .list_prize
--- a/src/engine/duel/ai/energy.asm
+++ b/src/engine/duel/ai/energy.asm
@@ -164,7 +164,7 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	call AddToAIScore

 ; if there's no Muk in any Play Area
-; and there's Venusaur_Lv67 in own Play Area,
+; and there's VenusaurLv67 in own Play Area,
 ; add to AI score
 .check_venusaur
 	ld a, MUK
@@ -187,7 +187,7 @@ AIProcessEnergyCards: ; 164fc (5:64fc)
 	jr z, .add_to_score

 ; subtract from score instead
-; if Player is running Mewtwo_Lv53 mill deck.
+; if Player is running MewtwoLv53 mill deck.
 	ld a, 5
 	call SubFromAIScore
 	jr .check_defending_can_ko
@@ -467,7 +467,7 @@ DetermineAIScoreOfAttackEnergyRequirement: ; 16695 (5:6695)

 ; checks if there is surplus energy for attack
 ; that discards attached energy card.
-; if current card is Zapdos_Lv64, don't add to score.
+; if current card is ZapdosLv64, don't add to score.
 ; if there is no surplus energy, encourage playing energy.
 .discard_energy
 	ld a, [wLoadedCard1ID]
@@ -706,13 +706,13 @@ CheckIfEvolutionNeedsEnergyForAttack: ; 16805 (5:6805)

 ; returns in e the card ID of the energy required for
 ; the Discard/Energy Boost attack loaded in wSelectedAttack.
-; if it's Zapdos_Lv64's Thunderbolt attack, return no carry.
+; if it's ZapdosLv64's Thunderbolt attack, return no carry.
 ; if it's Charizard's Fire Spin or Exeggutor's Big Eggsplosion
 ; attack, don't return energy card ID, but set carry.
 ; output:
 ;	b = 1 if needs color energy, 0 otherwise;
 ;	c = 1 if only needs colorless energy, 0 otherwise;
-;	carry set if not Zapdos_Lv64's Thunderbolt attack.
+;	carry set if not ZapdosLv64's Thunderbolt attack.
 GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
 ; load card ID and check selected attack index.
 	ldh a, [hTempPlayAreaLocation_ff9d]
@@ -724,7 +724,7 @@ GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
 	or a
 	jr z, .first_attack

-; check if second attack is Zapdos_Lv64's Thunderbolt,
+; check if second attack is ZapdosLv64's Thunderbolt,
 ; Charizard's Fire Spin or Exeggutor's Big Eggsplosion,
 ; for these to be treated differently.
 ; for both attacks, load its energy cost.
@@ -784,7 +784,7 @@ GetEnergyCardForDiscardOrEnergyBoostAttack: ; 1683b (5:683b)
 	scf
 	ret

-; for Zapdos_Lv64's Thunderbolt attack, return with no carry.
+; for ZapdosLv64's Thunderbolt attack, return with no carry.
 .zapdos2
 	or a
 	ret
@@ -867,7 +867,7 @@ AITryToPlayEnergyCard: ; 1689f (5:689f)

 ; for attacks that discard energy or get boost for
 ; additional energy cards, get the energy card ID required by attack.
-; if it's Zapdos_Lv64's Thunderbolt attack, return.
+; if it's ZapdosLv64's Thunderbolt attack, return.
 .energy_boost_or_discard_energy
 	call GetEnergyCardForDiscardOrEnergyBoostAttack
 	ret nc
--- a/src/engine/duel/ai/hand_pokemon.asm
+++ b/src/engine/duel/ai/hand_pokemon.asm
@@ -353,7 +353,7 @@ AIDecideEvolution:
 	jr z, .pikachu
 	cp PIKACHU_LV16
 	jr z, .pikachu
-	cp PIKACHU_LV16A
+	cp PIKACHU_ALT_LV16
 	jr nz, .check_score
 .pikachu
 	ld a, 3
--- a/src/engine/duel/ai/init.asm
+++ b/src/engine/duel/ai/init.asm
@@ -10,7 +10,7 @@ InitAIDuelVars:

 ; initializes some variables and sets value of wAIBarrierFlagCounter.
 ; if Player uses Barrier 3 times in a row, AI checks if Player's deck
-; has only Mewtwo_Lv53 Pokemon cards (running a Mewtwo_Lv53 mill deck).
+; has only MewtwoLv53 Pokemon cards (running a MewtwoLv53 mill deck).
 InitAITurnVars:
 ; increase Pokedex counter by 1
 	ld a, [wAIPokedexCounter]
@@ -34,7 +34,7 @@ InitAITurnVars:
 	cp $ff
 	jr z, .check_flag

-; if the card is Mewtwo_Lv53, it means the Player
+; if the card is MewtwoLv53, it means the Player
 ; used its second attack, Barrier.
 	call SwapTurn
 	call GetCardIDFromDeckIndex
@@ -58,7 +58,7 @@ InitAITurnVars:

 ; this means that the Player used Barrier
 ; at least 3 turns in a row.
-; check if Player is running Mewtwo_Lv53-only deck,
+; check if Player is running MewtwoLv53-only deck,
 ; if so, set wAIBarrierFlagCounter flag.
 	ld a, DUELVARS_ARENA_CARD
 	call GetNonTurnDuelistVariable
@@ -68,7 +68,7 @@ InitAITurnVars:
 	ld a, e
 	cp MEWTWO_LV53
 	jr nz, .reset_1
-	farcall CheckIfPlayerHasPokemonOtherThanMewtwo_Lv53
+	farcall CheckIfPlayerHasPokemonOtherThanMewtwoLv53
 	jr nc, .set_flag
 .reset_1
 ; reset wAIBarrierFlagCounter
--- a/src/engine/duel/ai/pkmn_powers.asm
+++ b/src/engine/duel/ai/pkmn_powers.asm
@@ -20,7 +20,7 @@ HandleAIEnergyTrans:

 	ld a, VENUSAUR_LV67
 	call CountPokemonIDInPlayArea
-	ret nc ; return if no Venusaur_Lv67 found in own Play Area
+	ret nc ; return if no VenusaurLv67 found in own Play Area

 	ld a, MUK
 	call CountPokemonIDInBothPlayAreas
@@ -47,7 +47,7 @@ HandleAIEnergyTrans:
 .TransferEnergyToArena
 	ld [wAINumberOfEnergyTransCards], a

-; look for Venusaur_Lv67 in Play Area
+; look for VenusaurLv67 in Play Area
 ; so that its PKMN Power can be used.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
@@ -289,7 +289,7 @@ AIEnergyTransTransferEnergyToBench:
 	ret nc

 ; AI decided that an energy card is needed
-; so look for Venusaur_Lv67 in Play Area
+; so look for VenusaurLv67 in Play Area
 ; so that its PKMN Power can be used.
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetTurnDuelistVariable
@@ -300,7 +300,7 @@ AIEnergyTransTransferEnergyToBench:
 	add b
 	call GetTurnDuelistVariable
 	ldh [hTempCardIndex_ff9f], a
-	ld [wAIVenusaur_Lv67DeckIndex], a
+	ld [wAIVenusaurLv67DeckIndex], a
 	call GetCardIDFromDeckIndex
 	ld a, e
 	cp VENUSAUR_LV67
@@ -317,7 +317,7 @@ AIEnergyTransTransferEnergyToBench:
 .use_pkmn_power
 	ld a, b
 	ldh [hTemp_ffa0], a
-	ld [wAIVenusaur_Lv67PlayAreaLocation], a
+	ld [wAIVenusaurLv67PlayAreaLocation], a
 	ld a, OPPACTION_USE_PKMN_POWER
 	bank1call AIMakeDecision
 	ld a, OPPACTION_EXECUTE_PKMN_POWER_EFFECT
@@ -327,7 +327,7 @@ AIEnergyTransTransferEnergyToBench:
 .loop_energy
 	xor a
 	ldh [hTempPlayAreaLocation_ffa1], a
-	ld a, [wAIVenusaur_Lv67PlayAreaLocation]
+	ld a, [wAIVenusaurLv67PlayAreaLocation]
 	ldh [hTemp_ffa0], a

 	; returns when Arena card has no Grass energy cards attached.
@@ -380,7 +380,7 @@ AIEnergyTransTransferEnergyToBench:
 	dec d
 	jr nz, .small_delay_loop

-	ld a, [wAIVenusaur_Lv67DeckIndex]
+	ld a, [wAIVenusaurLv67DeckIndex]
 	ldh [hTempCardIndex_ff9f], a
 	ld d, a
 	ld e, FIRST_ATTACK_OR_PKMN_POWER
--- a/src/engine/duel/ai/retreat.asm
+++ b/src/engine/duel/ai/retreat.asm
@@ -676,7 +676,7 @@ AIDecideBenchPokemonToSwitchTo:

 ; raise AI score if
 ;	- is a Mr Mime OR
-;	- is a Mew_Lv8 and defending card is not basic stage
+;	- is a MewLv8 and defending card is not basic stage
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	add DUELVARS_ARENA_CARD
 	call GetTurnDuelistVariable
--- a/src/engine/duel/ai/special_attacks.asm
+++ b/src/engine/duel/ai/special_attacks.asm
@@ -35,7 +35,7 @@ HandleSpecialAIAttacks:
 	jp z, .FriendshipSong
 	cp PORYGON
 	jp z, .Conversion
-	cp MEWTWO_LV60A
+	cp MEWTWO_ALT_LV60
 	jp z, .EnergyAbsorption
 	cp MEWTWO_LV60
 	jp z, .EnergyAbsorption
--- a/src/engine/duel/ai/trainer_cards.asm
+++ b/src/engine/duel/ai/trainer_cards.asm
@@ -2109,11 +2109,11 @@ AIDecide_PokemonBreeder:
 	push de
 	call CheckIfCanEvolveInto_BasicToStage2
 	pop de
-	call nc, .HandleDragonite_Lv41Evolution
+	call nc, .HandleDragoniteLv41Evolution
 	call nc, .can_evolve

 ; not possible to evolve or returned carry
-; when handling Dragonite_Lv41 evolution
+; when handling DragoniteLv41 evolution
 	pop bc
 	inc e
 	dec c
@@ -2192,12 +2192,12 @@ AIDecide_PokemonBreeder:
 	or a
 	ret

-; return carry if card is evolving to Dragonite_Lv41 and if
+; return carry if card is evolving to DragoniteLv41 and if
 ; - the card that is evolving is not Arena card and
 ;   number of damage counters in Play Area is under 8;
 ; - the card that is evolving is Arena card and has under 5
 ;   damage counters or has less than 3 energy cards attached.
-.HandleDragonite_Lv41Evolution
+.HandleDragoniteLv41Evolution
 	push af
 	push bc
 	push de
@@ -4038,7 +4038,7 @@ AIDecide_ScoopUp:
 	scf
 	ret

-; this deck will use Scoop Up on a benched Articuno_Lv37.
+; this deck will use Scoop Up on a benched ArticunoLv37.
 ; it checks if the defending Pokemon is a Snorlax,
 ; but interestingly does not check for Muk in both Play Areas.
 ; will also use Scoop Up on
@@ -4049,7 +4049,7 @@ AIDecide_ScoopUp:
 	cp 3
 	jr c, .no_carry

-; look for Articuno_Lv37 in bench
+; look for ArticunoLv37 in bench
 	ld a, ARTICUNO_LV37
 	ld b, PLAY_AREA_BENCH_1
 	call LookForCardIDInPlayArea_Bank8
@@ -4065,7 +4065,7 @@ AIDecide_ScoopUp:
 	cp CHANSEY
 	jr nz, .no_carry

-; here either Articuno_Lv37 or Chansey
+; here either ArticunoLv37 or Chansey
 ; is the Arena Card.
 .articuno_or_chansey
 ; if can't KO defending Pokemon, check if defending Pokemon
@@ -4122,7 +4122,7 @@ AIDecide_ScoopUp:
 	scf
 	ret

-; this deck will use Scoop Up on a benched Articuno_Lv37, Zapdos_Lv68 or Moltres_Lv37.
+; this deck will use Scoop Up on a benched ArticunoLv37, ZapdosLv68 or MoltresLv37.
 ; interestingly, does not check for Muk in both Play Areas.
 .HandleLegendaryRonald
 ; if less than 3 Play Area Pokemon cards, skip.
@@ -4571,21 +4571,21 @@ AIPlay_Gambler:

 ; checks whether to play Gambler.
 ; aside from Imakuni?, all other opponents only
-; play this card if Player is running Mewtwo_Lv53-only deck.
+; play this card if Player is running MewtwoLv53-only deck.
 AIDecide_Gambler:
 ; Imakuni? has his own routine
 	ld a, [wOpponentDeckID]
 	cp IMAKUNI_DECK_ID
 	jr z, .imakuni

-; check if flag is set for Player using Mewtwo_Lv53 only deck
+; check if flag is set for Player using MewtwoLv53 only deck
 	ld a, [wAIBarrierFlagCounter]
 	and AI_MEWTWO_MILL
 	jr z, .no_carry

 ; set carry if number of cards in deck <= 4.
 ; this is done to counteract the deck out strategy
-; of Mewtwo_Lv53 deck, by replenishing the deck with hand cards.
+; of MewtwoLv53 deck, by replenishing the deck with hand cards.
 	ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK
 	call GetTurnDuelistVariable
 	cp DECK_SIZE - 4
@@ -4882,7 +4882,7 @@ AIDecide_Pokeball:
 	ld a, CARD_LOCATION_DECK
 	call LookForCardIDInLocation
 	ret c
-	ld e, PIKACHU_LV16A
+	ld e, PIKACHU_ALT_LV16
 	ld a, CARD_LOCATION_DECK
 	call LookForCardIDInLocation
 	ret c
@@ -5476,8 +5476,8 @@ AIDecide_PokemonTrader:
 	ret

 AIDecide_PokemonTrader_LegendaryMoltres:
-; look for Moltres_Lv37 card in deck to trade with a
-; card in hand different from Moltres_Lv35.
+; look for MoltresLv37 card in deck to trade with a
+; card in hand different from MoltresLv35.
 	ld a, MOLTRES_LV37
 	ld e, MOLTRES_LV35
 	call LookForCardIDToTradeWithDifferentHandCard
--- a/src/engine/duel/effect_commands.asm
+++ b/src/engine/duel/effect_commands.asm
@@ -615,9 +615,9 @@ MoltresWildfireEffectCommands:
 	dbw EFFECTCMDTYPE_AI_SELECTION, Wildfire_AISelectEffect
 	db  $00

-Moltres_Lv35DiveBombEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Moltres_Lv35DiveBomb_Success50PercentEffect
-	dbw EFFECTCMDTYPE_AI, Moltres_Lv35DiveBomb_AIEffect
+MoltresLv35DiveBombEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, MoltresLv35DiveBomb_Success50PercentEffect
+	dbw EFFECTCMDTYPE_AI, MoltresLv35DiveBomb_AIEffect
 	db  $00

 FlareonQuickAttackEffectCommands:
@@ -689,9 +689,9 @@ MoltresFiregiverEffectCommands:
 	dbw EFFECTCMDTYPE_PKMN_POWER_TRIGGER, Firegiver_AddToHandEffect
 	db  $00

-Moltres_Lv37DiveBombEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Moltres_Lv37DiveBomb_Success50PercentEffect
-	dbw EFFECTCMDTYPE_AI, Moltres_Lv37DiveBomb_AIEffect
+MoltresLv37DiveBombEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, MoltresLv37DiveBomb_Success50PercentEffect
+	dbw EFFECTCMDTYPE_AI, MoltresLv37DiveBomb_AIEffect
 	db  $00

 AbraPsyshockEffectCommands:
@@ -818,18 +818,18 @@ MewtwoBarrierEffectCommands:
 	dbw EFFECTCMDTYPE_AI_SELECTION, Barrier_AISelectEffect
 	db  $00

-Mewtwo_Lv60AEnergyAbsorptionEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, Mewtwo_Lv60AEnergyAbsorption_CheckDiscardPile
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Mewtwo_Lv60AEnergyAbsorption_AddToHandEffect
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, Mewtwo_Lv60AEnergyAbsorption_PlayerSelectEffect
-	dbw EFFECTCMDTYPE_AI_SELECTION, Mewtwo_Lv60AEnergyAbsorption_AISelectEffect
+MewtwoAltLV60EnergyAbsorptionEffectCommands:
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, MewtwoAltLV60EnergyAbsorption_CheckDiscardPile
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, MewtwoAltLV60EnergyAbsorption_AddToHandEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, MewtwoAltLV60EnergyAbsorption_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_AI_SELECTION, MewtwoAltLV60EnergyAbsorption_AISelectEffect
 	db  $00

-Mewtwo_Lv60EnergyAbsorptionEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, Mewtwo_Lv60EnergyAbsorption_CheckDiscardPile
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Mewtwo_Lv60EnergyAbsorption_AddToHandEffect
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, Mewtwo_Lv60EnergyAbsorption_PlayerSelectEffect
-	dbw EFFECTCMDTYPE_AI_SELECTION, Mewtwo_Lv60EnergyAbsorption_AISelectEffect
+MewtwoLv60EnergyAbsorptionEffectCommands:
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, MewtwoLv60EnergyAbsorption_CheckDiscardPile
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, MewtwoLv60EnergyAbsorption_AddToHandEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, MewtwoLv60EnergyAbsorption_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_AI_SELECTION, MewtwoLv60EnergyAbsorption_AISelectEffect
 	db  $00

 SlowbroStrangeBehaviorEffectCommands:
@@ -1074,19 +1074,19 @@ PikachuSparkEffectCommands:
 	dbw EFFECTCMDTYPE_AI_SELECTION, Spark_AISelectEffect
 	db  $00

-Pikachu_Lv16GrowlEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Pikachu_Lv16GrowlEffect
+PikachuLv16GrowlEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, PikachuLv16GrowlEffect
 	db  $00

-Pikachu_Lv16ThundershockEffectCommands:
+PikachuLv16ThundershockEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Paralysis50PercentEffect
 	db  $00

-Pikachu_Lv16AGrowlEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Pikachu_Lv16AGrowlEffect
+PikachuAltLv16GrowlEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, PikachuAltLv16GrowlEffect
 	db  $00

-Pikachu_Lv16AThundershockEffectCommands:
+PikachuAltLv16ThundershockEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Paralysis50PercentEffect
 	db  $00

@@ -1113,8 +1113,8 @@ MagnetonThunderWaveEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Paralysis50PercentEffect
 	db  $00

-Magneton_Lv28SelfdestructEffectCommands:
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Magneton_Lv28SelfdestructEffect
+MagnetonLv28SelfdestructEffectCommands:
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, MagnetonLv28SelfdestructEffect
 	db  $00

 MagnetonSonicboomEffectCommands:
@@ -1123,8 +1123,8 @@ MagnetonSonicboomEffectCommands:
 	dbw EFFECTCMDTYPE_AI, MagnetonSonicboom_UnaffectedByColorEffect
 	db  $00

-Magneton_Lv35SelfdestructEffectCommands:
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Magneton_Lv35SelfdestructEffect
+MagnetonLv35SelfdestructEffectCommands:
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, MagnetonLv35SelfdestructEffect
 	db  $00

 ZapdosPealOfThunderEffectCommands:
@@ -1190,9 +1190,9 @@ DragoniteStepInEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, StepIn_SwitchEffect
 	db  $00

-Dragonite_Lv45SlamEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Dragonite_Lv45Slam_MultiplierEffect
-	dbw EFFECTCMDTYPE_AI, Dragonite_Lv45Slam_AIEffect
+DragoniteLv45SlamEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, DragoniteLv45Slam_MultiplierEffect
+	dbw EFFECTCMDTYPE_AI, DragoniteLv45Slam_AIEffect
 	db  $00

 SnorlaxThickSkinnedEffectCommands:
@@ -1376,9 +1376,9 @@ DragoniteHealingWindEffectCommands:
 	dbw EFFECTCMDTYPE_PKMN_POWER_TRIGGER, HealingWind_PlayAreaHealEffect
 	db  $00

-Dragonite_Lv41SlamEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Dragonite_Lv41Slam_MultiplierEffect
-	dbw EFFECTCMDTYPE_AI, Dragonite_Lv41Slam_AIEffect
+DragoniteLv41SlamEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, DragoniteLv41Slam_MultiplierEffect
+	dbw EFFECTCMDTYPE_AI, DragoniteLv41Slam_AIEffect
 	db  $00

 MeowthCatPunchEffectCommands:
--- a/src/engine/duel/effect_functions.asm
+++ b/src/engine/duel/effect_functions.asm
@@ -3490,7 +3490,7 @@ IceBreath_RandomPokemonDamageEffect: ; 2d32e (b:532e)
 FocusEnergyEffect: ; 2d33f (b:533f)
 	ld a, [wTempTurnDuelistCardID]
 	cp VAPOREON_LV29
-	ret nz ; return if no Vaporeon_Lv29
+	ret nz ; return if no VaporeonLv29
 	ld a, SUBSTATUS1_NEXT_TURN_DOUBLE_DAMAGE
 	call ApplySubstatus1ToDefendingCard
 	ret
@@ -3818,12 +3818,12 @@ Wildfire_DiscardDeckEffect: ; 2d4f4 (b:54f4)
 	call SwapTurn
 	ret

-Moltres_Lv35DiveBomb_AIEffect: ; 2d523 (b:5523)
+MoltresLv35DiveBomb_AIEffect: ; 2d523 (b:5523)
 	ld a, 80 / 2
 	lb de, 0, 80
 	jp SetExpectedAIDamage

-Moltres_Lv35DiveBomb_Success50PercentEffect: ; 2d52b (b:552b)
+MoltresLv35DiveBomb_Success50PercentEffect: ; 2d52b (b:552b)
 	ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText
 	call TossCoin_BankB
 	jr c, .heads
@@ -4231,12 +4231,12 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2)
 	call Func_2c0bd
 	ret

-Moltres_Lv37DiveBomb_AIEffect: ; 2d76e (b:576e)
+MoltresLv37DiveBomb_AIEffect: ; 2d76e (b:576e)
 	ld a, 70 / 2
 	lb de, 0, 70
 	jp SetExpectedAIDamage

-Moltres_Lv37DiveBomb_Success50PercentEffect: ; 2d776 (b:5776)
+MoltresLv37DiveBomb_Success50PercentEffect: ; 2d776 (b:5776)
 	ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText
 	call TossCoin_BankB
 	jr c, .heads
@@ -5409,17 +5409,17 @@ Barrier_BarrierEffect: ; 2ddbf (b:5dbf)
 	call ApplySubstatus1ToDefendingCard
 	ret

-Mewtwo_Lv60AEnergyAbsorption_CheckDiscardPile: ; 2ddc5 (b:5dc5)
+MewtwoAltLV60EnergyAbsorption_CheckDiscardPile: ; 2ddc5 (b:5dc5)
 	call CreateEnergyCardListFromDiscardPile_AllEnergy
 	ldtx hl, ThereAreNoEnergyCardsInDiscardPileText
 	ret

-Mewtwo_Lv60AEnergyAbsorption_PlayerSelectEffect: ; 2ddcc (b:5dcc)
+MewtwoAltLV60EnergyAbsorption_PlayerSelectEffect: ; 2ddcc (b:5dcc)
 	ldtx hl, Choose2EnergyCardsFromDiscardPileToAttachText
 	call HandleEnergyCardsInDiscardPileSelection
 	ret

-Mewtwo_Lv60AEnergyAbsorption_AISelectEffect: ; 2ddd3 (b:5dd3)
+MewtwoAltLV60EnergyAbsorption_AISelectEffect: ; 2ddd3 (b:5dd3)
 ; AI picks first 2 energy cards
 	call CreateEnergyCardListFromDiscardPile_AllEnergy
 	ld hl, wDuelTempList
@@ -5438,7 +5438,7 @@ Mewtwo_Lv60AEnergyAbsorption_AISelectEffect: ; 2ddd3 (b:5dd3)
 	ld [de], a
 	ret

-Mewtwo_Lv60AEnergyAbsorption_AddToHandEffect: ; 2ddec (b:5dec)
+MewtwoAltLV60EnergyAbsorption_AddToHandEffect: ; 2ddec (b:5dec)
 	ld hl, hTempList
 .loop
 	ld a, [hli]
@@ -5451,17 +5451,17 @@ Mewtwo_Lv60AEnergyAbsorption_AddToHandEffect: ; 2ddec (b:5dec)
 	pop hl
 	jr .loop

-Mewtwo_Lv60EnergyAbsorption_CheckDiscardPile: ; 2ddff (b:5dff)
+MewtwoLv60EnergyAbsorption_CheckDiscardPile: ; 2ddff (b:5dff)
 	call CreateEnergyCardListFromDiscardPile_AllEnergy
 	ldtx hl, ThereAreNoEnergyCardsInDiscardPileText
 	ret

-Mewtwo_Lv60EnergyAbsorption_PlayerSelectEffect: ; 2de06 (b:5e06)
+MewtwoLv60EnergyAbsorption_PlayerSelectEffect: ; 2de06 (b:5e06)
 	ldtx hl, Choose2EnergyCardsFromDiscardPileToAttachText
 	call HandleEnergyCardsInDiscardPileSelection
 	ret

-Mewtwo_Lv60EnergyAbsorption_AISelectEffect: ; 2de0d (b:5e0d)
+MewtwoLv60EnergyAbsorption_AISelectEffect: ; 2de0d (b:5e0d)
 ; AI picks first 2 energy cards
 	call CreateEnergyCardListFromDiscardPile_AllEnergy
 	ld hl, wDuelTempList
@@ -5480,7 +5480,7 @@ Mewtwo_Lv60EnergyAbsorption_AISelectEffect: ; 2de0d (b:5e0d)
 	ld [de], a
 	ret

-Mewtwo_Lv60EnergyAbsorption_AddToHandEffect: ; 2de26 (b:5e26)
+MewtwoLv60EnergyAbsorption_AddToHandEffect: ; 2de26 (b:5e26)
 	ld hl, hTempList
 .loop
 	ld a, [hli]
@@ -6692,12 +6692,12 @@ Spark_BenchDamageEffect: ; 2e574 (b:6574)
 	call SwapTurn
 	ret

-Pikachu_Lv16GrowlEffect: ; 2e589 (b:6589)
+PikachuLv16GrowlEffect: ; 2e589 (b:6589)
 	ld a, SUBSTATUS2_GROWL
 	call ApplySubstatus2ToDefendingCard
 	ret

-Pikachu_Lv16AGrowlEffect: ; 2e58f (b:658f)
+PikachuAltLv16GrowlEffect: ; 2e58f (b:658f)
 	ld a, SUBSTATUS2_GROWL
 	call ApplySubstatus2ToDefendingCard
 	ret
@@ -7010,7 +7010,7 @@ Gigashock_BenchDamageEffect: ; 2e71f (b:671f)
 	call SwapTurn
 	ret

-Magneton_Lv28SelfdestructEffect: ; 2e739 (b:6739)
+MagnetonLv28SelfdestructEffect: ; 2e739 (b:6739)
 	ld a, 80
 	call DealRecoilDamageToSelf

@@ -7037,7 +7037,7 @@ MagnetonSonicboom_UnaffectedByColorEffect: ; 2e758 (b:6758)
 MagnetonSonicboom_NullEffect: ; 2e75e (b:675e)
 	ret

-Magneton_Lv35SelfdestructEffect: ; 2e75f (b:675f)
+MagnetonLv35SelfdestructEffect: ; 2e75f (b:675f)
 	ld a, 100
 	call DealRecoilDamageToSelf

@@ -7695,12 +7695,12 @@ StepIn_SwitchEffect: ; 2eae8 (b:6ae8)
 	set USED_PKMN_POWER_THIS_TURN_F, [hl]
 	ret

-Dragonite_Lv45Slam_AIEffect: ; 2eaf6 (b:6af6)
+DragoniteLv45Slam_AIEffect: ; 2eaf6 (b:6af6)
 	ld a, (40 * 2) / 2
 	lb de, 0, 80
 	jp SetExpectedAIDamage

-Dragonite_Lv45Slam_MultiplierEffect: ; 2eafe (b:6afe)
+DragoniteLv45Slam_MultiplierEffect: ; 2eafe (b:6afe)
 	ld hl, 40
 	call LoadTxRam3
 	ldtx de, DamageCheckIfHeadsXDamageText
@@ -8512,12 +8512,12 @@ HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53)

 	ret

-Dragonite_Lv41Slam_AIEffect: ; 2ef9c (b:6f9c)
+DragoniteLv41Slam_AIEffect: ; 2ef9c (b:6f9c)
 	ld a, (30 * 2) / 2
 	lb de, 0, 60
 	jp SetExpectedAIDamage

-Dragonite_Lv41Slam_MultiplierEffect: ; 2efa4 (b:6fa4)
+DragoniteLv41Slam_MultiplierEffect: ; 2efa4 (b:6fa4)
 	ld hl, 30
 	call LoadTxRam3
 	ldtx de, DamageCheckIfHeadsXDamageText
--- a/src/engine/link/card_pop.asm
+++ b/src/engine/link/card_pop.asm
@@ -239,7 +239,7 @@ LookUpNameInCardPopNameList:
 ; decided from the names of both participants
 ; the card will always be a Pokemon card that is not
 ; from a Promotional set, with the exception
-; of Venusaur_Lv64 and Mew_Lv15
+; of VenusaurLv64 and MewLv15
 ; output:
 ; - e = card ID chosen
 DecideCardToReceiveFromCardPop:
@@ -277,7 +277,7 @@ DecideCardToReceiveFromCardPop:
 ; 101/256 ~ 39% for Circle
 ;  90/256 ~ 35% for Diamond
 ;  63/256 ~ 25% for Star
-;   1/256 ~ .4% for Venusaur_Lv64 or Mew_Lv15
+;   1/256 ~ .4% for VenusaurLv64 or MewLv15
 	ld a, e
 	cp 5
 	jr z, .venusaur1_or_mew2
@@ -312,7 +312,7 @@ DecideCardToReceiveFromCardPop:
 	ret

 .venusaur1_or_mew2
-; choose either Venusaur_Lv64 or Mew_Lv15
+; choose either VenusaurLv64 or MewLv15
 ; depending on whether the lower
 ; bit of d is unset or set, respectively
 	ld a, MUSIC_MEDAL
--- a/src/engine/menus/card_album.asm
+++ b/src/engine/menus/card_album.asm
@@ -30,9 +30,9 @@ CreateCardSetList:
 ; it's same set as input
 	ld a, e
 	cp VENUSAUR_LV64
-	jp z, .SetVenusaur_Lv64OwnedFlag
+	jp z, .SetVenusaurLv64OwnedFlag
 	cp MEW_LV15
-	jp z, .SetMew_Lv15OwnedFlag
+	jp z, .SetMewLv15OwnedFlag

 	push bc
 	push hl
@@ -122,11 +122,11 @@ CreateCardSetList:
 	ld a, [wOwnedPhantomCardFlags]
 	bit VENUSAUR_OWNED_PHANTOM_F, a
 	jr z, .check_mew
-	call .PlaceVenusaur_Lv64InList
+	call .PlaceVenusaurLv64InList
 .check_mew
 	bit MEW_OWNED_PHANTOM_F, a
 	jr z, .find_first_owned
-	call .PlaceMew_Lv15InList
+	call .PlaceMewLv15InList

 .find_first_owned
 	dec l
@@ -155,7 +155,7 @@ CreateCardSetList:
 	ld [hl], a
 	ret

-.SetMew_Lv15OwnedFlag
+.SetMewLv15OwnedFlag
 	ld a, (1 << MEW_OWNED_PHANTOM_F)
 ;	fallthrough

@@ -176,11 +176,11 @@ CreateCardSetList:
 	pop hl
 	jp .loop_all_cards

-.SetVenusaur_Lv64OwnedFlag
+.SetVenusaurLv64OwnedFlag
 	ld a, (1 << VENUSAUR_OWNED_PHANTOM_F)
 	jr .SetPhantomOwnedFlag

-.PlaceVenusaur_Lv64InList
+.PlaceVenusaurLv64InList
 	push af
 	push hl
 	ld e, VENUSAUR_LV64
@@ -201,7 +201,7 @@ CreateCardSetList:
 	pop af
 	ret

-.PlaceMew_Lv15InList
+.PlaceMewLv15InList
 	push af
 	push hl
 	ld e, MEW_LV15
--- a/src/engine/overworld/scripting.asm
+++ b/src/engine/overworld/scripting.asm
@@ -1479,13 +1479,13 @@ ChallengeCupPrizeCards:
 	db PIKACHU_LV16
 	tx PikachuTradeCardName

-	db PIKACHU_LV16A
+	db PIKACHU_ALT_LV16
 	tx PikachuTradeCardName

 	db SURFING_PIKACHU_LV13
 	tx SurfingPikachuTradeCardName

-	db SURFING_PIKACHU_LV13A
+	db SURFING_PIKACHU_ALT_LV13
 	tx SurfingPikachuTradeCardName

 	db ELECTABUZZ_LV20
@@ -1494,7 +1494,7 @@ ChallengeCupPrizeCards:
 	db SLOWPOKE_LV9
 	tx SlowpokeTradeCardName

-	db MEWTWO_LV60A
+	db MEWTWO_ALT_LV60
 	tx MewtwoTradeCardName

 	db MEWTWO_LV60
--- a/src/engine/promotional_card.asm
+++ b/src/engine/promotional_card.asm
@@ -31,7 +31,7 @@ _ShowPromotionalCardScreen:
 	ldtx hl, ReceivedPromotionalSurfingPikachuText
 	cp SURFING_PIKACHU_LV13
 	jr z, .print_text
-	cp SURFING_PIKACHU_LV13A
+	cp SURFING_PIKACHU_ALT_LV13
 	jr z, .print_text
 	ldtx hl, ReceivedPromotionalCardText
 .print_text
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -1504,11 +1504,11 @@ IvysaurCardGfx::
 	INCBIN "gfx/cards/ivysaur.2bpp"
 	INCBIN "gfx/cards/ivysaur.pal"

-Venusaur_Lv64CardGfx::
+VenusaurLv64CardGfx::
 	INCBIN "gfx/cards/venusaur1.2bpp"
 	INCBIN "gfx/cards/venusaur1.pal"

-Venusaur_Lv67CardGfx::
+VenusaurLv67CardGfx::
 	INCBIN "gfx/cards/venusaur2.2bpp"
 	INCBIN "gfx/cards/venusaur2.pal"

@@ -1648,11 +1648,11 @@ WeezingCardGfx::
 	INCBIN "gfx/cards/weezing.2bpp"
 	INCBIN "gfx/cards/weezing.pal"

-Tangela_Lv8CardGfx::
+TangelaLv8CardGfx::
 	INCBIN "gfx/cards/tangela1.2bpp"
 	INCBIN "gfx/cards/tangela1.pal"

-Tangela_Lv12CardGfx::
+TangelaLv12CardGfx::
 	INCBIN "gfx/cards/tangela2.2bpp"
 	INCBIN "gfx/cards/tangela2.pal"

@@ -1680,11 +1680,11 @@ VulpixCardGfx::
 	INCBIN "gfx/cards/vulpix.2bpp"
 	INCBIN "gfx/cards/vulpix.pal"

-Ninetales_Lv32CardGfx::
+NinetalesLv32CardGfx::
 	INCBIN "gfx/cards/ninetales1.2bpp"
 	INCBIN "gfx/cards/ninetales1.pal"

-Ninetales_Lv35CardGfx::
+NinetalesLv35CardGfx::
 	INCBIN "gfx/cards/ninetales2.2bpp"
 	INCBIN "gfx/cards/ninetales2.pal"

@@ -1692,11 +1692,11 @@ GrowlitheCardGfx::
 	INCBIN "gfx/cards/growlithe.2bpp"
 	INCBIN "gfx/cards/growlithe.pal"

-Arcanine_Lv34CardGfx::
+ArcanineLv34CardGfx::
 	INCBIN "gfx/cards/arcanine1.2bpp"
 	INCBIN "gfx/cards/arcanine1.pal"

-Arcanine_Lv45CardGfx::
+ArcanineLv45CardGfx::
 	INCBIN "gfx/cards/arcanine2.2bpp"
 	INCBIN "gfx/cards/arcanine2.pal"

@@ -1708,23 +1708,23 @@ RapidashCardGfx::
 	INCBIN "gfx/cards/rapidash.2bpp"
 	INCBIN "gfx/cards/rapidash.pal"

-Magmar_Lv24CardGfx::
+MagmarLv24CardGfx::
 	INCBIN "gfx/cards/magmar1.2bpp"
 	INCBIN "gfx/cards/magmar1.pal"

-Magmar_Lv31CardGfx::
+MagmarLv31CardGfx::
 	INCBIN "gfx/cards/magmar2.2bpp"
 	INCBIN "gfx/cards/magmar2.pal"

-Flareon_Lv22CardGfx::
+FlareonLv22CardGfx::
 	INCBIN "gfx/cards/flareon1.2bpp"
 	INCBIN "gfx/cards/flareon1.pal"

-Flareon_Lv28CardGfx::
+FlareonLv28CardGfx::
 	INCBIN "gfx/cards/flareon2.2bpp"
 	INCBIN "gfx/cards/flareon2.pal"

-Moltres_Lv35CardGfx::
+MoltresLv35CardGfx::
 	INCBIN "gfx/cards/moltres1.2bpp"
 	INCBIN "gfx/cards/moltres1.pal"

@@ -1732,7 +1732,7 @@ Moltres_Lv35CardGfx::

 SECTION "Card Gfx 4", ROMX

-Moltres_Lv37CardGfx::
+MoltresLv37CardGfx::
 	INCBIN "gfx/cards/moltres2.2bpp"
 	INCBIN "gfx/cards/moltres2.pal"

@@ -1840,11 +1840,11 @@ LaprasCardGfx::
 	INCBIN "gfx/cards/lapras.2bpp"
 	INCBIN "gfx/cards/lapras.pal"

-Vaporeon_Lv29CardGfx::
+VaporeonLv29CardGfx::
 	INCBIN "gfx/cards/vaporeon1.2bpp"
 	INCBIN "gfx/cards/vaporeon1.pal"

-Vaporeon_Lv42CardGfx::
+VaporeonLv42CardGfx::
 	INCBIN "gfx/cards/vaporeon2.2bpp"
 	INCBIN "gfx/cards/vaporeon2.pal"

@@ -1856,27 +1856,27 @@ OmastarCardGfx::
 	INCBIN "gfx/cards/omastar.2bpp"
 	INCBIN "gfx/cards/omastar.pal"

-Articuno_Lv35CardGfx::
+ArticunoLv35CardGfx::
 	INCBIN "gfx/cards/articuno1.2bpp"
 	INCBIN "gfx/cards/articuno1.pal"

-Articuno_Lv37CardGfx::
+ArticunoLv37CardGfx::
 	INCBIN "gfx/cards/articuno2.2bpp"
 	INCBIN "gfx/cards/articuno2.pal"

-Pikachu_Lv12CardGfx::
+PikachuLv12CardGfx::
 	INCBIN "gfx/cards/pikachu1.2bpp"
 	INCBIN "gfx/cards/pikachu1.pal"

-Pikachu_Lv14CardGfx::
+PikachuLv14CardGfx::
 	INCBIN "gfx/cards/pikachu2.2bpp"
 	INCBIN "gfx/cards/pikachu2.pal"

-Pikachu_Lv16CardGfx::
+PikachuLv16CardGfx::
 	INCBIN "gfx/cards/pikachu3.2bpp"
 	INCBIN "gfx/cards/pikachu3.pal"

-Pikachu_Lv16ACardGfx::
+PikachuAltLv16CardGfx::
 	INCBIN "gfx/cards/pikachu4.2bpp"
 	INCBIN "gfx/cards/pikachu4.pal"

@@ -1884,23 +1884,23 @@ FlyingPikachuCardGfx::
 	INCBIN "gfx/cards/flyingpikachu.2bpp"
 	INCBIN "gfx/cards/flyingpikachu.pal"

-SurfingPikachu_Lv13CardGfx::
+SurfingPikachuLv13CardGfx::
 	INCBIN "gfx/cards/surfingpikachu1.2bpp"
 	INCBIN "gfx/cards/surfingpikachu1.pal"

-SurfingPikachu_Lv13ACardGfx::
+SurfingPikachuAltLv13CardGfx::
 	INCBIN "gfx/cards/surfingpikachu2.2bpp"
 	INCBIN "gfx/cards/surfingpikachu2.pal"

-Raichu_Lv40CardGfx::
+RaichuLv40CardGfx::
 	INCBIN "gfx/cards/raichu1.2bpp"
 	INCBIN "gfx/cards/raichu1.pal"

-Raichu_Lv45CardGfx::
+RaichuLv45CardGfx::
 	INCBIN "gfx/cards/raichu2.2bpp"
 	INCBIN "gfx/cards/raichu2.pal"

-Magnemite_Lv13CardGfx::
+MagnemiteLv13CardGfx::
 	INCBIN "gfx/cards/magnemite1.2bpp"
 	INCBIN "gfx/cards/magnemite1.pal"

@@ -1908,15 +1908,15 @@ Magnemite_Lv13CardGfx::

 SECTION "Card Gfx 6", ROMX

-Magnemite_Lv15CardGfx::
+MagnemiteLv15CardGfx::
 	INCBIN "gfx/cards/magnemite2.2bpp"
 	INCBIN "gfx/cards/magnemite2.pal"

-Magneton_Lv28CardGfx::
+MagnetonLv28CardGfx::
 	INCBIN "gfx/cards/magneton1.2bpp"
 	INCBIN "gfx/cards/magneton1.pal"

-Magneton_Lv35CardGfx::
+MagnetonLv35CardGfx::
 	INCBIN "gfx/cards/magneton2.2bpp"
 	INCBIN "gfx/cards/magneton2.pal"

@@ -1924,39 +1924,39 @@ VoltorbCardGfx::
 	INCBIN "gfx/cards/voltorb.2bpp"
 	INCBIN "gfx/cards/voltorb.pal"

-Electrode_Lv35CardGfx::
+ElectrodeLv35CardGfx::
 	INCBIN "gfx/cards/electrode1.2bpp"
 	INCBIN "gfx/cards/electrode1.pal"

-Electrode_Lv42CardGfx::
+ElectrodeLv42CardGfx::
 	INCBIN "gfx/cards/electrode2.2bpp"
 	INCBIN "gfx/cards/electrode2.pal"

-Electabuzz_Lv20CardGfx::
+ElectabuzzLv20CardGfx::
 	INCBIN "gfx/cards/electabuzz1.2bpp"
 	INCBIN "gfx/cards/electabuzz1.pal"

-Electabuzz_Lv35CardGfx::
+ElectabuzzLv35CardGfx::
 	INCBIN "gfx/cards/electabuzz2.2bpp"
 	INCBIN "gfx/cards/electabuzz2.pal"

-Jolteon_Lv24CardGfx::
+JolteonLv24CardGfx::
 	INCBIN "gfx/cards/jolteon1.2bpp"
 	INCBIN "gfx/cards/jolteon1.pal"

-Jolteon_Lv29CardGfx::
+JolteonLv29CardGfx::
 	INCBIN "gfx/cards/jolteon2.2bpp"
 	INCBIN "gfx/cards/jolteon2.pal"

-Zapdos_Lv40CardGfx::
+ZapdosLv40CardGfx::
 	INCBIN "gfx/cards/zapdos1.2bpp"
 	INCBIN "gfx/cards/zapdos1.pal"

-Zapdos_Lv64CardGfx::
+ZapdosLv64CardGfx::
 	INCBIN "gfx/cards/zapdos2.2bpp"
 	INCBIN "gfx/cards/zapdos2.pal"

-Zapdos_Lv68CardGfx::
+ZapdosLv68CardGfx::
 	INCBIN "gfx/cards/zapdos3.2bpp"
 	INCBIN "gfx/cards/zapdos3.pal"

@@ -2020,11 +2020,11 @@ CuboneCardGfx::
 	INCBIN "gfx/cards/cubone.2bpp"
 	INCBIN "gfx/cards/cubone.pal"

-Marowak_Lv26CardGfx::
+MarowakLv26CardGfx::
 	INCBIN "gfx/cards/marowak1.2bpp"
 	INCBIN "gfx/cards/marowak1.pal"

-Marowak_Lv32CardGfx::
+MarowakLv32CardGfx::
 	INCBIN "gfx/cards/marowak2.2bpp"
 	INCBIN "gfx/cards/marowak2.pal"

@@ -2068,11 +2068,11 @@ AlakazamCardGfx::
 	INCBIN "gfx/cards/alakazam.2bpp"
 	INCBIN "gfx/cards/alakazam.pal"

-Slowpoke_Lv9CardGfx::
+SlowpokeLv9CardGfx::
 	INCBIN "gfx/cards/slowpoke1.2bpp"
 	INCBIN "gfx/cards/slowpoke1.pal"

-Slowpoke_Lv18CardGfx::
+SlowpokeLv18CardGfx::
 	INCBIN "gfx/cards/slowpoke2.2bpp"
 	INCBIN "gfx/cards/slowpoke2.pal"

@@ -2084,19 +2084,19 @@ SlowbroCardGfx::

 SECTION "Card Gfx 8", ROMX

-Gastly_Lv8CardGfx::
+GastlyLv8CardGfx::
 	INCBIN "gfx/cards/gastly1.2bpp"
 	INCBIN "gfx/cards/gastly1.pal"

-Gastly_Lv17CardGfx::
+GastlyLv17CardGfx::
 	INCBIN "gfx/cards/gastly2.2bpp"
 	INCBIN "gfx/cards/gastly2.pal"

-Haunter_Lv17CardGfx::
+HaunterLv17CardGfx::
 	INCBIN "gfx/cards/haunter1.2bpp"
 	INCBIN "gfx/cards/haunter1.pal"

-Haunter_Lv22CardGfx::
+HaunterLv22CardGfx::
 	INCBIN "gfx/cards/haunter2.2bpp"
 	INCBIN "gfx/cards/haunter2.pal"

@@ -2120,27 +2120,27 @@ JynxCardGfx::
 	INCBIN "gfx/cards/jynx.2bpp"
 	INCBIN "gfx/cards/jynx.pal"

-Mewtwo_Lv53CardGfx::
+MewtwoLv53CardGfx::
 	INCBIN "gfx/cards/mewtwo1.2bpp"
 	INCBIN "gfx/cards/mewtwo1.pal"

-Mewtwo_Lv60CardGfx::
+MewtwoLv60CardGfx::
 	INCBIN "gfx/cards/mewtwo2.2bpp"
 	INCBIN "gfx/cards/mewtwo2.pal"

-Mewtwo_Lv60ACardGfx::
+MewtwoAltLV60CardGfx::
 	INCBIN "gfx/cards/mewtwo3.2bpp"
 	INCBIN "gfx/cards/mewtwo3.pal"

-Mew_Lv8CardGfx::
+MewLv8CardGfx::
 	INCBIN "gfx/cards/mew1.2bpp"
 	INCBIN "gfx/cards/mew1.pal"

-Mew_Lv15CardGfx::
+MewLv15CardGfx::
 	INCBIN "gfx/cards/mew2.2bpp"
 	INCBIN "gfx/cards/mew2.pal"

-Mew_Lv23CardGfx::
+MewLv23CardGfx::
 	INCBIN "gfx/cards/mew3.2bpp"
 	INCBIN "gfx/cards/mew3.pal"

@@ -2188,15 +2188,15 @@ ClefableCardGfx::
 	INCBIN "gfx/cards/clefable.2bpp"
 	INCBIN "gfx/cards/clefable.pal"

-Jigglypuff_Lv12CardGfx::
+JigglypuffLv12CardGfx::
 	INCBIN "gfx/cards/jigglypuff1.2bpp"
 	INCBIN "gfx/cards/jigglypuff1.pal"

-Jigglypuff_Lv13CardGfx::
+JigglypuffLv13CardGfx::
 	INCBIN "gfx/cards/jigglypuff2.2bpp"
 	INCBIN "gfx/cards/jigglypuff2.pal"

-Jigglypuff_Lv14CardGfx::
+JigglypuffLv14CardGfx::
 	INCBIN "gfx/cards/jigglypuff3.2bpp"
 	INCBIN "gfx/cards/jigglypuff3.pal"

@@ -2204,11 +2204,11 @@ WigglytuffCardGfx::
 	INCBIN "gfx/cards/wigglytuff.2bpp"
 	INCBIN "gfx/cards/wigglytuff.pal"

-Meowth_Lv14CardGfx::
+MeowthLv14CardGfx::
 	INCBIN "gfx/cards/meowth1.2bpp"
 	INCBIN "gfx/cards/meowth1.pal"

-Meowth_Lv15CardGfx::
+MeowthLv15CardGfx::
 	INCBIN "gfx/cards/meowth2.2bpp"
 	INCBIN "gfx/cards/meowth2.pal"

@@ -2272,11 +2272,11 @@ DragonairCardGfx::
 	INCBIN "gfx/cards/dragonair.2bpp"
 	INCBIN "gfx/cards/dragonair.pal"

-Dragonite_Lv41CardGfx::
+DragoniteLv41CardGfx::
 	INCBIN "gfx/cards/dragonite1.2bpp"
 	INCBIN "gfx/cards/dragonite1.pal"

-Dragonite_Lv45CardGfx::
+DragoniteLv45CardGfx::
 	INCBIN "gfx/cards/dragonite2.2bpp"
 	INCBIN "gfx/cards/dragonite2.pal"

--- a/src/scripts/fighting_club_lobby.asm
+++ b/src/scripts/fighting_club_lobby.asm
@@ -63,8 +63,8 @@ Script_Man1:

 .ows_dcd7
 	print_npc_text Text0463
-	give_card PIKACHU_LV16A
-	show_card_received_screen PIKACHU_LV16A
+	give_card PIKACHU_ALT_LV16
+	show_card_received_screen PIKACHU_ALT_LV16
 	print_npc_text Text0464
 	set_event EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE
 	quit_script_fully
--- a/src/scripts/ishiharas_house.asm
+++ b/src/scripts/ishiharas_house.asm
@@ -186,8 +186,8 @@ Script_Ishihara:
 	print_npc_text Text072f
 	print_text Text073c
 	take_card CHANSEY
-	give_card SURFING_PIKACHU_LV13A
-	show_card_received_screen SURFING_PIKACHU_LV13A
+	give_card SURFING_PIKACHU_ALT_LV13
+	show_card_received_screen SURFING_PIKACHU_ALT_LV13
 	print_text_quit_fully Text073d

 .ows_dc3e
--- a/src/scripts/psychic_club_lobby.asm
+++ b/src/scripts/psychic_club_lobby.asm
@@ -61,8 +61,8 @@ Script_Pappy1:
 .ows_e9cb
 	test_if_event_zero EVENT_PAPPY1_STATE
 	print_variable_npc_text Text0660, Text0661
-	give_card MEWTWO_LV60A
-	show_card_received_screen MEWTWO_LV60A
+	give_card MEWTWO_ALT_LV60
+	show_card_received_screen MEWTWO_ALT_LV60
 	set_event EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_COMPLETE
 	print_text_quit_fully Text0662

--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -706,7 +706,7 @@ VineName: ; 59bcd (16:5bcd)
 	text "Vine"
 	done

-Tangela_Lv8Description: ; 59bd3 (16:5bd3)
+TangelaLv8Description: ; 59bd3 (16:5bd3)
 	text "Its whole body is swathed with wide"
 	line "vines that are similar to seaweed."
 	line "These vines shake as it walks."
@@ -716,7 +716,7 @@ PoisonWhipName: ; 59c3a (16:5c3a)
 	text "Poison Whip"
 	done

-Tangela_Lv12Description: ; 59c47 (16:5c47)
+TangelaLv12Description: ; 59c47 (16:5c47)
 	text "Its identity is obscured by masses"
 	line "of thick, blue vines. The vines are"
 	line "said to never stop growing."
@@ -889,7 +889,7 @@ FireBlastDescription: ; 5a23d (16:623d)
 	line "attack."
 	done

-Ninetales_Lv32Description: ; 5a28a (16:628a)
+NinetalesLv32Description: ; 5a28a (16:628a)
 	text "Very smart and very vengeful."
 	line "Grabbing one of its many tails could"
 	line "result in a 1,000-year curse."
@@ -924,7 +924,7 @@ DancingEmbersDescription: ; 5a441 (16:6441)
 	line "damage times the number of heads."
 	done

-Ninetales_Lv35Description: ; 5a486 (16:6486)
+NinetalesLv35Description: ; 5a486 (16:6486)
 	text "According to an enduring legend,"
 	line "9 noble heroes were united and"
 	line "reincarnated as this."
@@ -979,7 +979,7 @@ LegendaryName: ; 5a689 (16:6689)
 	text "Legendary"
 	done

-Arcanine_Lv34Description: ; 5a694 (16:6694)
+ArcanineLv34Description: ; 5a694 (16:6694)
 	text "A legendary Pokémon famous for its"
 	line "beauty. It looks almost as if it"
 	line "flies when it runs."
@@ -999,7 +999,7 @@ TakeDownDescription: ; 5a744 (16:6744)
 	text "Arcanine does 30 damage to itself."
 	done

-Arcanine_Lv45Description: ; 5a768 (16:6768)
+ArcanineLv45Description: ; 5a768 (16:6768)
 	text "A Pokémon that has been long admired"
 	line "for its beauty. It runs gracefully,"
 	line "as if on wings."
@@ -1076,7 +1076,7 @@ SpitfireName: ; 5aa09 (16:6a09)
 	text "Spitfire"
 	done

-Magmar_Lv24Description: ; 5aa13 (16:6a13)
+MagmarLv24Description: ; 5aa13 (16:6a13)
 	text "Its body always burns with an orange"
 	line "glow that enables it to hide"
 	line "perfectly among flames."
@@ -1093,7 +1093,7 @@ MagmarsSmokescreenDescription: ; 5aa7b (16:6a7b)
 	line "tails, that attack does nothing."
 	done

-Magmar_Lv31Description: ; 5ab07 (16:6b07)
+MagmarLv31Description: ; 5ab07 (16:6b07)
 	text "Found at the mouths of volcanoes and"
 	line "extremely hard to spot. There are"
 	line "very few instances of capturing this"
@@ -1121,7 +1121,7 @@ FlareonsRageDescription: ; 5ab99 (16:6b99)
 	line "for each damage counter on Flareon."
 	done

-Flareon_Lv22Description: ; 5abe1 (16:6be1)
+FlareonLv22Description: ; 5abe1 (16:6be1)
 	text "It has a flame chamber inside its"
 	line "body. It inhales, then blows out"
 	line "fire that is over 3,000 degrees."
@@ -1132,7 +1132,7 @@ FlareonsFlamethrowerDescription: ; 5ac46 (16:6c46)
 	line "Flareon in order to use this attack."
 	done

-Flareon_Lv28Description: ; 5ac91 (16:6c91)
+FlareonLv28Description: ; 5ac91 (16:6c91)
 	text "When storing thermal energy in its"
 	line "body, its temperature could soar to"
 	line "over 1,600 degrees."
@@ -1158,7 +1158,7 @@ DiveBombName: ; 5ada6 (16:6da6)
 	text "Dive Bomb"
 	done

-Moltres_Lv35Description: ; 5adb1 (16:6db1)
+MoltresLv35Description: ; 5adb1 (16:6db1)
 	text "Known as the legendary bird of fire."
 	line "Every flap of its wings creates a"
 	line "dazzling flash of flames."
@@ -1177,7 +1177,7 @@ FiregiverDescription: ; 5ae1e (16:6e1e)
 	line "deck afterward."
 	done

-Moltres_Lv37Description: ; 5aed3 (16:6ed3)
+MoltresLv37Description: ; 5aed3 (16:6ed3)
 	text "A legendary bird Pokémon. As it"
 	line "flaps its flaming wings, even the"
 	line "night sky will turn red."
--- a/src/text/text11.asm
+++ b/src/text/text11.asm
@@ -193,7 +193,7 @@ BubbleJetName: ; 5c70b (17:470b)
 	text "Bubble Jet"
 	done

-Vaporeon_Lv29Description: ; 5c717 (17:4717)
+VaporeonLv29Description: ; 5c717 (17:4717)
 	text "Its cell structure is similar to"
 	line "water molecules. It will melt away"
 	line "and become invisible in water."
@@ -207,7 +207,7 @@ VaporeonsWaterGunDescription: ; 5c77b (17:477b)
 	line "add more than 20 damage in this way."
 	done

-Vaporeon_Lv42Description: ; 5c829 (17:4829)
+VaporeonLv42Description: ; 5c829 (17:4829)
 	text "Lives close to water. Its long tail"
 	line "is ridged with a fin that is often"
 	line "mistaken for a mermaid's."
@@ -294,7 +294,7 @@ FreezeName: ; 5cc5b (17:4c5b)
 	text "Freeze"
 	done

-Articuno_Lv35Description: ; 5cc63 (17:4c63)
+ArticunoLv35Description: ; 5cc63 (17:4c63)
 	text "A legendary bird Pokémon that is"
 	line "said to appear to doomed people who"
 	line "are lost in icy mountains."
@@ -325,7 +325,7 @@ IceBreathDescription: ; 5cd63 (17:4d63)
 	line "happen.)"
 	done

-Articuno_Lv37Description: ; 5ce35 (17:4e35)
+ArticunoLv37Description: ; 5ce35 (17:4e35)
 	text "A legendary bird Pokémon. It freezes"
 	line "water that is contained in winter"
 	line "air and makes it snow."
@@ -352,7 +352,7 @@ MouseName: ; 5ceeb (17:4eeb)
 	text "Mouse"
 	done

-Pikachu_Lv12Description: ; 5cef2 (17:4ef2)
+PikachuLv12Description: ; 5cef2 (17:4ef2)
 	text "When several of these Pokémon"
 	line "gather, their electricity can cause"
 	line "lightning storms."
@@ -370,7 +370,7 @@ SparkDescription: ; 5cf4e (17:4f4e)
 	line "Benched Pokémon.)"
 	done

-Pikachu_Lv14Description: ; 5cfeb (17:4feb)
+PikachuLv14Description: ; 5cfeb (17:4feb)
 	text "When several of these Pokémon"
 	line "gather, their electricity can build"
 	line "and cause lightning storms."
@@ -394,7 +394,7 @@ ThundershockName: ; 5d12f (17:512f)
 	text "Thundershock"
 	done

-Pikachu_Lv16Description: ; 5d13d (17:513d)
+PikachuLv16Description: ; 5d13d (17:513d)
 	text "When several of these Pokémon"
 	line "gather, their electricity could"
 	line "build and cause lightning storms."
@@ -457,7 +457,7 @@ RaichusThunderDescription: ; 5d3ae (17:53ae)
 	line "30 damage to itself."
 	done

-Raichu_Lv40Description: ; 5d3e7 (17:53e7)
+RaichuLv40Description: ; 5d3e7 (17:53e7)
 	text "Its long tail serves as a ground to"
 	line "protect itself from its own"
 	line "high-voltage power."
@@ -477,7 +477,7 @@ GigashockDescription: ; 5d447 (17:5447)
 	line "damage to each of them."
 	done

-Raichu_Lv45Description: ; 5d531 (17:5531)
+RaichuLv45Description: ; 5d531 (17:5531)
 	text "Its long tail serves as a ground to"
 	line "protect itself from its own high"
 	line "voltage power."
@@ -503,7 +503,7 @@ MagnetName: ; 5d636 (17:5636)
 	text "Magnet"
 	done

-Magnemite_Lv13Description: ; 5d63e (17:563e)
+MagnemiteLv13Description: ; 5d63e (17:563e)
 	text "Uses anti-gravity to stay suspended."
 	line "Appears without warning and uses"
 	line "attacks like Thunder Wave."
@@ -519,7 +519,7 @@ MagneticStormDescription: ; 5d6b0 (17:56b0)
 	line "reattach each of them."
 	done

-Magnemite_Lv15Description: ; 5d70f (17:570f)
+MagnemiteLv15Description: ; 5d70f (17:570f)
 	text "It is born with the ability to defy"
 	line "gravity. Floats in air on powerful"
 	line "electromagnetic waves."
@@ -529,7 +529,7 @@ MagnetonName: ; 5d76e (17:576e)
 	text "Magneton"
 	done

-Magneton_Lv28sSelfdestructDescription: ; 5d778 (17:5778)
+MagnetonLv28sSelfdestructDescription: ; 5d778 (17:5778)
 	text "Does 20 damage to each Pokémon on"
 	line "each player's Bench. (Don't apply"
 	line "Weakness and Resistance for Benched"
@@ -537,7 +537,7 @@ Magneton_Lv28sSelfdestructDescription: ; 5d778 (17:5778)
 	line "Magneton does 80 damage to itself."
 	done

-Magneton_Lv28Description: ; 5d80e (17:580e)
+MagnetonLv28Description: ; 5d80e (17:580e)
 	text "Formed by several Magnemites linked"
 	line "together. It frequently appears when"
 	line "sunspots flare up."
@@ -555,7 +555,7 @@ SonicboomDescription: ; 5d876 (17:5876)
 	line "happen.)"
 	done

-Magneton_Lv35sSelfdestructDescription: ; 5d907 (17:5907)
+MagnetonLv35sSelfdestructDescription: ; 5d907 (17:5907)
 	text "Does 20 damage to each Pokémon on"
 	line "each player's Bench. (Don't apply"
 	line "Weakness and Resistance for Benched"
@@ -563,7 +563,7 @@ Magneton_Lv35sSelfdestructDescription: ; 5d907 (17:5907)
 	line "to itself."
 	done

-Magneton_Lv35Description: ; 5d99e (17:599e)
+MagnetonLv35Description: ; 5d99e (17:599e)
 	text "Formed by several Magnemites linked"
 	line "together. They frequently appear"
 	line "when sunspots flare up."
@@ -598,7 +598,7 @@ EnergySpikeDescription: ; 5da80 (17:5a80)
 	line "afterward."
 	done

-Electrode_Lv35Description: ; 5daeb (17:5aeb)
+ElectrodeLv35Description: ; 5daeb (17:5aeb)
 	text "Stores electrical energy inside its"
 	line "body. Even the slightest shock could"
 	line "trigger a huge explosion."
@@ -616,7 +616,7 @@ ChainLightningDescription: ; 5db60 (17:5b60)
 	line "Pokémon (including your own)."
 	done

-Electrode_Lv42Description: ; 5dbfe (17:5bfe)
+ElectrodeLv42Description: ; 5dbfe (17:5bfe)
 	text "It stores electrical energy under"
 	line "very high pressure. It often"
 	line "explodes with little or no"
@@ -657,7 +657,7 @@ ElectricName: ; 5ddec (17:5dec)
 	text "Electric"
 	done

-Electabuzz_Lv20Description: ; 5ddf6 (17:5df6)
+ElectabuzzLv20Description: ; 5ddf6 (17:5df6)
 	text "A wild Pokémon with a short temper."
 	line "It is able to distinguish colors"
 	line "and likes the color red."
@@ -675,7 +675,7 @@ ThunderpunchDescription: ; 5de63 (17:5e63)
 	line "itself."
 	done

-Electabuzz_Lv35Description: ; 5def9 (17:5ef9)
+ElectabuzzLv35Description: ; 5def9 (17:5ef9)
 	text "Normally found near power plants,"
 	line "it can wander away and cause major"
 	line "blackouts in cities."
@@ -698,7 +698,7 @@ LightningName: ; 5dfaf (17:5faf)
 	text "Lightning"
 	done

-Jolteon_Lv24Description: ; 5dfba (17:5fba)
+JolteonLv24Description: ; 5dfba (17:5fba)
 	text "A sensitive Pokémon that easily"
 	line "becomes sad or angry. Every time"
 	line "its mood changes, it charges power."
@@ -713,7 +713,7 @@ QuadrupleAttackX20Description: ; 5e02d (17:602d)
 	line "damage times the number of heads."
 	done

-Jolteon_Lv29Description: ; 5e072 (17:6072)
+JolteonLv29Description: ; 5e072 (17:6072)
 	text "It accumulates negative ions from"
 	line "the atmosphere to blast out 10,000-"
 	line "volt lightning bolts."
@@ -737,7 +737,7 @@ ThunderstormDescription: ; 5e0e5 (17:60e5)
 	line "the number of tails to itself."
 	done

-Zapdos_Lv40Description: ; 5e1d2 (17:61d2)
+ZapdosLv40Description: ; 5e1d2 (17:61d2)
 	text "A legendary thunderbird Pokémon"
 	line "whose anger is said to cause storms."
 	line "Some say it has lived above the"
@@ -758,7 +758,7 @@ ThunderboltDescription: ; 5e29d (17:629d)
 	line "Zapdos in order to use this attack."
 	done

-Zapdos_Lv64Description: ; 5e2e7 (17:62e7)
+ZapdosLv64Description: ; 5e2e7 (17:62e7)
 	text "A legendary bird Pokémon said to"
 	line "appear from clouds while wielding"
 	line "enormous lightning bolts."
@@ -790,7 +790,7 @@ BigThunderDescription: ; 5e40d (17:640d)
 	line "and Resistance still happen.)"
 	done

-Zapdos_Lv68Description: ; 5e4f8 (17:64f8)
+ZapdosLv68Description: ; 5e4f8 (17:64f8)
 	text "This legendary bird Pokémon is said"
 	line "to appear when the sky turns dark"
 	line "and lightning showers down."
@@ -1156,7 +1156,7 @@ BonekeeperName: ; 5f3e9 (17:73e9)
 	text "Bonekeeper"
 	done

-Marowak_Lv26Description: ; 5f3f5 (17:73f5)
+MarowakLv26Description: ; 5f3f5 (17:73f5)
 	text "The bone it holds is its key weapon."
 	line "It throws the bone skillfully like"
 	line "a boomerang to K.O. targets."
@@ -1186,7 +1186,7 @@ WailDescription: ; 5f4cb (17:74cb)
 	line "or her deck afterward."
 	done

-Marowak_Lv32Description: ; 5f5b6 (17:75b6)
+MarowakLv32Description: ; 5f5b6 (17:75b6)
 	text "Small and weak, this Pokémon is"
 	line "adept with its bone club. It has"
 	line "grown more vicious over the ages."
--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@@ -29,7 +29,7 @@ DopeyName: ; 601c8 (18:41c8)
 	text "Dopey"
 	done

-Slowpoke_Lv9Description: ; 601cf (18:41cf)
+SlowpokeLv9Description: ; 601cf (18:41cf)
 	text "Incredibly slow and dopey. It takes"
 	line "5 seconds for it to feel pain when"
 	line "under attack."
@@ -114,7 +114,7 @@ GasName: ; 605bf (18:45bf)
 	text "Gas"
 	done

-Gastly_Lv8Description: ; 605c4 (18:45c4)
+GastlyLv8Description: ; 605c4 (18:45c4)
 	text "Almost invisible, this gaseous"
 	line "Pokémon cloaks the target and puts"
 	line "it to sleep without notice."
@@ -134,7 +134,7 @@ EnergyConversionDescription: ; 6063c (18:463c)
 	line "does 10 damage to itself."
 	done

-Gastly_Lv17Description: ; 6069e (18:469e)
+GastlyLv17Description: ; 6069e (18:469e)
 	text "A mysterious Pokémon. Some say it is"
 	line "a lifeform from another dimension,"
 	line "while others believe it is formed"
@@ -345,7 +345,7 @@ GeneticName: ; 60ff3 (18:4ff3)
 	text "Genetic"
 	done

-Mewtwo_Lv53Description: ; 60ffc (18:4ffc)
+MewtwoLv53Description: ; 60ffc (18:4ffc)
 	text "A scientist created this Pokémon"
 	line "after years of horrific"
 	line "gene-splicing and DNA engineering"
@@ -366,7 +366,7 @@ PsyburnName: ; 610c7 (18:50c7)
 	text "Psyburn"
 	done

-Mewtwo_Lv60Description: ; 610d0 (18:50d0)
+MewtwoLv60Description: ; 610d0 (18:50d0)
 	text "Years of genetic experiments"
 	line "resulted in the creation of this"
 	line "never-before-seen violent Pokémon."
@@ -393,7 +393,7 @@ NewSpeciesName: ; 611fa (18:51fa)
 	text "New Species"
 	done

-Mew_Lv8Description: ; 61207 (18:5207)
+MewLv8Description: ; 61207 (18:5207)
 	text "So rare that it is still said to be"
 	line "a mirage by many experts. Only a few"
 	line "people have seen it worldwide."
@@ -410,7 +410,7 @@ MysteryAttackDescription: ; 61280 (18:5280)
 	line "Pokémon."
 	done

-Mew_Lv15Description: ; 612f1 (18:52f1)
+MewLv15Description: ; 612f1 (18:52f1)
 	text "When viewed through a microscope, "
 	line "this Pokémon's short, fine, delicate"
 	line "hair can be seen."
@@ -695,7 +695,7 @@ BalloonName: ; 61f38 (18:5f38)
 	text "Balloon"
 	done

-Jigglypuff_Lv12Description: ; 61f41 (18:5f41)
+JigglypuffLv12Description: ; 61f41 (18:5f41)
 	text "When its huge eyes light up, it"
 	line "sings a mysteriously soothing"
 	line "melody that lulls its enemies to"
@@ -725,7 +725,7 @@ ExpandDescription: ; 62056 (18:6056)
 	line "Resistance)."
 	done

-Jigglypuff_Lv13Description: ; 620d1 (18:60d1)
+JigglypuffLv13Description: ; 620d1 (18:60d1)
 	text "Uses its alluring eyes to enrapture"
 	line "its foe. It then sings a pleasing"
 	line "melody that lulls the foe to sleep."
@@ -735,7 +735,7 @@ LullabyName: ; 6213c (18:613c)
 	text "Lullaby"
 	done

-Jigglypuff_Lv14Description: ; 62145 (18:6145)
+JigglypuffLv14Description: ; 62145 (18:6145)
 	text "When its huge eyes light up, it"
 	line "sings a mysteriously soothing melody"
 	line "that lulls its enemies to sleep."
@@ -782,7 +782,7 @@ ScratchCatName: ; 62359 (18:6359)
 	text "Scratch Cat"
 	done

-Meowth_Lv14Description: ; 62366 (18:6366)
+MeowthLv14Description: ; 62366 (18:6366)
 	text "Appears to be more active at night."
 	line "It loves round and shiny things, so"
 	line "it can't stop from picking them up."
@@ -796,7 +796,7 @@ PayDayDescription: ; 623dc (18:63dc)
 	text "Flip a coin. If heads, draw a card."
 	done

-Meowth_Lv15Description: ; 62401 (18:6401)
+MeowthLv15Description: ; 62401 (18:6401)
 	text "Adores circular objects. Wanders"
 	line "the streets on a nightly basis to"
 	line "look for dropped loose change."
@@ -1164,7 +1164,7 @@ HealingWindDescription: ; 631f2 (18:71f2)
 	line "Pokémon."
 	done

-Dragonite_Lv41Description: ; 632a2 (18:72a2)
+DragoniteLv41Description: ; 632a2 (18:72a2)
 	text "It is said that this Pokémon lives"
 	line "somewhere in the sea and that it"
 	line "flies. However, it is only a rumor."
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1329,7 +1329,7 @@ VenusaursMegaDrainDescriptionCont: ; 578b7 (15:78b7)
 	line "them."
 	done

-Venusaur_Lv64Description: ; 578fd (15:78fd)
+VenusaurLv64Description: ; 578fd (15:78fd)
 	text "The flower on its back catches"
 	line "the sun's rays. The sunlight is then"
 	line "absorbed and used for energy."
@@ -1353,7 +1353,7 @@ SolarBeamName: ; 57a51 (15:7a51)
 	text "Solarbeam"
 	done

-Venusaur_Lv67Description: ; 57a5c (15:7a5c)
+VenusaurLv67Description: ; 57a5c (15:7a5c)
 	text "This plant blooms when it is"
 	line "absorbing solar energy. It stays on"
 	line "the move to seek sunlight."
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -2076,11 +2076,11 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer MegaDrainName                                      ; 0x0818
 	textpointer VenusaursMegaDrainDescription                      ; 0x0819
 	textpointer VenusaursMegaDrainDescriptionCont                  ; 0x081a
-	textpointer Venusaur_Lv64Description                           ; 0x081b
+	textpointer VenusaurLv64Description                           ; 0x081b
 	textpointer EnergyTransName                                    ; 0x081c
 	textpointer EnergyTransDescription                             ; 0x081d
 	textpointer SolarBeamName                                      ; 0x081e
-	textpointer Venusaur_Lv67Description                           ; 0x081f
+	textpointer VenusaurLv67Description                           ; 0x081f
 	textpointer CaterpieName                                       ; 0x0820
 	textpointer StringShotName                                     ; 0x0821
 	textpointer MayInflictParalysisDescription                     ; 0x0822
@@ -2247,9 +2247,9 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer TangelaName                                        ; 0x08c3
 	textpointer BindName                                           ; 0x08c4
 	textpointer VineName                                           ; 0x08c5
-	textpointer Tangela_Lv8Description                             ; 0x08c6
+	textpointer TangelaLv8Description                             ; 0x08c6
 	textpointer PoisonWhipName                                     ; 0x08c7
-	textpointer Tangela_Lv12Description                            ; 0x08c8
+	textpointer TangelaLv12Description                            ; 0x08c8
 	textpointer ScytherName                                        ; 0x08c9
 	textpointer SwordsDanceName                                    ; 0x08ca
 	textpointer SwordsDanceDescription                             ; 0x08cb
@@ -2284,13 +2284,13 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer NinetalesLureDescription                           ; 0x08e8
 	textpointer FireBlastName                                      ; 0x08e9
 	textpointer FireBlastDescription                               ; 0x08ea
-	textpointer Ninetales_Lv32Description                          ; 0x08eb
+	textpointer NinetalesLv32Description                          ; 0x08eb
 	textpointer MixUpName                                          ; 0x08ec
 	textpointer MixUpDescription                                   ; 0x08ed
 	textpointer MixUpDescriptionCont                               ; 0x08ee
 	textpointer DancingEmbersName                                  ; 0x08ef
 	textpointer DancingEmbersDescription                           ; 0x08f0
-	textpointer Ninetales_Lv35Description                          ; 0x08f1
+	textpointer NinetalesLv35Description                          ; 0x08f1
 	textpointer GrowlitheName                                      ; 0x08f2
 	textpointer FlareName                                          ; 0x08f3
 	textpointer PuppyName                                          ; 0x08f4
@@ -2301,11 +2301,11 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FlamesOfRageName                                   ; 0x08f9
 	textpointer FlamesOfRageDescription                            ; 0x08fa
 	textpointer LegendaryName                                      ; 0x08fb
-	textpointer Arcanine_Lv34Description                           ; 0x08fc
+	textpointer ArcanineLv34Description                           ; 0x08fc
 	textpointer ArcaninesFlamethrowerDescription                   ; 0x08fd
 	textpointer TakeDownName                                       ; 0x08fe
 	textpointer TakeDownDescription                                ; 0x08ff
-	textpointer Arcanine_Lv45Description                           ; 0x0900
+	textpointer ArcanineLv45Description                           ; 0x0900
 	textpointer PonytaName                                         ; 0x0901
 	textpointer SmashKickName                                      ; 0x0902
 	textpointer FlameTailName                                      ; 0x0903
@@ -2321,26 +2321,26 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FirePunchName                                      ; 0x090d
 	textpointer FirePunchDescription                               ; 0x090e
 	textpointer SpitfireName                                       ; 0x090f
-	textpointer Magmar_Lv24Description                             ; 0x0910
+	textpointer MagmarLv24Description                             ; 0x0910
 	textpointer SmokescreenName                                    ; 0x0911
 	textpointer MagmarsSmokescreenDescription                      ; 0x0912
-	textpointer Magmar_Lv31Description                             ; 0x0913
+	textpointer MagmarLv31Description                             ; 0x0913
 	textpointer FlareonName                                        ; 0x0914
 	textpointer EeveeName                                          ; 0x0915
 	textpointer BiteName                                           ; 0x0916
 	textpointer RageName                                           ; 0x0917
 	textpointer FlareonsRageDescription                            ; 0x0918
-	textpointer Flareon_Lv22Description                            ; 0x0919
+	textpointer FlareonLv22Description                            ; 0x0919
 	textpointer FlareonsFlamethrowerDescription                    ; 0x091a
-	textpointer Flareon_Lv28Description                            ; 0x091b
+	textpointer FlareonLv28Description                            ; 0x091b
 	textpointer MoltresName                                        ; 0x091c
 	textpointer WildfireName                                       ; 0x091d
 	textpointer WildfireDescription                                ; 0x091e
 	textpointer DiveBombName                                       ; 0x091f
-	textpointer Moltres_Lv35Description                            ; 0x0920
+	textpointer MoltresLv35Description                            ; 0x0920
 	textpointer FiregiverName                                      ; 0x0921
 	textpointer FiregiverDescription                               ; 0x0922
-	textpointer Moltres_Lv37Description                            ; 0x0923
+	textpointer MoltresLv37Description                            ; 0x0923
 	textpointer SquirtleName                                       ; 0x0924
 	textpointer BubbleName                                         ; 0x0925
 	textpointer WithdrawName                                       ; 0x0926
@@ -2462,9 +2462,9 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer FocusEnergyName                                    ; 0x099a
 	textpointer FocusEnergyDescription                             ; 0x099b
 	textpointer BubbleJetName                                      ; 0x099c
-	textpointer Vaporeon_Lv29Description                           ; 0x099d
+	textpointer VaporeonLv29Description                           ; 0x099d
 	textpointer VaporeonsWaterGunDescription                       ; 0x099e
-	textpointer Vaporeon_Lv42Description                           ; 0x099f
+	textpointer VaporeonLv42Description                           ; 0x099f
 	textpointer OmanyteName                                        ; 0x09a0
 	textpointer MysteriousFossilName                               ; 0x09a1
 	textpointer ClairvoyanceName                                   ; 0x09a2
@@ -2480,25 +2480,25 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer BlizzardName                                       ; 0x09ac
 	textpointer BlizzardDescription                                ; 0x09ad
 	textpointer FreezeName                                         ; 0x09ae
-	textpointer Articuno_Lv35Description                           ; 0x09af
+	textpointer ArticunoLv35Description                           ; 0x09af
 	textpointer QuickfreezeName                                    ; 0x09b0
 	textpointer QuickfreezeDescription                             ; 0x09b1
 	textpointer IceBreathName                                      ; 0x09b2
 	textpointer IceBreathDescription                               ; 0x09b3
-	textpointer Articuno_Lv37Description                           ; 0x09b4
+	textpointer ArticunoLv37Description                           ; 0x09b4
 	textpointer PikachuName                                        ; 0x09b5
 	textpointer GnawName                                           ; 0x09b6
 	textpointer ThunderJoltName                                    ; 0x09b7
 	textpointer ThunderJoltDescription                             ; 0x09b8
 	textpointer MouseName                                          ; 0x09b9
-	textpointer Pikachu_Lv12Description                            ; 0x09ba
+	textpointer PikachuLv12Description                            ; 0x09ba
 	textpointer SparkName                                          ; 0x09bb
 	textpointer SparkDescription                                   ; 0x09bc
-	textpointer Pikachu_Lv14Description                            ; 0x09bd
+	textpointer PikachuLv14Description                            ; 0x09bd
 	textpointer GrowlName                                          ; 0x09be
 	textpointer GrowlDescription                                   ; 0x09bf
 	textpointer ThundershockName                                   ; 0x09c0
-	textpointer Pikachu_Lv16Description                            ; 0x09c1
+	textpointer PikachuLv16Description                            ; 0x09c1
 	textpointer FlyingPikachuName                                  ; 0x09c2
 	textpointer FlyName                                            ; 0x09c3
 	textpointer FlyDescription                                     ; 0x09c4
@@ -2510,66 +2510,66 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer RaichusAgilityDescription                          ; 0x09ca
 	textpointer ThunderName                                        ; 0x09cb
 	textpointer RaichusThunderDescription                          ; 0x09cc
-	textpointer Raichu_Lv40Description                             ; 0x09cd
+	textpointer RaichuLv40Description                             ; 0x09cd
 	textpointer GigashockName                                      ; 0x09ce
 	textpointer GigashockDescription                               ; 0x09cf
-	textpointer Raichu_Lv45Description                             ; 0x09d0
+	textpointer RaichuLv45Description                             ; 0x09d0
 	textpointer MagnemiteName                                      ; 0x09d1
 	textpointer ThunderWaveName                                    ; 0x09d2
 	textpointer MagnemitesSelfdestructDescription                  ; 0x09d3
 	textpointer MagnetName                                         ; 0x09d4
-	textpointer Magnemite_Lv13Description                          ; 0x09d5
+	textpointer MagnemiteLv13Description                          ; 0x09d5
 	textpointer MagneticStormName                                  ; 0x09d6
 	textpointer MagneticStormDescription                           ; 0x09d7
-	textpointer Magnemite_Lv15Description                          ; 0x09d8
+	textpointer MagnemiteLv15Description                          ; 0x09d8
 	textpointer MagnetonName                                       ; 0x09d9
-	textpointer Magneton_Lv28sSelfdestructDescription              ; 0x09da
-	textpointer Magneton_Lv28Description                           ; 0x09db
+	textpointer MagnetonLv28sSelfdestructDescription              ; 0x09da
+	textpointer MagnetonLv28Description                           ; 0x09db
 	textpointer SonicboomName                                      ; 0x09dc
 	textpointer SonicboomDescription                               ; 0x09dd
-	textpointer Magneton_Lv35sSelfdestructDescription              ; 0x09de
-	textpointer Magneton_Lv35Description                           ; 0x09df
+	textpointer MagnetonLv35sSelfdestructDescription              ; 0x09de
+	textpointer MagnetonLv35Description                           ; 0x09df
 	textpointer VoltorbName                                        ; 0x09e0
 	textpointer BallName                                           ; 0x09e1
 	textpointer VoltorbDescription                                 ; 0x09e2
 	textpointer ElectrodeName                                      ; 0x09e3
 	textpointer EnergySpikeName                                    ; 0x09e4
 	textpointer EnergySpikeDescription                             ; 0x09e5
-	textpointer Electrode_Lv35Description                          ; 0x09e6
+	textpointer ElectrodeLv35Description                          ; 0x09e6
 	textpointer ChainLightningName                                 ; 0x09e7
 	textpointer ChainLightningDescription                          ; 0x09e8
-	textpointer Electrode_Lv42Description                          ; 0x09e9
+	textpointer ElectrodeLv42Description                          ; 0x09e9
 	textpointer ElectabuzzName                                     ; 0x09ea
 	textpointer LightScreenName                                    ; 0x09eb
 	textpointer LightScreenDescription                             ; 0x09ec
 	textpointer LightScreenDescriptionCont                         ; 0x09ed
 	textpointer ElectabuzzsQuickAttackDescription                  ; 0x09ee
 	textpointer ElectricName                                       ; 0x09ef
-	textpointer Electabuzz_Lv20Description                         ; 0x09f0
+	textpointer ElectabuzzLv20Description                         ; 0x09f0
 	textpointer ThunderpunchName                                   ; 0x09f1
 	textpointer ThunderpunchDescription                            ; 0x09f2
-	textpointer Electabuzz_Lv35Description                         ; 0x09f3
+	textpointer ElectabuzzLv35Description                         ; 0x09f3
 	textpointer JolteonName                                        ; 0x09f4
 	textpointer DoubleAttackX20Description                         ; 0x09f5
 	textpointer StunNeedleName                                     ; 0x09f6
 	textpointer LightningName                                      ; 0x09f7
-	textpointer Jolteon_Lv24Description                            ; 0x09f8
+	textpointer JolteonLv24Description                            ; 0x09f8
 	textpointer PinMissileName                                     ; 0x09f9
 	textpointer QuadrupleAttackX20Description                      ; 0x09fa
-	textpointer Jolteon_Lv29Description                            ; 0x09fb
+	textpointer JolteonLv29Description                            ; 0x09fb
 	textpointer ZapdosName                                         ; 0x09fc
 	textpointer ThunderstormName                                   ; 0x09fd
 	textpointer ThunderstormDescription                            ; 0x09fe
-	textpointer Zapdos_Lv40Description                             ; 0x09ff
+	textpointer ZapdosLv40Description                             ; 0x09ff
 	textpointer ZapdosThunderDescription                           ; 0x0a00
 	textpointer ThunderboltName                                    ; 0x0a01
 	textpointer ThunderboltDescription                             ; 0x0a02
-	textpointer Zapdos_Lv64Description                             ; 0x0a03
+	textpointer ZapdosLv64Description                             ; 0x0a03
 	textpointer PealOfThunderName                                  ; 0x0a04
 	textpointer PealOfThunderDescription                           ; 0x0a05
 	textpointer BigThunderName                                     ; 0x0a06
 	textpointer BigThunderDescription                              ; 0x0a07
-	textpointer Zapdos_Lv68Description                             ; 0x0a08
+	textpointer ZapdosLv68Description                             ; 0x0a08
 	textpointer SandshrewName                                      ; 0x0a09
 	textpointer SandAttackName                                     ; 0x0a0a
 	textpointer SandshrewDescription                               ; 0x0a0b
@@ -2641,12 +2641,12 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CallforFriendName                                  ; 0x0a4d
 	textpointer CallforFriendDescription                           ; 0x0a4e
 	textpointer BonekeeperName                                     ; 0x0a4f
-	textpointer Marowak_Lv26Description                            ; 0x0a50
+	textpointer MarowakLv26Description                            ; 0x0a50
 	textpointer BoneAttackName                                     ; 0x0a51
 	textpointer BoneAttackDescription                              ; 0x0a52
 	textpointer WailName                                           ; 0x0a53
 	textpointer WailDescription                                    ; 0x0a54
-	textpointer Marowak_Lv32Description                            ; 0x0a55
+	textpointer MarowakLv32Description                            ; 0x0a55
 	textpointer HitmonleeName                                      ; 0x0a56
 	textpointer StretchKickName                                    ; 0x0a57
 	textpointer StretchKickDescription                             ; 0x0a58
@@ -2698,7 +2698,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer SlowpokeName                                       ; 0x0a86
 	textpointer SlowpokesAmnesiaDescription                        ; 0x0a87
 	textpointer DopeyName                                          ; 0x0a88
-	textpointer Slowpoke_Lv9Description                            ; 0x0a89
+	textpointer SlowpokeLv9Description                            ; 0x0a89
 	textpointer SpacingOutName                                     ; 0x0a8a
 	textpointer SpacingOutDescription                              ; 0x0a8b
 	textpointer ScavengeName                                       ; 0x0a8c
@@ -2714,11 +2714,11 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DestinyBondName                                    ; 0x0a96
 	textpointer DestinyBondDescription                             ; 0x0a97
 	textpointer GasName                                            ; 0x0a98
-	textpointer Gastly_Lv8Description                              ; 0x0a99
+	textpointer GastlyLv8Description                              ; 0x0a99
 	textpointer LickName                                           ; 0x0a9a
 	textpointer EnergyConversionName                               ; 0x0a9b
 	textpointer EnergyConversionDescription                        ; 0x0a9c
-	textpointer Gastly_Lv17Description                             ; 0x0a9d
+	textpointer GastlyLv17Description                             ; 0x0a9d
 	textpointer HaunterName                                        ; 0x0a9e
 	textpointer TransparencyName                                   ; 0x0a9f
 	textpointer TransparencyDescription                            ; 0x0aa0
@@ -2758,19 +2758,19 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer PsychicDescription                                 ; 0x0ac2
 	textpointer BarrierDescription                                 ; 0x0ac3
 	textpointer GeneticName                                        ; 0x0ac4
-	textpointer Mewtwo_Lv53Description                             ; 0x0ac5
+	textpointer MewtwoLv53Description                             ; 0x0ac5
 	textpointer EnergyAbsorptionName                               ; 0x0ac6
 	textpointer EnergyAbsorptionDescription                        ; 0x0ac7
 	textpointer PsyburnName                                        ; 0x0ac8
-	textpointer Mewtwo_Lv60Description                             ; 0x0ac9
+	textpointer MewtwoLv60Description                             ; 0x0ac9
 	textpointer MewName                                            ; 0x0aca
 	textpointer NeutralizingShieldName                             ; 0x0acb
 	textpointer NeutralizingShieldDescription                      ; 0x0acc
 	textpointer NewSpeciesName                                     ; 0x0acd
-	textpointer Mew_Lv8Description                                 ; 0x0ace
+	textpointer MewLv8Description                                 ; 0x0ace
 	textpointer MysteryAttackName                                  ; 0x0acf
 	textpointer MysteryAttackDescription                           ; 0x0ad0
-	textpointer Mew_Lv15Description                                ; 0x0ad1
+	textpointer MewLv15Description                                ; 0x0ad1
 	textpointer PsywaveName                                        ; 0x0ad2
 	textpointer PsywaveDescription                                 ; 0x0ad3
 	textpointer DevolutionBeamName                                 ; 0x0ad4
@@ -2824,14 +2824,14 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DoubleEdgeName                                     ; 0x0b04
 	textpointer JigglypuffsDoubleEdgeDescription                   ; 0x0b05
 	textpointer BalloonName                                        ; 0x0b06
-	textpointer Jigglypuff_Lv12Description                         ; 0x0b07
+	textpointer JigglypuffLv12Description                         ; 0x0b07
 	textpointer FriendshipSongName                                 ; 0x0b08
 	textpointer FriendshipSongDescription                          ; 0x0b09
 	textpointer ExpandName                                         ; 0x0b0a
 	textpointer ExpandDescription                                  ; 0x0b0b
-	textpointer Jigglypuff_Lv13Description                         ; 0x0b0c
+	textpointer JigglypuffLv13Description                         ; 0x0b0c
 	textpointer LullabyName                                        ; 0x0b0d
-	textpointer Jigglypuff_Lv14Description                         ; 0x0b0e
+	textpointer JigglypuffLv14Description                         ; 0x0b0e
 	textpointer WigglytuffName                                     ; 0x0b0f
 	textpointer DoTheWaveName                                      ; 0x0b10
 	textpointer DoTheWaveDescription                               ; 0x0b11
@@ -2840,10 +2840,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer CatPunchName                                       ; 0x0b14
 	textpointer CatPunchDescription                                ; 0x0b15
 	textpointer ScratchCatName                                     ; 0x0b16
-	textpointer Meowth_Lv14Description                             ; 0x0b17
+	textpointer MeowthLv14Description                             ; 0x0b17
 	textpointer PayDayName                                         ; 0x0b18
 	textpointer PayDayDescription                                  ; 0x0b19
-	textpointer Meowth_Lv15Description                             ; 0x0b1a
+	textpointer MeowthLv15Description                             ; 0x0b1a
 	textpointer PersianName                                        ; 0x0b1b
 	textpointer PounceName                                         ; 0x0b1c
 	textpointer PounceDescription                                  ; 0x0b1d
@@ -2916,7 +2916,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer DragoniteName                                      ; 0x0b60
 	textpointer HealingWindName                                    ; 0x0b61
 	textpointer HealingWindDescription                             ; 0x0b62
-	textpointer Dragonite_Lv41Description                          ; 0x0b63
+	textpointer DragoniteLv41Description                          ; 0x0b63
 	textpointer StepInName                                         ; 0x0b64
 	textpointer StepInDescription                                  ; 0x0b65
 	textpointer DoubleAttackX40Description                         ; 0x0b66
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1343,10 +1343,10 @@ wAIPeekedPrizes:: ; cda5
 wAIPokedexCounter:: ; cda6
 	ds $1

-; variable to keep track of Mewtwo_Lv53's Barrier usage during Player' turn.
-; AI_MEWTWO_MILL set means Player is running Mewtwo_Lv53 mill deck.
+; variable to keep track of MewtwoLv53's Barrier usage during Player' turn.
+; AI_MEWTWO_MILL set means Player is running MewtwoLv53 mill deck.
 ; 	- when flag is not set, this counts how many turns in a row
-;	  Player used Mewtwo_Lv53's Barrier attack;
+;	  Player used MewtwoLv53's Barrier attack;
 ;	- when flag is set, this counts how many turns in a row
 ;	  Player has NOT used Barrier attack.
 wAIBarrierFlagCounter:: ; cda7
@@ -1573,11 +1573,11 @@ wAIAttackIsNonDamaging:: ; ce02
 wAIRetreatedThisTurn:: ; ce03
 	ds $1

-; used by AI to store information of Venusaur_Lv67
+; used by AI to store information of VenusaurLv67
 ; while handling Energy Trans logic.
-wAIVenusaur_Lv67DeckIndex:: ; ce04
+wAIVenusaurLv67DeckIndex:: ; ce04
 	ds $1
-wAIVenusaur_Lv67PlayAreaLocation:: ; ce05
+wAIVenusaurLv67PlayAreaLocation:: ; ce05
 	ds $1

 wce06:: ; ce06
@@ -2783,7 +2783,7 @@ wTotalNumCardsCollected:: ; d3cd
 	ds $1

 ; total number of cards to be collected
-; doesn't count the Phantom cards (Venusaur_Lv64 and Mew_Lv15)
+; doesn't count the Phantom cards (VenusaurLv64 and MewLv15)
 ; unless they have already been collected
 wTotalNumCardsToCollect:: ; d3ce
 	ds $1
--- a/tools/constants.py
+++ b/tools/constants.py
@@ -131,10 +131,10 @@ cards = {
 	0x60: "PIKACHU_LV12",
 	0x61: "PIKACHU_LV14",
 	0x62: "PIKACHU_LV16",
-	0x63: "PIKACHU_LV16A",
+	0x63: "PIKACHU_ALT_LV16",
 	0x64: "FLYING_PIKACHU",
 	0x65: "SURFING_PIKACHU_LV13",
-	0x66: "SURFING_PIKACHU_LV13A",
+	0x66: "SURFING_PIKACHU_ALT_LV13",
 	0x67: "RAICHU_LV40",
 	0x68: "RAICHU_LV45",
 	0x69: "MAGNEMITE_LV13",
@@ -191,7 +191,7 @@ cards = {
 	0x9c: "JYNX",
 	0x9d: "MEWTWO_LV53",
 	0x9e: "MEWTWO_LV60",
-	0x9f: "MEWTWO_LV60A",
+	0x9f: "MEWTWO_ALT_LV60",
 	0xa0: "MEW_LV8",
 	0xa1: "MEW_LV15",
 	0xa2: "MEW_LV23",