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!

README.md

@@ -97,16 +97,18 @@ Improved Areas
 	- To encourage this, Gym Leaders now have level scaling, giving more consistent challenge across the game. 
 - Giovanni now uses his unused theme song from Yellow, and has his LGPE monologue in the Rocket Hideout.
 - Jessie and James have been backported from Yellow, appearing in Mt. Moon, Rocket Hideout, Pokemon Tower, and Silph Co. Additionally, they have a post-game fight.
-- Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. 
 - Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! It also has its beta music!
-- Route 24 now features Damien, the Charmander trainer from Yellow, who only appears if Pikachu or Eevee are chosen. His text has been altered to be more accurate to his anime appearance. It also has a house where you can get a Fishing Rod.
-- Route 25 has been given a facelift, adding Bill's Lighthouse in place of the Sea Cottage.
-- The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. 
 - The Day Care now contains a PC and Melanie from Yellow. If you pick Pikachu or Eevee and beat Misty, Melanie will give you a Bulbasaur.
+- Route 24 now features a Fishing Rod house; it's basically a Super Rod. It also features Damien, the Charmander trainer from Yellow. He only appears if Pikachu or Eevee are chosen. His text has been altered to be more accurate to his anime appearance. It also has a house where you can get a Fishing Rod.
+- Route 25 has been given a facelift, adding Bill's Lighthouse in place of the Sea Cottage.
+- Vermilion City now features Officer Jenny with the Squirtle. She only appears if Pikachu or Eevee are chosen.
+- Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. 
+- Pokemon Tower was shortened, being less intensive and adding room for more maps.
+- Fuchsia City has been made to resemble the more walkable LGPE version, removing the Cut trees among other things.
+- The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. 
+- Silph Co's pathing was completely overhauled to make navigating it less tedious.
 - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too...
 	- Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you!
-- Pokemon Tower was shortened, being less intensive and adding room for more maps.
-- Silph Co's pathing was completely overhauled to make navigating it less tedious.
 - Viridian Gym now has a minor new area once you make Giovanni leave.
 - Various Move Tutors from FireRed and LeafGreen have been distributed around the region, instead giving their respective TMs.
 - The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros.

constants/event_constants.asm

@@ -63,6 +63,7 @@
 	const_skip 18
 	const EVENT_BEAT_CERULEAN_GYM_TRAINER_0
 	const EVENT_BEAT_CERULEAN_GYM_TRAINER_1
+	const EVENT_BEAT_CERULEAN_GYM_TRAINER_2
 	const EVENT_GOT_TM01
 	const EVENT_GOT_TM05
 	const EVENT_GOT_TM11
@@ -71,6 +72,7 @@
 
 ; Silph Gauntlet events		; Why is there so much free space here, my god
 	; 1F Trainers
+	const_next $d1
 	const EVENT_BEAT_GAUNTLET_YOUNGSTER
 	const EVENT_BEAT_GAUNTLET_BUG_CATCHER
 	const EVENT_BEAT_GAUNTLET_STUDENT

constants/hide_show_constants.asm

@@ -21,6 +21,7 @@ DEF SHOW EQU $15
 	const HS_CERULEAN_GUARD_1              ; 07
 	const HS_CERULEAN_CAVE_GUY             ; 08
 	const HS_CERULEAN_GUARD_2              ; 09
+	const HS_VERMILION_JENNY			   ; FC
 	const HS_SAFFRON_CITY_1                ; 0A
 	const HS_SAFFRON_CITY_2                ; 0B
 	const HS_SAFFRON_CITY_3                ; 0C

data/maps/hide_show_data.asm

@@ -7,7 +7,7 @@ MapHSPointers:
 	dw ViridianCityHS
 	dw PewterCityHS
 	dw CeruleanCityHS
-	dw NoHS
+	dw VermilionCityHS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -284,6 +284,8 @@ CeruleanCityHS:
 	db CERULEAN_CITY, $06, HIDE               ; HS_CERULEAN_GUARD_1
 	db CERULEAN_CITY, $0A, SHOW               ; HS_CERULEAN_CAVE_GUY
 	db CERULEAN_CITY, $0B, SHOW               ; HS_CERULEAN_GUARD_2
