Insert Crystal audio engine and music

most credit goes to Sanqui
This commit is contained in:
dannye 2017-05-07 15:30:08 -05:00
parent 832c28eaea
commit 87eed68710
586 changed files with 193763 additions and 6447 deletions

View file

@ -68,7 +68,7 @@ CeruleanCityScript0:
ld [wNewSoundID], a
call PlaySound
.asm_19512
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
xor a

View file

@ -350,7 +350,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

View file

@ -29,7 +29,7 @@ PalletTownScript0:
ld [wPlayerMovingDirection],a
ld a,$FF
call PlaySound ; stop music
ld a, BANK(Music_MeetProfOak)
ld a, 0 ; BANK(Music_MeetProfOak)
ld c,a
ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music
call PlayMusic

View file

@ -37,7 +37,7 @@ PewterJigglypuffText:
jr nz, .findMatchingFacingDirectionLoop
dec hl
push hl
ld c, BANK(Music_JigglypuffSong)
ld c, 0 ; BANK(Music_JigglypuffSong)
ld a, MUSIC_JIGGLYPUFF_SONG
call PlayMusic
pop hl
@ -58,11 +58,10 @@ PewterJigglypuffText:
ld c, 24
call DelayFrames
ld a, [wChannelSoundIDs]
ld b, a
ld a, [wChannelSoundIDs + Ch1]
or b
jr nz, .loop
push hl
call IsSongPlaying
pop hl
jr c, .loop
ld c, 48
call DelayFrames

View file

@ -25,7 +25,7 @@ PokemonTower2Script0:
ld a, $ff
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT

View file

@ -30,14 +30,11 @@ MomHealPokemon:
predef HealParty
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlaySound
.next
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .next
call PlayMusic
call WaitForSongToFinish
ld a, [wMapMusicSoundID]
ld [wNewSoundID], a
call PlaySound
call PlayMusic
call GBFadeInFromWhite
ld hl, MomHealText2
jp PrintText

View file

@ -92,7 +92,7 @@ Route22Script0:
ld [wNewSoundID], a
call PlaySound
.asm_50f4e
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $1

View file

@ -133,7 +133,7 @@ SilphCo7Script0:
ld a, $ff
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $9

View file

@ -27,7 +27,7 @@ SSAnne2Script0:
ld a, $ff
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, [wCoordIndex]

View file

@ -45,22 +45,19 @@ SSAnne7RubText:
TX_FAR _SSAnne7RubText
TX_ASM
ld a, [wAudioROMBank]
cp BANK(Audio3_UpdateMusic)
cp $1f ; 0 ; BANK(Audio3_UpdateMusic) XXXXX
ld [wAudioSavedROMBank], a
jr nz, .asm_61908
ld a, $ff
ld [wNewSoundID], a
call PlaySound
ld a, Bank(Music_PkmnHealed)
ld a, 0 ; Bank(Music_PkmnHealed)
ld [wAudioROMBank], a
.asm_61908
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlaySound
.asm_61910
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .asm_61910
call PlayMusic
call WaitForSongToFinish
call PlayDefaultMusic
SetEvent EVENT_RUBBED_CAPTAINS_BACK
ld hl, wd72d

View file

@ -42,7 +42,7 @@ VermilionDock_1db9b:
ld [wJoyIgnore], a
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_Surfing)
ld c, 0 ; BANK(Music_Surfing)
ld a, MUSIC_SURFING
call PlayMusic
callba LoadSmokeTileFourTimes