Merge branch 'mistress' into renewables

2025-10-22 14:57:57 +13:00 · 2023-12-05 06:39:17 +11:00 · 2023-12-05 06:39:17 +11:00 · e852291bdf
parent 2f2e917e21 64e15c75ef
commit e852291bdf
35 changed files with 194 additions and 113 deletions
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@ -51,6 +51,8 @@
 	const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5
 	const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6
 	const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7
+	const_skip 3
+	const EVENT_GIOVANNIS_ROOM_DOOR_UNLOCKED

 ; Pewter City events
 	const_next $68
--- a/data/credits/credits_text.asm
+++ b/data/credits/credits_text.asm
@ -244,7 +244,7 @@ CredHelix:
 CredFO:
 	db -6, "FRENCH ORANGE@"
 CredZetaNull:
-	db -4, "ZETA-NULL@"
+	db -4, "ZETA NULL@"
 CredPSDevs:
 	db -5, "SHOWDOWN MOD@"
 CredAus:
@ -268,7 +268,7 @@ CredFrrf:
 CredMisty:
 	db -5, "LADYMISTICUS@"
 CredThornAvery:
-	db -4, "THORNAVERY@"
+	db -4, "THORN AVERY@"
 CredDannye:
 	db -4, "DANNYE33@"
 CredEro:
--- a/data/events/prize_mon_levels.asm
+++ b/data/events/prize_mon_levels.asm
@ -1,8 +1,12 @@
 PrizeMonLevelDictionary:

-	db CUBONE,    15
+	db ABRA,      14
+	db SEEL,      20
+	db CLEFAIRY,  20
+
 	db CACTORMUS, 20
 	db SQUEAMATA, 20
+	db DRATINI,   20

 	db SCYTHER,   25
 	db PINSIR,    25
--- a/data/events/prizes.asm
+++ b/data/events/prizes.asm
@ -1,32 +1,45 @@
 PrizeDifferentMenuPtrs:
 	dw PrizeMenuMon1Entries, PrizeMenuMon1Cost
 	dw PrizeMenuMon2Entries, PrizeMenuMon2Cost
+	dw PrizeMenuMon3Entries, PrizeMenuMon3Cost
 	dw PrizeMenuTMsEntries,  PrizeMenuTMsCost

 NoThanksText:
 	db "NO THANKS@"

 PrizeMenuMon1Entries:
-	db CUBONE
-	db CACTORMUS
-	db SQUEAMATA
+	db ABRA
+	db SEEL
+	db CLEFAIRY
 	db "@"

 PrizeMenuMon1Cost:
+	bcd2 300
 	bcd2 500
 	bcd2 1000
-	bcd2 2000
 	db "@"

 PrizeMenuMon2Entries:
+	db CACTORMUS
+	db SQUEAMATA
+	db DRATINI
+	db "@"
+
+PrizeMenuMon2Cost:
+	bcd2 1500
+	bcd2 3000
+	bcd2 3000
+	db "@"
+
+PrizeMenuMon3Entries:
 	db SCYTHER
 	db PINSIR
 	db PORYGON
 	db "@"

-PrizeMenuMon2Cost:
-	bcd2 3500
-	bcd2 3500
+PrizeMenuMon3Cost:
+	bcd2 4500
+	bcd2 4500
 	bcd2 7000
 	db "@"

--- a/data/maps/objects/BrunswickGlade.asm
+++ b/data/maps/objects/BrunswickGlade.asm
@ -13,6 +13,6 @@ BrunswickGlade_Object:
 	def_object_events
 	object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
 	object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
-	object_event 14,  8, SPRITE_BIRD, STAY, RIGHT, 3
+	object_event  9,  3, SPRITE_BIRD, STAY, UP, 3

 	def_warps_to BRUNSWICK_GLADE
--- a/data/maps/objects/BrunswickGrotto.asm
+++ b/data/maps/objects/BrunswickGrotto.asm
@ -9,6 +9,6 @@ BrunswickGrotto_Object:
 	bg_event 22, 10, 2 ; signage
 	
 	def_object_events
