Fix crash when losing to Yujirou

The reason was because not all the infrastructure for an actual battle was set up - this fixes it. It still has some strange text that appears though.

Also did some minor optimisations on the Vermillion Dock stuff - I think the direction I am taking Faraway Island will work. However, something in that script causes any and all special warps to crash in some way. I am not sure what it is that does it.

scripts/VermilionCity.asm

@@ -226,24 +226,22 @@ PassListings:
 	ld a, [hl]
 	ldh [hItemToRemoveID], a
 	cp S_S_TICKET
-	jr z, .choseSSAnne
+	jp z, VermilionCityText3.playerHasTicket ; Saves time and less risk of bugs
 	cp OLD_SEA_MAP
 	jr z, .choseFaraway
 	cp CITRINE_PASS
 	jr z, .choseCitrine
 ; god bless the safari game and pokemon tower 7f for being the few times a forcewarp exists
 ; For some reason, these aren't working properly...
-.choseSSAnne
-	jp VermilionCityText3.playerHasTicket ; Saves time and less risk of bugs
 .choseFaraway
 	ld hl, EventVermillionCityOldSeaMap
 	call PrintText
-    ld a, FARAWAY_ISLAND_OUTSIDE
-    ldh [hWarpDestinationMap], a
-    ld a, $1
-    ld [wDestinationWarpID], a
-	call WarpFound2
-    jr .done
+	ld a, FARAWAY_ISLAND_OUTSIDE
+	ld [wDestinationMap], a
+	ld hl, wd732
+	set 2, [hl] ; fly warp or dungeon warp
+	call SpecialWarpIn
+	jp SpecialEnterMap
 .choseCitrine
 	ld hl, EventVermillionCityCitrinePass
 	call PrintText

scripts/ViridianPreGym.asm

@@ -56,13 +56,10 @@ ViridianPreGymTrainerHeader1:
 
 YujirouText:
 	text_asm
-	
 	CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff
 	jr nz, .rematchMode
-	
 	CheckEvent EVENT_BEAT_YUJIROU
-	jr nz, .YujirouBeaten
-	
+	jp nz, .YujirouBeaten
 	ld hl, YujirouIntro
 	call PrintText
 	
@@ -73,7 +70,12 @@ YujirouText:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	call Delay3
+	ld hl, YujirouLoseText
+	ld de, YujirouWinText
+	call SaveEndBattleTextPointers
+	ldh a, [hSpriteIndex]
+	ld [wSpriteIndex], a
+	call EngageMapTrainer
 	
 	; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
 	ld a, OPP_YUJIROU
@@ -88,9 +90,6 @@ YujirouText:
 	
 	ld a, 1
 	ld [wIsTrainerBattle], a
-	ld hl, YujirouLoseText
-	ld de, YujirouWinText
-	call SaveEndBattleTextPointers
 	ld a, $3
 	ld [wViridianPreGymCurScript], a
 	ld [wCurMapScript], a
@@ -121,7 +120,6 @@ YujirouText:
 .YujirouBeaten
 	ld hl, YujirouAfterBattleText
 	call PrintText
-	jr .done
 .done
 	jp TextScriptEnd