Rename 'evolution line' to 'catchem mon' because those constants represent catchable pokemon during catchem mode

10 files changed, 330 insertions, 330 deletions

diff --git a/constants.asm b/constants.asm
index dc5fc1f..46a0cd5 100644
--- a/constants.asm
+++ b/constants.asm
@@ -5,7 +5,7 @@ INCLUDE "gbhw.asm"
 INCLUDE "constants/ball_types.asm"
 INCLUDE "constants/bonus_stage_order_constants.asm"
 INCLUDE "constants/diglett_stage_constants.asm"
-INCLUDE "constants/evolution_line_constants.asm"
+INCLUDE "constants/catchem_pokemon_constants.asm"
 INCLUDE "constants/evolution_type_constants.asm"
 INCLUDE "constants/joy_constants.asm"
 INCLUDE "constants/map_constants.asm"
diff --git a/constants/catchem_pokemon_constants.asm b/constants/catchem_pokemon_constants.asm
new file mode 100644
index 0000000..9d75ec1
--- /dev/null
+++ b/constants/catchem_pokemon_constants.asm
@@ -0,0 +1,81 @@
+const_value = 0
+	
+	const CATCHEM_BULBASAUR     ; $0
+	const CATCHEM_CHARMANDER    ; $1
+	const CATCHEM_SQUIRTLE      ; $2
+	const CATCHEM_CATERPIE      ; $3
+	const CATCHEM_WEEDLE        ; $4
+	const CATCHEM_PIDGEY        ; $5
+	const CATCHEM_RATTATA       ; $6
+	const CATCHEM_SPEAROW       ; $7
+	const CATCHEM_EKANS         ; $8
+	const CATCHEM_PIKACHU       ; $9
+	const CATCHEM_SANDSHREW     ; $a
+	const CATCHEM_NIDORAN_F     ; $b
+	const CATCHEM_NIDORAN_M     ; $c
+	const CATCHEM_CLEFAIRY      ; $d
+	const CATCHEM_VULPIX        ; $e
+	const CATCHEM_JIGGLYPUFF    ; $f
+	const CATCHEM_ZUBAT         ; $10
+	const CATCHEM_ODDISH        ; $11
+	const CATCHEM_PARAS         ; $12
+	const CATCHEM_VENONAT       ; $13
+	const CATCHEM_DIGLETT       ; $14
+	const CATCHEM_MEOWTH        ; $15
+	const CATCHEM_PSYDUCK       ; $16
+	const CATCHEM_MANKEY        ; $17
+	const CATCHEM_GROWLITHE     ; $18
+	const CATCHEM_POLIWAG       ; $19
+	const CATCHEM_ABRA          ; $1a
+	const CATCHEM_MACHOP        ; $1b
+	const CATCHEM_BELLSPROUT    ; $1c
+	const CATCHEM_TENTACOOL     ; $1d
+	const CATCHEM_GEODUDE       ; $1e
+	const CATCHEM_PONYTA        ; $1f
+	const CATCHEM_SLOWPOKE      ; $20
+	const CATCHEM_MAGNEMITE     ; $21
+	const CATCHEM_FARFETCH_D    ; $22
+	const CATCHEM_DODUO         ; $23
+	const CATCHEM_SEEL          ; $24
+	const CATCHEM_GRIMER        ; $25
+	const CATCHEM_SHELLDER      ; $26
+	const CATCHEM_GASTLY        ; $27
+	const CATCHEM_ONIX          ; $28
+	const CATCHEM_DROWZEE       ; $29
+	const CATCHEM_KRABBY        ; $2a
+	const CATCHEM_VOLTORB       ; $2b
+	const CATCHEM_EXEGGCUTE     ; $2c
+	const CATCHEM_CUBONE        ; $2d
+	const CATCHEM_HITMONLEE     ; $2e
+	const CATCHEM_HITMONCHAN    ; $2f
+	const CATCHEM_LICKITUNG     ; $30
+	const CATCHEM_KOFFING       ; $31
+	const CATCHEM_RHYHORN       ; $32
+	const CATCHEM_CHANSEY       ; $33
+	const CATCHEM_TANGELA       ; $34
+	const CATCHEM_KANGASKHAN    ; $35
+	const CATCHEM_HORSEA        ; $36
+	const CATCHEM_GOLDEEN       ; $37
+	const CATCHEM_STARYU        ; $38
+	const CATCHEM_MR_MIME       ; $39
+	const CATCHEM_SCYTHER       ; $3a
+	const CATCHEM_JYNX          ; $3b
+	const CATCHEM_ELECTABUZZ    ; $3c
+	const CATCHEM_MAGMAR        ; $3d
+	const CATCHEM_PINSIR        ; $3e
+	const CATCHEM_TAUROS        ; $3f
+	const CATCHEM_MAGIKARP      ; $40
+	const CATCHEM_LAPRAS        ; $41
+	const CATCHEM_DITTO         ; $42
+	const CATCHEM_EEVEE         ; $43
+	const CATCHEM_PORYGON       ; $44
+	const CATCHEM_OMANYTE       ; $45
+	const CATCHEM_KABUTO        ; $46
+	const CATCHEM_AERODACTYL    ; $47
+	const CATCHEM_SNORLAX       ; $48
+	const CATCHEM_ARTICUNO      ; $49
+	const CATCHEM_ZAPDOS        ; $4a
+	const CATCHEM_MOLTRES       ; $4b
+	const CATCHEM_DRATINI       ; $4c
+	const CATCHEM_MEWTWO        ; $4d
+	const CATCHEM_MEW           ; $4e
diff --git a/constants/evolution_line_constants.asm b/constants/evolution_line_constants.asm
deleted file mode 100644
index 871da64..0000000
--- a/constants/evolution_line_constants.asm
+++ /dev/null
@@ -1,81 +0,0 @@
-const_value = 0
-	
-	const EVOLINE_BULBASAUR     ; $0
-	const EVOLINE_CHARMANDER    ; $1
-	const EVOLINE_SQUIRTLE      ; $2
-	const EVOLINE_CATERPIE      ; $3
-	const EVOLINE_WEEDLE        ; $4
-	const EVOLINE_PIDGEY        ; $5
-	const EVOLINE_RATTATA       ; $6
-	const EVOLINE_SPEAROW       ; $7
-	const EVOLINE_EKANS         ; $8
-	const EVOLINE_PIKACHU       ; $9
-	const EVOLINE_SANDSHREW     ; $a
-	const EVOLINE_NIDORAN_F     ; $b
-	const EVOLINE_NIDORAN_M     ; $c
-	const EVOLINE_CLEFAIRY      ; $d
-	const EVOLINE_VULPIX        ; $e
-	const EVOLINE_JIGGLYPUFF    ; $f
-	const EVOLINE_ZUBAT         ; $10
-	const EVOLINE_ODDISH        ; $11
-	const EVOLINE_PARAS         ; $12
-	const EVOLINE_VENONAT       ; $13
-	const EVOLINE_DIGLETT       ; $14
-	const EVOLINE_MEOWTH        ; $15
-	const EVOLINE_PSYDUCK       ; $16
-	const EVOLINE_MANKEY        ; $17
-	const EVOLINE_GROWLITHE     ; $18
-	const EVOLINE_POLIWAG       ; $19
-	const EVOLINE_ABRA          ; $1a
-	const EVOLINE_MACHOP        ; $1b
-	const EVOLINE_BELLSPROUT    ; $1c
-	const EVOLINE_TENTACOOL     ; $1d
-	const EVOLINE_GEODUDE       ; $1e
-	const EVOLINE_PONYTA        ; $1f
-	const EVOLINE_SLOWPOKE      ; $20
-	const EVOLINE_MAGNEMITE     ; $21
-	const EVOLINE_FARFETCH_D    ; $22
-	const EVOLINE_DODUO         ; $23
-	const EVOLINE_SEEL          ; $24
-	const EVOLINE_GRIMER        ; $25
-	const EVOLINE_SHELLDER      ; $26
-	const EVOLINE_GASTLY        ; $27
-	const EVOLINE_ONIX          ; $28
-	const EVOLINE_DROWZEE       ; $29
-	const EVOLINE_KRABBY        ; $2a
-	const EVOLINE_VOLTORB       ; $2b
-	const EVOLINE_EXEGGCUTE     ; $2c
-	const EVOLINE_CUBONE        ; $2d
-	const EVOLINE_HITMONLEE     ; $2e
-	const EVOLINE_HITMONCHAN    ; $2f
-	const EVOLINE_LICKITUNG     ; $30
-	const EVOLINE_KOFFING       ; $31
-	const EVOLINE_RHYHORN       ; $32
-	const EVOLINE_CHANSEY       ; $33
-	const EVOLINE_TANGELA       ; $34
-	const EVOLINE_KANGASKHAN    ; $35
-	const EVOLINE_HORSEA        ; $36
-	const EVOLINE_GOLDEEN       ; $37
-	const EVOLINE_STARYU        ; $38
-	const EVOLINE_MR_MIME       ; $39
-	const EVOLINE_SCYTHER       ; $3a
-	const EVOLINE_JYNX          ; $3b
-	const EVOLINE_ELECTABUZZ    ; $3c
-	const EVOLINE_MAGMAR        ; $3d
-	const EVOLINE_PINSIR        ; $3e
-	const EVOLINE_TAUROS        ; $3f
-	const EVOLINE_MAGIKARP      ; $40
-	const EVOLINE_LAPRAS        ; $41
-	const EVOLINE_DITTO         ; $42
-	const EVOLINE_EEVEE         ; $43
-	const EVOLINE_PORYGON       ; $44
-	const EVOLINE_OMANYTE       ; $45
-	const EVOLINE_KABUTO        ; $46
-	const EVOLINE_AERODACTYL    ; $47
-	const EVOLINE_SNORLAX       ; $48
-	const EVOLINE_ARTICUNO      ; $49
-	const EVOLINE_ZAPDOS        ; $4a
-	const EVOLINE_MOLTRES       ; $4b
-	const EVOLINE_DRATINI       ; $4c
-	const EVOLINE_MEWTWO        ; $4d
-	const EVOLINE_MEW           ; $4e
diff --git a/data/catchem_mons.asm b/data/catchem_mons.asm
new file mode 100644
index 0000000..babf36e
--- /dev/null
+++ b/data/catchem_mons.asm
@@ -0,0 +1,81 @@
+CatchemMonIds: ; 0x1161d
+; Each byte corresponds to a mon in the PokeDex.
+	db CATCHEM_BULBASAUR, CATCHEM_BULBASAUR, CATCHEM_BULBASAUR
+	db CATCHEM_CHARMANDER, CATCHEM_CHARMANDER, CATCHEM_CHARMANDER
+	db CATCHEM_SQUIRTLE, CATCHEM_SQUIRTLE, CATCHEM_SQUIRTLE
+	db CATCHEM_CATERPIE, CATCHEM_CATERPIE, CATCHEM_CATERPIE
+	db CATCHEM_WEEDLE, CATCHEM_WEEDLE, CATCHEM_WEEDLE
+	db CATCHEM_PIDGEY, CATCHEM_PIDGEY, CATCHEM_PIDGEY
+	db CATCHEM_RATTATA, CATCHEM_RATTATA
+	db CATCHEM_SPEAROW, CATCHEM_SPEAROW
+	db CATCHEM_EKANS, CATCHEM_EKANS
+	db CATCHEM_PIKACHU, CATCHEM_PIKACHU
+	db CATCHEM_SANDSHREW, CATCHEM_SANDSHREW
+	db CATCHEM_NIDORAN_F, CATCHEM_NIDORAN_F, CATCHEM_NIDORAN_F
+	db CATCHEM_NIDORAN_M, CATCHEM_NIDORAN_M, CATCHEM_NIDORAN_M
+	db CATCHEM_CLEFAIRY, CATCHEM_CLEFAIRY
+	db CATCHEM_VULPIX, CATCHEM_VULPIX
+	db CATCHEM_JIGGLYPUFF, CATCHEM_JIGGLYPUFF
+	db CATCHEM_ZUBAT, CATCHEM_ZUBAT
+	db CATCHEM_ODDISH, CATCHEM_ODDISH, CATCHEM_ODDISH
+	db CATCHEM_PARAS,CATCHEM_PARAS
+	db CATCHEM_VENONAT,CATCHEM_VENONAT
+	db CATCHEM_DIGLETT, CATCHEM_DIGLETT
+	db CATCHEM_MEOWTH, CATCHEM_MEOWTH
+	db CATCHEM_PSYDUCK, CATCHEM_PSYDUCK
+	db CATCHEM_MANKEY, CATCHEM_MANKEY
+	db CATCHEM_GROWLITHE, CATCHEM_GROWLITHE
+	db CATCHEM_POLIWAG, CATCHEM_POLIWAG, CATCHEM_POLIWAG
+	db CATCHEM_ABRA, CATCHEM_ABRA, CATCHEM_ABRA
+	db CATCHEM_MACHOP, CATCHEM_MACHOP, CATCHEM_MACHOP
+	db CATCHEM_BELLSPROUT, CATCHEM_BELLSPROUT, CATCHEM_BELLSPROUT
+	db CATCHEM_TENTACOOL, CATCHEM_TENTACOOL
+	db CATCHEM_GEODUDE, CATCHEM_GEODUDE, CATCHEM_GEODUDE
+	db CATCHEM_PONYTA, CATCHEM_PONYTA
+	db CATCHEM_SLOWPOKE, CATCHEM_SLOWPOKE
+	db CATCHEM_MAGNEMITE, CATCHEM_MAGNEMITE
+	db CATCHEM_FARFETCH_D
+	db CATCHEM_DODUO, CATCHEM_DODUO
+	db CATCHEM_SEEL, CATCHEM_SEEL
+	db CATCHEM_GRIMER, CATCHEM_GRIMER
+	db CATCHEM_SHELLDER, CATCHEM_SHELLDER
+	db CATCHEM_GASTLY, CATCHEM_GASTLY, CATCHEM_GASTLY
+	db CATCHEM_ONIX
+	db CATCHEM_DROWZEE, CATCHEM_DROWZEE
+	db CATCHEM_KRABBY, CATCHEM_KRABBY
+	db CATCHEM_VOLTORB, CATCHEM_VOLTORB
+	db CATCHEM_EXEGGCUTE, CATCHEM_EXEGGCUTE
+	db CATCHEM_CUBONE, CATCHEM_CUBONE
+	db CATCHEM_HITMONLEE
+	db CATCHEM_HITMONCHAN
+	db CATCHEM_LICKITUNG
+	db CATCHEM_KOFFING, CATCHEM_KOFFING
+	db CATCHEM_RHYHORN, CATCHEM_RHYHORN
+	db CATCHEM_CHANSEY
+	db CATCHEM_TANGELA
+	db CATCHEM_KANGASKHAN
+	db CATCHEM_HORSEA, CATCHEM_HORSEA
+	db CATCHEM_GOLDEEN, CATCHEM_GOLDEEN
+	db CATCHEM_STARYU, CATCHEM_STARYU
+	db CATCHEM_MR_MIME
+	db CATCHEM_SCYTHER
+	db CATCHEM_JYNX
+	db CATCHEM_ELECTABUZZ
+	db CATCHEM_MAGMAR
+	db CATCHEM_PINSIR
+	db CATCHEM_TAUROS
+	db CATCHEM_MAGIKARP, CATCHEM_MAGIKARP
+	db CATCHEM_LAPRAS
+	db CATCHEM_DITTO
+	db CATCHEM_EEVEE, CATCHEM_EEVEE, CATCHEM_EEVEE, CATCHEM_EEVEE
+	db CATCHEM_PORYGON
+	db CATCHEM_OMANYTE, CATCHEM_OMANYTE
+	db CATCHEM_KABUTO, CATCHEM_KABUTO
+	db CATCHEM_AERODACTYL
+	db CATCHEM_SNORLAX
+	db CATCHEM_ARTICUNO
+	db CATCHEM_ZAPDOS
+	db CATCHEM_MOLTRES
+	db CATCHEM_DRATINI, CATCHEM_DRATINI, CATCHEM_DRATINI
+	db CATCHEM_MEWTWO
+	db CATCHEM_MEW
diff --git a/data/evolution_lines.asm b/data/evolution_lines.asm
deleted file mode 100644
index 43f7308..0000000
--- a/data/evolution_lines.asm
+++ /dev/null
@@ -1,81 +0,0 @@
-EvolutionLineIds: ; 0x1161d
-; Each byte corresponds to a mon in the PokeDex.
-	db EVOLINE_BULBASAUR, EVOLINE_BULBASAUR, EVOLINE_BULBASAUR
-	db EVOLINE_CHARMANDER, EVOLINE_CHARMANDER, EVOLINE_CHARMANDER
-	db EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE, EVOLINE_SQUIRTLE
-	db EVOLINE_CATERPIE, EVOLINE_CATERPIE, EVOLINE_CATERPIE
-	db EVOLINE_WEEDLE, EVOLINE_WEEDLE, EVOLINE_WEEDLE
-	db EVOLINE_PIDGEY, EVOLINE_PIDGEY, EVOLINE_PIDGEY
-	db EVOLINE_RATTATA, EVOLINE_RATTATA
-	db EVOLINE_SPEAROW, EVOLINE_SPEAROW
-	db EVOLINE_EKANS, EVOLINE_EKANS
-	db EVOLINE_PIKACHU, EVOLINE_PIKACHU
-	db EVOLINE_SANDSHREW, EVOLINE_SANDSHREW
-	db EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F, EVOLINE_NIDORAN_F
-	db EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M, EVOLINE_NIDORAN_M
-	db EVOLINE_CLEFAIRY, EVOLINE_CLEFAIRY
-	db EVOLINE_VULPIX, EVOLINE_VULPIX
-	db EVOLINE_JIGGLYPUFF, EVOLINE_JIGGLYPUFF
-	db EVOLINE_ZUBAT, EVOLINE_ZUBAT
-	db EVOLINE_ODDISH, EVOLINE_ODDISH, EVOLINE_ODDISH
-	db EVOLINE_PARAS,EVOLINE_PARAS
-	db EVOLINE_VENONAT,EVOLINE_VENONAT
-	db EVOLINE_DIGLETT, EVOLINE_DIGLETT
-	db EVOLINE_MEOWTH, EVOLINE_MEOWTH
-	db EVOLINE_PSYDUCK, EVOLINE_PSYDUCK
-	db EVOLINE_MANKEY, EVOLINE_MANKEY
-	db EVOLINE_GROWLITHE, EVOLINE_GROWLITHE
-	db EVOLINE_POLIWAG, EVOLINE_POLIWAG, EVOLINE_POLIWAG
-	db EVOLINE_ABRA, EVOLINE_ABRA, EVOLINE_ABRA
-	db EVOLINE_MACHOP, EVOLINE_MACHOP, EVOLINE_MACHOP
-	db EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT, EVOLINE_BELLSPROUT
-	db EVOLINE_TENTACOOL, EVOLINE_TENTACOOL
-	db EVOLINE_GEODUDE, EVOLINE_GEODUDE, EVOLINE_GEODUDE
-	db EVOLINE_PONYTA, EVOLINE_PONYTA
-	db EVOLINE_SLOWPOKE, EVOLINE_SLOWPOKE
-	db EVOLINE_MAGNEMITE, EVOLINE_MAGNEMITE
-	db EVOLINE_FARFETCH_D
-	db EVOLINE_DODUO, EVOLINE_DODUO
-	db EVOLINE_SEEL, EVOLINE_SEEL
-	db EVOLINE_GRIMER, EVOLINE_GRIMER
-	db EVOLINE_SHELLDER, EVOLINE_SHELLDER
-	db EVOLINE_GASTLY, EVOLINE_GASTLY, EVOLINE_GASTLY
-	db EVOLINE_ONIX
-	db EVOLINE_DROWZEE, EVOLINE_DROWZEE
-	db EVOLINE_KRABBY, EVOLINE_KRABBY
-	db EVOLINE_VOLTORB, EVOLINE_VOLTORB
-	db EVOLINE_EXEGGCUTE, EVOLINE_EXEGGCUTE
-	db EVOLINE_CUBONE, EVOLINE_CUBONE
-	db EVOLINE_HITMONLEE
-	db EVOLINE_HITMONCHAN
-	db EVOLINE_LICKITUNG
-	db EVOLINE_KOFFING, EVOLINE_KOFFING
-	db EVOLINE_RHYHORN, EVOLINE_RHYHORN
-	db EVOLINE_CHANSEY
-	db EVOLINE_TANGELA
-	db EVOLINE_KANGASKHAN
-	db EVOLINE_HORSEA, EVOLINE_HORSEA
-	db EVOLINE_GOLDEEN, EVOLINE_GOLDEEN
-	db EVOLINE_STARYU, EVOLINE_STARYU
-	db EVOLINE_MR_MIME
-	db EVOLINE_SCYTHER
-	db EVOLINE_JYNX
-	db EVOLINE_ELECTABUZZ
-	db EVOLINE_MAGMAR
-	db EVOLINE_PINSIR
-	db EVOLINE_TAUROS
-	db EVOLINE_MAGIKARP, EVOLINE_MAGIKARP
-	db EVOLINE_LAPRAS
-	db EVOLINE_DITTO
-	db EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE, EVOLINE_EEVEE
-	db EVOLINE_PORYGON
-	db EVOLINE_OMANYTE, EVOLINE_OMANYTE
-	db EVOLINE_KABUTO, EVOLINE_KABUTO
-	db EVOLINE_AERODACTYL
-	db EVOLINE_SNORLAX
-	db EVOLINE_ARTICUNO
-	db EVOLINE_ZAPDOS
-	db EVOLINE_MOLTRES
-	db EVOLINE_DRATINI, EVOLINE_DRATINI, EVOLINE_DRATINI
-	db EVOLINE_MEWTWO
-	db EVOLINE_MEW
diff --git a/data/mon_animation_durations.asm b/data/mon_animation_durations.asm
index ded8e73..d9624e3 100755
--- a/data/mon_animation_durations.asm
+++ b/data/mon_animation_durations.asm
@@ -1,81 +1,81 @@
 CatchSpriteFrameDurations: ; 0x13685

 ; Controls how the duration of each of the 3 animation frames in a mon's mini catch sprite animation.