-	object_event 6, 4, SPRITE_BIRD, STAY, LEFT, 1, ZAPDOS_G, 70 | OW_POKEMON ; person
+	object_event  5,  5, SPRITE_BIRD, STAY, LEFT, 1, ZAPDOS_G, 70 | OW_POKEMON ; person

 	def_warps_to BRUNSWICK_GROTTO
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@ -12,7 +12,7 @@ CopycatsHouse2F_Object:
 	object_event  4,  3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
 	object_event  0,  6, SPRITE_SEEL, STAY, RIGHT, 2 ; person
 	object_event  5,  1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
-	object_event  2,  0, SPRITE_BIRD, STAY, DOWN, 4 ; person
+	object_event  1,  2, SPRITE_BIRD, STAY, DOWN, 4 ; person
 	object_event  4,  6, SPRITE_FAIRY, STAY, LEFT, 5 ; person

 	def_warps_to COPYCATS_HOUSE_2F
--- a/data/maps/objects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@ -9,9 +9,10 @@ GameCornerPrizeRoom_Object:
 	bg_event  2,  2, 3 ; CeladonPrizeRoomText3
 	bg_event  4,  2, 4 ; CeladonPrizeRoomText4
 	bg_event  6,  2, 5 ; CeladonPrizeRoomText5
+	bg_event  8,  2, 6 ; CeladonPrizeRoomText6

 	def_object_events
 	object_event  1,  4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
-	object_event  7,  3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
+	object_event  7,  4, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person

 	def_warps_to GAME_CORNER_PRIZE_ROOM
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@ -4,13 +4,14 @@ ViridianGym_Object:
 	def_warp_events
 	warp_event 16, 17, LAST_MAP, 5 ; front door
 	warp_event 17, 17, LAST_MAP, 5 ; front door
-	warp_event  4,  2, GIOVANNIS_ROOM, 1 ; stairs
+	warp_event  2,  0, GIOVANNIS_ROOM, 1 ; stairs
+	warp_event  3,  0, GIOVANNIS_ROOM, 1 ; stairs
 	

 	def_bg_events

 	def_object_events
-	object_event  4,  3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
+	object_event  2,  2, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
 	object_event 12,  7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
 	object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 13
 	object_event 10,  7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@ -249,13 +249,13 @@ _TotartleDexEntry::
 	dex

 _WeirduckDexEntry::
-	text "It exhibits odd"
-	next "mannerisms as"
+	text "WEIRDUCK exhibits"
+	next "odd mannerisms as"
 	next "it attempts to"

-	page "control its"
-	next "developing"
-	next "psychic powers"
+	page "keep its still-"
+	next "developing PSI"
+	next "under control"
 	dex

 _CroakozunaDexEntry::
@ -269,22 +269,22 @@ _CroakozunaDexEntry::
 	dex

 _GorotoraDexEntry::
-	text "Its growls sound"
-	next "like rolling"
-	next "thunder. It can"
-
-	page "only be tamed"
-	next "by the bravest"
+	text "It is said that"
+	next "only the bravest"
 	next "#MON trainers"
+
+	page "can tame it. Its"
+	next "growls sound like"
+	next "rolling thunder"
 	dex

 _OmegadgeDexEntry::
-	text "A recent creation"
-	next "by SILPH CO."
-	next "Modeled after the"
+	text "Modeled after the"
+	next "extinct GAWARHED,"
+	next "this recent SILPH"

-	page "extinct GAWARHED,"
-	next "it's said to pack"
+	page "invention is said"
+	next "to pack truly"
 	next "devastating power"
 	dex

@ -299,8 +299,8 @@ _TriculesDexEntry::		; Official entry from GS beta, reworded
 	dex

 _TrampelDexEntry::
-	text "A rare species"
-	next "that's well-known"
+	text "This rare species"
+	next "is very well-known"
 	next "in India. It has"

 	page "a bulky physique,"
@ -321,9 +321,9 @@ _GavillainDexEntry::
 _PendrakenDexEntry::
 	text "It often clashes"
 	next "with TENTACRUEL."
-	next "Sprays ink into"
+	next "It sprays ink in"

