mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 06:08:57 +13:00
WE ARE TEAM ROCKET, YOU CANNOT BEAT US
- Adds a slightly remade version of the Rocket battle theme that plays when fighting Rocket Grunts, Jessie & James, and Giovanni (1 and 2) - Giovanni 3 and Chief now share a new battle theme composed by myself and LuciShrimp, which is a slower, more intimidating remix of the regular Rocket fight theme. - Gave Giovanni 3 his own trainer class, allowing for better AI routines and smarter move choices. - Removed Giovanni's name from the Viridian City Gym statues to keep his identity a further secret. It also made more sense than in vanilla. - Gave the postgame Morimoto fight a better selection of moves.
This commit is contained in:
parent
f65a0313b2
commit
f9bbabbcca
22 changed files with 2216 additions and 14 deletions
|
|
@ -60,6 +60,16 @@ PlayBattleMusic::
|
|||
jp z, .GymOrElite4Battle
|
||||
cp OPP_BLAINE
|
||||
jp z, .GymOrElite4Battle
|
||||
cp OPP_ROCKET
|
||||
jr z, .RocketBattle
|
||||
cp OPP_JESSIE_JAMES
|
||||
jr z, .RocketBattle
|
||||
cp OPP_GIOVANNI
|
||||
jr z, .RocketBattle
|
||||
cp OPP_LEADER_GIOVANNI
|
||||
jr z, .Giovanni
|
||||
cp OPP_CHIEF
|
||||
jr z, .Giovanni
|
||||
cp OPP_LORELEI ; elite four now play the gym leader battle theme
|
||||
jr z, .GymOrElite4Battle
|
||||
cp OPP_BRUNO
|
||||
|
|
@ -71,9 +81,7 @@ PlayBattleMusic::
|
|||
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
|
||||
cp OPP_RIVAL3
|
||||
jr z, .finalBattle
|
||||
cp OPP_CHIEF
|
||||
jr z, .finalBattle
|
||||
jr z, .finalBattle
|
||||
jr nz, .normalTrainerBattle
|
||||
.GymOrElite4Battle
|
||||
ld a, MUSIC_GYM_LEADER_BATTLE
|
||||
|
|
@ -81,6 +89,12 @@ PlayBattleMusic::
|
|||
.normalTrainerBattle
|
||||
ld a, MUSIC_TRAINER_BATTLE
|
||||
jr .playSong
|
||||
.RocketBattle
|
||||
ld a, MUSIC_ROCKET_RBY
|
||||
jr .playSong
|
||||
.Giovanni
|
||||
ld a, MUSIC_GIOVANNI_BATTLE
|
||||
jr .playSong
|
||||
.finalBattle
|
||||
ld a, MUSIC_FINAL_BATTLE
|
||||
jr .playSong
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue