shithub: pokered

Download patch

ref: 91e55dbe0ba2e22f4cdf0b5c33aba3e0845ddd01
parent: 509ee98219bae35c3edae81ed36f3c40ab9dbd5b
parent: 5c4397c899f5b80d5b142ec68603bef31cf92c75
author: Daniel Harding <33dannye@gmail.com>
date: Sat Mar 24 09:25:15 EDT 2018

Merge pull request #180 from yenatch/fix-wevosmoves

add wEvosMoves instead of using eevee

--- a/constants/evolution_constants.asm
+++ b/constants/evolution_constants.asm
@@ -1,4 +1,9 @@
+; See data/evos_moves.asm
+
 ; Evolution types
 EV_LEVEL EQU 1
 EV_ITEM  EQU 2
 EV_TRADE EQU 3
+
+MAX_EVOLUTIONS EQU 3
+EVOLUTION_SIZE EQU 4
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -1,3 +1,6 @@
+; See constants/evolution_constants.asm
+; The max number of evolutions per monster is MAX_EVOLUTIONS
+
 EvosMovesPointerTable:
 	dw RhydonEvosMoves
 	dw KangaskhanEvosMoves
@@ -191,1942 +194,1941 @@
 	dw VictreebelEvosMoves
 
 RhydonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 30,STOMP
-	db 35,TAIL_WHIP
-	db 40,FURY_ATTACK
-	db 48,HORN_DRILL
-	db 55,LEER
-	db 64,TAKE_DOWN
+; Learnset
+	db 30, STOMP
+	db 35, TAIL_WHIP
+	db 40, FURY_ATTACK
+	db 48, HORN_DRILL
+	db 55, LEER
+	db 64, TAKE_DOWN
 	db 0
 
 KangaskhanEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 26,BITE
-	db 31,TAIL_WHIP
-	db 36,MEGA_PUNCH
-	db 41,LEER
-	db 46,DIZZY_PUNCH
+; Learnset
+	db 26, BITE
+	db 31, TAIL_WHIP
+	db 36, MEGA_PUNCH
+	db 41, LEER
+	db 46, DIZZY_PUNCH
 	db 0
 
 NidoranMEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,NIDORINO
+; Evolutions
+	db EV_LEVEL, 16, NIDORINO
 	db 0
-;Learnset
-	db 8,HORN_ATTACK
-	db 14,POISON_STING
-	db 21,FOCUS_ENERGY
-	db 29,FURY_ATTACK
-	db 36,HORN_DRILL
-	db 43,DOUBLE_KICK
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 21, FOCUS_ENERGY
+	db 29, FURY_ATTACK
+	db 36, HORN_DRILL
+	db 43, DOUBLE_KICK
 	db 0
 
 ClefairyEvosMoves:
-;Evolutions
-	db EV_ITEM,MOON_STONE,1,CLEFABLE
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, CLEFABLE
 	db 0
-;Learnset
-	db 13,SING
-	db 18,DOUBLESLAP
-	db 24,MINIMIZE
-	db 31,METRONOME
-	db 39,DEFENSE_CURL
-	db 48,LIGHT_SCREEN
+; Learnset
+	db 13, SING
+	db 18, DOUBLESLAP
+	db 24, MINIMIZE
+	db 31, METRONOME
+	db 39, DEFENSE_CURL
+	db 48, LIGHT_SCREEN
 	db 0
 
 SpearowEvosMoves:
-;Evolutions
-	db EV_LEVEL,20,FEAROW
+; Evolutions
+	db EV_LEVEL, 20, FEAROW
 	db 0
-;Learnset
-	db 9,LEER
-	db 15,FURY_ATTACK
-	db 22,MIRROR_MOVE
-	db 29,DRILL_PECK
-	db 36,AGILITY
+; Learnset
+	db 9, LEER
+	db 15, FURY_ATTACK
+	db 22, MIRROR_MOVE
+	db 29, DRILL_PECK
+	db 36, AGILITY
 	db 0
 
 VoltorbEvosMoves:
-;Evolutions
-	db EV_LEVEL,30,ELECTRODE
+; Evolutions
+	db EV_LEVEL, 30, ELECTRODE
 	db 0
-;Learnset
-	db 17,SONICBOOM
-	db 22,SELFDESTRUCT
-	db 29,LIGHT_SCREEN
-	db 36,SWIFT
-	db 43,EXPLOSION
+; Learnset
+	db 17, SONICBOOM
+	db 22, SELFDESTRUCT
+	db 29, LIGHT_SCREEN
+	db 36, SWIFT
+	db 43, EXPLOSION
 	db 0
 
 NidokingEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 8,HORN_ATTACK
-	db 14,POISON_STING
-	db 23,THRASH
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 23, THRASH
 	db 0
 
 SlowbroEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 18,DISABLE
-	db 22,HEADBUTT
-	db 27,GROWL
-	db 33,WATER_GUN
-	db 37,WITHDRAW
-	db 44,AMNESIA
-	db 55,PSYCHIC_M
+; Learnset
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, WATER_GUN
+	db 37, WITHDRAW
+	db 44, AMNESIA
+	db 55, PSYCHIC_M
 	db 0
 
 IvysaurEvosMoves:
-;Evolutions
-	db EV_LEVEL,32,VENUSAUR
+; Evolutions
+	db EV_LEVEL, 32, VENUSAUR
 	db 0
-;Learnset
-	db 7,LEECH_SEED
-	db 13,VINE_WHIP
-	db 22,POISONPOWDER
-	db 30,RAZOR_LEAF
-	db 38,GROWTH
-	db 46,SLEEP_POWDER
-	db 54,SOLARBEAM
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 22, POISONPOWDER
+	db 30, RAZOR_LEAF
+	db 38, GROWTH
+	db 46, SLEEP_POWDER
+	db 54, SOLARBEAM
 	db 0
 
 ExeggutorEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 28,STOMP
+; Learnset
+	db 28, STOMP
 	db 0
 
 LickitungEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 7,STOMP
-	db 15,DISABLE
-	db 23,DEFENSE_CURL
-	db 31,SLAM
-	db 39,SCREECH
+; Learnset
+	db 7, STOMP
+	db 15, DISABLE
+	db 23, DEFENSE_CURL
+	db 31, SLAM
+	db 39, SCREECH
 	db 0
 
 ExeggcuteEvosMoves:
-;Evolutions
-	db EV_ITEM,LEAF_STONE,1,EXEGGUTOR
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR
 	db 0
-;Learnset
-	db 25,REFLECT
-	db 28,LEECH_SEED
-	db 32,STUN_SPORE
-	db 37,POISONPOWDER
-	db 42,SOLARBEAM
-	db 48,SLEEP_POWDER
+; Learnset
+	db 25, REFLECT
+	db 28, LEECH_SEED
+	db 32, STUN_SPORE
+	db 37, POISONPOWDER
+	db 42, SOLARBEAM
+	db 48, SLEEP_POWDER
 	db 0
 
 GrimerEvosMoves:
-;Evolutions
-	db EV_LEVEL,38,MUK
+; Evolutions
+	db EV_LEVEL, 38, MUK
 	db 0
-;Learnset
-	db 30,POISON_GAS
-	db 33,MINIMIZE
-	db 37,SLUDGE
-	db 42,HARDEN
-	db 48,SCREECH
-	db 55,ACID_ARMOR
+; Learnset
+	db 30, POISON_GAS
+	db 33, MINIMIZE
+	db 37, SLUDGE
+	db 42, HARDEN
+	db 48, SCREECH
+	db 55, ACID_ARMOR
 	db 0
 
 GengarEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 29,HYPNOSIS
-	db 38,DREAM_EATER
+; Learnset
+	db 29, HYPNOSIS
+	db 38, DREAM_EATER
 	db 0
 
 NidoranFEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,NIDORINA
+; Evolutions
+	db EV_LEVEL, 16, NIDORINA
 	db 0
-;Learnset
-	db 8,SCRATCH
-	db 14,POISON_STING
-	db 21,TAIL_WHIP
-	db 29,BITE
-	db 36,FURY_SWIPES
-	db 43,DOUBLE_KICK
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 21, TAIL_WHIP
+	db 29, BITE
+	db 36, FURY_SWIPES
+	db 43, DOUBLE_KICK
 	db 0
 
 NidoqueenEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 8,SCRATCH
-	db 14,POISON_STING
-	db 23,BODY_SLAM
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 23, BODY_SLAM
 	db 0
 
 CuboneEvosMoves:
-;Evolutions
-	db EV_LEVEL,28,MAROWAK
+; Evolutions
+	db EV_LEVEL, 28, MAROWAK
 	db 0