-	page "its foe's eyes,"
+	page "its foe's face,"
 	next "disorienting it"
 	next "before attacking"
 	dex
@ -339,11 +339,11 @@ _MagnetiteDexEntry::
 	dex

 _NidoreignDexEntry:: ; The Nidos are based on the Moon Rabbit of East Asian mythology, so we're expanding on this with actual moon references.
-	text "It's said to come"
-	next "from the moon."
-	next "Its poisonous"
+	text "Said to have come"
+	next "from the moon. It"
+	next "has toxic spines"

-	page "spines are used"
+	page "which can be used"
 	next "to make powerful"
 	next "MAX ELIXERs"
 	dex
@ -391,15 +391,15 @@ _DisturbanDexEntry::
 _GentlarvaDexEntry::
 	text "Closely related to"
 	next "WEEDLE. Due to the"
-	next "lack of a horn,"
+	next "lack of a horn, it"

-	page "it hides under"
-	next "trees, gnawing"
+	page "hides under tall"
+	next "trees, gnawing on"
 	next "their roots"
 	dex

 _PupalDexEntry::
-	text "While awaiting"
+	text "While it awaits"
 	next "evolution, it"
 	next "barely moves. If"

@ -584,8 +584,8 @@ _LickilickyDexEntry::
 	next "prey, leaving it"

 	page "covered with a"
-	next "saliva that"
-	next "causes numbness"
+	next "saliva that can"
+	next "cause numbness"
 	dex
 	
 _MagnezoneDexEntry::
@ -721,11 +721,11 @@ _SandyShocksDexEntry::
 _MeltanDexEntry::
 	text "Typically living"
 	next "in a group, this"
-	next "#MON eats iron"
+	next "#MON absorbs"

-	page "particles that"
-	next "it finds in the"
-	next "subsoil"
+	page "particles of iron"
+	next "that it finds"
+	next "in the subsoil"
 	dex
 	
 _MelmetalDexEntry::
@ -769,23 +769,23 @@ _PerrserkerDexEntry::
 	dex
 	
 _ArticunoGDexEntry::
-	text "From its eyes,"
-	next "it fires beams"
-	next "which can stun"
+	text "From its eyes, it"
+	next "fires PSI beams,"
+	next "which can stun and"

-	page "and immobilize"
-	next "foes as if they"
-	next "had been frozen"
+	page "immobilize foes as"
+	next "if they had been"
+	next "frozen solid"
 	dex
 	
 _ZapdosGDexEntry::
-	text "Its leg muscles"
-	next "are so powerful"
-	next "that one kick can"
+	text "As it runs, its"
+	next "feathers make a"
+	next "crackling sound."

-	page "pulverize a dump"
-	next "truck. It runs"
-	next "at over 180 mph"
+	page "One kick from its"
+	next "mighty legs can"
+	next "demolish a truck"
 	dex
 	
 _MoltresGDexEntry::
@ -793,8 +793,8 @@ _MoltresGDexEntry::
 	next "that surrounds it"
 	next "is said to burn"

-	page "the spirit of"
-	next "any creature that"
+	page "the spirit of any"
+	next "creature that"
 	next "wanders too close"
 	dex

@ -803,7 +803,7 @@ _ArcanineHDexEntry::
 	next "rock-like feel."
 	next "It dances around"
 	
-	page "its foe before"
+	page "its foe, before"
 	next "biting it in a"
 	next "vicious rage" ; reference to Raging Fury
 	dex
@ -824,7 +824,7 @@ _RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries
 	next "greedily order"
 	
 	page "its subjects to"
-	next "gather large"
+	next "gather incredible"
 	next "amounts of food"
 	dex
 	
@ -840,11 +840,11 @@ _RaichuADexEntry::

 _SandslashADexEntry::
 	text "It adapted to a"
-	next "frigid region."
-	next "Wounds caused"
+	next "frigid region. A"
+	next "wound caused by"
 	
-	page "by SANDSLASH"
-	next "cause severe"
+	page "its sharp claws"
+	next "can cause severe"
 	next "frostbite"
 	dex