-	db $12, $12, $10 ; EVOLINE_BULBASAUR

-	db $10, $10, $10 ; EVOLINE_CHARMANDER

-	db $12, $12, $0E ; EVOLINE_SQUIRTLE

-	db $14, $14, $12 ; EVOLINE_CATERPIE

-	db $14, $14, $10 ; EVOLINE_WEEDLE

-	db $0A, $0A, $0E ; EVOLINE_PIDGEY

-	db $11, $13, $10 ; EVOLINE_RATTATA

-	db $0B, $0B, $10 ; EVOLINE_SPEAROW

-	db $12, $12, $0E ; EVOLINE_EKANS

-	db $12, $14, $0E ; EVOLINE_PIKACHU

-	db $10, $12, $10 ; EVOLINE_SANDSHREW

-	db $11, $12, $0E ; EVOLINE_NIDORAN_F

-	db $11, $12, $0E ; EVOLINE_NIDORAN_M

-	db $12, $13, $10 ; EVOLINE_CLEFAIRY

-	db $11, $11, $10 ; EVOLINE_VULPIX

-	db $12, $12, $10 ; EVOLINE_JIGGLYPUFF

-	db $08, $08, $10 ; EVOLINE_ZUBAT

-	db $10, $10, $10 ; EVOLINE_ODDISH

