Music fadeout before Champion fight

This commit is contained in:
Martha Schilling 2024-01-04 22:18:45 +00:00
parent d51cab873b
commit a2acee24e7
2 changed files with 24 additions and 2 deletions

View file

@ -276,9 +276,25 @@ ChampionsRoom_TextPointers:
GaryText1: GaryText1:
text_asm text_asm
CheckEvent EVENT_BEAT_CHAMPION_RIVAL CheckEvent EVENT_BEAT_CHAMPION_RIVAL
jr nz, .championBeaten
ld hl, GaryChampionIntroText ld hl, GaryChampionIntroText
call PrintText
ld a, 5
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitloop
ld a, [wMusicFade]
and a
jr nz, .waitloop
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld hl, GaryChampionIntroTextPart2
jr z, .printText jr z, .printText
.championBeaten
ld hl, GaryText_76103 ld hl, GaryText_76103
jr z, .printText
.printText .printText
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
@ -287,6 +303,10 @@ GaryChampionIntroText:
text_far _GaryChampionIntroText text_far _GaryChampionIntroText
text_end text_end
GaryChampionIntroTextPart2:
text_far _GaryChampionIntroTextPart2
text_end
GaryDefeatedText: GaryDefeatedText:
text_far _GaryDefeatedText text_far _GaryDefeatedText
text_end text_end

View file

@ -19,9 +19,11 @@ _GaryChampionIntroText::
cont "that would beat" cont "that would beat"
cont "any #MON type!" cont "any #MON type!"
para "And now!" para "And now..."
prompt
para "I'm the #MON" _GaryChampionIntroTextPart2::
text "I'm the #MON"
line "LEAGUE champion!" line "LEAGUE champion!"
para "<PLAYER>! Do you" para "<PLAYER>! Do you"