thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Mewtwo theme play issues

Browse source 
Mewtwo's theme wasn't playing properly because I am silly and forgot to add a `jr .playSong` so it doesn't fall through. Also, it needed to be before the wild check. Now it works as expected.

This also has the latest version of the Mewtwo theme by LuciShrimp, which is reaching a pretty amazing state.
This commit is contained in:
Llinos Evans 2023-06-25 20:09:52 +01:00
parent 30a33c6d8e
commit 41e7439496
2 changed files with 835 additions and 585 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio/play_battle_music.asm
View file

@ -14,10 +14,10 @@ PlayBattleMusic::
jr .playSong
.notGymLeaderBattle
ld a, [wCurOpponent]
cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check.
jr z, .mewtwoBattle
cp OPP_ID_OFFSET
jr c, .wildBattle
cp MEWTWO
jr z, .mewtwoBattle
cp OPP_YUJIROU
jr z, .Elite4Battle
cp OPP_LORELEI ; elite four now play the gym leader battle theme
@ -48,6 +48,7 @@ PlayBattleMusic::
jr .playSong
.mewtwoBattle
ld a, MUSIC_MEWTWO01
jr .playSong
.wildBattle
ld a, MUSIC_WILD_BATTLE
.playSong

1415
crysaudio/music/RBY/mewtwo01.asm
View file

File diff suppressed because it is too large Load diff