thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dannye/pokered-crysaudio

Browse source
This commit is contained in:
dannye 2023-04-19 21:08:01 -05:00
commit 8021cbdf04
530 changed files with 153841 additions and 14088 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/movie/credits.asm
View file

@ -23,7 +23,7 @@ HallOfFamePC:
call EnableLCD
ld a, SFX_STOP_ALL_MUSIC
call PlaySoundWaitForCurrent
ld c, BANK(Music_Credits)
ld c, 0 ; BANK(Music_Credits)
ld a, MUSIC_CREDITS
call PlayMusic
ld c, 128

8
engine/movie/evolution.asm
View file

@ -8,9 +8,9 @@ EvolveMon:
push af
xor a
ld [wLowHealthAlarm], a
ld [wChannelSoundIDs + CHAN5], a
; ld [wChannelSoundIDs + CHAN5], a
dec a ; SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld a, $1
ldh [hAutoBGTransferEnabled], a
@ -41,7 +41,7 @@ EvolveMon:
ld a, [wEvoOldSpecies]
call PlayCry
call WaitForSoundToFinish
ld c, BANK(Music_SafariZone)
ld c, 0 ; BANK(Music_SafariZone)
ld a, MUSIC_SAFARI_ZONE
call PlayMusic
ld c, 80
@ -68,7 +68,7 @@ EvolveMon:
.done
ld [wWholeScreenPaletteMonSpecies], a
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
ld a, [wWholeScreenPaletteMonSpecies]
call PlayCry

9
engine/movie/hall_of_fame.asm
View file

@ -33,7 +33,7 @@ AnimateHallOfFame:
.skipInc
ld a, $90
ldh [hWY], a
ld c, BANK(Music_HallOfFame)
ld c, 0 ; BANK(Music_HallOfFame)
ld a, MUSIC_HALL_OF_FAME
call PlayMusic
ld hl, wPartySpecies
@ -281,8 +281,7 @@ HoFRecordMonInfo:
HoFFadeOutScreenAndMusic:
ld a, 10
ld [wAudioFadeOutCounterReloadValue], a
ld [wAudioFadeOutCounter], a
ld a, $ff
ld [wAudioFadeOutControl], a
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
jp GBFadeOutToWhite

10
engine/movie/intro.asm
View file

@ -338,12 +338,12 @@ PlayShootingStar:
ld c, 40
call DelayFrames
.next
ld a, BANK(Music_IntroBattle)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_IntroBattle)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, MUSIC_INTRO_BATTLE
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
call IntroClearMiddleOfScreen
call ClearSprites
jp Delay3

17
engine/movie/oak_speech/oak_speech.asm
View file

@ -36,7 +36,7 @@ PrepareOakSpeech:
OakSpeech:
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld a, BANK(Music_Routes2)
ld a, 0 ; BANK(Music_Routes2)
ld c, a
ld a, MUSIC_ROUTES2
call PlayMusic
@ -130,14 +130,15 @@ OakSpeech:
call ResetPlayerSpriteData
ldh a, [hLoadedROMBank]
push af
ld a, BANK(Music_PalletTown)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_PalletTown)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, 10
ld [wAudioFadeOutControl], a
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
pop af
ldh [hLoadedROMBank], a
ld [MBC1RomBank], a

10
engine/movie/title.asm
View file

@ -19,9 +19,9 @@ PrepareTitleScreen::
ld [hli], a
ld [hli], a
ld [hl], a
ld a, BANK(Music_TitleScreen)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_TitleScreen)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
DisplayTitleScreen:
call GBPalWhiteOut
@ -210,8 +210,8 @@ DisplayTitleScreen:
call Delay3
call WaitForSoundToFinish
ld a, MUSIC_TITLE_SCREEN
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
xor a
ld [wUnusedCC5B], a