@ -869,9 +869,9 @@ _DugtrioADexEntry::
 	dex

 _PersianADexEntry::
-	text "Its round face"
-	next "is a symbol of"
-	next "prosperity."
+	text "Its round face is"
+	next "seen as a symbol"
+	next "of prosperity."
 	
 	page "Despite this, it"
 	next "prefers to fight"
@ -879,9 +879,9 @@ _PersianADexEntry::
 	dex

 _GolemADexEntry::
-	text "It fires rocks"
-	next "charged with"
-	next "electricity."
+	text "It charges rocks"
+	next "with electricity,"
+	next "then fires them."
 	
 	page "If it can't find"
 	next "ammo, it may fire"
@ -919,9 +919,9 @@ _SlowkingGDexEntry::
 	dex

 _MukADexEntry::
-	text "Over 100 kinds"
-	next "of poison make"
-	next "up its body."
+	text "Its body contains"
+	next "over 100 different"
+	next "kinds of poison."
 	
 	page "While friendly,"
 	next "it must be fed"
--- a/data/pokemon/tradeback_moves.asm
+++ b/data/pokemon/tradeback_moves.asm
@ -1326,8 +1326,6 @@ MewtwoTradebackMoves:
 	db 1, THUNDERPUNCH
 	db 1, HEADBUTT
 	db 1, FLAMETHROWER
-	db 1, WATERFALL
-	db 1, ROAR
 	db 0

 SnorlaxTradebackMoves:
--- a/data/tilesets/collision_tile_ids.asm
+++ b/data/tilesets/collision_tile_ids.asm
@ -75,7 +75,7 @@ Citrine_Coll::
 	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59

 Celeste_Coll::
-	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
+	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c

 RocketHouse_Coll::
 	coll_tiles $13, $31, $01, $53
--- a/data/tilesets/water_tilesets.asm
+++ b/data/tilesets/water_tilesets.asm
@ -11,10 +11,12 @@ WaterTilesets:
 	db PLATEAU
 	db CITRINE
 	db CELESTE
+	db SEAGALLOPPORT
 	db -1 ; end
 	
 NonShoreTilesets:
 	db GYM
+	db SEAGALLOPPORT
 	db SHIP_PORT
 	db DOJO
 	db -1 ; end
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@ -88,7 +88,7 @@ GetPrizeMenuId:
 	ld bc, 6
 	call CopyData
 	ld a, [wWhichPrizeWindow]
-	cp 2        ;is TM_menu?
+	cp 3        ;is TM_menu?
 	jr nz, .putMonName
 	ld a, [wPrize1]
 	ld [wd11e], a
@ -194,7 +194,7 @@ HandlePrizeChoice:
 	ld a, [hl]
 	ld [wd11e], a
 	ld a, [wWhichPrizeWindow]
-	cp 2 ; is prize a TM?
+	cp 3 ; is prize a TM?
 	jr nz, .getMonName
 	call GetItemName
 	jr .givePrize
@ -211,7 +211,7 @@ HandlePrizeChoice:
 	call HasEnoughCoins
 	jr c, .notEnoughCoins
 	ld a, [wWhichPrizeWindow]
-	cp $02
+	cp $03
 	jr nz, .giveMon
 	ld a, [wd11e]
 	ld b, a
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@ -171,6 +171,8 @@ SetPal_Overworld:
 	jp z, .brunswick
 	cp SILPH_GAUNTLET_3F
 	jp z, .ship
+	cp VERMILION_FERRY_DOCK
+	jp z, .ship
 	cp GAME_CORNER
 	jp z, .pachinko
 	cp GAME_CORNER_PRIZE_ROOM
@ -185,6 +187,8 @@ SetPal_Overworld:
 	jp z, .pachinko
 	cp ROCKET_HIDEOUT_ELEVATOR
 	jp z, .pachinko
+	cp GIOVANNIS_ROOM
+	jp z, .pachinko
 	cp FARAWAY_ISLAND_OUTSIDE
 	jp z, .faraway
 	cp FARAWAY_ISLAND_INSIDE
