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

6
scripts/OaksLab.asm
View file

@ -387,7 +387,7 @@ OaksLabScript10:
call SetSpriteFacingDirectionAndDelay
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $f
@ -564,7 +564,7 @@ OaksLabScript15:
ldh [hJoyHeld], a
call EnableAutoTextBoxDrawing
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $15
@ -665,7 +665,7 @@ OaksLabScript16:
call FillMemory
ld [hl], $ff
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySound
farcall Music_RivalAlternateStart
ld a, $1