-	db $10, $10, $10 ; EVOLINE_PARAS

-	db $11, $11, $0E ; EVOLINE_VENONAT

-	db $10, $10, $0E ; EVOLINE_DIGLETT

-	db $14, $14, $0E ; EVOLINE_MEOWTH

-	db $30, $30, $10 ; EVOLINE_PSYDUCK

-	db $12, $12, $10 ; EVOLINE_MANKEY

-	db $12, $12, $10 ; EVOLINE_GROWLITHE

-	db $10, $10, $10 ; EVOLINE_POLIWAG

-	db $10, $10, $10 ; EVOLINE_ABRA

-	db $12, $14, $10 ; EVOLINE_MACHOP

-	db $10, $12, $10 ; EVOLINE_BELLSPROUT

-	db $0C, $0C, $12 ; EVOLINE_TENTACOOL

-	db $12, $14, $0C ; EVOLINE_GEODUDE

-	db $12, $14, $0E ; EVOLINE_PONYTA

-	db $30, $30, $10 ; EVOLINE_SLOWPOKE

-	db $14, $14, $10 ; EVOLINE_MAGNEMITE

-	db $12, $12, $0E ; EVOLINE_FARFETCH_D

-	db $12, $12, $0E ; EVOLINE_DODUO

-	db $14, $14, $0E ; EVOLINE_SEEL