-;Learnset
-	db 25,LEER
-	db 31,FOCUS_ENERGY
-	db 38,THRASH
-	db 43,BONEMERANG
-	db 46,RAGE
+; Learnset
+	db 25, LEER
+	db 31, FOCUS_ENERGY
+	db 38, THRASH
+	db 43, BONEMERANG
+	db 46, RAGE
 	db 0
 
 RhyhornEvosMoves:
-;Evolutions
-	db EV_LEVEL,42,RHYDON
+; Evolutions
+	db EV_LEVEL, 42, RHYDON
 	db 0
-;Learnset
-	db 30,STOMP
-	db 35,TAIL_WHIP
-	db 40,FURY_ATTACK
-	db 45,HORN_DRILL
-	db 50,LEER
-	db 55,TAKE_DOWN
+; Learnset
+	db 30, STOMP
+	db 35, TAIL_WHIP
+	db 40, FURY_ATTACK
+	db 45, HORN_DRILL
+	db 50, LEER
+	db 55, TAKE_DOWN
 	db 0
 
 LaprasEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 16,SING
-	db 20,MIST
-	db 25,BODY_SLAM
-	db 31,CONFUSE_RAY
-	db 38,ICE_BEAM
-	db 46,HYDRO_PUMP
+; Learnset
+	db 16, SING
+	db 20, MIST
+	db 25, BODY_SLAM
+	db 31, CONFUSE_RAY
+	db 38, ICE_BEAM
+	db 46, HYDRO_PUMP
 	db 0
 
 ArcanineEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MewEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 10,TRANSFORM
-	db 20,MEGA_PUNCH
-	db 30,METRONOME
-	db 40,PSYCHIC_M
+; Learnset
+	db 10, TRANSFORM
+	db 20, MEGA_PUNCH
+	db 30, METRONOME
+	db 40, PSYCHIC_M
 	db 0
 
 GyaradosEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 20,BITE
-	db 25,DRAGON_RAGE
-	db 32,LEER
-	db 41,HYDRO_PUMP
-	db 52,HYPER_BEAM
+; Learnset
+	db 20, BITE
+	db 25, DRAGON_RAGE
+	db 32, LEER
+	db 41, HYDRO_PUMP
+	db 52, HYPER_BEAM
 	db 0
 
 ShellderEvosMoves:
-;Evolutions
-	db EV_ITEM,WATER_STONE,1,CLOYSTER
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, CLOYSTER
 	db 0
-;Learnset
-	db 18,SUPERSONIC
-	db 23,CLAMP
-	db 30,AURORA_BEAM
-	db 39,LEER
-	db 50,ICE_BEAM
+; Learnset
+	db 18, SUPERSONIC
+	db 23, CLAMP
+	db 30, AURORA_BEAM
+	db 39, LEER
+	db 50, ICE_BEAM
 	db 0
 
 TentacoolEvosMoves:
-;Evolutions
-	db EV_LEVEL,30,TENTACRUEL
+; Evolutions
+	db EV_LEVEL, 30, TENTACRUEL
 	db 0
-;Learnset
-	db 7,SUPERSONIC
-	db 13,WRAP
-	db 18,POISON_STING
-	db 22,WATER_GUN
-	db 27,CONSTRICT
-	db 33,BARRIER
-	db 40,SCREECH
-	db 48,HYDRO_PUMP
+; Learnset
+	db 7, SUPERSONIC
+	db 13, WRAP
+	db 18, POISON_STING
+	db 22, WATER_GUN
+	db 27, CONSTRICT
+	db 33, BARRIER
+	db 40, SCREECH
+	db 48, HYDRO_PUMP
 	db 0
 
 GastlyEvosMoves:
-;Evolutions
-	db EV_LEVEL,25,HAUNTER
+; Evolutions
+	db EV_LEVEL, 25, HAUNTER
 	db 0
-;Learnset
-	db 27,HYPNOSIS
-	db 35,DREAM_EATER
+; Learnset
+	db 27, HYPNOSIS
+	db 35, DREAM_EATER
 	db 0
 
 ScytherEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 17,LEER
-	db 20,FOCUS_ENERGY
-	db 24,DOUBLE_TEAM
-	db 29,SLASH
-	db 35,SWORDS_DANCE
-	db 42,AGILITY
+; Learnset
+	db 17, LEER
+	db 20, FOCUS_ENERGY
+	db 24, DOUBLE_TEAM
+	db 29, SLASH
+	db 35, SWORDS_DANCE
+	db 42, AGILITY
 	db 0
 
 StaryuEvosMoves:
-;Evolutions
-	db EV_ITEM,WATER_STONE,1,STARMIE
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, STARMIE
 	db 0
-;Learnset
-	db 17,WATER_GUN
-	db 22,HARDEN
-	db 27,RECOVER
-	db 32,SWIFT
-	db 37,MINIMIZE
-	db 42,LIGHT_SCREEN
-	db 47,HYDRO_PUMP
+; Learnset
+	db 17, WATER_GUN
+	db 22, HARDEN
+	db 27, RECOVER
+	db 32, SWIFT
+	db 37, MINIMIZE
+	db 42, LIGHT_SCREEN
+	db 47, HYDRO_PUMP
 	db 0
 
 BlastoiseEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 8,BUBBLE
-	db 15,WATER_GUN
-	db 24,BITE
-	db 31,WITHDRAW
-	db 42,SKULL_BASH
-	db 52,HYDRO_PUMP
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 24, BITE
+	db 31, WITHDRAW
+	db 42, SKULL_BASH
+	db 52, HYDRO_PUMP
 	db 0
 
 PinsirEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 25,SEISMIC_TOSS
-	db 30,GUILLOTINE
-	db 36,FOCUS_ENERGY
-	db 43,HARDEN
-	db 49,SLASH
-	db 54,SWORDS_DANCE
+; Learnset
+	db 25, SEISMIC_TOSS
+	db 30, GUILLOTINE
+	db 36, FOCUS_ENERGY
+	db 43, HARDEN
+	db 49, SLASH
+	db 54, SWORDS_DANCE
 	db 0
 
 TangelaEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 29,ABSORB
-	db 32,POISONPOWDER
-	db 36,STUN_SPORE
-	db 39,SLEEP_POWDER
-	db 45,SLAM
-	db 49,GROWTH
+; Learnset
+	db 29, ABSORB
+	db 32, POISONPOWDER
+	db 36, STUN_SPORE
+	db 39, SLEEP_POWDER
+	db 45, SLAM
+	db 49, GROWTH
 	db 0
 
 MissingNo1FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo20EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 GrowlitheEvosMoves:
-;Evolutions
-	db EV_ITEM,FIRE_STONE,1,ARCANINE
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, ARCANINE
 	db 0
-;Learnset
-	db 18,EMBER
-	db 23,LEER
-	db 30,TAKE_DOWN
-	db 39,AGILITY
-	db 50,FLAMETHROWER
+; Learnset
+	db 18, EMBER
+	db 23, LEER
+	db 30, TAKE_DOWN
+	db 39, AGILITY
+	db 50, FLAMETHROWER
 	db 0
 
 OnixEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 15,BIND
-	db 19,ROCK_THROW
-	db 25,RAGE
-	db 33,SLAM
-	db 43,HARDEN
+; Learnset
+	db 15, BIND
+	db 19, ROCK_THROW
+	db 25, RAGE
+	db 33, SLAM
+	db 43, HARDEN
 	db 0
 
 FearowEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 9,LEER
-	db 15,FURY_ATTACK
-	db 25,MIRROR_MOVE
-	db 34,DRILL_PECK
-	db 43,AGILITY
+; Learnset
+	db 9, LEER
+	db 15, FURY_ATTACK
+	db 25, MIRROR_MOVE
+	db 34, DRILL_PECK
+	db 43, AGILITY
 	db 0
 
 PidgeyEvosMoves:
-;Evolutions
-	db EV_LEVEL,18,PIDGEOTTO
+; Evolutions
+	db EV_LEVEL, 18, PIDGEOTTO
 	db 0
-;Learnset
-	db 5,SAND_ATTACK
-	db 12,QUICK_ATTACK
-	db 19,WHIRLWIND
-	db 28,WING_ATTACK
-	db 36,AGILITY
-	db 44,MIRROR_MOVE
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 19, WHIRLWIND
+	db 28, WING_ATTACK
+	db 36, AGILITY
+	db 44, MIRROR_MOVE
 	db 0
 
 SlowpokeEvosMoves:
-;Evolutions
-	db EV_LEVEL,37,SLOWBRO
+; Evolutions
+	db EV_LEVEL, 37, SLOWBRO
 	db 0
-;Learnset
-	db 18,DISABLE
-	db 22,HEADBUTT
-	db 27,GROWL
-	db 33,WATER_GUN
-	db 40,AMNESIA
-	db 48,PSYCHIC_M
+; Learnset
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, WATER_GUN
+	db 40, AMNESIA
+	db 48, PSYCHIC_M
 	db 0
 
 KadabraEvosMoves:
