From 52dbf397581b9a9be9a71e3d14b66432b3873189 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Sat, 29 Jul 2023 18:20:45 +0100
Subject: [PATCH] Scream Tail title screen + bug fix

---
 constants/event_constants.asm |  4 ++--
 data/pokemon/title_mons.asm   | 13 +++++--------
 data/sgb/sgb_palettes.asm     |  2 +-
 engine/movie/title.asm        |  2 +-
 engine/movie/title2.asm       |  4 ++--
 text/SilphGauntlet4F.asm      |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index d565c73d..60d14a8f 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -105,12 +105,12 @@
 	const EVENT_BEAT_GAUNTLET_SCIENTIST
 	const EVENT_BEAT_GAUNTLET_GAMBLER
 	const EVENT_BEAT_GAUNTLET_ROCKET
-	const EVENT_BEAT_GAUNTLET_PSYCHIC
+	const EVENT_BEAT_GAUNTLET_BIKER
 	const EVENT_BEAT_GAUNTLET_BURGLAR
 	const EVENT_BEAT_GAUNTLET_CHANNELER
 	; 5F Trainers
 	const EVENT_BEAT_GAUNTLET_JUGGLER
-	const EVENT_BEAT_GAUNTLET_BIKER
+	const EVENT_BEAT_GAUNTLET_PSYCHIC
 	const EVENT_BEAT_GAUNTLET_CUE_BALL
 	const EVENT_BEAT_GAUNTLET_SWIMMER
 	const EVENT_BEAT_GAUNTLET_TAMER
diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm
index d29724c0..822a9331 100644
--- a/data/pokemon/title_mons.asm
+++ b/data/pokemon/title_mons.asm
@@ -1,21 +1,18 @@
 TitleMons:
 ; mons on the title screen are randomly chosen from here
-	db TOTARTLE		; New Starters
+	db TOTARTLE     ; New Starters
 	db GOROCHU
 	db SYLVEON
-	db CROCKY		; RG Betas
+	db CROCKY       ; RG Betas
 	db JAGG
-	db CHEEP
 	db GYAOON
 	db TSUBOMITTO	; GS Betas
 	db MADAAMU
-	db PORYGON2		; Post-Gen 1 Evos
+	db PORYGON2     ; Post-Gen 1 Evos
 	db MAGNEZONE
 	db ANNIHILAPE
-	db SCREAM_TAIL	; LGPE and SV
+	db SCREAM_TAIL  ; LGPE and SV
 	db WUGTRIO
 	db MELTAN
-	db EXEGGUTOR_A	; Regional Variants
-	db WEEZING_G
-	db ARCANINE_H
+	db EXEGGUTOR_A  ; Regional Variants
 	db TAUROS_PA
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm
index e7fd5317..14752e7e 100644
--- a/data/sgb/sgb_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
@@ -16,7 +16,7 @@ SuperPalettes:
 	RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
 	RGB 31,31,31, 30,26,01, 11,23,31, 03,03,03 ; PAL_CITRINE
 	RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
-	RGB 31,31,31, 31,31,00, 25,10,31, 19,00,23 ; PAL_LOGO1
+	RGB 31,31,31, 31,31,00, 31,01,09, 31,13,15 ; PAL_LOGO1
 	RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
 	RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F
 	RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 1f0494d6..f5bab4be 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -120,7 +120,7 @@ DisplayTitleScreen:
 	call LoadScreenTilesFromBuffer2
 	call EnableLCD
 
-	ld a, GYAOON
+	ld a, SCREAM_TAIL
 	ld [wTitleMonSpecies], a
 	call LoadTitleMonSprite
 
diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm
index 258b63e1..485d6b1c 100644
--- a/engine/movie/title2.asm
+++ b/engine/movie/title2.asm
@@ -90,9 +90,9 @@ TitleBallYTable:
 TitleScreenAnimateBallIfStarterOut:
 ; Animate the TitleBall if a starter just got scrolled out.
 	ld a, [wTitleMonSpecies]
-	cp VENUSAUR
+	cp GOROCHU
 	jr z, .ok
-	cp CHARIZARD
+	cp SYLVEON
 	jr z, .ok
 	cp TOTARTLE
 	ret nz
diff --git a/text/SilphGauntlet4F.asm b/text/SilphGauntlet4F.asm
index 9052c79e..ea9daa0f 100644
--- a/text/SilphGauntlet4F.asm
+++ b/text/SilphGauntlet4F.asm
@@ -75,7 +75,7 @@ _SilphGauntlet4FEndBattleText4::
 	line "Awful! Awful!"
 	prompt
 
-_SilphGauntle45FAfterBattleText4::
+_SilphGauntlet4FAfterBattleText4::
 	text "This floor is a"
 	line "graveyard! That"
 	cont "CHIEF has a sick"