Manually merge pokecrystal audio files

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

View file

@ -4,7 +4,7 @@ Music_DefeatedGymLeader:
dbw $02, Music_DefeatedGymLeader_Ch3
Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad)
ftempo 112
tempo 112
volume 119
dutycycle 3
vibrato 18, 49

View file

@ -4,7 +4,7 @@ Music_DefeatedTrainer:
dbw $02, Music_DefeatedTrainer_Ch3
Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
ftempo 224
tempo 224
volume 119
dutycycle 2
notetype 4, 162

View file

@ -4,7 +4,7 @@ Music_DefeatedWildMon:
dbw $02, Music_DefeatedWildMon_Ch3
Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74)
ftempo 112
tempo 112
volume 119
dutycycle 3
vibrato 6, 52

View file

@ -4,7 +4,7 @@ Music_FinalBattle:
dbw $02, Music_FinalBattle_Ch3
Music_FinalBattle_Ch1:
ftempo 112
tempo 112
volume 119
dutycycle 3
vibrato $6, $34

View file

@ -4,7 +4,7 @@ Music_GymLeaderBattle:
dbw $02, Music_GymLeaderBattle_Ch3
Music_GymLeaderBattle_Ch1:
ftempo 104
tempo 104
volume 119
dutycycle 3
vibrato $8, $34

View file

@ -5,7 +5,7 @@ Music_IntroBattle:
dbw $03, Music_IntroBattle_Ch4
Music_IntroBattle_Ch1: ; 7f844 (1f:7844)
ftempo 98
tempo 98
volume 119
dutycycle 3
vibrato 6, 52

View file

@ -3,11 +3,11 @@ Music_JigglypuffSong:
dbw $01, Music_JigglypuffSong_Ch2
Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
ftempo 144
tempo 144
volume 119
vibrato 8, 36
dutycycle 2
unknownmusic0xde 165
sound_duty 165
notetype 13, 103
octave 4
@ -28,7 +28,7 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a)
vibrato 5, 21
dutycycle 2
unknownmusic0xde 10
sound_duty 10
notetype 12, 167
octave 4
note E_, 8

View file

@ -90,7 +90,7 @@ Music_Lavender_Ch3: ; bbae (2:7bae)
note __, 16
note __, 16
notetype 12, $2f
db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $EA, $10, $14, $DC, $10, $E3, $41, $51, $73
load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3
Music_Lavender_branch_bbb9:
octave 4
note E_, 16

View file

@ -4,28 +4,28 @@ Music_PkmnHealed:
dbw $02, Music_PkmnHealed_Ch3
Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3)
ftempo 144
tempo 144
volume 119
fdutycycle 2
dutycycle 2
notetype 12, 129
note __, 2
unknownmusic0xe0 0, $4C
slidepitchto 1, 4, B_
note B_, 2
unknownmusic0xe0 0, $55
slidepitchto 1, 5, E_
note B_, 2
unknownmusic0xe0 0, $45
slidepitchto 1, 4, E_
note E_, 2
note __, 4
unknownmusic0xe0 0, $3C
slidepitchto 1, 3, B_
note E_, 4
unknownmusic0xe0 0, $4C
slidepitchto 1, 4, B_
note B_, 4
endchannel
Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4)
fdutycycle 2
dutycycle 2
notetype 12, 195
octave 4
note B_, 4

View file

@ -408,7 +408,7 @@ Music_PokemonTower_branch_7f1a2:
note G_, 1
note __, 15
notetype 12, $1f
db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $22, $F7, $24, $22, $F7, $34, $24, $F7, $44
load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 2, 2, 15, 7, 2, 4, 2, 2, 15, 7, 3, 4, 2, 4, 15, 7, 4, 4
octave 4
note F#, 1
note __, 3

View file

@ -4,20 +4,20 @@ Music_SafariZone:
dbw $02, Music_SafariZone_Ch3
Music_SafariZone_Ch1: ; bc2e (2:7c2e)
ftempo 132
tempo 132
volume 119
vibrato 6, 52
dutycycle 2
notetype 12, 146
octave 3
unknownmusic0xe0 0, $4A
slidepitchto 1, 4, A_
note C_, 1
unknownmusic0xe0 0, $4A
slidepitchto 1, 4, A_
note G_, 1
unknownmusic0xe0 0, $4A
slidepitchto 1, 4, A_
note C_, 1
unknownmusic0xe0 0, $4A
slidepitchto 1, 4, A_
note G_, 1
note __, 4
dutycycle 3

View file

@ -5,7 +5,7 @@ Music_RBYTitleScreen:
dbw $03, Music_RBYTitleScreen_Ch4
Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0)
ftempo 144
tempo 144
volume 119
vibrato 9, 52
dutycycle 3

View file

@ -4,7 +4,7 @@ Music_TrainerBattle:
dbw $02, Music_TrainerBattle_Ch3
Music_TrainerBattle_Ch1:
ftempo 112
tempo 112
volume 119
dutycycle 3
vibrato $6, $34

View file

@ -4,7 +4,7 @@ Music_WildBattle:
dbw $02, Music_WildBattle_Ch3
Music_WildBattle_Ch1:
ftempo 104
tempo 104
volume 119
dutycycle 3
vibrato $6, $34

View file

@ -4,7 +4,7 @@ Music_YellowIntro:
dbw $02, Music_YellowIntro_Ch3
Music_YellowIntro_Ch1:
ftempo 116
tempo 116
volume 119
dutycycle 3
vibrato $8, $14

View file

@ -5,7 +5,7 @@ Music_YellowUnusedSong:
dbw $03, Music_YellowUnusedSong_Ch4
Music_YellowUnusedSong_Ch1:
ftempo 140
tempo 140
volume 119
dutycycle 3
vibrato $8, $14