Scream Tail title screen + bug fix

This commit is contained in:
Martha Schilling 2023-07-29 18:20:45 +01:00
parent 38b2b2c6c9
commit 52dbf39758
6 changed files with 12 additions and 15 deletions

View file

@ -105,12 +105,12 @@
const EVENT_BEAT_GAUNTLET_SCIENTIST const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_PSYCHIC const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers ; 5F Trainers
const EVENT_BEAT_GAUNTLET_JUGGLER 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_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER const EVENT_BEAT_GAUNTLET_TAMER

View file

@ -5,7 +5,6 @@ TitleMons:
db SYLVEON db SYLVEON
db CROCKY ; RG Betas db CROCKY ; RG Betas
db JAGG db JAGG
db CHEEP
db GYAOON db GYAOON
db TSUBOMITTO ; GS Betas db TSUBOMITTO ; GS Betas
db MADAAMU db MADAAMU
@ -16,6 +15,4 @@ TitleMons:
db WUGTRIO db WUGTRIO
db MELTAN db MELTAN
db EXEGGUTOR_A ; Regional Variants db EXEGGUTOR_A ; Regional Variants
db WEEZING_G
db ARCANINE_H
db TAUROS_PA db TAUROS_PA

View file

@ -16,7 +16,7 @@ SuperPalettes:
RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO 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, 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, 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, 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, 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 RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON

View file

@ -120,7 +120,7 @@ DisplayTitleScreen:
call LoadScreenTilesFromBuffer2 call LoadScreenTilesFromBuffer2
call EnableLCD call EnableLCD
ld a, GYAOON ld a, SCREAM_TAIL
ld [wTitleMonSpecies], a ld [wTitleMonSpecies], a
call LoadTitleMonSprite call LoadTitleMonSprite

View file

@ -90,9 +90,9 @@ TitleBallYTable:
TitleScreenAnimateBallIfStarterOut: TitleScreenAnimateBallIfStarterOut:
; Animate the TitleBall if a starter just got scrolled out. ; Animate the TitleBall if a starter just got scrolled out.
ld a, [wTitleMonSpecies] ld a, [wTitleMonSpecies]
cp VENUSAUR cp GOROCHU
jr z, .ok jr z, .ok
cp CHARIZARD cp SYLVEON
jr z, .ok jr z, .ok
cp TOTARTLE cp TOTARTLE
ret nz ret nz

View file

@ -75,7 +75,7 @@ _SilphGauntlet4FEndBattleText4::
line "Awful! Awful!" line "Awful! Awful!"
prompt prompt
_SilphGauntle45FAfterBattleText4:: _SilphGauntlet4FAfterBattleText4::
text "This floor is a" text "This floor is a"
line "graveyard! That" line "graveyard! That"
cont "CHIEF has a sick" cont "CHIEF has a sick"