Bug Fixes

Fixes the following bugs:
- Restores the Museum Guy's functionality that was removed when trying to allow Brock skip. Now works fine.
- Attempt to fix Yujirou's Sabrina-like glitch. If this doesn't fix it, look at Sabrina between RB and Y
- Attempt to fix some Misty text.
- Changed Squirtle check to use EVENT_BEAT_SURGE over the ThunderBadge. Same effect, saves a line of code, generally easier.
- Reverts a really old and shoddy DV generation system back to vanilla.

Also, I changed some gym/rival teams to reflect new philosophies from Discord discussion.

scripts/CeruleanGym.asm

@@ -43,7 +43,7 @@ CeruleanGymMistyPostBattle:
 	ld [wJoyIgnore], a
 
 CeruleanGymReceiveTM11:
-	ld a, $5
+	ld a, $7
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_BEAT_MISTY
@@ -56,7 +56,7 @@ CeruleanGymReceiveTM11:
 	SetEvent EVENT_GOT_TM11
 	jr .gymVictory
 .BagFull
-	ld a, $7
+	ld a, $8
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 .gymVictory

scripts/PewterCity.asm

@@ -6,7 +6,7 @@ PewterCity_Script:
 
 PewterCity_ScriptPointers:
 	dw PewterCityScript0
-;	dw PewterCityScript1
+	dw PewterCityScript1
 	dw PewterCityScript2
 	dw PewterCityScript3
 	dw PewterCityScript4
@@ -44,49 +44,49 @@ PewterCityScript0:
 ;	dbmapcoord 37, 19
 ;	db -1 ; end
 
-;PewterCityScript1:
-;	ld a, [wNPCMovementScriptPointerTableNum]
-;	and a
-;	ret nz
-;	ld a, $3
-;	ldh [hSpriteIndex], a
-;	ld a, SPRITE_FACING_UP
-;	ldh [hSpriteFacingDirection], a
-;	call SetSpriteFacingDirectionAndDelay
-;	ld a, ($3 << 4) | SPRITE_FACING_UP
-;	ldh [hSpriteImageIndex], a
-;	call SetSpriteImageIndexAfterSettingFacingDirection
-;	call PlayDefaultMusic
-;	ld hl, wFlags_0xcd60
-;	set 4, [hl]
-;	ld a, $d
-;	ldh [hSpriteIndexOrTextID], a
-;	call DisplayTextID
-;	ld a, $3c
-;	ldh [hSpriteScreenYCoord], a
-;	ld a, $30
-;	ldh [hSpriteScreenXCoord], a
-;	ld a, 12
-;	ldh [hSpriteMapYCoord], a
-;	ld a, 17
-;	ldh [hSpriteMapXCoord], a
-;	ld a, $3
-;	ld [wSpriteIndex], a
-;	call SetSpritePosition1
-;	ld a, $3
-;	ldh [hSpriteIndex], a
-;	ld de, MovementData_PewterMuseumGuyExit
-;	call MoveSprite
-;	ld a, $2
-;	ld [wPewterCityCurScript], a
-;	ret
+PewterCityScript1:
+	ld a, [wNPCMovementScriptPointerTableNum]
+	and a
+	ret nz
+	ld a, $3
+	ldh [hSpriteIndex], a
+	ld a, SPRITE_FACING_UP
+	ldh [hSpriteFacingDirection], a
+	call SetSpriteFacingDirectionAndDelay
+	ld a, ($3 << 4) | SPRITE_FACING_UP
+	ldh [hSpriteImageIndex], a
+	call SetSpriteImageIndexAfterSettingFacingDirection
+	call PlayDefaultMusic
+	ld hl, wFlags_0xcd60
+	set 4, [hl]
+	ld a, $d
+	ldh [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	ld a, $3c
+	ldh [hSpriteScreenYCoord], a
+	ld a, $30
+	ldh [hSpriteScreenXCoord], a
+	ld a, 12
+	ldh [hSpriteMapYCoord], a
+	ld a, 17
+	ldh [hSpriteMapXCoord], a
+	ld a, $3
+	ld [wSpriteIndex], a
+	call SetSpritePosition1
+	ld a, $3
+	ldh [hSpriteIndex], a
+	ld de, MovementData_PewterMuseumGuyExit
+	call MoveSprite
+	ld a, $2
+	ld [wPewterCityCurScript], a
+	ret
 
-;MovementData_PewterMuseumGuyExit:
-;	db NPC_MOVEMENT_DOWN
-;	db NPC_MOVEMENT_DOWN
-;	db NPC_MOVEMENT_DOWN
-;	db NPC_MOVEMENT_DOWN
-;	db -1 ; end
+MovementData_PewterMuseumGuyExit:
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db -1 ; end
 
 PewterCityScript2:
 	ld a, [wd730]

scripts/VermilionCity.asm

@@ -441,8 +441,7 @@ OfficerJennySquirtle:
 	text_asm
 	CheckEvent EVENT_GOT_SQUIRTLE
 	jr nz, .howDoing
-	ld a, [wObtainedBadges]
-	bit 3, a ; THUNDERBADGE
+	CheckEvent EVENT_BEAT_LT_SURGE
 	jr z, .noBadge
 	ld hl, OfficerJennyHasBadge
 	call PrintText

scripts/ViridianPreGym.asm

@@ -80,7 +80,7 @@ YujirouText:
 	ld hl, YujirouLoseText
 	ld de, YujirouWinText
 	call SaveEndBattleTextPointers
-	ld a, $3
+	ld a, $2
 	ld [wViridianPreGymCurScript], a
 	ld [wCurMapScript], a
 	jr .done