thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +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

17
scripts/PewterPokecenter.asm
View file

@ -42,7 +42,7 @@ PewterJigglypuffText:
dec hl
push hl
ld c, BANK(Music_JigglypuffSong)
ld c, 0 ; BANK(Music_JigglypuffSong)
ld a, MUSIC_JIGGLYPUFF_SONG
call PlayMusic
pop hl
@ -61,11 +61,16 @@ PewterJigglypuffText:
pop hl
ld c, 24
call DelayFrames
ld a, [wChannelSoundIDs]
ld b, a
ld a, [wChannelSoundIDs + CHAN2]
or b
jr nz, .spinMovementLoop
push hl
call IsSongPlaying
pop hl
jr c, .spinMovementLoop
; ld a, [wChannelSoundIDs]
; ld b, a
; ld a, [wChannelSoundIDs + CHAN2]
; or b
; jr nz, .spinMovementLoop
ld c, 48
call DelayFrames