diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index d7dc9399..ceb581f3 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -43,7 +43,7 @@
 	const DEX_WEEDLE     ; 13	(037)
 	const DEX_KAKUNA     ; 14	(038)
 	const DEX_BEEDRILL   ; 15	(039)
-	const DEX_GENTLARVA     ; 		(040)
+	const DEX_GENTLARVA  ; 		(040)
 	const DEX_PUPAL      ; 		(041)
 	const DEX_CARAPTHOR  ; 		(042)
 	const DEX_KOTORA     ;		(043)
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index bbbc7c44..448b0c36 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -221,7 +221,7 @@
 	const ELECTIVIRE         ; $D4
 	const MAGMORTAR          ; $D5
 	const DISTURBAN          ; $D6
-	const GENTLARVA             ; $D7
+	const GENTLARVA          ; $D7
 	const PUPAL              ; $D8
 	const CARAPTHOR          ; $D9
 	const MAGNEZONE          ; $DA
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 56edcab1..f4deebff 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -39,7 +39,7 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm"
 INCLUDE "data/pokemon/base_stats/weedle.asm"
 INCLUDE "data/pokemon/base_stats/kakuna.asm"
 INCLUDE "data/pokemon/base_stats/beedrill.asm"
-INCLUDE "data/pokemon/base_stats/kokana.asm" ; Gentlarva
+INCLUDE "data/pokemon/base_stats/gentlarva.asm"
 INCLUDE "data/pokemon/base_stats/pupal.asm"
 INCLUDE "data/pokemon/base_stats/carapthor.asm"
 INCLUDE "data/pokemon/base_stats/kotora.asm"
diff --git a/data/pokemon/base_stats/kokana.asm b/data/pokemon/base_stats/gentlarva.asm
similarity index 85%
rename from data/pokemon/base_stats/kokana.asm
rename to data/pokemon/base_stats/gentlarva.asm
index ebb2059d..8d2ed7df 100644
--- a/data/pokemon/base_stats/kokana.asm
+++ b/data/pokemon/base_stats/gentlarva.asm
@@ -7,7 +7,7 @@
 	db 255 ; catch rate
 	db 54 ; base exp
 
-	INCBIN "gfx/pokemon/front/kokana.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/gentlarva.pic", 0, 1 ; sprite dimensions
 	dw GentlarvaPicFront, GentlarvaPicBack
 
 	db LEECH_LIFE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/omegadge.asm b/data/pokemon/base_stats/omegadge.asm
index d1416bcc..a3cd8462 100644
--- a/data/pokemon/base_stats/omegadge.asm
+++ b/data/pokemon/base_stats/omegadge.asm
@@ -1,6 +1,6 @@
 	db DEX_OMEGADGE ; pokedex id
 
-	db 101, 106, 120,  25,  95
+	db 101, 106, 120,  28,  95
 	;   hp  atk  def  spd  spc
 
 	db STEEL, STEEL ; type
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 5e8e71c4..94a58605 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -30,7 +30,7 @@ MonsterNames::
 	db "BLASTOISE@"
 	db "PINSIR@@@@"
 	db "TANGELA@@@"
-	db "GAWARHED@@"
+	db "GAWARHED@@"	; Gyaoon
 	db "NIDOREIGN@"
 	db "GROWLITHE@"
 	db "ONIX@@@@@@"
@@ -49,25 +49,25 @@ MonsterNames::
 	db "PSYDUCK@@@"
 	db "DROWZEE@@@"
 	db "GOLEM@@@@@"
-	db "BALUMBA@@@"
+	db "BALUMBA@@@"	; Barunda
 	db "MAGMAR@@@@"
 	db "BUU@@@@@@@"
 	db "ELECTABUZZ"
 	db "MAGNETON@@"
 	db "KOFFING@@@"
-	db "RAMOOSE@@@"
+	db "RAMOOSE@@@"	; Deer
 	db "MANKEY@@@@"
 	db "SEEL@@@@@@"
 	db "DIGLETT@@@"
 	db "TAUROS@@@@"
 	db "TRAMPEL@@@"
-	db "GAVILLAIN@"
+	db "GAVILLAIN@"	; Crocky
 	db "BLOTTLE@@@"
 	db "FARFETCH'D"
 	db "VENONAT@@@"
 	db "DRAGONITE@"
-	db "CACTORMUS@"
-	db "SHARPOON@@"
+	db "CACTORMUS@"	; Cactus
+	db "SHARPOON@@"	; Jagg
 	db "WIGLETT@@@"
 	db "DODUO@@@@@"
 	db "POLIWAG@@@"
@@ -80,7 +80,7 @@ MonsterNames::
 	db "KRABBY@@@@"
 	db "CHEEP@@@@@"
 	db "JABETTA@@@"
-	db "VULPIII@@@"
+	db "VULPIII@@@"	; Mikon
 	db "VULPIX@@@@"
 	db "NINETALES@"
 	db "PIKACHU@@@"
