mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
Merge branch 'master' into mistress
This commit is contained in:
Thorn Avery
commit
6525b11a6c
|
|
@ -383,6 +383,8 @@ INCLUDE "crysaudio/music/RBY/legendarybattle.asm"
|
|||
INCLUDE "crysaudio/music/RBY/giovannisroom.asm"
|
||||
INCLUDE "crysaudio/music/RBY/rocketrby.asm"
|
||||
INCLUDE "crysaudio/music/RBY/giovannibattle.asm"
|
||||
INCLUDE "crysaudio/music/RBY/elitefourbattle.asm"
|
||||
INCLUDE "crysaudio/music/RBY/champrival.asm"
|
||||
|
||||
SECTION "TCG Songs 1", ROMX
|
||||
|
||||
|
|
|
|||
|
|
@ -43,23 +43,23 @@ PlayBattleMusic::
|
|||
cp OPP_ID_OFFSET
|
||||
jp c, .wildBattle
|
||||
cp OPP_YUJIROU
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_KOICHI
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_BROCK ; there's probably a much better way of doing this, but this allows the Gym leader rematches in SIlph to play the Gym Battle music
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_MISTY
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_LT_SURGE
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_ERIKA
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_KOGA
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_SABRINA
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_BLAINE
|
||||
jp z, .GymOrElite4Battle
|
||||
jp z, .GymBattle
|
||||
cp OPP_ROCKET
|
||||
jr z, .RocketBattle
|
||||
cp OPP_JESSIE_JAMES
|
||||
|
|
@ -71,21 +71,24 @@ PlayBattleMusic::
|
|||
cp OPP_CHIEF
|
||||
jr z, .Giovanni
|
||||
cp OPP_LORELEI ; elite four now play the gym leader battle theme
|
||||
jr z, .GymOrElite4Battle
|
||||
jr z, .Elite4Battle
|
||||
cp OPP_BRUNO
|
||||
jr z, .GymOrElite4Battle
|
||||
jr z, .Elite4Battle
|
||||
cp OPP_AGATHA
|
||||
jr z, .GymOrElite4Battle
|
||||
jr z, .Elite4Battle
|
||||
cp OPP_LANCE
|
||||
jr z, .GymOrElite4Battle
|
||||
cp OPP_PROF_OAK ; could also use the final battle theme, but I think the gym leader/elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked.
|
||||
jr z, .GymOrElite4Battle
|
||||
jr z, .Elite4Battle
|
||||
cp OPP_PROF_OAK ; could also use the final battle theme, but I think the elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked.
|
||||
jr z, .Elite4Battle
|
||||
cp OPP_RIVAL3
|
||||
jr z, .finalBattle
|
||||
jr nz, .normalTrainerBattle
|
||||
.GymOrElite4Battle
|
||||
.GymBattle
|
||||
ld a, MUSIC_GYM_LEADER_BATTLE
|
||||
jr .playSong
|
||||
.Elite4Battle
|
||||
ld a, MUSIC_ELITE_FOUR_BATTLE
|
||||
jr .playSong
|
||||
.normalTrainerBattle
|
||||
ld a, MUSIC_TRAINER_BATTLE
|
||||
jr .playSong
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@
|
|||
const MUSIC_GIOVANNIS_ROOM
|
||||
const MUSIC_ROCKET_RBY
|
||||
const MUSIC_GIOVANNI_BATTLE
|
||||
const MUSIC_ELITE_FOUR_BATTLE
|
||||
const MUSIC_CHAMP_RIVAL
|
||||
|
||||
const NUM_SONGS
|
||||
|
||||
|
|
|
|||
358
crysaudio/music/RBY/champrival.asm
Normal file
358
crysaudio/music/RBY/champrival.asm
Normal file
|
|
@ -0,0 +1,358 @@
|
|||
Music_ChampRival:
|
||||
channel_count 3
|
||||
channel 1, Music_ChampRival_Ch1
|
||||
channel 2, Music_ChampRival_Ch2
|
||||
channel 3, Music_ChampRival_Ch3
|
||||
|
||||
Music_ChampRival_Ch1:
|
||||
tempo 170
|
||||
Music_ChampRival_branch_b123:
|
||||
volume 7, 7
|
||||
duty_cycle 3
|
||||
vibrato 6, 3, 4
|
||||
toggle_perfect_pitch
|
||||
note_type 12, 11, 3
|
||||
octave 3
|
||||
note E_, 1
|
||||
note D#, 1
|
||||
note D_, 1
|
||||
note C#, 1
|
||||
note C_, 2
|
||||
octave 2
|
||||
note B_, 1
|
||||
note A#, 1
|
||||
note A_, 1
|
||||
note G#, 1
|
||||
note G_, 6
|
||||
note E_, 1
|
||||
rest 1
|
||||
note E_, 1
|
||||
rest 1
|
||||
note E_, 1
|
||||
rest 1
|
||||
note E_, 1
|
||||
rest 3
|
||||
note B_, 2
|
||||
note A_, 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
Music_ChampRival_branch_b140:
|
||||
octave 3
|
||||
note C#, 4
|
||||
note C_, 2
|
||||
octave 2
|
||||
note B_, 4
|
||||
note A_, 2
|
||||
octave 3
|
||||
note D_, 4
|
||||
note E_, 4
|
||||
rest 2
|
||||
note E_, 4
|
||||
note D#, 2
|
||||
note D_, 2
|
||||
note C#, 2
|
||||
note D_, 4
|
||||
note F#, 2
|
||||
note E_, 4
|
||||
note D_, 2
|
||||
note C#, 4
|
||||
note D_, 4
|
||||
rest 2
|
||||
note A_, 4
|
||||
note A_, 2
|
||||
note G#, 2
|
||||
note F#, 2
|
||||
note E_, 2
|
||||
note G#, 2
|
||||
octave 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
note E_, 2
|
||||
note G#, 2
|
||||
octave 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
note E_, 2
|
||||
octave 2
|
||||
note E_, 2
|
||||
octave 3
|
||||
note E_, 2
|
||||
rest 2
|
||||
octave 2
|
||||
note E_, 2
|
||||
octave 3
|
||||
note D_, 4
|
||||
note C#, 2
|
||||
note C_, 2
|
||||
note C#, 2
|
||||
note D_, 2
|
||||
note G_, 2
|
||||
octave 2
|
||||
note A_, 2
|
||||
octave 3
|
||||
note D_, 2
|
||||
note G_, 2
|
||||
note F_, 2
|
||||
note D_, 2
|
||||
note C_, 2
|
||||
octave 2
|
||||
note G#, 4
|
||||
rest 2
|
||||
octave 3
|
||||
note C_, 4
|
||||
note D_, 2
|
||||
note C_, 2
|
||||
note D_, 2
|
||||
note_type 12, 11, 7
|
||||
octave 2
|
||||
note A_, 4
|
||||
note E_, 2
|
||||
note G_, 6
|
||||
note G#, 4
|
||||
note E_, 2
|
||||
rest 4
|
||||
note E_, 4
|
||||
note_type 12, 11, 3
|
||||
note B_, 2
|
||||
note A_, 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
sound_loop 0, Music_ChampRival_branch_b140
|
||||
|
||||
Music_ChampRival_Ch2:
|
||||
duty_cycle 3
|
||||
vibrato 10, 2, 6
|
||||
note_type 12, 12, 7
|
||||
octave 4
|
||||
note C#, 1
|
||||
note C_, 1
|
||||
octave 3
|
||||
note B_, 1
|
||||
note A#, 1
|
||||
note A_, 2
|
||||
note G#, 1
|
||||
note G_, 1
|
||||
note F#, 1
|
||||
note F_, 1
|
||||
note E_, 6
|
||||
octave 2
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note F#, 1
|
||||
rest 1
|
||||
note E_, 1
|
||||
rest 1
|
||||
octave 3
|
||||
note E_, 2
|
||||
note G_, 2
|
||||
note G#, 2
|
||||
octave 4
|
||||
Music_ChampRival_branch_b1d8:
|
||||
note_type 12, 12, 7
|
||||
octave 3
|
||||
note A_, 4
|
||||
note E_, 2
|
||||
note G_, 6
|
||||
note G#, 4
|
||||
note A_, 4
|
||||
rest 2
|
||||
note A_, 4
|
||||
note A_, 2
|
||||
octave 4
|
||||
note C_, 2
|
||||
note C#, 2
|
||||
note D_, 4
|
||||
octave 3
|
||||
note A_, 2
|
||||
octave 4
|
||||
note C_, 6
|
||||
note C#, 4
|
||||
note D_, 4
|
||||
rest 2
|
||||
note D_, 4
|
||||
note D_, 2
|
||||
note C#, 2
|
||||
note D_, 2
|
||||
note_type 12, 11, 8
|
||||
note E_, 16
|
||||
note_type 12, 11, 5
|
||||
note E_, 6
|
||||
note_type 12, 12, 7
|
||||
note G_, 4
|
||||
note E_, 2
|
||||
note D_, 2
|
||||
note E_, 2
|
||||
note_type 12, 11, 8
|
||||
note D_, 8
|
||||
note_type 12, 12, 7
|
||||
note D_, 8
|
||||
octave 3
|
||||
note D_, 4
|
||||
rest 2
|
||||
octave 4
|
||||
note C_, 4
|
||||
octave 3
|
||||
note A_, 2
|
||||
note G_, 2
|
||||
note_type 12, 11, 8
|
||||
note A_, 16
|
||||
note_type 12, 11, 3
|
||||
note A_, 2
|
||||
octave 2
|
||||
note A_, 2
|
||||
rest 4
|
||||
note A_, 4
|
||||
octave 3
|
||||
note E_, 2
|
||||
note G_, 2
|
||||
note G#, 2
|
||||
octave 4
|
||||
sound_loop 0, Music_ChampRival_branch_b1d8
|
||||
|
||||
Music_ChampRival_Ch3:
|
||||
note_type 12, 1, 4
|
||||
octave 4
|
||||
note E_, 2
|
||||
rest 2
|
||||
note D#, 2
|
||||
rest 2
|
||||
note D_, 2
|
||||
rest 2
|
||||
note C#, 2
|
||||
octave 3
|
||||
rest 2
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
rest 1
|
||||
note A_, 1
|
||||
octave 4
|
||||
rest 1
|
||||
Music_ChampRival_branch_b24b:
|
||||
octave 3
|
||||
note A_, 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 4
|
||||
octave 4
|
||||
note E_, 4
|
||||
octave 3
|
||||
note A_, 2
|
||||
octave 4
|
||||
note C_, 2
|
||||
note C#, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
octave 4
|
||||
note D_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note D_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note C#, 2
|
||||
note D_, 4
|
||||
rest 2
|
||||
note D_, 4
|
||||
note D_, 2
|
||||
note C#, 2
|
||||
octave 3
|
||||
note B_, 2
|
||||
note G#, 2
|
||||
note B_, 2
|
||||
rest 2
|
||||
note G#, 2
|
||||
note B_, 2
|
||||
note G#, 2
|
||||
rest 2
|
||||
note B_, 2
|
||||
note G#, 2
|
||||
note B_, 2
|
||||
rest 2
|
||||
note G#, 2
|
||||
note B_, 2
|
||||
note G#, 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note B_, 2
|
||||
note F#, 2
|
||||
octave 4
|
||||
note D_, 2
|
||||
rest 2
|
||||
octave 3
|
||||
note F#, 2
|
||||
octave 4
|
||||
note D_, 2
|
||||
octave 3
|
||||
note F#, 2
|
||||
note G_, 2
|
||||
note A_, 2
|
||||
note F#, 4
|
||||
rest 2
|
||||
note F#, 2
|
||||
octave 4
|
||||
note D_, 2
|
||||
note C#, 2
|
||||
note C_, 2
|
||||
octave 3
|
||||
note B_, 2
|
||||
note A_, 2
|
||||
octave 4
|
||||
note C_, 2
|
||||
octave 3
|
||||
rest 2
|
||||
note A_, 2
|
||||
octave 4
|
||||
note C_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note C_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 3
|
||||
note A_, 2
|
||||
rest 2
|
||||
octave 4
|
||||
note E_, 2
|
||||
octave 5
|
||||
sound_loop 0, Music_ChampRival_branch_b24b
|
||||
1357
crysaudio/music/RBY/elitefourbattle.asm
Normal file
1357
crysaudio/music/RBY/elitefourbattle.asm
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -61,3 +61,5 @@ Music:
|
|||
dba Music_GiovannisRoom
|
||||
dba Music_RocketRBY
|
||||
dba Music_GiovanniBattle
|
||||
dba Music_EliteFourBattle
|
||||
dba Music_ChampRival
|
||||
|
|
|
|||
Loading…
Reference in a new issue