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

20
engine/overworld/auto_movement.asm
View file

@ -162,12 +162,12 @@ PewterMuseumGuyMovementScriptPointerTable::
dw PewterMovementScript_Done
PewterMovementScript_WalkToMuseum:
ld a, BANK(Music_MuseumGuy)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_MuseumGuy)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
ld a, [wSpriteIndex]
swap a
ld [wNPCMovementScriptSpriteOffset], a
@ -218,12 +218,12 @@ PewterGymGuyMovementScriptPointerTable::
dw PewterMovementScript_Done
PewterMovementScript_WalkToGym:
ld a, BANK(Music_MuseumGuy)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_MuseumGuy)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
ld a, [wSpriteIndex]
swap a
ld [wNPCMovementScriptSpriteOffset], a

16
engine/overworld/elevator.asm
View file

@ -17,9 +17,9 @@ ShakeElevator::
add d
ldh [hSCY], a
push bc
ld c, BANK(SFX_Collision_1)
ld c, 0 ; BANK(SFX_Collision_1)
ld a, SFX_COLLISION
call PlayMusic
call PlaySound
pop bc
ld c, 2
call DelayFrames
@ -29,13 +29,13 @@ ShakeElevator::
ldh [hSCY], a
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld c, BANK(SFX_Safari_Zone_PA)
ld c, 0 ; BANK(SFX_Safari_Zone_PA)
ld a, SFX_SAFARI_ZONE_PA
call PlayMusic
.musicLoop
ld a, [wChannelSoundIDs + CHAN5]
cp SFX_SAFARI_ZONE_PA
jr z, .musicLoop
call PlaySound
;.musicLoop
; ld a, [wChannelSoundIDs + CHAN5]
; cp SFX_SAFARI_ZONE_PA
; jr z, .musicLoop
call UpdateSprites
jp PlayDefaultMusic

45
engine/overworld/healing_machine.asm
View file

@ -15,15 +15,16 @@ AnimateHealingMachine:
ld hl, wShadowOAMSprite33
ld de, PokeCenterOAMData
call CopyHealingMachineOAM
ld a, 4
ld [wAudioFadeOutControl], a
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitLoop
ld a, [wAudioFadeOutControl]
ld a, [wMusicFade]
and a ; is fade-out finished?
jr nz, .waitLoop ; if not, check again
ld a, [wPartyCount]
ld b, a
.partyLoop
@ -34,25 +35,29 @@ AnimateHealingMachine:
call DelayFrames
dec b
jr nz, .partyLoop
ld a, [wAudioROMBank]
cp BANK("Audio Engine 3")
ld [wAudioSavedROMBank], a
jr nz, .next
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
ld a, BANK(Music_PkmnHealed)
ld [wAudioROMBank], a
.next
; ld a, [wAudioROMBank]
; cp BANK("Audio Engine 3")
; ld [wAudioSavedROMBank], a
; jr nz, .next
; ld a, SFX_STOP_ALL_MUSIC
; ld [wNewSoundID], a
; call PlaySound
; ld a, 0 ; BANK(Music_PkmnHealed)
; ld [wAudioROMBank], a
;.next
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlaySound
; ld [wNewSoundID], a
call PlayMusic
ld d, $28
call FlashSprite8Times
.waitLoop2
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED ; is the healed music still playing?
jr z, .waitLoop2 ; if so, check gain
ld a, [wChannel1MusicID]
and a
jr nz, .waitLoop2
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED ; is the healed music still playing?
; jr z, .waitLoop2 ; if so, check gain
ld c, 32
call DelayFrames
pop af