mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
508a4e790e
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
81 lines
2.1 KiB
NASM
81 lines
2.1 KiB
NASM
PlayBattleMusic::
|
|
xor a
|
|
ld [wMusicFade], a
|
|
ld [wLowHealthAlarm], a
|
|
dec a ; SFX_STOP_ALL_MUSIC
|
|
; ld [wNewSoundID], a
|
|
call PlaySound
|
|
call DelayFrame
|
|
ld c, 0 ; BANK(Music_GymLeaderBattle)
|
|
ld a, [wGymLeaderNo]
|
|
and a
|
|
jr z, .notGymLeaderBattle
|
|
ld a, MUSIC_GYM_LEADER_BATTLE
|
|
jr .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
|
|
cp ARTICUNO
|
|
jr z, .legendaryBattle
|
|
cp ZAPDOS
|
|
jr z, .legendaryBattle
|
|
cp MOLTRES
|
|
jr z, .legendaryBattle
|
|
cp MEW
|
|
jr z, .legendaryBattle
|
|
cp OMEGADGE
|
|
jr z, .legendaryBattle
|
|
cp SNORLAX ; Just like LGPE. Snorlax is basically a legendary in RBY, so I love this.
|
|
jr 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
|
|
cp DRAGONAIR
|
|
jr z, .legendaryBattle
|
|
cp DRAGONITE
|
|
jr z, .legendaryBattle
|
|
cp ARTICUNO_G
|
|
jr z, .legendaryBattle
|
|
cp ZAPDOS_G
|
|
jr z, .legendaryBattle
|
|
cp MOLTRES_G
|
|
jr z, .legendaryBattle
|
|
cp OPP_ID_OFFSET
|
|
jr c, .wildBattle
|
|
cp OPP_YUJIROU
|
|
jr z, .Elite4Battle
|
|
cp OPP_LORELEI ; elite four now play the gym leader battle theme
|
|
jr z, .Elite4Battle
|
|
cp OPP_BRUNO
|
|
jr z, .Elite4Battle
|
|
cp OPP_AGATHA
|
|
jr z, .Elite4Battle
|
|
cp OPP_LANCE
|
|
jr z, .Elite4Battle
|
|
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
|
|
cp OPP_RIVAL3
|
|
jr z, .finalBattle
|
|
cp OPP_CHIEF
|
|
jr z, .finalBattle
|
|
jr nz, .normalTrainerBattle
|
|
.Elite4Battle
|
|
ld a, MUSIC_GYM_LEADER_BATTLE
|
|
jr .playSong
|
|
.normalTrainerBattle
|
|
ld a, MUSIC_TRAINER_BATTLE
|
|
jr .playSong
|
|
.finalBattle
|
|
ld a, MUSIC_FINAL_BATTLE
|
|
jr .playSong
|
|
.mewtwoBattle
|
|
ld a, MUSIC_MEWTWO01
|
|
jr .playSong
|
|
.legendaryBattle
|
|
ld a, MUSIC_LEGENDARYBATTLE
|
|
jr .playSong
|
|
.wildBattle
|
|
ld a, MUSIC_WILD_BATTLE
|
|
.playSong
|
|
jp PlayMusic
|