@@ -93,8 +93,8 @@ MonsterNames::
 	db "KABUTOPS@@"
 	db "HORSEA@@@@"
 	db "SEADRA@@@@"
-	db "MINISTARE@"
-	db "IGUANARCH@"
+	db "MINISTARE@"	; Bawligua
+	db "IGUANARCH@"	; Cryithan
 	db "SANDSHREW@"
 	db "SANDSLASH@"
 	db "OMANYTE@@@"
@@ -114,13 +114,13 @@ MonsterNames::
 	db "WEEDLE@@@@"
 	db "KAKUNA@@@@"
 	db "BEEDRILL@@"
-	db "LUXWAN@@@@"
+	db "LUXWAN@@@@"	; Madaamu
 	db "DODRIO@@@@"
 	db "PRIMEAPE@@"
 	db "DUGTRIO@@@"
 	db "VENOMOTH@@"
 	db "DEWGONG@@@"
-	db "TRICULES@@"
+	db "TRICULES@@"	; Purakkusu
 	db "PENDRAKEN@"
 	db "CATERPIE@@"
 	db "METAPOD@@@"
@@ -133,8 +133,8 @@ MonsterNames::
 	db "MEWTWO@@@@"
 	db "SNORLAX@@@"
 	db "MAGIKARP@@"
-	db "COINPUR@@@"
-	db "OMEGADGE@@"
+	db "COINPUR@@@"	; Konya
+	db "OMEGADGE@@"	; Omega
 	db "MUK@@@@@@@"
 	db "DECILLA@@@"
 	db "KINGLER@@@"
@@ -155,13 +155,13 @@ MonsterNames::
 	db "BULBASAUR@"
 	db "VENUSAUR@@"
 	db "TENTACRUEL"
-	db "ORFRY@@@@@"
+	db "ORFRY@@@@@"	; Gyopin
 	db "GOLDEEN@@@"
 	db "SEAKING@@@"
 	db "KOTORA@@@@"
 	db "GAOTORA@@@"
 	db "GOROTORA@@"
-	db "KOLTA@@@@@"
+	db "KOLTA@@@@@"	; Puchikoon
 	db "PONYTA@@@@"
 	db "RAPIDASH@@"
 	db "RATTATA@@@"
@@ -173,7 +173,7 @@ MonsterNames::
 	db "AERODACTYL"
 	db "BLASTYKE@@"
 	db "MAGNEMITE@"
-	db "SQUEAMATA@"
+	db "SQUEAMATA@"	; Skimper
 	db "GOROCHU@@@"
 	db "CHARMANDER"
 	db "SQUIRTLE@@"
@@ -200,12 +200,12 @@ MonsterNames::
 	db "LICKILICKY"
 	db "TANGROWTH@"
 	db "KLEAVOR@@@"
-	db "BELLIGNAN@"
+	db "BELLIGNAN@"	; Tsubomitto
 	db "STEELIX@@@"
 	db "BLISSEY@@@"
 	db "HITMONTOP@"
 	db "CROBAT@@@@"
-	db "MIMMEO@@@@"
+	db "MIMMEO@@@@"	; Animon
 	db "BELLOSSOM@"
 	db "PORYGON2@@"
 	db "KINGDRA@@@"
@@ -213,8 +213,8 @@ MonsterNames::
 	db "SLOWKING@@"
 	db "ELECTIVIRE"
 	db "MAGMORTAR@"
-	db "DISTURBAN@"
-	db "GENTLARVA@" ; Gentlarva
+	db "DISTURBAN@"	; Taaban
+	db "GENTLARVA@" ; Kokana
 	db "PUPAL@@@@@" ; Kasanagi
 	db "CARAPTHOR@"
 	db "MAGNEZONE@"
diff --git a/gfx/pokemon/back/dugtrioab.png b/gfx/pokemon/back/dugtrioab.png
index 55f33661..3757931b 100644
Binary files a/gfx/pokemon/back/dugtrioab.png and b/gfx/pokemon/back/dugtrioab.png differ
diff --git a/gfx/pokemon/back/mukab.png b/gfx/pokemon/back/mukab.png
index d2f6ca26..63bfc340 100644
Binary files a/gfx/pokemon/back/mukab.png and b/gfx/pokemon/back/mukab.png differ
diff --git a/gfx/pokemon/back/rapidashgb.png b/gfx/pokemon/back/rapidashgb.png
index 188a3bbf..0183dcec 100644
Binary files a/gfx/pokemon/back/rapidashgb.png and b/gfx/pokemon/back/rapidashgb.png differ
diff --git a/gfx/pokemon/back/tangrowthb.png b/gfx/pokemon/back/tangrowthb.png
index 265999d9..5fe6b047 100644
Binary files a/gfx/pokemon/back/tangrowthb.png and b/gfx/pokemon/back/tangrowthb.png differ
diff --git a/gfx/pokemon/back/weezinggb.png b/gfx/pokemon/back/weezinggb.png
index 43c3d381..b412d8c9 100644
Binary files a/gfx/pokemon/back/weezinggb.png and b/gfx/pokemon/back/weezinggb.png differ