diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index 3cc4f238..702ec17f 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -72,22 +72,22 @@ GaryScript2:
 	cp STARTER1
 	jr nz, .NotSquirtle
 	ld a, $1
-	jr .done
+	jr .saveTrainerId
 .NotSquirtle
 	cp STARTER3
 	jr nz, .Charmander
 	ld a, $2
-	jr .done
+	jr .saveTrainerId
 .Charmander
 	cp STARTER2 ; changes start here
 	ld a, $3
 	jr nz, .Pikachu
-	jr .done
+	jr .saveTrainerId
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
 	ld a, $4
-	jr .done
+	jr .saveTrainerId
 .Eevee
 	ld a, $5
 	jr .saveTrainerId
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index 8377fa7b..9fb68377 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -189,25 +189,25 @@ SilphCo7Script3:
 	cp STARTER1
 	jr nz, .NotSquirtle
 	ld a, $11
-	jr .done
+	jr .asm_51cc0
 .NotSquirtle
 	cp STARTER3
 	jr nz, .Charmander
 	ld a, $12
-	jr .done
+	jr .asm_51cc0
 .Charmander
 	cp STARTER2 ; changes start here
 	ld a, $13
 	jr nz, .Pikachu
-	jr .done
+	jr .asm_51cc0
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
 	ld a, $14
-	jr .done
+	jr .asm_51cc0
 .Eevee
 	ld a, $15
-	jr .done
+	jr .asm_51cc0
 .asm_51cc0
 	ld [wTrainerNo], a
 	ld a, 1