summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/music/contestresults.asm (renamed from audio/music/bugcatchingcontestresults.asm)0
-rw-r--r--audio/music/johtogymbattle.asm (renamed from audio/music/johtogymleaderbattle.asm)0
-rw-r--r--audio/music/johtowildbattle.asm (renamed from audio/music/johtowildpokemonbattle.asm)0
-rw-r--r--audio/music/johtowildbattlenight.asm (renamed from audio/music/johtowildpokemonbattlenight.asm)0
-rw-r--r--audio/music/kantogymbattle.asm (renamed from audio/music/kantogymleaderbattle.asm)0
-rw-r--r--audio/music/kantowildbattle.asm (renamed from audio/music/kantowildpokemonbattle.asm)0
-rw-r--r--audio/music/lakeofragerocketradio.asm (renamed from audio/music/lakeofragerocketsradiosignal.asm)0
-rw-r--r--audio/music/ruinsofalphradio.asm (renamed from audio/music/ruinsofalphradiosignal.asm)0
-rw-r--r--main.asm16
9 files changed, 8 insertions, 8 deletions
diff --git a/audio/music/bugcatchingcontestresults.asm b/audio/music/contestresults.asm
index b6a00c721..b6a00c721 100644
--- a/audio/music/bugcatchingcontestresults.asm
+++ b/audio/music/contestresults.asm
diff --git a/audio/music/johtogymleaderbattle.asm b/audio/music/johtogymbattle.asm
index f20ab6c19..f20ab6c19 100644
--- a/audio/music/johtogymleaderbattle.asm
+++ b/audio/music/johtogymbattle.asm
diff --git a/audio/music/johtowildpokemonbattle.asm b/audio/music/johtowildbattle.asm
index 3d17d6fb0..3d17d6fb0 100644
--- a/audio/music/johtowildpokemonbattle.asm
+++ b/audio/music/johtowildbattle.asm
diff --git a/audio/music/johtowildpokemonbattlenight.asm b/audio/music/johtowildbattlenight.asm
index 1d48e7a19..1d48e7a19 100644
--- a/audio/music/johtowildpokemonbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
diff --git a/audio/music/kantogymleaderbattle.asm b/audio/music/kantogymbattle.asm
index fa587f709..fa587f709 100644
--- a/audio/music/kantogymleaderbattle.asm
+++ b/audio/music/kantogymbattle.asm
diff --git a/audio/music/kantowildpokemonbattle.asm b/audio/music/kantowildbattle.asm
index 9ad410458..9ad410458 100644
--- a/audio/music/kantowildpokemonbattle.asm
+++ b/audio/music/kantowildbattle.asm
diff --git a/audio/music/lakeofragerocketsradiosignal.asm b/audio/music/lakeofragerocketradio.asm
index 7fc1965d8..7fc1965d8 100644
--- a/audio/music/lakeofragerocketsradiosignal.asm
+++ b/audio/music/lakeofragerocketradio.asm
diff --git a/audio/music/ruinsofalphradiosignal.asm b/audio/music/ruinsofalphradio.asm
index f2bc19774..f2bc19774 100644
--- a/audio/music/ruinsofalphradiosignal.asm
+++ b/audio/music/ruinsofalphradio.asm
diff --git a/main.asm b/main.asm
index a4a2959a0..70e7fa018 100644
--- a/main.asm
+++ b/main.asm
@@ -64875,7 +64875,7 @@ Music_RivalBattle: INCLUDE "audio/music/rivalbattle.asm"
Music_RocketBattle: INCLUDE "audio/music/rocketbattle.asm"
Music_ElmsLab: INCLUDE "audio/music/elmslab.asm"
Music_DarkCave: INCLUDE "audio/music/darkcave.asm"
-Music_JohtoGymBattle: INCLUDE "audio/music/johtogymleaderbattle.asm"
+Music_JohtoGymBattle: INCLUDE "audio/music/johtogymbattle.asm"
Music_ChampionBattle: INCLUDE "audio/music/championbattle.asm"
Music_SSAqua: INCLUDE "audio/music/ssaqua.asm"
Music_NewBarkTown: INCLUDE "audio/music/newbarktown.asm"
@@ -64894,9 +64894,9 @@ SECTION "bank3B",ROMX,BANK[$3B]
Music_Route1: INCLUDE "audio/music/route1.asm"
Music_Route3: INCLUDE "audio/music/route3.asm"
Music_Route12: INCLUDE "audio/music/route12.asm"
-Music_KantoGymBattle: INCLUDE "audio/music/kantogymleaderbattle.asm"
+Music_KantoGymBattle: INCLUDE "audio/music/kantogymbattle.asm"
Music_KantoTrainerBattle: INCLUDE "audio/music/kantotrainerbattle.asm"
-Music_KantoWildBattle: INCLUDE "audio/music/kantowildpokemonbattle.asm"
+Music_KantoWildBattle: INCLUDE "audio/music/kantowildbattle.asm"
Music_PokemonCenter: INCLUDE "audio/music/pokemoncenter.asm"
Music_LookLass: INCLUDE "audio/music/looklass.asm"
Music_LookOfficer: INCLUDE "audio/music/lookofficer.asm"
@@ -64913,15 +64913,15 @@ Music_IndigoPlateau: INCLUDE "audio/music/indigoplateau.asm"
Music_Route37: INCLUDE "audio/music/route37.asm"
Music_RocketHideout: INCLUDE "audio/music/rockethideout.asm"
Music_DragonsDen: INCLUDE "audio/music/dragonsden.asm"
-Music_RuinsOfAlphRadio: INCLUDE "audio/music/ruinsofalphradiosignal.asm"
+Music_RuinsOfAlphRadio: INCLUDE "audio/music/ruinsofalphradio.asm"
Music_LookBeauty: INCLUDE "audio/music/lookbeauty.asm"
Music_Route26: INCLUDE "audio/music/route26.asm"
Music_EcruteakCity: INCLUDE "audio/music/ecruteakcity.asm"
-Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketsradiosignal.asm"
+Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketradio.asm"
Music_MagnetTrain: INCLUDE "audio/music/magnettrain.asm"
Music_LavenderTown: INCLUDE "audio/music/lavendertown.asm"
Music_DancingHall: INCLUDE "audio/music/dancinghall.asm"
-Music_ContestResults: INCLUDE "audio/music/bugcatchingcontestresults.asm"
+Music_ContestResults: INCLUDE "audio/music/contestresults.asm"
Music_Route30: INCLUDE "audio/music/route30.asm"
SECTION "bank3C",ROMX,BANK[$3C]
@@ -64964,8 +64964,8 @@ Music_NationalPark: INCLUDE "audio/music/nationalpark.asm"
Music_AzaleaTown: INCLUDE "audio/music/azaleatown.asm"
Music_CherrygroveCity: INCLUDE "audio/music/cherrygrovecity.asm"
Music_UnionCave: INCLUDE "audio/music/unioncave.asm"
-Music_JohtoWildBattle: INCLUDE "audio/music/johtowildpokemonbattle.asm"
-Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildpokemonbattlenight.asm"
+Music_JohtoWildBattle: INCLUDE "audio/music/johtowildbattle.asm"
+Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildbattlenight.asm"
Music_JohtoTrainerBattle: INCLUDE "audio/music/johtotrainerbattle.asm"
Music_LookYoungster: INCLUDE "audio/music/lookyoungster.asm"
Music_TinTower: INCLUDE "audio/music/tintower.asm"