@ -197,6 +201,10 @@ SetPal_Overworld:
 	jp z, .celeste
 	cp CELESTE_HILL
 	jp z, .celeste
+	cp CITRINE_FERRY_DOCK
+	jp z, .citrine
+	cp SEAGALLOP_FERRY
+	jp z, .ferry
 	cp SILPH_GAUNTLET_5F
 	jp z, .trans
 	cp CERULEAN_CAVE_2F
@ -280,6 +288,12 @@ SetPal_Overworld:
 .faraway
 	ld a, PAL_ROUTE - 1
 	jr .town
+.citrine
+	ld a, PAL_CITRINE - 1
+	jr .town
+.ferry
+	ld a, PAL_BLUEMON - 1
+	jr .town

 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@ -382,6 +382,8 @@ DisplayWildLocations:
 	call LoadTownMapEntry
 	pop hl
 	ld a, [de]
+	cp $0C ; Bill's Garden's coordinates
+	jr z, .nextEntry ; skip
 	cp $16 ; Mt. Moon Crater's coordinates
 	jr z, .nextEntry ; skip
 	cp $19 ; Cerulean Cave's coordinates
--- a/gfx/blocksets/celeste.bst
+++ b/gfx/blocksets/celeste.bst
--- a/maps/BrunswickGlade.blk
+++ b/maps/BrunswickGlade.blk
@ -1,2 +1,2 @@
-X(( ,(nHI((((/
-78. ((((,(77g)	((:7	(((((I(	g,,_(gg_)#g_./ZU,_}}}}I_UgU(_;_(U._8_(Ug7 .L8_(U_6/g,(gY
+Xg;"Z7bbb
+7$g)g.7779	g):7	)I(	g,,_(gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY
--- a/maps/BrunswickGrotto.blk
+++ b/maps/BrunswickGrotto.blk
@ -1,2 +1,2 @@
-	<=>Z@AB_DGF
8:.9
-5)g.;;55g!gggg)gggg_	g9Ig45M)~;554g~Mg~.Y
+abbi).a_h6;h
bbL4b
+	g.;;55g!agg)ggggh	g9Ig45M)~;554g~Mbg~.Y
--- a/maps/CelesteHill.blk
+++ b/maps/CelesteHill.blk
@ -1 +1 @@
-@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒiU_i…B@ƒj<C692><6A>€<EFBFBD><EFBFBD>ˆ…B@†<>s)†<>‡BDEFYDEF
+@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒiaai…B@ƒj<C692>jŠj<EFBFBD>ˆ…B@†<>s)†<>‡BDEFYDEF
--- a/maps/GameCornerPrizeRoom.blk
+++ b/maps/GameCornerPrizeRoom.blk
@ -1 +1 @@
-?@@@?>>>>>     =
+?@@@@>>>>>     =
--- a/maps/GiovannisRoom.blk
+++ b/maps/GiovannisRoom.blk
@ -1 +1 @@
-............@AABAAAAB..DoF:;F..@+B 55..DwEF GF..DwEF 5'F..DwEF 59..DwEF'..H
	J55..DF555..DF*+AAB..DGGq^..DSCG5..HIIJ3333J.
+............@AABAAAAB..DnF:;F..@+B 55..DwEF GF..DwEF 5'F..DwEF 59..DwEF'..H
	J55..DF555..DF*+AAB..DGGq^..DSCG5..HIIJ3333J.
--- a/maps/ViridianGym.blk
+++ b/maps/ViridianGym.blk
@ -1 +1 @@
-III_]KMp[qWFF^\KUUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB
+IJ_]KLqWFF^\KUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB
--- a/scripts/CeruleanGym.asm
+++ b/scripts/CeruleanGym.asm
@ -43,14 +43,14 @@ CeruleanGymMistyPostBattle:
 	ld [wJoyIgnore], a

 CeruleanGymReceiveTM11:
-	ld a, $7
+	ld a, $6
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_BEAT_MISTY
 	lb bc, TM_BUBBLEBEAM, 1
 	call GiveItem
 	jr nc, .BagFull
-	ld a, $6
+	ld a, $7
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM11
--- a/scripts/CitrineFerryDock.asm
+++ b/scripts/CitrineFerryDock.asm
@ -1,4 +1,6 @@
 CitrineFerryDock_Script:
+	ld a, CITRINE_CITY
+	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing

 CitrineFerryDock_TextPointers:
--- a/scripts/GameCornerPrizeRoom.asm
+++ b/scripts/GameCornerPrizeRoom.asm
@ -7,6 +7,7 @@ GameCornerPrizeRoom_TextPointers:
 	dw CeladonPrizeRoomText3
 	dw CeladonPrizeRoomText3
 	dw CeladonPrizeRoomText3
+	dw CeladonPrizeRoomText3

 CeladonPrizeRoomText1:
 	text_far _CeladonPrizeRoomText1
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@ -778,6 +778,9 @@ OmegaText:
 OmegaBattleText:
 	text_far _OmegaBattleText
 	text_asm
+	ld a, OMEGADGE
+	call PlayCry
+	call WaitForSoundToFinish
 	jp TextScriptEnd

 Omega2Text:
--- a/scripts/VermilionFerryDock.asm
+++ b/scripts/VermilionFerryDock.asm
@ -1,4 +1,6 @@
 VermilionFerryDock_Script:
+	ld a, VERMILION_CITY
+	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing

 VermilionFerryDock_TextPointers:
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@ -1,4 +1,5 @@
 ViridianGym_Script:
+	call ViridianGymDoorCallbackScript
 	ld hl, .CityName
 	ld de, .LeaderName
 	call LoadGymLeaderAndCityName
@ -16,6 +17,22 @@ ViridianGym_Script:
 .LeaderName:
 	db "GIOVANNI@"

+ViridianGymDoorCallbackScript:
+	ld hl, wCurrentMapScriptFlags
+	bit 5, [hl]
+	res 5, [hl]
+	ret z
+	CheckEvent EVENT_GIOVANNIS_ROOM_DOOR_UNLOCKED
+	jr z, .blockExitToNextRoom
+	ld a, $5
+	jp .setExitBlock
+.blockExitToNextRoom
+	ld a, $24
+.setExitBlock
+	ld [wNewTileBlockID], a
+	lb bc, 0, 1
+	predef_jump ReplaceTileBlock
+
 ViridianGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
@ -29,6 +46,7 @@ ViridianGym_ScriptPointers:
 	dw EndTrainerBattle
 	dw ViridianGymGiovanniPostBattle
 	dw ViridianGymScript4
+	dw ViridianGymOpenTheDoor

 ViridianGymScript0:
 	ld a, [wYCoord]
@ -161,6 +179,15 @@ ViridianGymReceiveTM27:
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	jp ViridianGymResetScripts

+ViridianGymOpenTheDoor:
+	ld a, SFX_GO_INSIDE
+	call PlaySound
+	SetEvent EVENT_GIOVANNIS_ROOM_DOOR_UNLOCKED
+	ld a, $5
+	ld [wNewTileBlockID], a
+	lb bc, 0, 1
+	predef_jump ReplaceTileBlock
+
 ViridianGym_TextPointers:
 	dw GiovanniText
 	dw ViridianGymTrainerText1
@ -217,6 +244,7 @@ GiovanniText:
 	predef HideObject
 	call UpdateSprites
 	call Delay3
+	call ViridianGymOpenTheDoor
 	call GBFadeInFromBlack
 	jr .done
 .beforeBeat
--- a/text.asm
+++ b/text.asm
@ -267,7 +267,6 @@ INCLUDE "data/text/text_6.asm"
 SECTION "Text 11", ROMX

 INCLUDE "data/text/text_7.asm"
-INCLUDE "data/pokemon/new_dex_text.asm"
 INCLUDE "text/CeladonUniversityOutside.asm"
 INCLUDE "text/CeladonUniversityInside.asm"
 INCLUDE "text/CeladonUniversityPokecenter.asm"
@ -308,6 +307,7 @@ INCLUDE "data/pokemon/dex_text.asm"
 SECTION "Move Names", ROMX

 INCLUDE "data/moves/names.asm"
+INCLUDE "data/pokemon/new_dex_text.asm"

 SECTION "Item Descriptions", ROMX

--- a/text/CelesteHill.asm
+++ b/text/CelesteHill.asm
@ -6,9 +6,9 @@ _CelesteHillSign::
 	text "When the sun"
 	line "shines upon this"
 	cont "hill, the cruel"
-	cont "pretenders to"
-	cont "the winged"
-	cont "mirages will"
-	cont "come to roost."
+	cont "pretenders to the"
+	cont "winged mirages"
+	cont "will come to"
+	cont "roost."
 	done
 	
--- a/text/PokemonFanClub.asm
+++ b/text/PokemonFanClub.asm
@ -69,7 +69,7 @@ FanClubChairStoryText::
 	cont "love it!"

 	para "Hug it...when..."
-	cont "sleeping...warm"
+	line "sleeping...warm"
 	cont "and cuddly..."
 	cont "spectacular..."
 	cont "ravishing..."
--- a/text/SilphCo11F.asm
+++ b/text/SilphCo11F.asm
@ -71,7 +71,7 @@ _SilphCo11Text2::
 	done

 _SilphCo11Text3::
-	text "Ah <PLAYER>!"
+	text "Ah, <PLAYER>!"
 	line "So we meet again!"

 	para "The CHIEF and"
@ -88,7 +88,7 @@ _SilphCo11Text3::
 	done

 _SilphCo10Text_62330::
-	text "Arrgh!!"
+	text "Arrgh!"
 	line "I lost again!?"
 	prompt

@ -148,7 +148,7 @@ _SilphCo10Text_6237b::

 _OmegaBattleText::
 	text "Bzzt! Clank!"
-	prompt
+	text_end

 ; Fun fact: For some reason, this text is stored in 10F. Seems to be a beta element - they ARE encountered in 11F.
 _SilphCoJessieJamesText1::
--- a/text/VermilionGym_2.asm
+++ b/text/VermilionGym_2.asm
@ -103,14 +103,18 @@ _VermilionGymEndBattleText3::
 	prompt

 _VermilionGymAfterBattleText3::
-	text "LT.SURGE set up"
-	line "double locks!"
-	cont "Here's a hint!"
+	text "Here's a hint!"

 	para "When you open the"
 	line "1st lock, the 2nd"
 	cont "lock is right"
 	cont "next to it!"
+
+	para "Though, half the"
+	line "time, the wiring"
+	cont "messes up, and"
+	cont "it'll be in the"
+	cont "top left can..."
 	done

 _VermilionGymGuidePreBattleText::
--- a/text/ViridianGym.asm
+++ b/text/ViridianGym.asm
@ -2,14 +2,18 @@ _GiovanniPreBattleText::
 	text "Fwahahaha! This is"
 	line "my hideout!"

-	para "Once again, you"
-	line "thwart me!"
+	para "I planned to"
+	line "resurrect TEAM"
+	cont "ROCKET here!"
+
+	para "But once again,"
+	line "you thwart me."
 	cont "So be it! This"
 	cont "time, I'm not"
 	cont "holding back!"

 	para "Once more, you"
-	line "shall face"
+	line "shall face me,"
 	cont "GIOVANNI, the"
 	cont "greatest trainer!"
 	done
@ -26,13 +30,13 @@ _ReceivedEarthBadgeText::
 _GiovanniPostBattleAdviceText::
 	text "Having lost, I"
 	line "cannot face my"
-	cont "underlings!"
+	cont "underlings..."
 	cont "TEAM ROCKET is"
 	cont "finished forever!"

 	para "I will dedicate my"
 	line "life to the study"
-	cont "of #MON!"
+	cont "of #MON."

 	para "Let us meet again"
 	line "some day!"
@ -42,7 +46,7 @@ _GiovanniPostBattleAdviceText::
 _GiovanniEarthBadgeInfoText::
 	text "The EARTHBADGE"
 	line "is evidence of"
-	line "your mastery as a"
+	cont "your mastery as a"
 	cont "#MON trainer!"

 	para "With it, you can"