diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm
index c7687e1..e990355 100644
--- a/data/pokemon/evos_attacks_johto.asm
+++ b/data/pokemon/evos_attacks_johto.asm
@@ -516,9 +516,11 @@ LedybaEvosAttacks:
 	dbbw EVOLVE_LEVEL, 18, LEDIAN
 	db 0 ; no more evolutions
 	dbw 1, TACKLE
+	dbw 1, STRING_SHOT
+	dbw 4, COMET_PUNCH
 	dbw 6, SUPERSONIC
 	dbw 12, QUICK_ATTACK ; SW97
-	dbw 17, COMET_PUNCH
+	dbw 15, MACH_PUNCH ; XY and SV
 	dbw 22, LIGHT_SCREEN
 	dbw 22, REFLECT
 	dbw 27, BATON_PASS
@@ -533,9 +535,11 @@ LedybaEvosAttacks:
 LedianEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, TACKLE
+	dbw 1, STRING_SHOT
+	dbw 4, COMET_PUNCH
 	dbw 6, SUPERSONIC
 	dbw 12, QUICK_ATTACK ; SW97
-	dbw 17, COMET_PUNCH
+	dbw 15, MACH_PUNCH ; XY and SV
 	dbw 24, LIGHT_SCREEN
 	dbw 24, REFLECT
 	dbw 29, BATON_PASS
diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin
index eff6609..11bd571 100644
Binary files a/data/tilesets/nihon_birdon_attributes.bin and b/data/tilesets/nihon_birdon_attributes.bin differ
diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm
index 008635e..a7bd552 100644
--- a/data/tilesets/nihon_birdon_collision.asm
+++ b/data/tilesets/nihon_birdon_collision.asm
@@ -34,8 +34,7 @@
 	tilecoll WALL, WALL, DOOR, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
-;	tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24
-	tilecoll WALL, WALL, WALL, WALL ; Placeholder for above
+	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin
index 7b12316..d30f27e 100644
Binary files a/data/tilesets/nihon_birdon_metatiles.bin and b/data/tilesets/nihon_birdon_metatiles.bin differ
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index 141aa21..21fc667 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -1299,15 +1299,15 @@ JohtoGrassWildMons:
 	dbw 3, LEDYBA
 	dbw 3, CATERPIE
 	dbw 4, CATERPIE
-	dbw 4, GENTLARVA
+	dbw 4, LEDYBA
 	dbw 3, WEEDLE
 	dbw 4, HOPPIP
 	dbw 5, HOPPIP
 	; day
-	dbw 3, PIDGEY
+	dbw 3, LEDYBA
 	dbw 3, CATERPIE
 	dbw 4, CATERPIE
-	dbw 4, GENTLARVA
+	dbw 4, LEDYBA
 	dbw 3, WEEDLE
 	dbw 4, HOPPIP
 	dbw 5, HOPPIP
@@ -1331,15 +1331,15 @@ JohtoGrassWildMons:
 	dbw 5, LEDYBA
 	dbw 4, CATERPIE
 	dbw 6, LEDYBA
-	dbw 4, GENTLARVA
+	dbw 4, LEDYBA
 	dbw 4, WEEDLE
 	dbw 5, BELLSPROUT
 	dbw 5, HOPPIP
 	; day
-	dbw 5, PIDGEY
+	dbw 5, LEDYBA
 	dbw 4, CATERPIE
 	dbw 5, BELLSPROUT
-	dbw 4, GENTLARVA
+	dbw 4, LEDYBA
 	dbw 4, WEEDLE
 	dbw 6, BELLSPROUT
 	dbw 5, HOPPIP
diff --git a/gfx/pokegear/nihon.bin b/gfx/pokegear/nihon.bin
index eca1a00..e86ad88 100644
Binary files a/gfx/pokegear/nihon.bin and b/gfx/pokegear/nihon.bin differ