-;Evolutions
-	db EV_TRADE,1,ALAKAZAM
+; Evolutions
+	db EV_TRADE, 1, ALAKAZAM
 	db 0
-;Learnset
-	db 16,CONFUSION
-	db 20,DISABLE
-	db 27,PSYBEAM
-	db 31,RECOVER
-	db 38,PSYCHIC_M
-	db 42,REFLECT
+; Learnset
+	db 16, CONFUSION
+	db 20, DISABLE
+	db 27, PSYBEAM
+	db 31, RECOVER
+	db 38, PSYCHIC_M
+	db 42, REFLECT
 	db 0
 
 GravelerEvosMoves:
-;Evolutions
-	db EV_TRADE,1,GOLEM
+; Evolutions
+	db EV_TRADE, 1, GOLEM
 	db 0
-;Learnset
-	db 11,DEFENSE_CURL
-	db 16,ROCK_THROW
-	db 21,SELFDESTRUCT
-	db 29,HARDEN
-	db 36,EARTHQUAKE
-	db 43,EXPLOSION
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 29, HARDEN
+	db 36, EARTHQUAKE
+	db 43, EXPLOSION
 	db 0
 
 ChanseyEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 24,SING
-	db 30,GROWL
-	db 38,MINIMIZE
-	db 44,DEFENSE_CURL
-	db 48,LIGHT_SCREEN
-	db 54,DOUBLE_EDGE
+; Learnset
+	db 24, SING
+	db 30, GROWL
+	db 38, MINIMIZE
+	db 44, DEFENSE_CURL
+	db 48, LIGHT_SCREEN
+	db 54, DOUBLE_EDGE
 	db 0
 
 MachokeEvosMoves:
-;Evolutions
-	db EV_TRADE,1,MACHAMP
+; Evolutions
+	db EV_TRADE, 1, MACHAMP
 	db 0
-;Learnset
-	db 20,LOW_KICK
-	db 25,LEER
-	db 36,FOCUS_ENERGY
-	db 44,SEISMIC_TOSS
-	db 52,SUBMISSION
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 36, FOCUS_ENERGY
+	db 44, SEISMIC_TOSS
+	db 52, SUBMISSION
 	db 0
 
 MrMimeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 15,CONFUSION
-	db 23,LIGHT_SCREEN
-	db 31,DOUBLESLAP
-	db 39,MEDITATE
-	db 47,SUBSTITUTE
+; Learnset
+	db 15, CONFUSION
+	db 23, LIGHT_SCREEN
+	db 31, DOUBLESLAP
+	db 39, MEDITATE
+	db 47, SUBSTITUTE
 	db 0
 
 HitmonleeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 33,ROLLING_KICK
-	db 38,JUMP_KICK
-	db 43,FOCUS_ENERGY
-	db 48,HI_JUMP_KICK
-	db 53,MEGA_KICK
+; Learnset
+	db 33, ROLLING_KICK
+	db 38, JUMP_KICK
+	db 43, FOCUS_ENERGY
+	db 48, HI_JUMP_KICK
+	db 53, MEGA_KICK
 	db 0
 
 HitmonchanEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 33,FIRE_PUNCH
-	db 38,ICE_PUNCH
-	db 43,THUNDERPUNCH
-	db 48,MEGA_PUNCH
-	db 53,COUNTER
+; Learnset
+	db 33, FIRE_PUNCH
+	db 38, ICE_PUNCH
+	db 43, THUNDERPUNCH
+	db 48, MEGA_PUNCH
+	db 53, COUNTER
 	db 0
 
 ArbokEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 10,POISON_STING
-	db 17,BITE
-	db 27,GLARE
-	db 36,SCREECH
-	db 47,ACID
+; Learnset
+	db 10, POISON_STING
+	db 17, BITE
+	db 27, GLARE
+	db 36, SCREECH
+	db 47, ACID
 	db 0
 
 ParasectEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 13,STUN_SPORE
-	db 20,LEECH_LIFE
-	db 30,SPORE
-	db 39,SLASH
-	db 48,GROWTH
+; Learnset
+	db 13, STUN_SPORE
+	db 20, LEECH_LIFE
+	db 30, SPORE
+	db 39, SLASH
+	db 48, GROWTH
 	db 0
 
 PsyduckEvosMoves:
-;Evolutions
-	db EV_LEVEL,33,GOLDUCK
+; Evolutions
+	db EV_LEVEL, 33, GOLDUCK
 	db 0
-;Learnset
-	db 28,TAIL_WHIP
-	db 31,DISABLE
-	db 36,CONFUSION
-	db 43,FURY_SWIPES
-	db 52,HYDRO_PUMP
+; Learnset
+	db 28, TAIL_WHIP
+	db 31, DISABLE
+	db 36, CONFUSION
+	db 43, FURY_SWIPES
+	db 52, HYDRO_PUMP
 	db 0
 
 DrowzeeEvosMoves:
-;Evolutions
-	db EV_LEVEL,26,HYPNO
+; Evolutions
+	db EV_LEVEL, 26, HYPNO
 	db 0
-;Learnset
-	db 12,DISABLE
-	db 17,CONFUSION
-	db 24,HEADBUTT
-	db 29,POISON_GAS
-	db 32,PSYCHIC_M
-	db 37,MEDITATE
+; Learnset
+	db 12, DISABLE
+	db 17, CONFUSION
+	db 24, HEADBUTT
+	db 29, POISON_GAS
+	db 32, PSYCHIC_M
+	db 37, MEDITATE
 	db 0
 
 GolemEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 11,DEFENSE_CURL
-	db 16,ROCK_THROW
-	db 21,SELFDESTRUCT
-	db 29,HARDEN
-	db 36,EARTHQUAKE
-	db 43,EXPLOSION
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 29, HARDEN
+	db 36, EARTHQUAKE
+	db 43, EXPLOSION
 	db 0
 
 MissingNo32EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MagmarEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 36,LEER
-	db 39,CONFUSE_RAY
-	db 43,FIRE_PUNCH
-	db 48,SMOKESCREEN
-	db 52,SMOG
-	db 55,FLAMETHROWER
+; Learnset
+	db 36, LEER
+	db 39, CONFUSE_RAY
+	db 43, FIRE_PUNCH
+	db 48, SMOKESCREEN
+	db 52, SMOG
+	db 55, FLAMETHROWER
 	db 0
 
 MissingNo34EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 ElectabuzzEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 34,THUNDERSHOCK
-	db 37,SCREECH
-	db 42,THUNDERPUNCH
-	db 49,LIGHT_SCREEN
-	db 54,THUNDER
+; Learnset
+	db 34, THUNDERSHOCK
+	db 37, SCREECH
+	db 42, THUNDERPUNCH
+	db 49, LIGHT_SCREEN
+	db 54, THUNDER
 	db 0
 
 MagnetonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 21,SONICBOOM
-	db 25,THUNDERSHOCK
-	db 29,SUPERSONIC
-	db 38,THUNDER_WAVE
-	db 46,SWIFT
-	db 54,SCREECH
+; Learnset
+	db 21, SONICBOOM
+	db 25, THUNDERSHOCK
+	db 29, SUPERSONIC
+	db 38, THUNDER_WAVE
+	db 46, SWIFT
+	db 54, SCREECH
 	db 0
 
 KoffingEvosMoves:
-;Evolutions
-	db EV_LEVEL,35,WEEZING
+; Evolutions
+	db EV_LEVEL, 35, WEEZING
 	db 0
-;Learnset
-	db 32,SLUDGE
-	db 37,SMOKESCREEN
-	db 40,SELFDESTRUCT
-	db 45,HAZE
-	db 48,EXPLOSION
+; Learnset
+	db 32, SLUDGE
+	db 37, SMOKESCREEN
+	db 40, SELFDESTRUCT
+	db 45, HAZE
+	db 48, EXPLOSION
 	db 0
 
 MissingNo38EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MankeyEvosMoves:
-;Evolutions
-	db EV_LEVEL,28,PRIMEAPE
+; Evolutions
+	db EV_LEVEL, 28, PRIMEAPE
 	db 0
-;Learnset
-	db 15,KARATE_CHOP
-	db 21,FURY_SWIPES
-	db 27,FOCUS_ENERGY
-	db 33,SEISMIC_TOSS
-	db 39,THRASH
+; Learnset
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 33, SEISMIC_TOSS
+	db 39, THRASH
 	db 0
 
 SeelEvosMoves:
-;Evolutions
-	db EV_LEVEL,34,DEWGONG
+; Evolutions
+	db EV_LEVEL, 34, DEWGONG
 	db 0
-;Learnset
-	db 30,GROWL
-	db 35,AURORA_BEAM
-	db 40,REST
-	db 45,TAKE_DOWN
-	db 50,ICE_BEAM
+; Learnset
+	db 30, GROWL
+	db 35, AURORA_BEAM
+	db 40, REST
+	db 45, TAKE_DOWN
+	db 50, ICE_BEAM
 	db 0
 
 DiglettEvosMoves:
-;Evolutions
-	db EV_LEVEL,26,DUGTRIO
+; Evolutions
+	db EV_LEVEL, 26, DUGTRIO
 	db 0
-;Learnset
-	db 15,GROWL
-	db 19,DIG
-	db 24,SAND_ATTACK
-	db 31,SLASH
-	db 40,EARTHQUAKE
+; Learnset
+	db 15, GROWL
+	db 19, DIG
+	db 24, SAND_ATTACK
+	db 31, SLASH
+	db 40, EARTHQUAKE
 	db 0
 
 TaurosEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 21,STOMP
-	db 28,TAIL_WHIP
-	db 35,LEER
-	db 44,RAGE
-	db 51,TAKE_DOWN
+; Learnset
+	db 21, STOMP
+	db 28, TAIL_WHIP
+	db 35, LEER
+	db 44, RAGE
+	db 51, TAKE_DOWN
 	db 0
 
 MissingNo3DEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo3EEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo3FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 FarfetchdEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 7,LEER
-	db 15,FURY_ATTACK
-	db 23,SWORDS_DANCE
-	db 31,AGILITY
-	db 39,SLASH
+; Learnset
+	db 7, LEER
+	db 15, FURY_ATTACK
+	db 23, SWORDS_DANCE
+	db 31, AGILITY
+	db 39, SLASH
 	db 0
 
 VenonatEvosMoves:
-;Evolutions
-	db EV_LEVEL,31,VENOMOTH
+; Evolutions
+	db EV_LEVEL, 31, VENOMOTH
 	db 0
-;Learnset
-	db 24,POISONPOWDER
-	db 27,LEECH_LIFE
-	db 30,STUN_SPORE
-	db 35,PSYBEAM
-	db 38,SLEEP_POWDER
-	db 43,PSYCHIC_M
+; Learnset
+	db 24, POISONPOWDER
+	db 27, LEECH_LIFE
+	db 30, STUN_SPORE
+	db 35, PSYBEAM
+	db 38, SLEEP_POWDER
+	db 43, PSYCHIC_M
 	db 0
 
 DragoniteEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 10,THUNDER_WAVE
-	db 20,AGILITY
-	db 35,SLAM
-	db 45,DRAGON_RAGE
-	db 60,HYPER_BEAM
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 35, SLAM
+	db 45, DRAGON_RAGE
+	db 60, HYPER_BEAM
 	db 0
 
 MissingNo43EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo44EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo45EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 DoduoEvosMoves:
-;Evolutions
-	db EV_LEVEL,31,DODRIO
+; Evolutions
+	db EV_LEVEL, 31, DODRIO
 	db 0
-;Learnset
-	db 20,GROWL
-	db 24,FURY_ATTACK
-	db 30,DRILL_PECK
-	db 36,RAGE
-	db 40,TRI_ATTACK
-	db 44,AGILITY
+; Learnset
+	db 20, GROWL
+	db 24, FURY_ATTACK
+	db 30, DRILL_PECK
+	db 36, RAGE
+	db 40, TRI_ATTACK
+	db 44, AGILITY
 	db 0
 
 PoliwagEvosMoves:
-;Evolutions
-	db EV_LEVEL,25,POLIWHIRL
+; Evolutions
+	db EV_LEVEL, 25, POLIWHIRL
 	db 0
-;Learnset
-	db 16,HYPNOSIS
-	db 19,WATER_GUN
-	db 25,DOUBLESLAP
-	db 31,BODY_SLAM
-	db 38,AMNESIA
-	db 45,HYDRO_PUMP
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 25, DOUBLESLAP
+	db 31, BODY_SLAM
+	db 38, AMNESIA
+	db 45, HYDRO_PUMP
 	db 0
 
 JynxEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 18,LICK
-	db 23,DOUBLESLAP
-	db 31,ICE_PUNCH
-	db 39,BODY_SLAM
-	db 47,THRASH
-	db 58,BLIZZARD
+; Learnset
+	db 18, LICK
+	db 23, DOUBLESLAP
+	db 31, ICE_PUNCH
+	db 39, BODY_SLAM
+	db 47, THRASH
+	db 58, BLIZZARD
 	db 0
 
 MoltresEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 51,LEER
-	db 55,AGILITY
-	db 60,SKY_ATTACK
+; Learnset
+	db 51, LEER
+	db 55, AGILITY
+	db 60, SKY_ATTACK
 	db 0
 
 ArticunoEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 51,BLIZZARD
-	db 55,AGILITY
-	db 60,MIST
+; Learnset
+	db 51, BLIZZARD
+	db 55, AGILITY
+	db 60, MIST
 	db 0
 
 ZapdosEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 51,THUNDER
-	db 55,AGILITY
-	db 60,LIGHT_SCREEN
+; Learnset
+	db 51, THUNDER
+	db 55, AGILITY
+	db 60, LIGHT_SCREEN
 	db 0
 
 DittoEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MeowthEvosMoves:
-;Evolutions
-	db EV_LEVEL,28,PERSIAN
+; Evolutions
+	db EV_LEVEL, 28, PERSIAN
 	db 0
-;Learnset
-	db 12,BITE
-	db 17,PAY_DAY
-	db 24,SCREECH
-	db 33,FURY_SWIPES
-	db 44,SLASH
+; Learnset
+	db 12, BITE
+	db 17, PAY_DAY
+	db 24, SCREECH
+	db 33, FURY_SWIPES
+	db 44, SLASH
 	db 0
 
 KrabbyEvosMoves:
-;Evolutions
-	db EV_LEVEL,28,KINGLER
+; Evolutions
+	db EV_LEVEL, 28, KINGLER
 	db 0
-;Learnset
-	db 20,VICEGRIP
-	db 25,GUILLOTINE
-	db 30,STOMP
-	db 35,CRABHAMMER
-	db 40,HARDEN
+; Learnset
+	db 20, VICEGRIP
+	db 25, GUILLOTINE
+	db 30, STOMP
+	db 35, CRABHAMMER
+	db 40, HARDEN
 	db 0
 
 MissingNo4FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo50EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo51EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 VulpixEvosMoves:
-;Evolutions
-	db EV_ITEM,FIRE_STONE,1,NINETALES
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, NINETALES
 	db 0
-;Learnset
-	db 16,QUICK_ATTACK
-	db 21,ROAR
-	db 28,CONFUSE_RAY
-	db 35,FLAMETHROWER
-	db 42,FIRE_SPIN
+; Learnset
+	db 16, QUICK_ATTACK
+	db 21, ROAR
+	db 28, CONFUSE_RAY
+	db 35, FLAMETHROWER
+	db 42, FIRE_SPIN
 	db 0
 
 NinetalesEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 PikachuEvosMoves:
-;Evolutions
-	db EV_ITEM,THUNDER_STONE,1,RAICHU
+; Evolutions
+	db EV_ITEM, THUNDER_STONE, 1, RAICHU
 	db 0
-;Learnset
-	db 9,THUNDER_WAVE
-	db 16,QUICK_ATTACK
-	db 26,SWIFT
-	db 33,AGILITY
-	db 43,THUNDER
+; Learnset
+	db 9, THUNDER_WAVE
+	db 16, QUICK_ATTACK
+	db 26, SWIFT
+	db 33, AGILITY
+	db 43, THUNDER
 	db 0
 
 RaichuEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo56EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo57EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 DratiniEvosMoves:
-;Evolutions
-	db EV_LEVEL,30,DRAGONAIR
+; Evolutions
+	db EV_LEVEL, 30, DRAGONAIR
 	db 0
-;Learnset
-	db 10,THUNDER_WAVE
-	db 20,AGILITY
-	db 30,SLAM
-	db 40,DRAGON_RAGE
-	db 50,HYPER_BEAM
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 30, SLAM
+	db 40, DRAGON_RAGE
+	db 50, HYPER_BEAM
 	db 0
 
 DragonairEvosMoves:
-;Evolutions
-	db EV_LEVEL,55,DRAGONITE
+; Evolutions
+	db EV_LEVEL, 55, DRAGONITE
 	db 0
-;Learnset
-	db 10,THUNDER_WAVE
-	db 20,AGILITY
-	db 35,SLAM
-	db 45,DRAGON_RAGE
-	db 55,HYPER_BEAM
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 35, SLAM
+	db 45, DRAGON_RAGE
+	db 55, HYPER_BEAM
 	db 0
 
 KabutoEvosMoves:
-;Evolutions
-	db EV_LEVEL,40,KABUTOPS
+; Evolutions
+	db EV_LEVEL, 40, KABUTOPS
 	db 0