+VermilionCityHS:
+	db VERMILION_CITY, $07, HIDE			  ; HS_VERMILION_JENNY
 SaffronCityHS:
 	db SAFFRON_CITY, $01, SHOW                ; HS_SAFFRON_CITY_1
 	db SAFFRON_CITY, $02, SHOW                ; HS_SAFFRON_CITY_2

data/maps/objects/CeruleanGym.asm

@@ -11,6 +11,7 @@ CeruleanGym_Object:
 	object_event  4,  2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
 	object_event  2,  3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
 	object_event  8,  7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
+	object_event  2,  8, SPRITE_COOLTRAINER_M, STAY, RIGHT, 5, OPP_FIREFIGHTER, 1
 	object_event  7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
 
 	def_warps_to CERULEAN_GYM

data/maps/objects/FuchsiaCity.asm

@@ -14,12 +14,12 @@ FuchsiaCity_Object:
 
 	def_bg_events
 	bg_event 29, 19, 11 ; FuchsiaCityText11
-	bg_event 25, 15, 12 ; FuchsiaCityText12
+	bg_event 25, 17, 12 ; FuchsiaCityText12
 	bg_event 17,  5, 13 ; FuchsiaCityText13
 	bg_event  6, 13, 14 ; MartSignText
 	bg_event 20, 27, 15 ; PokeCenterSignText
 	bg_event 27, 29, 16 ; FuchsiaCityText16
-	bg_event 21, 15, 17 ; FuchsiaCityText17
+	bg_event 21, 17, 17 ; FuchsiaCityText17
 	bg_event  3, 29, 18 ; FuchsiaCityText18
 	bg_event 33,  7, 19 ; FuchsiaCityText19
 	bg_event 27,  7, 20 ; FuchsiaCityText20
@@ -30,7 +30,7 @@ FuchsiaCity_Object:
 
 	def_object_events
 	object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
-	object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
+	object_event 28, 18, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
 	object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
 	object_event 24,  8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
 	object_event 31,  5, SPRITE_CHANSEY, STAY, ANY_DIR, 5 ; person

data/maps/objects/VermilionCity.asm

@@ -23,13 +23,13 @@ VermilionCity_Object:
 	bg_event 29, 15, 15 ; VermilionCityText13
 
 	def_object_events
-	object_event 19,  7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
+	object_event 23,  5, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
 	object_event 14,  6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 	object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person
 	object_event 30,  7, SPRITE_GAMBLER, STAY, NONE, 4 ; person
 	object_event 29,  9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
 	object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
-	object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 7 ; person
+	object_event 19,  8, SPRITE_OFFICER_JENNY, STAY, ANY_DIR, 7 ; squirtle event
-	object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 8 ; person
+	object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 8 ; arc/pers event
 
 	def_warps_to VERMILION_CITY

data/maps/sprite_sets.asm

@@ -117,7 +117,7 @@ SpriteSets:
 	db SPRITE_MONSTER
 	db SPRITE_GUARD
 	db SPRITE_SAILOR
-	db SPRITE_COOLTRAINER_F
+	db SPRITE_OFFICER_JENNY
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_POKE_BALL
 	db SPRITE_CAT

data/trainers/parties.asm

@@ -681,7 +681,7 @@ StudentData:
 
 FirefighterData:
 ; For Cerulean Gym
-	db 15, POLIWAG, SQUIRTLE, CHEEP, 0
+	db 15, POLIWAG, CHEEP, SQUIRTLE, 0
 ; Silph Gauntlet 3F (S.S Anne)
 	db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0   ; mostly water-types, but adding other types that hit Fire super-effectively
 

data/wild/maps/SafariZoneCenter.asm

@@ -7,9 +7,9 @@ SafariZoneCenterWildMons:
 	db 31, MAROWAK
 	db 25, SLOWPOKE
 	db 31, LICKITUNG
-	db 30, PARASECT
-	db 23, TRAMPEL
 	db 23, CHANSEY
+	db 23, DEER
+	db 23, TRAMPEL
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SafariZoneEast.asm

@@ -8,8 +8,8 @@ SafariZoneEastWildMons:
 	db 23, EXEGGCUTE
 	db 24, KANGASKHAN
 	db 25, PINSIR
-	db 7, CHANSEY
+	db  7, CHANSEY
-	db 28, SCYTHER
+	db 28, DEER
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

