thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 06:08:57 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Two new(?) music tracks

Browse source 
I was gonna push the rest of the 1.3 stuff at the same time, but these are probably the biggest additions so I'm committing them now just to be safe.

- Made a variant of the Gym Leader battle theme that's pitched down a bit, using it for the battles against the Elite Four (basically what Diamond and Pearl did for its own Elite Four theme). Oak uses it too, given his apparent involvement with the Pokemon League as shown by the email in his lab and his history with Agatha.

- Also, a slower, heavier pitched version of the Rival's encounter theme has been added, which I'm thinking will play in his Pokemon League room if it gets used. This one currently can't be heard in-game, it's just in the files and will stay there until 1.3 comes out or until it gets cut.
This commit is contained in:
Martha Schilling 2024-02-02 21:07:13 +00:00
parent 9c0962690b
commit 27bda7052d
6 changed files with 1740 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
audio/play_battle_music.asm
View file

@ -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