-;Learnset
-	db 34,ABSORB
-	db 39,SLASH
-	db 44,LEER
-	db 49,HYDRO_PUMP
+; Learnset
+	db 34, ABSORB
+	db 39, SLASH
+	db 44, LEER
+	db 49, HYDRO_PUMP
 	db 0
 
 KabutopsEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 34,ABSORB
-	db 39,SLASH
-	db 46,LEER
-	db 53,HYDRO_PUMP
+; Learnset
+	db 34, ABSORB
+	db 39, SLASH
+	db 46, LEER
+	db 53, HYDRO_PUMP
 	db 0
 
 HorseaEvosMoves:
-;Evolutions
-	db EV_LEVEL,32,SEADRA
+; Evolutions
+	db EV_LEVEL, 32, SEADRA
 	db 0
-;Learnset
-	db 19,SMOKESCREEN
-	db 24,LEER
-	db 30,WATER_GUN
-	db 37,AGILITY
-	db 45,HYDRO_PUMP
+; Learnset
+	db 19, SMOKESCREEN
+	db 24, LEER
+	db 30, WATER_GUN
+	db 37, AGILITY
+	db 45, HYDRO_PUMP
 	db 0
 
 SeadraEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 19,SMOKESCREEN
-	db 24,LEER
-	db 30,WATER_GUN
-	db 41,AGILITY
-	db 52,HYDRO_PUMP
+; Learnset
+	db 19, SMOKESCREEN
+	db 24, LEER
+	db 30, WATER_GUN
+	db 41, AGILITY
+	db 52, HYDRO_PUMP
 	db 0
 
 MissingNo5EEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo5FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 SandshrewEvosMoves:
-;Evolutions
-	db EV_LEVEL,22,SANDSLASH
+; Evolutions
+	db EV_LEVEL, 22, SANDSLASH
 	db 0
-;Learnset
-	db 10,SAND_ATTACK
-	db 17,SLASH
-	db 24,POISON_STING
-	db 31,SWIFT
-	db 38,FURY_SWIPES
+; Learnset
+	db 10, SAND_ATTACK
+	db 17, SLASH
+	db 24, POISON_STING
+	db 31, SWIFT
+	db 38, FURY_SWIPES
 	db 0
 
 SandslashEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 10,SAND_ATTACK
-	db 17,SLASH
-	db 27,POISON_STING
-	db 36,SWIFT
-	db 47,FURY_SWIPES
+; Learnset
+	db 10, SAND_ATTACK
+	db 17, SLASH
+	db 27, POISON_STING
+	db 36, SWIFT
+	db 47, FURY_SWIPES
 	db 0
 
 OmanyteEvosMoves:
-;Evolutions
-	db EV_LEVEL,40,OMASTAR
+; Evolutions
+	db EV_LEVEL, 40, OMASTAR
 	db 0
-;Learnset
-	db 34,HORN_ATTACK
-	db 39,LEER
-	db 46,SPIKE_CANNON
-	db 53,HYDRO_PUMP
+; Learnset
+	db 34, HORN_ATTACK
+	db 39, LEER
+	db 46, SPIKE_CANNON
+	db 53, HYDRO_PUMP
 	db 0
 
 OmastarEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 34,HORN_ATTACK
-	db 39,LEER
-	db 44,SPIKE_CANNON
-	db 49,HYDRO_PUMP
+; Learnset
+	db 34, HORN_ATTACK
+	db 39, LEER
+	db 44, SPIKE_CANNON
+	db 49, HYDRO_PUMP
 	db 0
 
 JigglypuffEvosMoves:
-;Evolutions
-	db EV_ITEM,MOON_STONE,1,WIGGLYTUFF
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF
 	db 0
-;Learnset
-	db 9,POUND
-	db 14,DISABLE
-	db 19,DEFENSE_CURL
-	db 24,DOUBLESLAP
-	db 29,REST
-	db 34,BODY_SLAM
-	db 39,DOUBLE_EDGE
+; Learnset
+	db 9, POUND
+	db 14, DISABLE
+	db 19, DEFENSE_CURL
+	db 24, DOUBLESLAP
+	db 29, REST
+	db 34, BODY_SLAM
+	db 39, DOUBLE_EDGE
 	db 0
 
 WigglytuffEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 EeveeEvosMoves:
-;Evolutions
-	db EV_ITEM,FIRE_STONE,1,FLAREON
-	db EV_ITEM,THUNDER_STONE,1,JOLTEON
-	db EV_ITEM,WATER_STONE,1,VAPOREON
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, FLAREON
+	db EV_ITEM, THUNDER_STONE, 1, JOLTEON
+	db EV_ITEM, WATER_STONE, 1, VAPOREON
 	db 0
-EeveeEvosEnd:
-;Learnset
-	db 27,QUICK_ATTACK
-	db 31,TAIL_WHIP
-	db 37,BITE
-	db 45,TAKE_DOWN
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, TAIL_WHIP
+	db 37, BITE
+	db 45, TAKE_DOWN
 	db 0
 
 FlareonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 27,QUICK_ATTACK
-	db 31,EMBER
-	db 37,TAIL_WHIP
-	db 40,BITE
-	db 42,LEER
-	db 44,FIRE_SPIN
-	db 48,RAGE
-	db 54,FLAMETHROWER
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, EMBER
+	db 37, TAIL_WHIP
+	db 40, BITE
+	db 42, LEER
+	db 44, FIRE_SPIN
+	db 48, RAGE
+	db 54, FLAMETHROWER
 	db 0
 
 JolteonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 27,QUICK_ATTACK
-	db 31,THUNDERSHOCK
-	db 37,TAIL_WHIP
-	db 40,THUNDER_WAVE
-	db 42,DOUBLE_KICK
-	db 44,AGILITY
-	db 48,PIN_MISSILE
-	db 54,THUNDER
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, THUNDERSHOCK
+	db 37, TAIL_WHIP
+	db 40, THUNDER_WAVE
+	db 42, DOUBLE_KICK
+	db 44, AGILITY
+	db 48, PIN_MISSILE
+	db 54, THUNDER
 	db 0
 
 VaporeonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 27,QUICK_ATTACK
-	db 31,WATER_GUN
-	db 37,TAIL_WHIP
-	db 40,BITE
-	db 42,ACID_ARMOR
-	db 44,HAZE
-	db 48,MIST
-	db 54,HYDRO_PUMP
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, WATER_GUN
+	db 37, TAIL_WHIP
+	db 40, BITE
+	db 42, ACID_ARMOR
+	db 44, HAZE
+	db 48, MIST
+	db 54, HYDRO_PUMP
 	db 0
 
 MachopEvosMoves:
-;Evolutions
-	db EV_LEVEL,28,MACHOKE
+; Evolutions
+	db EV_LEVEL, 28, MACHOKE
 	db 0
-;Learnset
-	db 20,LOW_KICK
-	db 25,LEER
-	db 32,FOCUS_ENERGY
-	db 39,SEISMIC_TOSS
-	db 46,SUBMISSION
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 32, FOCUS_ENERGY
+	db 39, SEISMIC_TOSS
+	db 46, SUBMISSION
 	db 0
 
 ZubatEvosMoves:
-;Evolutions
-	db EV_LEVEL,22,GOLBAT
+; Evolutions
+	db EV_LEVEL, 22, GOLBAT
 	db 0
-;Learnset
-	db 10,SUPERSONIC
-	db 15,BITE
-	db 21,CONFUSE_RAY
-	db 28,WING_ATTACK
-	db 36,HAZE
+; Learnset
+	db 10, SUPERSONIC
+	db 15, BITE
+	db 21, CONFUSE_RAY
+	db 28, WING_ATTACK
+	db 36, HAZE
 	db 0
 
 EkansEvosMoves:
-;Evolutions
-	db EV_LEVEL,22,ARBOK
+; Evolutions
+	db EV_LEVEL, 22, ARBOK
 	db 0
-;Learnset
-	db 10,POISON_STING
-	db 17,BITE
-	db 24,GLARE
-	db 31,SCREECH
-	db 38,ACID
+; Learnset
+	db 10, POISON_STING
+	db 17, BITE
+	db 24, GLARE
+	db 31, SCREECH
+	db 38, ACID
 	db 0
 
 ParasEvosMoves:
-;Evolutions
-	db EV_LEVEL,24,PARASECT
+; Evolutions
+	db EV_LEVEL, 24, PARASECT
 	db 0
-;Learnset
-	db 13,STUN_SPORE
-	db 20,LEECH_LIFE
-	db 27,SPORE
-	db 34,SLASH
-	db 41,GROWTH
+; Learnset
+	db 13, STUN_SPORE
+	db 20, LEECH_LIFE
+	db 27, SPORE
+	db 34, SLASH
+	db 41, GROWTH
 	db 0
 
 PoliwhirlEvosMoves:
