diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm
index df3df344b..9b9fc1c6e 100644
--- a/data/pokemon/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -105,6 +105,7 @@ VulpixEggMoves:
 
 ZubatEggMoves:
 	db FEINT_ATTACK
+	db GUST
 	db HYPNOSIS
 	db PURSUIT
 	db QUICK_ATTACK
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index 49f225223..099a27659 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -581,15 +581,14 @@ ZubatEvosAttacks:
 	db 0 ; no more evolutions
 	db 1, LEECH_LIFE
 	db 5, SUPERSONIC
-	db 8, BITE
-	db 12, GUST
-	db 15, CONFUSE_RAY
-	db 19, SWIFT
-	db 22, HAZE
-	db 26, WING_ATTACK
+	db 9, BITE
+	db 12, SWIFT
+	db 16, CONFUSE_RAY
+	db 21, HAZE
+	db 25, WING_ATTACK
 	db 29, CRUNCH
 	db 33, MEAN_LOOK
-	db 36, TOXIC
+	db 37, TOXIC
 	db 0 ; no more level-up moves
 
 GolbatEvosAttacks:
@@ -598,15 +597,14 @@ GolbatEvosAttacks:
 	db 1, SCREECH
 	db 1, LEECH_LIFE
 	db 1, SUPERSONIC
-	db 8, BITE
-	db 12, GUST
-	db 15, CONFUSE_RAY
-	db 19, SWIFT
-	db 22, HAZE
+	db 9, BITE
+	db 13, SWIFT
+	db 17, CONFUSE_RAY
+	db 21, HAZE
 	db 27, WING_ATTACK
 	db 33, CRUNCH
-	db 38, MEAN_LOOK
-	db 44, TOXIC
+	db 39, MEAN_LOOK
+	db 45, TOXIC
 	db 0 ; no more level-up moves
 
 OddishEvosAttacks:
@@ -2566,15 +2564,14 @@ CrobatEvosAttacks:
 	db 1, SCREECH
 	db 1, LEECH_LIFE
 	db 1, SUPERSONIC
-	db 8, BITE
-	db 12, GUST
-	db 15, CONFUSE_RAY
-	db 19, SWIFT
-	db 22, HAZE
+	db 9, BITE
+	db 13, SWIFT
+	db 17, CONFUSE_RAY
+	db 21, HAZE
 	db 27, WING_ATTACK
 	db 33, CRUNCH
-	db 38, MEAN_LOOK
-	db 44, TOXIC
+	db 39, MEAN_LOOK
+	db 45, TOXIC
 	db 0 ; no more level-up moves
 
 ChinchouEvosAttacks:
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 06e842ef8..19c468685 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -238,7 +238,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
 	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, WING_ATTACK
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, SWIFT
 	db 22, BAYLEEF,    RAZOR_LEAF, POISONPOWDER, SYNTHESIS, REFLECT
 	db $fe ; delimiter
 	
@@ -246,7 +246,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 24, HAUNTER,    NIGHT_SHADE, POISON_GAS, MEAN_LOOK, CURSE
 	db 22, MAGNEMITE,  THUNDER_WAVE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 24, ZUBAT,      SWIFT, CONFUSE_RAY, BITE, GUST
+	db 24, ZUBAT,      LEECH_LIFE, SWIFT, CONFUSE_RAY, BITE
 	db 26, BAYLEEF,    RAZOR_LEAF, POISONPOWDER, SYNTHESIS, REFLECT
 	db -1 ; end
 
@@ -257,7 +257,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
 	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, WING_ATTACK
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, SWIFT
 	db 22, QUILAVA,    LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 	db $fe ; delimiter
 	
@@ -265,7 +265,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 24, HAUNTER,    NIGHT_SHADE, POISON_GAS, MEAN_LOOK, CURSE
 	db 22, MAGNEMITE,  THUNDER_WAVE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 24, ZUBAT,      SWIFT, CONFUSE_RAY, BITE, GUST
+	db 24, ZUBAT,      LEECH_LIFE, SWIFT, CONFUSE_RAY, BITE
 	db 26, QUILAVA,    LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 	db -1 ; end
 
@@ -276,7 +276,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
 	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, WING_ATTACK
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, SWIFT
 	db 22, CROCONAW,   SCARY_FACE, RAGE, WATER_GUN, BITE
 	db $fe ; delimiter
 	
@@ -284,7 +284,7 @@ Rival1Group:
 	db TRAINERTYPE_MOVES
 	db 24, HAUNTER,    NIGHT_SHADE, POISON_GAS, MEAN_LOOK, CURSE
 	db 22, MAGNEMITE,  THUNDER_WAVE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 24, ZUBAT,      SWIFT, CONFUSE_RAY, BITE, GUST
+	db 24, ZUBAT,      LEECH_LIFE, SWIFT, CONFUSE_RAY, BITE
 	db 26, CROCONAW,   SCARY_FACE, RAGE, WATER_GUN, BITE
 	db -1 ; end