-	db $12, $12, $10 ; EVOLINE_GRIMER

-	db $14, $14, $0E ; EVOLINE_SHELLDER

-	db $10, $10, $0E ; EVOLINE_GASTLY

-	db $12, $12, $10 ; EVOLINE_ONIX

-	db $14, $14, $10 ; EVOLINE_DROWZEE

-	db $14, $12, $10 ; EVOLINE_KRABBY

-	db $02, $02, $10 ; EVOLINE_VOLTORB

-	db $12, $12, $10 ; EVOLINE_EXEGGCUTE

-	db $12, $12, $10 ; EVOLINE_CUBONE

-	db $14, $10, $10 ; EVOLINE_HITMONLEE

-	db $14, $10, $10 ; EVOLINE_HITMONCHAN

-	db $14, $12, $10 ; EVOLINE_LICKITUNG

-	db $11, $11, $10 ; EVOLINE_KOFFING

-	db $14, $14, $10 ; EVOLINE_RHYHORN

-	db $12, $12, $10 ; EVOLINE_CHANSEY

-	db $10, $10, $10 ; EVOLINE_TANGELA

-	db $12, $12, $10 ; EVOLINE_KANGASKHAN

-	db $0F, $0F, $0E ; EVOLINE_HORSEA

-	db $12, $12, $0E ; EVOLINE_GOLDEEN

