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-

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