-;Evolutions
-	db EV_ITEM,WATER_STONE,1,POLIWRATH
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, POLIWRATH
 	db 0
-;Learnset
-	db 16,HYPNOSIS
-	db 19,WATER_GUN
-	db 26,DOUBLESLAP
-	db 33,BODY_SLAM
-	db 41,AMNESIA
-	db 49,HYDRO_PUMP
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 26, DOUBLESLAP
+	db 33, BODY_SLAM
+	db 41, AMNESIA
+	db 49, HYDRO_PUMP
 	db 0
 
 PoliwrathEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 16,HYPNOSIS
-	db 19,WATER_GUN
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
 	db 0
 
 WeedleEvosMoves:
-;Evolutions
-	db EV_LEVEL,7,KAKUNA
+; Evolutions
+	db EV_LEVEL, 7, KAKUNA
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 KakunaEvosMoves:
-;Evolutions
-	db EV_LEVEL,10,BEEDRILL
+; Evolutions
+	db EV_LEVEL, 10, BEEDRILL
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 BeedrillEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 12,FURY_ATTACK
-	db 16,FOCUS_ENERGY
-	db 20,TWINEEDLE
-	db 25,RAGE
-	db 30,PIN_MISSILE
-	db 35,AGILITY
+; Learnset
+	db 12, FURY_ATTACK
+	db 16, FOCUS_ENERGY
+	db 20, TWINEEDLE
+	db 25, RAGE
+	db 30, PIN_MISSILE
+	db 35, AGILITY
 	db 0
 
 MissingNo73EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 DodrioEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 20,GROWL
-	db 24,FURY_ATTACK
-	db 30,DRILL_PECK
-	db 39,RAGE
-	db 45,TRI_ATTACK
-	db 51,AGILITY
+; Learnset
+	db 20, GROWL
+	db 24, FURY_ATTACK
+	db 30, DRILL_PECK
+	db 39, RAGE
+	db 45, TRI_ATTACK
+	db 51, AGILITY
 	db 0
 
 PrimeapeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 15,KARATE_CHOP
-	db 21,FURY_SWIPES
-	db 27,FOCUS_ENERGY
-	db 37,SEISMIC_TOSS
-	db 46,THRASH
+; Learnset
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 37, SEISMIC_TOSS
+	db 46, THRASH
 	db 0
 
 DugtrioEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 15,GROWL
-	db 19,DIG
-	db 24,SAND_ATTACK
-	db 35,SLASH
-	db 47,EARTHQUAKE
+; Learnset
+	db 15, GROWL
+	db 19, DIG
+	db 24, SAND_ATTACK
+	db 35, SLASH
+	db 47, EARTHQUAKE
 	db 0
 
 VenomothEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 24,POISONPOWDER
-	db 27,LEECH_LIFE
-	db 30,STUN_SPORE
-	db 38,PSYBEAM
-	db 43,SLEEP_POWDER
-	db 50,PSYCHIC_M
+; Learnset
+	db 24, POISONPOWDER
+	db 27, LEECH_LIFE
+	db 30, STUN_SPORE
+	db 38, PSYBEAM
+	db 43, SLEEP_POWDER
+	db 50, PSYCHIC_M
 	db 0
 
 DewgongEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 30,GROWL
-	db 35,AURORA_BEAM
-	db 44,REST
-	db 50,TAKE_DOWN
-	db 56,ICE_BEAM
+; Learnset
+	db 30, GROWL
+	db 35, AURORA_BEAM
+	db 44, REST
+	db 50, TAKE_DOWN
+	db 56, ICE_BEAM
 	db 0
 
 MissingNo79EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo7AEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 CaterpieEvosMoves:
-;Evolutions
-	db EV_LEVEL,7,METAPOD
+; Evolutions
+	db EV_LEVEL, 7, METAPOD
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MetapodEvosMoves:
-;Evolutions
-	db EV_LEVEL,10,BUTTERFREE
+; Evolutions
+	db EV_LEVEL, 10, BUTTERFREE
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 ButterfreeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 12,CONFUSION
-	db 15,POISONPOWDER
-	db 16,STUN_SPORE
-	db 17,SLEEP_POWDER
-	db 21,SUPERSONIC
-	db 26,WHIRLWIND
-	db 32,PSYBEAM
+; Learnset
+	db 12, CONFUSION
+	db 15, POISONPOWDER
+	db 16, STUN_SPORE
+	db 17, SLEEP_POWDER
+	db 21, SUPERSONIC
+	db 26, WHIRLWIND
+	db 32, PSYBEAM
 	db 0
 
 MachampEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 20,LOW_KICK
-	db 25,LEER
-	db 36,FOCUS_ENERGY
-	db 44,SEISMIC_TOSS
-	db 52,SUBMISSION
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 36, FOCUS_ENERGY
+	db 44, SEISMIC_TOSS
+	db 52, SUBMISSION
 	db 0
 
 MissingNo7FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 GolduckEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 28,TAIL_WHIP
-	db 31,DISABLE
-	db 39,CONFUSION
-	db 48,FURY_SWIPES
-	db 59,HYDRO_PUMP
+; Learnset
+	db 28, TAIL_WHIP
+	db 31, DISABLE
+	db 39, CONFUSION
+	db 48, FURY_SWIPES
+	db 59, HYDRO_PUMP
 	db 0
 
 HypnoEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 12,DISABLE
-	db 17,CONFUSION
-	db 24,HEADBUTT
-	db 33,POISON_GAS
-	db 37,PSYCHIC_M
-	db 43,MEDITATE
+; Learnset
+	db 12, DISABLE
+	db 17, CONFUSION
+	db 24, HEADBUTT
+	db 33, POISON_GAS
+	db 37, PSYCHIC_M
+	db 43, MEDITATE
 	db 0
 
 GolbatEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 10,SUPERSONIC
-	db 15,BITE
-	db 21,CONFUSE_RAY
-	db 32,WING_ATTACK
-	db 43,HAZE
+; Learnset
+	db 10, SUPERSONIC
+	db 15, BITE
+	db 21, CONFUSE_RAY
+	db 32, WING_ATTACK
+	db 43, HAZE
 	db 0
 
 MewtwoEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 63,BARRIER
-	db 66,PSYCHIC_M
-	db 70,RECOVER
-	db 75,MIST
-	db 81,AMNESIA
+; Learnset
+	db 63, BARRIER
+	db 66, PSYCHIC_M
+	db 70, RECOVER
+	db 75, MIST
+	db 81, AMNESIA
 	db 0
 
 SnorlaxEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 35,BODY_SLAM
-	db 41,HARDEN
-	db 48,DOUBLE_EDGE
-	db 56,HYPER_BEAM
+; Learnset
+	db 35, BODY_SLAM
+	db 41, HARDEN
+	db 48, DOUBLE_EDGE
+	db 56, HYPER_BEAM
 	db 0
 
 MagikarpEvosMoves:
-;Evolutions
-	db EV_LEVEL,20,GYARADOS
+; Evolutions
+	db EV_LEVEL, 20, GYARADOS
 	db 0
-;Learnset
-	db 15,TACKLE
+; Learnset
+	db 15, TACKLE
 	db 0
 
 MissingNo86EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNo87EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MukEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 30,POISON_GAS
-	db 33,MINIMIZE
-	db 37,SLUDGE
-	db 45,HARDEN
-	db 53,SCREECH
-	db 60,ACID_ARMOR
+; Learnset
+	db 30, POISON_GAS
+	db 33, MINIMIZE
+	db 37, SLUDGE
+	db 45, HARDEN
+	db 53, SCREECH
+	db 60, ACID_ARMOR
 	db 0
 
 MissingNo8AEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 KinglerEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 20,VICEGRIP
-	db 25,GUILLOTINE
-	db 34,STOMP
-	db 42,CRABHAMMER
-	db 49,HARDEN
+; Learnset
+	db 20, VICEGRIP
+	db 25, GUILLOTINE
+	db 34, STOMP
+	db 42, CRABHAMMER
+	db 49, HARDEN
 	db 0
 
 CloysterEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 50,SPIKE_CANNON
+; Learnset
+	db 50, SPIKE_CANNON
 	db 0
 
 MissingNo8CEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 ElectrodeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 17,SONICBOOM
-	db 22,SELFDESTRUCT
-	db 29,LIGHT_SCREEN
-	db 40,SWIFT
-	db 50,EXPLOSION
+; Learnset
+	db 17, SONICBOOM
+	db 22, SELFDESTRUCT
+	db 29, LIGHT_SCREEN
+	db 40, SWIFT
+	db 50, EXPLOSION
 	db 0
 
 ClefableEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 WeezingEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 32,SLUDGE
-	db 39,SMOKESCREEN
-	db 43,SELFDESTRUCT
-	db 49,HAZE
-	db 53,EXPLOSION
+; Learnset
+	db 32, SLUDGE
+	db 39, SMOKESCREEN
+	db 43, SELFDESTRUCT
+	db 49, HAZE
+	db 53, EXPLOSION
 	db 0
 
 PersianEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 12,BITE
-	db 17,PAY_DAY
-	db 24,SCREECH
-	db 37,FURY_SWIPES
-	db 51,SLASH
+; Learnset
+	db 12, BITE
+	db 17, PAY_DAY
+	db 24, SCREECH
+	db 37, FURY_SWIPES
+	db 51, SLASH
 	db 0
 
 MarowakEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 25,LEER
-	db 33,FOCUS_ENERGY
-	db 41,THRASH
-	db 48,BONEMERANG
-	db 55,RAGE
+; Learnset
+	db 25, LEER
+	db 33, FOCUS_ENERGY
+	db 41, THRASH
+	db 48, BONEMERANG
+	db 55, RAGE
 	db 0
 
 MissingNo92EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 HaunterEvosMoves:
-;Evolutions
-	db EV_TRADE,1,GENGAR
+; Evolutions
+	db EV_TRADE, 1, GENGAR
 	db 0
-;Learnset
-	db 29,HYPNOSIS
-	db 38,DREAM_EATER
+; Learnset
+	db 29, HYPNOSIS
+	db 38, DREAM_EATER
 	db 0
 
 AbraEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,KADABRA
+; Evolutions
+	db EV_LEVEL, 16, KADABRA
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 AlakazamEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 16,CONFUSION
-	db 20,DISABLE
-	db 27,PSYBEAM
-	db 31,RECOVER
-	db 38,PSYCHIC_M
-	db 42,REFLECT
+; Learnset
+	db 16, CONFUSION
+	db 20, DISABLE
+	db 27, PSYBEAM
+	db 31, RECOVER
+	db 38, PSYCHIC_M
+	db 42, REFLECT
 	db 0
 
 PidgeottoEvosMoves:
-;Evolutions
-	db EV_LEVEL,36,PIDGEOT
+; Evolutions
+	db EV_LEVEL, 36, PIDGEOT
 	db 0
-;Learnset
-	db 5,SAND_ATTACK
-	db 12,QUICK_ATTACK
-	db 21,WHIRLWIND
-	db 31,WING_ATTACK
-	db 40,AGILITY
-	db 49,MIRROR_MOVE
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 21, WHIRLWIND
+	db 31, WING_ATTACK
+	db 40, AGILITY
+	db 49, MIRROR_MOVE
 	db 0
 
 PidgeotEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 5,SAND_ATTACK
-	db 12,QUICK_ATTACK
-	db 21,WHIRLWIND
-	db 31,WING_ATTACK
-	db 44,AGILITY
-	db 54,MIRROR_MOVE
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 21, WHIRLWIND
+	db 31, WING_ATTACK
+	db 44, AGILITY
+	db 54, MIRROR_MOVE
 	db 0
 
 StarmieEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 BulbasaurEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,IVYSAUR
+; Evolutions
+	db EV_LEVEL, 16, IVYSAUR
 	db 0
-;Learnset
-	db 7,LEECH_SEED
-	db 13,VINE_WHIP
-	db 20,POISONPOWDER
-	db 27,RAZOR_LEAF
-	db 34,GROWTH
-	db 41,SLEEP_POWDER
-	db 48,SOLARBEAM
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 20, POISONPOWDER
+	db 27, RAZOR_LEAF
+	db 34, GROWTH
+	db 41, SLEEP_POWDER
+	db 48, SOLARBEAM
 	db 0
 
 VenusaurEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 7,LEECH_SEED
-	db 13,VINE_WHIP
-	db 22,POISONPOWDER
-	db 30,RAZOR_LEAF
-	db 43,GROWTH
-	db 55,SLEEP_POWDER
-	db 65,SOLARBEAM
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 22, POISONPOWDER
+	db 30, RAZOR_LEAF
+	db 43, GROWTH
+	db 55, SLEEP_POWDER
+	db 65, SOLARBEAM
 	db 0
 
 TentacruelEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 7,SUPERSONIC
-	db 13,WRAP
-	db 18,POISON_STING
-	db 22,WATER_GUN
-	db 27,CONSTRICT
-	db 35,BARRIER
-	db 43,SCREECH
-	db 50,HYDRO_PUMP
+; Learnset
+	db 7, SUPERSONIC
+	db 13, WRAP
+	db 18, POISON_STING
+	db 22, WATER_GUN
+	db 27, CONSTRICT
+	db 35, BARRIER
+	db 43, SCREECH
+	db 50, HYDRO_PUMP
 	db 0
 
 MissingNo9CEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 GoldeenEvosMoves:
-;Evolutions
-	db EV_LEVEL,33,SEAKING
+; Evolutions
+	db EV_LEVEL, 33, SEAKING
 	db 0
-;Learnset
-	db 19,SUPERSONIC
-	db 24,HORN_ATTACK
-	db 30,FURY_ATTACK
-	db 37,WATERFALL
-	db 45,HORN_DRILL
-	db 54,AGILITY
+; Learnset
+	db 19, SUPERSONIC
+	db 24, HORN_ATTACK
+	db 30, FURY_ATTACK
+	db 37, WATERFALL
+	db 45, HORN_DRILL
+	db 54, AGILITY
 	db 0
 
 SeakingEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 19,SUPERSONIC
-	db 24,HORN_ATTACK
-	db 30,FURY_ATTACK
-	db 39,WATERFALL
-	db 48,HORN_DRILL
-	db 54,AGILITY
+; Learnset
+	db 19, SUPERSONIC
+	db 24, HORN_ATTACK
+	db 30, FURY_ATTACK
+	db 39, WATERFALL
+	db 48, HORN_DRILL
+	db 54, AGILITY
 	db 0
 
 MissingNo9FEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNoA0EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNoA1EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNoA2EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 PonytaEvosMoves:
-;Evolutions
-	db EV_LEVEL,40,RAPIDASH
+; Evolutions
+	db EV_LEVEL, 40, RAPIDASH
 	db 0
-;Learnset
-	db 30,TAIL_WHIP
-	db 32,STOMP
-	db 35,GROWL
-	db 39,FIRE_SPIN
-	db 43,TAKE_DOWN
-	db 48,AGILITY
+; Learnset
+	db 30, TAIL_WHIP
+	db 32, STOMP
+	db 35, GROWL
+	db 39, FIRE_SPIN
+	db 43, TAKE_DOWN
+	db 48, AGILITY
 	db 0
 
 RapidashEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 30,TAIL_WHIP
-	db 32,STOMP
-	db 35,GROWL
-	db 39,FIRE_SPIN
-	db 47,TAKE_DOWN
-	db 55,AGILITY
+; Learnset
+	db 30, TAIL_WHIP
+	db 32, STOMP
+	db 35, GROWL
+	db 39, FIRE_SPIN
+	db 47, TAKE_DOWN
+	db 55, AGILITY
 	db 0
 
 RattataEvosMoves:
-;Evolutions
-	db EV_LEVEL,20,RATICATE
+; Evolutions
+	db EV_LEVEL, 20, RATICATE
 	db 0
-;Learnset
-	db 7,QUICK_ATTACK
-	db 14,HYPER_FANG
-	db 23,FOCUS_ENERGY
-	db 34,SUPER_FANG
+; Learnset
+	db 7, QUICK_ATTACK
+	db 14, HYPER_FANG
+	db 23, FOCUS_ENERGY
+	db 34, SUPER_FANG
 	db 0
 
 RaticateEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 7,QUICK_ATTACK
-	db 14,HYPER_FANG
-	db 27,FOCUS_ENERGY
-	db 41,SUPER_FANG
+; Learnset
+	db 7, QUICK_ATTACK
+	db 14, HYPER_FANG
+	db 27, FOCUS_ENERGY
+	db 41, SUPER_FANG
 	db 0
 
 NidorinoEvosMoves:
-;Evolutions
-	db EV_ITEM,MOON_STONE,1,NIDOKING
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, NIDOKING
 	db 0
-;Learnset
-	db 8,HORN_ATTACK
-	db 14,POISON_STING
-	db 23,FOCUS_ENERGY
-	db 32,FURY_ATTACK
-	db 41,HORN_DRILL
-	db 50,DOUBLE_KICK
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 23, FOCUS_ENERGY
+	db 32, FURY_ATTACK
+	db 41, HORN_DRILL
+	db 50, DOUBLE_KICK
 	db 0
 
 NidorinaEvosMoves:
-;Evolutions
-	db EV_ITEM,MOON_STONE,1,NIDOQUEEN
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, NIDOQUEEN
 	db 0
