diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 1d9680f7..e70ac773 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -178,7 +178,7 @@ JrTrainerFData:
 ; Route 6
 	db 16, RATTATA, PIKACHU, 0
 	db 16, PIDGEY, PIDGEY, PIDGEY, 0
-; Unused - used in celadon university
+; Unused
 	db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
 ; Route 9
 	db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0
@@ -674,6 +674,8 @@ StudentData:
 	db 6, CLEFAIRY, 0
 ; Silph Gauntlet
 	db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0		; may revise
+; Celadon University
+	db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
 
 FirefighterData:
 ; For Cerulean Gym
diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm
index 0e53be88..6a5af4fc 100644
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@@ -8,7 +8,7 @@ Route17WildMons:
 	db 26, DODUO
 	db 28, DODUO
 	db 29, GRIMER
-	db 25, EEVEE
+	db 25, PUCHIKOON
 	db 27, DODRIO
 	end_grass_wildmons
 
diff --git a/scripts/CeladonUniversityOutside.asm b/scripts/CeladonUniversityOutside.asm
index d312229a..259cc62e 100644
--- a/scripts/CeladonUniversityOutside.asm
+++ b/scripts/CeladonUniversityOutside.asm
@@ -37,7 +37,7 @@ CeladonUniversityOutsideText1: ; Starter girl
 	set 6, [hl]
 	set 7, [hl]
 	call Delay3
-	ld a, OPP_JR_TRAINER_F
+	ld a, OPP_STUDENT
 	ld [wCurOpponent], a
 	ld a, 4
 	ld [wTrainerNo], a