Vermilion Officer Jenny, other things

- Adds Officer Jenny from Yellow to Vermilion City. Due to spriteset restrictions, Roingus Girl has been removed; the self-insert felt a little weird anyway.
- Fuchsia City's map has been redone a little bit to more closely resemble the LGPE version, being far more walkable and aesthetically appealing.
- A Firefighter has been added to Cerulean Gym!

scripts/CeruleanGym.asm

@@ -66,7 +66,7 @@ CeruleanGymReceiveTM11:
 	set BIT_CASCADEBADGE, [hl]
 
 	; deactivate gym trainers
-	SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1
+	SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1, EVENT_BEAT_CERULEAN_GYM_TRAINER_2
 
 	jp CeruleanGymResetScripts
 
@@ -75,6 +75,7 @@ CeruleanGym_TextPointers:
 	dw CeruleanGymTrainerText1
 	dw CeruleanGymTrainerText2
 	dw CeruleanGymGuideText
+	dw CeruleanGymTrainerText3
 	dw MistyCascadeBadgeInfoText
 	dw ReceivedTM11Text
 	dw TM11NoRoomText
@@ -85,6 +86,8 @@ CeruleanGymTrainerHeader0:
 	trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1
 CeruleanGymTrainerHeader1:
 	trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2
+CeruleanGymTrainerHeader2:
+	trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_2, 3, CeruleanGymBattleText3, CeruleanGymEndBattleText3, CeruleanGymAfterBattleText3
 	db -1 ; end
 
 MistyText:
@@ -227,6 +230,24 @@ CeruleanGymAfterBattleText2:
 	text_far _CeruleanGymAfterBattleText2
 	text_end
 
+CeruleanGymTrainerText3:
+	text_asm
+	ld hl, CeruleanGymTrainerHeader2
+	call TalkToTrainer
+	jp TextScriptEnd
+
+CeruleanGymBattleText3:
+	text_far _CeruleanGymBattleText3
+	text_end
+
+CeruleanGymEndBattleText3:
+	text_far _CeruleanGymEndBattleText3
+	text_end
+
+CeruleanGymAfterBattleText3:
+	text_far _CeruleanGymAfterBattleText3
+	text_end
+
 CeruleanGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_MISTY

scripts/OaksLab.asm

@@ -1365,4 +1365,5 @@ PikachuEeveeMode:
 
 PikachuEeveeShows:
 	db HS_DAMIEN ; Charmander guy
+	db HS_VERMILION_JENNY ; Squirtle
 	db -1 ; end

scripts/VermilionCity.asm

@@ -266,7 +266,7 @@ VermilionCity_TextPointers:
 	dw VermilionCityText4
 	dw VermilionCityText5
 	dw VermilionCityText6
-	dw RoingusText
+	dw OfficerJennySquirtle
 	dw VermilionBeauty
 	dw VermilionCityText7
 	dw VermilionCityText8
@@ -437,8 +437,69 @@ VermilionCityText13:
 	text_far _VermilionCityText13
 	text_end
 
-RoingusText:
-	text_far _RoingusText
+OfficerJennySquirtle:
+	text_asm
+	CheckEvent EVENT_GOT_SQUIRTLE
+	jr nz, .howDoing
+	ld a, [wObtainedBadges]
+	bit 3, a ; THUNDERBADGE
+	jr z, .noBadge
+	ld hl, OfficerJennyHasBadge
+	call PrintText
+	call YesNoChoice
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .refuse
+	ld a, SQUIRTLE
+	ld [wd11e], a
+	ld [wcf91], a
+	call GetMonName
+	ld a, $1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	lb bc, SQUIRTLE, 15
+	call GivePokemon
+	ld a, [wAddedToParty]
+	and a
+	call z, WaitForTextScrollButtonPress
+	ld a, $1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	ld hl, OfficerJennyGive
+	call PrintText
+	SetEvent EVENT_GOT_SQUIRTLE
+	jp TextScriptEnd
+
+.howDoing
+	ld hl, OfficerJennyHowDoing
+	jr .done
+.noBadge
+	ld hl, OfficerJennyNoBadge
+	jr .done
+.refuse
+	ld hl, OfficerJennyRefuse
+	; fallthrough
+.done
+	call PrintText
+	jp TextScriptEnd
+
+OfficerJennyNoBadge:
+	text_far _OfficerJennyText1
+	text_end
+
+OfficerJennyHasBadge:
+	text_far _OfficerJennyText2
+	text_end
+
+OfficerJennyGive:
+	text_far _OfficerJennyText3
+	text_waitbutton
+	text_end
+
+OfficerJennyRefuse:
+	text_far _OfficerJennyText4
+	text_end
+
+OfficerJennyHowDoing:
+	text_far _OfficerJennyText5
 	text_end
 
 VermillionCityPassSelectionText: