Making Giovanni's Room better

I've been at this for like 2 hours, I don't care how scuffed this code is, I just wanted to make the entrance to Giovanni's room look smoother and less obvious-

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

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

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.

maps/ViridianGym.blk

@@ -1 +1 @@
-II
I
_


]KMp[qWFF^\KUUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB
+IJ

_


]KLqWFF^\KUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB

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

text/ViridianGym.asm

@@ -2,14 +2,18 @@ _GiovanniPreBattleText::
 	text "Fwahahaha! This is"
 	line "my hideout!"
 
-	para "Once again, you"
+	para "I planned to"
-	line "thwart me!"
+	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"