-	db $23, $23, $10 ; EVOLINE_STARYU

-	db $13, $13, $10 ; EVOLINE_MR_MIME

-	db $13, $13, $10 ; EVOLINE_SCYTHER

-	db $12, $12, $10 ; EVOLINE_JYNX

-	db $12, $14, $10 ; EVOLINE_ELECTABUZZ

-	db $14, $14, $0E ; EVOLINE_MAGMAR

-	db $12, $12, $0E ; EVOLINE_PINSIR

-	db $12, $14, $10 ; EVOLINE_TAUROS

-	db $18, $18, $0C ; EVOLINE_MAGIKARP

-	db $16, $16, $0C ; EVOLINE_LAPRAS

-	db $14, $14, $10 ; EVOLINE_DITTO

-	db $12, $12, $10 ; EVOLINE_EEVEE

-	db $10, $10, $0E ; EVOLINE_PORYGON

-	db $12, $12, $0E ; EVOLINE_OMANYTE

-	db $12, $12, $0E ; EVOLINE_KABUTO

-	db $0C, $0C, $12 ; EVOLINE_AERODACTYL

-	db $26, $36, $12 ; EVOLINE_SNORLAX

-	db $13, $13, $10 ; EVOLINE_ARTICUNO

-	db $13, $13, $10 ; EVOLINE_ZAPDOS

