diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index f40d788b..58cb9b35 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -26,9 +26,9 @@
 	const EVENT_VIRIDIAN_GYM_OPEN
 	const EVENT_GOT_TM42
 	const EVENT_BEAT_YUJIROU
-	const_skip 11
 	const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0
 	const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
+	const_skip 11
 	const EVENT_OAK_GOT_PARCEL
 	const EVENT_GOT_OAKS_PARCEL
 	const_skip 22
diff --git a/ram/wram.asm b/ram/wram.asm
index c1a26590..a393461e 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -2040,7 +2040,7 @@ wBrunosRoomCurScript:: db
 wAgathasRoomCurScript:: db
 wCeruleanCaveB1FCurScript:: db
 wVictoryRoad1FCurScript:: db
-wFarawayIslandInsideCurScript:: db ; this should work
+wFarawayIslandInsideCurScript:: db
 wLancesRoomCurScript:: db
 wPokemonMansionB2FCurScript:: db
 wMtMoonCraterCurScript:: db
diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm
index b119fab4..e34b8de3 100644
--- a/scripts/ViridianPreGym.asm
+++ b/scripts/ViridianPreGym.asm
@@ -6,7 +6,7 @@ ViridianPreGym_Script:
 	call ExecuteCurMapScriptInTable
 	ld [wViridianPreGymCurScript], a
 	ret
-	
+
 ViridianPreGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
@@ -28,7 +28,7 @@ ViridianGymYujirouPostBattle:
 	ld [wJoyIgnore], a
 
 YujirouHasBeenBeaten:
-	SetEvent EVENT_BEAT_YUJIROU
+	SetEvent EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
 	jp ViridianPreGymResetScripts
 
 ViridianPreGym_TextPointers:
@@ -46,11 +46,11 @@ ViridianPreGym_TextPointers:
 	dw ViridianPreGymStatue2
 
 ViridianPreGymTrainerHeaders:
-	def_trainers 6
+	def_trainers 3
 ViridianPreGymTrainerHeader0:
-	trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, 1, ViridianPreGymBattleText1, ViridianPreGymEndBattleText1, ViridianPreGymAfterBattleText1
+	trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, 3, ViridianPreGymBattleText1, ViridianPreGymEndBattleText1, ViridianPreGymAfterBattleText1
 ViridianPreGymTrainerHeader1:
-	trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1, 2, ViridianPreGymBattleText2, ViridianPreGymEndBattleText2, ViridianPreGymAfterBattleText2
+	trainer EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1, 3, ViridianPreGymBattleText2, ViridianPreGymEndBattleText2, ViridianPreGymAfterBattleText2
 	db -1 ;end
 
 YujirouText: