thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-22 15:12:18 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manually merge pokecrystal audio files

Browse source 
and remove more CrystalComplete leftovers
This commit is contained in:
dannye 2019-04-20 18:26:43 -05:00
parent 094594bffb
commit 735d5bd4c2
189 changed files with 9015 additions and 41631 deletions
Download patch file Download diff file Expand all files Collapse all files

10
home/overworld.asm
View file

@ -772,15 +772,15 @@ HandleBlackOut::
StopMusic::
xor a
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, 1
ld [MusicFade], a
ld [wMusicFade], a
.wait0
ld a, [MusicFadeCount]
ld a, [wMusicFadeCount]
and a
jr z, .wait0
.wait1
ld a, [MusicFadeCount]
ld a, [wMusicFadeCount]
and a
jr nz, .wait1
ret
@ -1262,7 +1262,7 @@ CollisionCheckOnLand::
; curSFX is not cleared for some reason.
; ch5 on?
ld hl, Channel5 + Channel1Flags - Channel1
ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
bit 0, [hl]
jr nz, .setCarry