-	db $13, $13, $10 ; EVOLINE_MOLTRES

-	db $12, $12, $0E ; EVOLINE_DRATINI

-	db $14, $14, $0E ; EVOLINE_MEWTWO

-	db $14, $14, $0E ; EVOLINE_MEW

+	db $12, $12, $10 ; CATCHEM_BULBASAUR

+	db $10, $10, $10 ; CATCHEM_CHARMANDER

+	db $12, $12, $0E ; CATCHEM_SQUIRTLE

+	db $14, $14, $12 ; CATCHEM_CATERPIE

+	db $14, $14, $10 ; CATCHEM_WEEDLE

+	db $0A, $0A, $0E ; CATCHEM_PIDGEY

+	db $11, $13, $10 ; CATCHEM_RATTATA

+	db $0B, $0B, $10 ; CATCHEM_SPEAROW

+	db $12, $12, $0E ; CATCHEM_EKANS

+	db $12, $14, $0E ; CATCHEM_PIKACHU

+	db $10, $12, $10 ; CATCHEM_SANDSHREW

+	db $11, $12, $0E ; CATCHEM_NIDORAN_F

+	db $11, $12, $0E ; CATCHEM_NIDORAN_M

+	db $12, $13, $10 ; CATCHEM_CLEFAIRY

+	db $11, $11, $10 ; CATCHEM_VULPIX

+	db $12, $12, $10 ; CATCHEM_JIGGLYPUFF

+	db $08, $08, $10 ; CATCHEM_ZUBAT

+	db $10, $10, $10 ; CATCHEM_ODDISH

+	db $10, $10, $10 ; CATCHEM_PARAS

+	db $11, $11, $0E ; CATCHEM_VENONAT

+	db $10, $10, $0E ; CATCHEM_DIGLETT

+	db $14, $14, $0E ; CATCHEM_MEOWTH

+	db $30, $30, $10 ; CATCHEM_PSYDUCK

+	db $12, $12, $10 ; CATCHEM_MANKEY

+	db $12, $12, $10 ; CATCHEM_GROWLITHE

+	db $10, $10, $10 ; CATCHEM_POLIWAG

+	db $10, $10, $10 ; CATCHEM_ABRA

+	db $12, $14, $10 ; CATCHEM_MACHOP

+	db $10, $12, $10 ; CATCHEM_BELLSPROUT

+	db $0C, $0C, $12 ; CATCHEM_TENTACOOL

