Merge branch 'mistress' into renewables

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

scripts/CitrineFerryDock.asm

@@ -1,4 +1,6 @@
 CitrineFerryDock_Script:
+	ld a, CITRINE_CITY
+	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
 CitrineFerryDock_TextPointers:

scripts/GameCornerPrizeRoom.asm

@@ -7,6 +7,7 @@ GameCornerPrizeRoom_TextPointers:
 	dw CeladonPrizeRoomText3
 	dw CeladonPrizeRoomText3
 	dw CeladonPrizeRoomText3
+	dw CeladonPrizeRoomText3
 
 CeladonPrizeRoomText1:
 	text_far _CeladonPrizeRoomText1

scripts/SilphCo11F.asm

@@ -778,6 +778,9 @@ OmegaText:
 OmegaBattleText:
 	text_far _OmegaBattleText
 	text_asm
+	ld a, OMEGADGE
+	call PlayCry
+	call WaitForSoundToFinish
 	jp TextScriptEnd
 
 Omega2Text:

scripts/VermilionFerryDock.asm

@@ -1,4 +1,6 @@
 VermilionFerryDock_Script:
+	ld a, VERMILION_CITY
+	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
 VermilionFerryDock_TextPointers:

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