-;Learnset
-	db 8,SCRATCH
-	db 14,POISON_STING
-	db 23,TAIL_WHIP
-	db 32,BITE
-	db 41,FURY_SWIPES
-	db 50,DOUBLE_KICK
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 23, TAIL_WHIP
+	db 32, BITE
+	db 41, FURY_SWIPES
+	db 50, DOUBLE_KICK
 	db 0
 
 GeodudeEvosMoves:
-;Evolutions
-	db EV_LEVEL,25,GRAVELER
+; Evolutions
+	db EV_LEVEL, 25, GRAVELER
 	db 0
-;Learnset
-	db 11,DEFENSE_CURL
-	db 16,ROCK_THROW
-	db 21,SELFDESTRUCT
-	db 26,HARDEN
-	db 31,EARTHQUAKE
-	db 36,EXPLOSION
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 26, HARDEN
+	db 31, EARTHQUAKE
+	db 36, EXPLOSION
 	db 0
 
 PorygonEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 23,PSYBEAM
-	db 28,RECOVER
-	db 35,AGILITY
-	db 42,TRI_ATTACK
+; Learnset
+	db 23, PSYBEAM
+	db 28, RECOVER
+	db 35, AGILITY
+	db 42, TRI_ATTACK
 	db 0
 
 AerodactylEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 33,SUPERSONIC
-	db 38,BITE
-	db 45,TAKE_DOWN
-	db 54,HYPER_BEAM
+; Learnset
+	db 33, SUPERSONIC
+	db 38, BITE
+	db 45, TAKE_DOWN
+	db 54, HYPER_BEAM
 	db 0
 
 MissingNoACEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MagnemiteEvosMoves:
-;Evolutions
-	db EV_LEVEL,30,MAGNETON
+; Evolutions
+	db EV_LEVEL, 30, MAGNETON
 	db 0
-;Learnset
-	db 21,SONICBOOM
-	db 25,THUNDERSHOCK
-	db 29,SUPERSONIC
-	db 35,THUNDER_WAVE
-	db 41,SWIFT
-	db 47,SCREECH
+; Learnset
+	db 21, SONICBOOM
+	db 25, THUNDERSHOCK
+	db 29, SUPERSONIC
+	db 35, THUNDER_WAVE
+	db 41, SWIFT
+	db 47, SCREECH
 	db 0
 
 MissingNoAEEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MissingNoAFEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 CharmanderEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,CHARMELEON
+; Evolutions
+	db EV_LEVEL, 16, CHARMELEON
 	db 0
-;Learnset
-	db 9,EMBER
-	db 15,LEER
-	db 22,RAGE
-	db 30,SLASH
-	db 38,FLAMETHROWER
-	db 46,FIRE_SPIN
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 22, RAGE
+	db 30, SLASH
+	db 38, FLAMETHROWER
+	db 46, FIRE_SPIN
 	db 0
 
 SquirtleEvosMoves:
-;Evolutions
-	db EV_LEVEL,16,WARTORTLE
+; Evolutions
+	db EV_LEVEL, 16, WARTORTLE
 	db 0
-;Learnset
-	db 8,BUBBLE
-	db 15,WATER_GUN
-	db 22,BITE
-	db 28,WITHDRAW
-	db 35,SKULL_BASH
-	db 42,HYDRO_PUMP
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 22, BITE
+	db 28, WITHDRAW
+	db 35, SKULL_BASH
+	db 42, HYDRO_PUMP
 	db 0
 
 CharmeleonEvosMoves:
-;Evolutions
-	db EV_LEVEL,36,CHARIZARD
+; Evolutions
+	db EV_LEVEL, 36, CHARIZARD
 	db 0
-;Learnset
-	db 9,EMBER
-	db 15,LEER
-	db 24,RAGE
-	db 33,SLASH
-	db 42,FLAMETHROWER
-	db 56,FIRE_SPIN
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 24, RAGE
+	db 33, SLASH
+	db 42, FLAMETHROWER
+	db 56, FIRE_SPIN
 	db 0
 
 WartortleEvosMoves:
-;Evolutions
-	db EV_LEVEL,36,BLASTOISE
+; Evolutions
+	db EV_LEVEL, 36, BLASTOISE
 	db 0
-;Learnset
-	db 8,BUBBLE
-	db 15,WATER_GUN
-	db 24,BITE
-	db 31,WITHDRAW
-	db 39,SKULL_BASH
-	db 47,HYDRO_PUMP
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 24, BITE
+	db 31, WITHDRAW
+	db 39, SKULL_BASH
+	db 47, HYDRO_PUMP
 	db 0
 
 CharizardEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 9,EMBER
-	db 15,LEER
-	db 24,RAGE
-	db 36,SLASH
-	db 46,FLAMETHROWER
-	db 55,FIRE_SPIN
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 24, RAGE
+	db 36, SLASH
+	db 46, FLAMETHROWER
+	db 55, FIRE_SPIN
 	db 0
 
 MissingNoB5EvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 FossilKabutopsEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 FossilAerodactylEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 MonGhostEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
+; Learnset
 	db 0
 
 OddishEvosMoves:
-;Evolutions
-	db EV_LEVEL,21,GLOOM
+; Evolutions
+	db EV_LEVEL, 21, GLOOM
 	db 0
-;Learnset
-	db 15,POISONPOWDER
-	db 17,STUN_SPORE
-	db 19,SLEEP_POWDER
-	db 24,ACID
-	db 33,PETAL_DANCE
-	db 46,SOLARBEAM
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
+	db 24, ACID
+	db 33, PETAL_DANCE
+	db 46, SOLARBEAM
 	db 0
 
 GloomEvosMoves:
-;Evolutions
-	db EV_ITEM,LEAF_STONE,1,VILEPLUME
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, VILEPLUME
 	db 0
-;Learnset
-	db 15,POISONPOWDER
-	db 17,STUN_SPORE
-	db 19,SLEEP_POWDER
-	db 28,ACID
-	db 38,PETAL_DANCE
-	db 52,SOLARBEAM
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
+	db 28, ACID
+	db 38, PETAL_DANCE
+	db 52, SOLARBEAM
 	db 0
 
 VileplumeEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 15,POISONPOWDER
-	db 17,STUN_SPORE
-	db 19,SLEEP_POWDER
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
 	db 0
 
 BellsproutEvosMoves:
-;Evolutions
-	db EV_LEVEL,21,WEEPINBELL
+; Evolutions
+	db EV_LEVEL, 21, WEEPINBELL
 	db 0
-;Learnset
-	db 13,WRAP
-	db 15,POISONPOWDER
-	db 18,SLEEP_POWDER
-	db 21,STUN_SPORE
-	db 26,ACID
-	db 33,RAZOR_LEAF
-	db 42,SLAM
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
+	db 21, STUN_SPORE
+	db 26, ACID
+	db 33, RAZOR_LEAF
+	db 42, SLAM
 	db 0
 
 WeepinbellEvosMoves:
-;Evolutions
-	db EV_ITEM,LEAF_STONE,1,VICTREEBEL
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
 	db 0
-;Learnset
-	db 13,WRAP
-	db 15,POISONPOWDER
-	db 18,SLEEP_POWDER
-	db 23,STUN_SPORE
-	db 29,ACID
-	db 38,RAZOR_LEAF
-	db 49,SLAM
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
+	db 23, STUN_SPORE
+	db 29, ACID
+	db 38, RAZOR_LEAF
+	db 49, SLAM
 	db 0
 
 VictreebelEvosMoves:
-;Evolutions
+; Evolutions
 	db 0
-;Learnset
-	db 13,WRAP
-	db 15,POISONPOWDER
-	db 18,SLEEP_POWDER
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
 	db 0
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -140,19 +140,19 @@
 	rl b
 	ld c, a
 	add hl, bc
-	ld de, wcd6d
+	ld de, wEvosMoves
 	ld a, BANK(EvosMovesPointerTable)
 	ld bc, 2
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wEvosMoves
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcd6d
+	ld de, wEvosMoves
 	ld a, BANK(EvosMovesPointerTable)
-	ld bc, EeveeEvosEnd - EeveeEvosMoves
+	ld bc, wEvosMoves.end - wEvosMoves
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wEvosMoves
 	ld de, .notAbleToEvolveText
 ; loop through the pokemon's evolution entries
 .checkEvolutionsLoop
--- a/wram.asm
+++ b/wram.asm
@@ -1237,6 +1237,8 @@
 ; FormatMovesString stores the number of moves minus one here
 	ds 1
 
+UNION
+
 wcd6d:: ds 4 ; buffer for various data
 
 wStatusScreenCurrentPP:: ; cd71
@@ -1248,6 +1250,13 @@
 wNormalMaxPPList:: ; cd78
 ; list of normal max PP (without PP up) values
 	ds 9
+
+NEXTU
+
+wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1
+.end::
+
+ENDU
 
 wSerialOtherGameboyRandomNumberListBlock:: ; cd81
 ; buffer for transferring the random number list generated by the other gameboy