+	db $12, $14, $0C ; CATCHEM_GEODUDE

+	db $12, $14, $0E ; CATCHEM_PONYTA

+	db $30, $30, $10 ; CATCHEM_SLOWPOKE

+	db $14, $14, $10 ; CATCHEM_MAGNEMITE

+	db $12, $12, $0E ; CATCHEM_FARFETCH_D

+	db $12, $12, $0E ; CATCHEM_DODUO

+	db $14, $14, $0E ; CATCHEM_SEEL

+	db $12, $12, $10 ; CATCHEM_GRIMER

+	db $14, $14, $0E ; CATCHEM_SHELLDER

+	db $10, $10, $0E ; CATCHEM_GASTLY

+	db $12, $12, $10 ; CATCHEM_ONIX

+	db $14, $14, $10 ; CATCHEM_DROWZEE

+	db $14, $12, $10 ; CATCHEM_KRABBY

+	db $02, $02, $10 ; CATCHEM_VOLTORB

+	db $12, $12, $10 ; CATCHEM_EXEGGCUTE

+	db $12, $12, $10 ; CATCHEM_CUBONE

+	db $14, $10, $10 ; CATCHEM_HITMONLEE

+	db $14, $10, $10 ; CATCHEM_HITMONCHAN

+	db $14, $12, $10 ; CATCHEM_LICKITUNG

+	db $11, $11, $10 ; CATCHEM_KOFFING

+	db $14, $14, $10 ; CATCHEM_RHYHORN

+	db $12, $12, $10 ; CATCHEM_CHANSEY

+	db $10, $10, $10 ; CATCHEM_TANGELA

+	db $12, $12, $10 ; CATCHEM_KANGASKHAN

+	db $0F, $0F, $0E ; CATCHEM_HORSEA

+	db $12, $12, $0E ; CATCHEM_GOLDEEN

+	db $23, $23, $10 ; CATCHEM_STARYU

+	db $13, $13, $10 ; CATCHEM_MR_MIME

+	db $13, $13, $10 ; CATCHEM_SCYTHER

+	db $12, $12, $10 ; CATCHEM_JYNX

+	db $12, $14, $10 ; CATCHEM_ELECTABUZZ

+	db $14, $14, $0E ; CATCHEM_MAGMAR

+	db $12, $12, $0E ; CATCHEM_PINSIR

+	db $12, $14, $10 ; CATCHEM_TAUROS

+	db $18, $18, $0C ; CATCHEM_MAGIKARP

+	db $16, $16, $0C ; CATCHEM_LAPRAS

+	db $14, $14, $10 ; CATCHEM_DITTO

+	db $12, $12, $10 ; CATCHEM_EEVEE

+	db $10, $10, $0E ; CATCHEM_PORYGON

+	db $12, $12, $0E ; CATCHEM_OMANYTE

+	db $12, $12, $0E ; CATCHEM_KABUTO

+	db $0C, $0C, $12 ; CATCHEM_AERODACTYL

+	db $26, $36, $12 ; CATCHEM_SNORLAX

+	db $13, $13, $10 ; CATCHEM_ARTICUNO

+	db $13, $13, $10 ; CATCHEM_ZAPDOS

+	db $13, $13, $10 ; CATCHEM_MOLTRES

+	db $12, $12, $0E ; CATCHEM_DRATINI

+	db $14, $14, $0E ; CATCHEM_MEWTWO

+	db $14, $14, $0E ; CATCHEM_MEW

diff --git a/data/mon_initial_indicator_states.asm b/data/mon_initial_indicator_states.asm
index 27b9db0..9ecbc67 100644
--- a/data/mon_initial_indicator_states.asm
+++ b/data/mon_initial_indicator_states.asm
@@ -1,84 +1,84 @@
 CatchEmModeInitialIndicatorStates: ; 0x123ae

 ; Initial states for the indicators when starting Catch Em mode.

-; For some reason, each pokemon evolution line has its own entry, but

+; For some reason, each catchable pokemon has its own entry, but

 ; they're all exactly the same.

 ; See wIndicatorStates, for a description of indicators.

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_BULBASAUR

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_CHARMANDER

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SQUIRTLE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_CATERPIE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_WEEDLE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PIDGEY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_RATTATA

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SPEAROW

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_EKANS

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PIKACHU

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SANDSHREW

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_NIDORAN_F

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_NIDORAN_M

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_CLEFAIRY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_VULPIX

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_JIGGLYPUFF

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ZUBAT

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ODDISH

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PARAS

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_VENONAT

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_DIGLETT

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MEOWTH

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PSYDUCK

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MANKEY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_GROWLITHE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_POLIWAG

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ABRA

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MACHOP

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_BELLSPROUT

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_TENTACOOL

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_GEODUDE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PONYTA

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SLOWPOKE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MAGNEMITE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_FARFETCH_D

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_DODUO

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SEEL

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_GRIMER

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SHELLDER

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_GASTLY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ONIX

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_DROWZEE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_KRABBY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_VOLTORB

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_EXEGGCUTE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_CUBONE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_HITMONLEE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_HITMONCHAN

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_LICKITUNG

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_KOFFING

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_RHYHORN

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_CHANSEY

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_TANGELA

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_KANGASKHAN

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_HORSEA

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_GOLDEEN

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_STARYU

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MR_MIME

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SCYTHER

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_JYNX

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ELECTABUZZ

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MAGMAR

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PINSIR

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_TAUROS

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MAGIKARP

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_LAPRAS

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_DITTO

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_EEVEE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_PORYGON

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_OMANYTE

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_KABUTO

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_AERODACTYL

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_SNORLAX

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ARTICUNO

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_ZAPDOS

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MOLTRES

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_DRATINI

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MEWTWO

