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

jojobear, our saviour

Browse source 
took out 4 bugs in one go, absolute legend
This commit is contained in:
Martha Schilling 2024-01-02 11:17:58 +00:00
parent 443277ffc8
commit fe651a7668
8 changed files with 88 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

60
audio/play_battle_music.asm
View file

@ -11,57 +11,71 @@ PlayBattleMusic::
and a
jr z, .notGymLeaderBattle
ld a, MUSIC_GYM_LEADER_BATTLE
jr .playSong
jp .playSong
.notGymLeaderBattle
ld a, [wCurOpponent] ; This can probably be made better with a list thing but uhhh idk how to do it. seethe.
cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check.
jr z, .mewtwoBattle
jp z, .mewtwoBattle
cp ARTICUNO
jr z, .legendaryBattle
jp z, .legendaryBattle
cp ZAPDOS
jr z, .legendaryBattle
jp z, .legendaryBattle
cp MOLTRES
jr z, .legendaryBattle
jp z, .legendaryBattle
cp MEW
jr z, .legendaryBattle
jp z, .legendaryBattle
cp OMEGADGE
jr z, .legendaryBattle
jp z, .legendaryBattle
cp SNORLAX ; Just like LGPE. Snorlax is basically a legendary in RBY, so I love this.
jr z, .legendaryBattle
jp z, .legendaryBattle
cp DRATINI ; In the Tajiri lore, the Dratini family is considered legendary. Also, we have a static Dragonite. I think the appearance of Dratini in the Safari Zone with this theme could also add some reeeeeal nice hype to the whole ordeal.
jr z, .legendaryBattle
jp z, .legendaryBattle
cp DRAGONAIR
jr z, .legendaryBattle
jp z, .legendaryBattle
cp DRAGONITE
jr z, .legendaryBattle
jp z, .legendaryBattle
cp ARTICUNO_G
jr z, .legendaryBattle
jp z, .legendaryBattle
cp ZAPDOS_G
jr z, .legendaryBattle
jp z, .legendaryBattle
cp MOLTRES_G
jr z, .legendaryBattle
jp z, .legendaryBattle
cp OPP_ID_OFFSET
jr c, .wildBattle
jp c, .wildBattle
cp OPP_YUJIROU
jr z, .Elite4Battle
jp z, .GymOrElite4Battle
cp OPP_KOICHI
jr z, .Elite4Battle
jp z, .GymOrElite4Battle
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
cp OPP_MISTY
jp z, .GymOrElite4Battle
cp OPP_LT_SURGE
jp z, .GymOrElite4Battle
cp OPP_ERIKA
jp z, .GymOrElite4Battle
cp OPP_KOGA
jp z, .GymOrElite4Battle
cp OPP_SABRINA
jp z, .GymOrElite4Battle
cp OPP_BLAINE
jp z, .GymOrElite4Battle
cp OPP_LORELEI ; elite four now play the gym leader battle theme
jr z, .Elite4Battle
jr z, .GymOrElite4Battle
cp OPP_BRUNO
jr z, .Elite4Battle
jr z, .GymOrElite4Battle
cp OPP_AGATHA
jr z, .Elite4Battle
jr z, .GymOrElite4Battle
cp OPP_LANCE
jr z, .Elite4Battle
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, .Elite4Battle
jr z, .GymOrElite4Battle
cp OPP_RIVAL3
jr z, .finalBattle
cp OPP_CHIEF
jr z, .finalBattle
jr nz, .normalTrainerBattle
.Elite4Battle
.GymOrElite4Battle
ld a, MUSIC_GYM_LEADER_BATTLE
jr .playSong
.normalTrainerBattle