Skip to content

Commit e21d349

Browse files
Changed Mt Silver and Kris music
1 parent f9fc233 commit e21d349

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

audio/play_battle_music.asm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ PlayBattleMusic::
8585
cp OPP_RIVAL3
8686
jr z, .finalBattle
8787
cp OPP_KRIS
88-
jr z, .finalBattle
88+
jr z, .johtoChamp
8989
jr nz, .normalTrainerBattle
9090
.GymBattle
9191
ld a, MUSIC_GYM_LEADER_BATTLE
@@ -105,6 +105,9 @@ PlayBattleMusic::
105105
.finalBattle
106106
ld a, MUSIC_FINAL_BATTLE
107107
jr .playSong
108+
.johtoChamp
109+
ld a, MUSIC_JOHTOCHAMP
110+
jr .playSong
108111
.mewtwoBattle
109112
ld a, MUSIC_MEWTWO01
110113
jr .playSong

constants/music_constants.asm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
; DEF \1 EQUS "((\2 - SFX_Headers_1) / 3)"
66
;ENDM
77

8-
const_def 1
8+
const_def 0
99

10+
const MUSIC_NOTHING
1011
const MUSIC_PALLET_TOWN
1112
const MUSIC_POKECENTER
1213
const MUSIC_GYM
@@ -70,6 +71,7 @@
7071
const MUSIC_ELITE_FOUR_BATTLE
7172
; const MUSIC_CHAMP_RIVAL
7273
const MUSIC_GALAR_BIRDS
74+
const MUSIC_JOHTOCHAMP
7375

7476
const NUM_SONGS
7577

crysaudio/music_pointers_red.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ Music:
6464
dba Music_EliteFourBattle
6565
; dba Music_ChampRival
6666
dba Music_GalarBirds
67+
dba Music_ChampionBattle

data/maps/songs.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,5 +254,5 @@ MapSongBanks::
254254
db MUSIC_DIGDA01, 0 ; CELESTE_HILL_CAVE
255255
db MUSIC_DIGDA01, 0 ; CELESTE_HILL_OUTSIDE
256256
db MUSIC_DUNGEON2, 0 ; BRUNSWICK_GLADE
257-
db MUSIC_AREA_ZERO, 0 ; MT_SILVER
257+
db MUSIC_NOTHING, 0 ; MT_SILVER
258258
assert_table_length NUM_MAPS

0 commit comments

Comments
 (0)