-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; EVOLINE_MEW

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_BULBASAUR

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_CHARMANDER

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SQUIRTLE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_CATERPIE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_WEEDLE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PIDGEY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_RATTATA

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SPEAROW

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_EKANS

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PIKACHU

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SANDSHREW

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_NIDORAN_F

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_NIDORAN_M

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_CLEFAIRY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_VULPIX

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_JIGGLYPUFF

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ZUBAT

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ODDISH

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PARAS

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_VENONAT

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_DIGLETT

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MEOWTH

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PSYDUCK

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MANKEY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_GROWLITHE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_POLIWAG

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ABRA

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MACHOP

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_BELLSPROUT

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_TENTACOOL

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_GEODUDE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PONYTA

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SLOWPOKE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MAGNEMITE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_FARFETCH_D

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_DODUO

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SEEL

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_GRIMER

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SHELLDER

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_GASTLY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ONIX

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_DROWZEE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_KRABBY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_VOLTORB

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_EXEGGCUTE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_CUBONE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_HITMONLEE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_HITMONCHAN

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_LICKITUNG

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_KOFFING

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_RHYHORN

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_CHANSEY

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_TANGELA

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_KANGASKHAN

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_HORSEA

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_GOLDEEN

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_STARYU

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MR_MIME

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SCYTHER

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_JYNX

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ELECTABUZZ

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MAGMAR

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PINSIR

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_TAUROS

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MAGIKARP

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_LAPRAS

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_DITTO

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_EEVEE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_PORYGON

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_OMANYTE

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_KABUTO

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_AERODACTYL

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_SNORLAX

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ARTICUNO

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_ZAPDOS

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MOLTRES

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_DRATINI

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MEWTWO

+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00  ; CATCHEM_MEW

diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index f67f1d5..6876345 100644
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -74,13 +74,13 @@ StartCatchEmMode: ; 0x1003f
 	ld a, [wCurrentCatchEmMon] ;wow gamefreak

 	ld c, a

 	ld b, $0

-	ld hl, EvolutionLineIds ;fetch the mon's evolution line

+	ld hl, CatchemMonIds ; fetch the mon's catchem id

 	add hl, bc

 	ld c, [hl]

 	ld h, b

 	ld l, c

 	add hl, bc

-	add hl, bc  ; multiply the evolution line id by 3, add it to pointer to ???

+	add hl, bc  ; multiply the catchem mod id by 3, add it to pointer to ???

 	ld bc, CatchSpriteFrameDurations ;mystery data, seems pokedex related too

 	add hl, bc

 	ld a, [hli]

@@ -1217,9 +1217,9 @@ Func_10871: ; 0x10871
 	ld a, [wCurrentCatchEmMon]

 	ld c, a

 	ld b, $0

-	ld hl, EvolutionLineIds

+	ld hl, CatchemMonIds

 	add hl, bc

-	ld a, [hl] ; a contains evolution line id

+	ld a, [hl]

 	ld c, a

 	ld b, $0

 	ld l, c

@@ -1352,7 +1352,7 @@ Func_1098c: ; 0x1098c
 	ld a, [wCurrentCatchEmMon]

 	ld c, a

 	ld b, $0

-	ld hl, EvolutionLineIds

+	ld hl, CatchemMonIds

 	add hl, bc

 	ld a, [hl]

 	ld c, a

diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 107ee19..2bb3cfb 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1809,9 +1809,9 @@ Func_28bf5: ; 0x28bf5
 	ld a, [wCurPokedexIndex]

 	ld c, a

 	ld b, $0

-	ld hl, EvolutionLineIds

+	ld hl, CatchemMonIds

 	add hl, bc

-	ld a, BANK(EvolutionLineIds)

+	ld a, BANK(CatchemMonIds)

 	call ReadByteFromBank

 	ld c, a

 	ld b, $0

diff --git a/main.asm b/main.asm
index b63ad4e..02657ad 100644
--- a/main.asm
+++ b/main.asm
@@ -62,7 +62,7 @@ INCLUDE "engine/pinball_game/catchem_mode.asm"
 INCLUDE "engine/pinball_game/evolution_mode.asm"
 INCLUDE "data/wild_mons.asm"
 INCLUDE "data/evolution_line_starts.asm"
-INCLUDE "data/evolution_lines.asm"
+INCLUDE "data/catchem_mons.asm"
 INCLUDE "data/evolution_methods.asm"
 INCLUDE "data/mon_names.asm"
 INCLUDE "data/mon_initial_indicator_states.asm"