engine/debug/debug_party.asm

@@ -162,10 +162,16 @@ IF DEF(_DEBUG)
 	inc hl ; hl = wPlayerStarter
 	ld a, STARTER5
 	ld [hl], a
-
+	
 	; This is used to display Damien and Officer Jenny for Charmander and Squirtle, respectively.
 	; It was set up in this way to easily add new things for the mode.
 	; By default, all Pikachu/Eevee Mode things are hidden - more efficient.
+	; To test without, comment this out.
+	call DebugPikachuEevee
+	
+	ret
+
+DebugPikachuEevee:
 	ld hl, DebugPikachuEeveeShows
 .loop
 	ld a, [hli]
@@ -177,10 +183,9 @@ IF DEF(_DEBUG)
 	pop hl
 	jr .loop
 
-	ret
-
 DebugPikachuEeveeShows:
 		db HS_DAMIEN ; Charmander guy
+		db HS_VERMILION_JENNY ; Squirtle
 		db -1 ; end
 
 DebugSetPokedexEntries:

maps/FuchsiaCity.blk

@@ -1,8 +1,17 @@
- 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmmzooooyzzzVUVzzzzzzn

gmzzM
U
lllll11N
kkkPRRO
U
wVww11N










_1nN>?????????;_1111nN$ 
!WWWW !%_89

nN
+ 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmmzooooyzzz1U1zzzzzzn

gmzzzVUVooooo11
kkkPRRO1U1wVww11










_1n
ttt
-|~0|r
-1<=01nN111111111
-_Vw1wnN
 
-11
 
-111111nPRRRR>?;ttttRRRRRRn11111(,)1111>?;
+
+tt
_1111n
 
!tttt !
_89

n
|~0|r
_<=0nJ\K
+_Vw1wn
+
+
+
+
+
+
+
+1
+
+





n>?;t1tt
+ooooo(,)1111>?;

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:
+OfficerJennySquirtle:
-	text_far _RoingusText
+	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:

text/CeruleanGym.asm

@@ -81,8 +81,8 @@ _CeruleanGymAfterBattleText1::
 _CeruleanGymBattleText2::
 	text "Splash!"
 
-	para "I'm first up!"
+	para "I'm up! Let's"
-	line "Let's do it!"
+	line "do it!"
 	done
 
 _CeruleanGymEndBattleText2::
@@ -98,6 +98,27 @@ _CeruleanGymAfterBattleText2::
 	line "someone like you!"
 	done
 
+_CeruleanGymBattleText3::
+	text "Don't skip out on"
+	line "fire safety!"
+	done
+
+_CeruleanGymEndBattleText3::
+	text "I got"
+	line "burned..."
+	prompt
+
+_CeruleanGymAfterBattleText3::
+	text "Why is a FIRE-"
+	line "FIGHTER in a"
+	cont "GYM for water"
+	cont "#MON?"
+	
+	para "Haha! You have to" ; Actually happens in real life!
+	line "check for short"
+	cont "circuits!"
+	done
+
 _CeruleanGymGuidePreBattleText::
 	text "Yo! Champ in"
 	line "making!"

text/VermilionCity.asm

@@ -226,3 +226,44 @@ _BeautyExplain::
 	line "wrong!"
 	done
 
+_OfficerJennyText1::
+	text "I just caught a"
+	line "SQUIRTLE that was"
+	cont "always getting"
+	cont "into mischief."
+
+	para "I think it needs a"
+	line "good trainer to"
+	cont "set it straight."
+	done
+
+_OfficerJennyText2::
+	text "You have the"
+	line "THUNDERBADGE!?"
+
+	para "You must be a"
+	line "good trainer!"
+
+	para "I just caught a"
+	line "SQUIRTLE that was"
+	cont "always getting"
+	cont "into mischief."
+
+	para "Would you take"
+	line "good care of it?"
+	done
+
+_OfficerJennyText3::
+	text "OK! Please treat"
+	line "SQUIRTLE right!@"
+	text_end
+
+_OfficerJennyText4::
+	text "Oh... What am I"
+	line "to do now?"
+	done
+
+_OfficerJennyText5::
+	text "How is SQUIRTLE"
+	line "doing?"
+	done