Move music/ into audio/

105 files changed, 103 insertions, 103 deletions

diff --git a/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm
index 24a483f5b..24a483f5b 100644
--- a/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
diff --git a/music/azaleatown.asm b/audio/music/azaleatown.asm
index e16bb9bfd..e16bb9bfd 100644
--- a/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
diff --git a/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm
index 3ed2af29b..3ed2af29b 100644
--- a/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
diff --git a/music/battletowertheme.asm b/audio/music/battletowertheme.asm
index edaa1cb45..edaa1cb45 100644
--- a/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
diff --git a/music/bicycle.asm b/audio/music/bicycle.asm
index c3d3914b3..c3d3914b3 100644
--- a/music/bicycle.asm
+++ b/audio/music/bicycle.asm
diff --git a/music/buenaspassword.asm b/audio/music/buenaspassword.asm
index cff3a0cbc..cff3a0cbc 100644
--- a/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
diff --git a/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm
index e4c269dc4..e4c269dc4 100644
--- a/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
diff --git a/music/bugcatchingcontestresults.asm b/audio/music/bugcatchingcontestresults.asm
index b6a00c721..b6a00c721 100644
--- a/music/bugcatchingcontestresults.asm
+++ b/audio/music/bugcatchingcontestresults.asm
diff --git a/music/burnedtower.asm b/audio/music/burnedtower.asm
index c69ec9f19..c69ec9f19 100644
--- a/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
diff --git a/music/celadoncity.asm b/audio/music/celadoncity.asm
index deba0f54c..deba0f54c 100644
--- a/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
diff --git a/music/championbattle.asm b/audio/music/championbattle.asm
index c1f8e3819..c1f8e3819 100644
--- a/music/championbattle.asm
+++ b/audio/music/championbattle.asm
diff --git a/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm
index d6ed5c5a8..d6ed5c5a8 100644
--- a/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
diff --git a/music/clair.asm b/audio/music/clair.asm
index 400c3288d..400c3288d 100644
--- a/music/clair.asm
+++ b/audio/music/clair.asm
diff --git a/music/credits.asm b/audio/music/credits.asm
index a7d4c8d7a..a7d4c8d7a 100644
--- a/music/credits.asm
+++ b/audio/music/credits.asm
diff --git a/music/crystalopening.asm b/audio/music/crystalopening.asm
index 08193dd6e..08193dd6e 100644
--- a/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
diff --git a/music/dancinghall.asm b/audio/music/dancinghall.asm
index 352df2752..352df2752 100644
--- a/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
diff --git a/music/darkcave.asm b/audio/music/darkcave.asm
index 5ac474211..5ac474211 100644
--- a/music/darkcave.asm
+++ b/audio/music/darkcave.asm
diff --git a/music/dragonsden.asm b/audio/music/dragonsden.asm
index 4c4d74329..4c4d74329 100644
--- a/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
diff --git a/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm
index b07427612..b07427612 100644
--- a/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
diff --git a/music/elmslab.asm b/audio/music/elmslab.asm
index c89b5c6b7..c89b5c6b7 100644
--- a/music/elmslab.asm
+++ b/audio/music/elmslab.asm
diff --git a/music/evolution.asm b/audio/music/evolution.asm
index 7a3a2b37c..7a3a2b37c 100644
--- a/music/evolution.asm
+++ b/audio/music/evolution.asm
diff --git a/music/gamecorner.asm b/audio/music/gamecorner.asm
index e39797aa4..e39797aa4 100644
--- a/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
diff --git a/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm
index 5732e139c..5732e139c 100644
--- a/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
diff --git a/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm
index e90ab2733..e90ab2733 100644
--- a/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
diff --git a/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm
index 48262fc18..48262fc18 100644
--- a/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
diff --git a/music/gym.asm b/audio/music/gym.asm
index e113a6e04..e113a6e04 100644
--- a/music/gym.asm
+++ b/audio/music/gym.asm
diff --git a/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm
index 12e021958..12e021958 100644
--- a/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
diff --git a/music/halloffame.asm b/audio/music/halloffame.asm
index 29118dbef..29118dbef 100644
--- a/music/halloffame.asm
+++ b/audio/music/halloffame.asm
diff --git a/music/healpokemon.asm b/audio/music/healpokemon.asm
index 7f458cacb..7f458cacb 100644
--- a/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
diff --git a/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index df21e89b9..df21e89b9 100644
--- a/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
diff --git a/music/johtogymleaderbattle.asm b/audio/music/johtogymleaderbattle.asm
index f20ab6c19..f20ab6c19 100644
--- a/music/johtogymleaderbattle.asm
+++ b/audio/music/johtogymleaderbattle.asm
diff --git a/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm
index bb0ce647d..bb0ce647d 100644
--- a/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
diff --git a/music/johtowildpokemonbattle.asm b/audio/music/johtowildpokemonbattle.asm
index 3d17d6fb0..3d17d6fb0 100644
--- a/music/johtowildpokemonbattle.asm
+++ b/audio/music/johtowildpokemonbattle.asm
diff --git a/music/johtowildpokemonbattlenight.asm b/audio/music/johtowildpokemonbattlenight.asm
index 1d48e7a19..1d48e7a19 100644
--- a/music/johtowildpokemonbattlenight.asm
+++ b/audio/music/johtowildpokemonbattlenight.asm
diff --git a/music/kantogymleaderbattle.asm b/audio/music/kantogymleaderbattle.asm
index fa587f709..fa587f709 100644
--- a/music/kantogymleaderbattle.asm
+++ b/audio/music/kantogymleaderbattle.asm
diff --git a/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm
index 899987baa..899987baa 100644
--- a/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
diff --git a/music/kantowildpokemonbattle.asm b/audio/music/kantowildpokemonbattle.asm
index 9ad410458..9ad410458 100644
--- a/music/kantowildpokemonbattle.asm
+++ b/audio/music/kantowildpokemonbattle.asm
diff --git a/music/lakeofrage.asm b/audio/music/lakeofrage.asm
index aa8aa27b4..aa8aa27b4 100644
--- a/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
diff --git a/music/lakeofragerocketsradiosignal.asm b/audio/music/lakeofragerocketsradiosignal.asm
index 7fc1965d8..7fc1965d8 100644
--- a/music/lakeofragerocketsradiosignal.asm
+++ b/audio/music/lakeofragerocketsradiosignal.asm
diff --git a/music/lavendertown.asm b/audio/music/lavendertown.asm
index e7f4226c8..e7f4226c8 100644
--- a/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
diff --git a/music/lighthouse.asm b/audio/music/lighthouse.asm
index 15d06ed85..15d06ed85 100644
--- a/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
diff --git a/music/lookbeauty.asm b/audio/music/lookbeauty.asm
index 7ac9ea395..7ac9ea395 100644
--- a/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
diff --git a/music/lookhiker.asm b/audio/music/lookhiker.asm
index d050d934d..d050d934d 100644
--- a/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
diff --git a/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm
index 723833582..723833582 100644
--- a/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
diff --git a/music/looklass.asm b/audio/music/looklass.asm
index 17cdea665..17cdea665 100644
--- a/music/looklass.asm
+++ b/audio/music/looklass.asm
diff --git a/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm
index f05aa10c1..f05aa10c1 100644
--- a/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
diff --git a/music/lookofficer.asm b/audio/music/lookofficer.asm
index 673072b35..673072b35 100644
--- a/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
diff --git a/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm
index 0d3a2bc7b..0d3a2bc7b 100644
--- a/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
diff --git a/music/lookrival.asm b/audio/music/lookrival.asm
index c02f24f6f..c02f24f6f 100644
--- a/music/lookrival.asm
+++ b/audio/music/lookrival.asm
diff --git a/music/lookrocket.asm b/audio/music/lookrocket.asm
index e60c9ae2c..e60c9ae2c 100644
--- a/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
diff --git a/music/looksage.asm b/audio/music/looksage.asm
index 312da661e..312da661e 100644
--- a/music/looksage.asm
+++ b/audio/music/looksage.asm
diff --git a/music/lookyoungster.asm b/audio/music/lookyoungster.asm
index 1bdc446d6..1bdc446d6 100644
--- a/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
diff --git a/music/magnettrain.asm b/audio/music/magnettrain.asm
index 3c715caf0..3c715caf0 100644
--- a/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
diff --git a/music/mainmenu.asm b/audio/music/mainmenu.asm
index 7ea3078f9..7ea3078f9 100644
--- a/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
diff --git a/music/mobileadapter.asm b/audio/music/mobileadapter.asm
index 5a4a8fbce..5a4a8fbce 100644
--- a/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
diff --git a/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm
index 18b8816c6..18b8816c6 100644
--- a/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
diff --git a/music/mobilecenter.asm b/audio/music/mobilecenter.asm
index e79c86c1c..e79c86c1c 100644
--- a/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
diff --git a/music/mom.asm b/audio/music/mom.asm
index ad34ca9d3..ad34ca9d3 100644
--- a/music/mom.asm
+++ b/audio/music/mom.asm
diff --git a/music/mtmoon.asm b/audio/music/mtmoon.asm
index de5e62c9e..de5e62c9e 100644
--- a/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
diff --git a/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm
index d3175b29b..d3175b29b 100644
--- a/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
diff --git a/music/music_labels.txt b/audio/music/music_labels.txt
index f22ed7d9c..f22ed7d9c 100644
--- a/music/music_labels.txt
+++ b/audio/music/music_labels.txt
diff --git a/music/nationalpark.asm b/audio/music/nationalpark.asm
index 270092ab1..270092ab1 100644
--- a/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
diff --git a/music/newbarktown.asm b/audio/music/newbarktown.asm
index 3f547ca71..3f547ca71 100644
--- a/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
diff --git a/music/nothing.asm b/audio/music/nothing.asm
index 15c8c85a7..15c8c85a7 100644
--- a/music/nothing.asm
+++ b/audio/music/nothing.asm
diff --git a/music/pallettown.asm b/audio/music/pallettown.asm
index 833ce3435..833ce3435 100644
--- a/music/pallettown.asm
+++ b/audio/music/pallettown.asm
diff --git a/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm
index 9dd6049c5..9dd6049c5 100644
--- a/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
diff --git a/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm
index 9eab47cba..9eab47cba 100644
--- a/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
diff --git a/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm
index 7b478977b..7b478977b 100644
--- a/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
diff --git a/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm
index 383651a42..383651a42 100644
--- a/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
diff --git a/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm
index 7859470f8..7859470f8 100644
--- a/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
diff --git a/music/postcredits.asm b/audio/music/postcredits.asm
index aaa9bb8d6..aaa9bb8d6 100644
--- a/music/postcredits.asm
+++ b/audio/music/postcredits.asm
diff --git a/music/printer.asm b/audio/music/printer.asm
index 2714d43a7..2714d43a7 100644
--- a/music/printer.asm
+++ b/audio/music/printer.asm
diff --git a/music/profoak.asm b/audio/music/profoak.asm
index 37663a2de..37663a2de 100644
--- a/music/profoak.asm
+++ b/audio/music/profoak.asm
diff --git a/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm
index 43ca5ee85..43ca5ee85 100644
--- a/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
diff --git a/music/rivalbattle.asm b/audio/music/rivalbattle.asm
index ef5da2c00..ef5da2c00 100644
--- a/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
diff --git a/music/rocketbattle.asm b/audio/music/rocketbattle.asm
index ccb2fb824..ccb2fb824 100644
--- a/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
diff --git a/music/rockethideout.asm b/audio/music/rockethideout.asm
index 6d75f36b8..6d75f36b8 100644
--- a/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
diff --git a/music/rockettheme.asm b/audio/music/rockettheme.asm
index 4d3b09472..4d3b09472 100644
--- a/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
diff --git a/music/route1.asm b/audio/music/route1.asm
index 50fb5a08b..50fb5a08b 100644
--- a/music/route1.asm
+++ b/audio/music/route1.asm
diff --git a/music/route12.asm b/audio/music/route12.asm
index 0a57bf2c8..0a57bf2c8 100644
--- a/music/route12.asm
+++ b/audio/music/route12.asm
diff --git a/music/route2.asm b/audio/music/route2.asm
index efb020bd4..efb020bd4 100644
--- a/music/route2.asm
+++ b/audio/music/route2.asm
diff --git a/music/route26.asm b/audio/music/route26.asm
index 51fe396c6..51fe396c6 100644
--- a/music/route26.asm
+++ b/audio/music/route26.asm
diff --git a/music/route29.asm b/audio/music/route29.asm
index 53c8a4420..53c8a4420 100644
--- a/music/route29.asm
+++ b/audio/music/route29.asm
diff --git a/music/route3.asm b/audio/music/route3.asm
index 87e1899be..87e1899be 100644
--- a/music/route3.asm
+++ b/audio/music/route3.asm
diff --git a/music/route30.asm b/audio/music/route30.asm
index dae228326..dae228326 100644
--- a/music/route30.asm
+++ b/audio/music/route30.asm
diff --git a/music/route36.asm b/audio/music/route36.asm
index 647497099..647497099 100644
--- a/music/route36.asm
+++ b/audio/music/route36.asm
diff --git a/music/route37.asm b/audio/music/route37.asm
index a5878b9ab..a5878b9ab 100644
--- a/music/route37.asm
+++ b/audio/music/route37.asm
diff --git a/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm
index 909d80ae4..909d80ae4 100644
--- a/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
diff --git a/music/ruinsofalphradiosignal.asm b/audio/music/ruinsofalphradiosignal.asm
index f2bc19774..f2bc19774 100644
--- a/music/ruinsofalphradiosignal.asm
+++ b/audio/music/ruinsofalphradiosignal.asm
diff --git a/music/showmearound.asm b/audio/music/showmearound.asm
index 6ce934b35..6ce934b35 100644
--- a/music/showmearound.asm
+++ b/audio/music/showmearound.asm
diff --git a/music/sprouttower.asm b/audio/music/sprouttower.asm
index fc781b47b..fc781b47b 100644
--- a/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
diff --git a/music/ssaqua.asm b/audio/music/ssaqua.asm
index 5a83f28a5..5a83f28a5 100644
--- a/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
diff --git a/music/successfulcapture.asm b/audio/music/successfulcapture.asm
index f0e0c172f..f0e0c172f 100644
--- a/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
diff --git a/music/suicunebattle.asm b/audio/music/suicunebattle.asm
index 9904914d7..9904914d7 100644
--- a/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
diff --git a/music/surf.asm b/audio/music/surf.asm
index f54ec7913..f54ec7913 100644
--- a/music/surf.asm
+++ b/audio/music/surf.asm
diff --git a/music/tintower.asm b/audio/music/tintower.asm
index 174c1317f..174c1317f 100644
--- a/music/tintower.asm
+++ b/audio/music/tintower.asm
diff --git a/music/titlescreen.asm b/audio/music/titlescreen.asm
index 849dbd4f6..849dbd4f6 100644
--- a/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
diff --git a/music/trainervictory.asm b/audio/music/trainervictory.asm
index 92837490d..92837490d 100644
--- a/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
diff --git a/music/unioncave.asm b/audio/music/unioncave.asm
index a9ba236b7..a9ba236b7 100644
--- a/music/unioncave.asm
+++ b/audio/music/unioncave.asm
diff --git a/music/vermilioncity.asm b/audio/music/vermilioncity.asm
index 58b01dcd7..58b01dcd7 100644
--- a/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
diff --git a/music/victoryroad.asm b/audio/music/victoryroad.asm
index 2e15de3ca..2e15de3ca 100644
--- a/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
diff --git a/music/violetcity.asm b/audio/music/violetcity.asm
index 02b2c669b..02b2c669b 100644
--- a/music/violetcity.asm
+++ b/audio/music/violetcity.asm
diff --git a/music/viridiancity.asm b/audio/music/viridiancity.asm
index 2c5a6b820..2c5a6b820 100644
--- a/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
diff --git a/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm
index db2fda5d4..db2fda5d4 100644
--- a/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
diff --git a/main.asm b/main.asm
index 24ec350dc..59200537a 100644
--- a/main.asm
+++ b/main.asm
@@ -5018,9 +5018,9 @@ INCBIN "baserom.gbc", $1ee0e, $1f31c - $1ee0e
 
 ;                           Songs i
 
-Music_Credits:       INCLUDE "music/credits.asm"
-Music_Clair:         INCLUDE "music/clair.asm"
-Music_MobileAdapter: INCLUDE "music/mobileadapter.asm"
+Music_Credits:       INCLUDE "audio/music/credits.asm"
+Music_Clair:         INCLUDE "audio/music/clair.asm"
+Music_MobileAdapter: INCLUDE "audio/music/mobileadapter.asm"
 
 INCBIN "baserom.gbc",$1ff6c, $20000 - $1ff6c
 
@@ -66482,7 +66482,7 @@ INCBIN "baserom.gbc",$cc000, $cfd9e - $cc000
 
 ;                          Songs iii
 
-Music_PostCredits: INCLUDE "music/postcredits.asm"
+Music_PostCredits: INCLUDE "audio/music/postcredits.asm"
 
 INCBIN "baserom.gbc",$cff04, $d0000 - $cff04
 
@@ -66769,7 +66769,7 @@ INCLUDE "audio/trainer_encounters.asm"
 Music: INCLUDE "audio/music_pointers.asm"
 
 ; Empty song
-Music_Nothing: INCLUDE "music/nothing.asm"
+Music_Nothing: INCLUDE "audio/music/nothing.asm"
 
 ; Pointer table for all 68 base cries
 Cries: INCLUDE "audio/cry_pointers.asm"
@@ -66780,70 +66780,70 @@ SFX: INCLUDE "audio/sfx_pointers.asm"
 
 ;                            Songs I
 
-Music_Route36:              INCLUDE "music/route36.asm"
-Music_RivalBattle:          INCLUDE "music/rivalbattle.asm"
-Music_RocketBattle:         INCLUDE "music/rocketbattle.asm"
-Music_ElmsLab:              INCLUDE "music/elmslab.asm"
-Music_DarkCave:             INCLUDE "music/darkcave.asm"
-Music_JohtoGymBattle:       INCLUDE "music/johtogymleaderbattle.asm"
-Music_ChampionBattle:       INCLUDE "music/championbattle.asm"
-Music_SSAqua:               INCLUDE "music/ssaqua.asm"
-Music_NewBarkTown:          INCLUDE "music/newbarktown.asm"
-Music_GoldenrodCity:        INCLUDE "music/goldenrodcity.asm"
-Music_VermilionCity:        INCLUDE "music/vermilioncity.asm"
-Music_TitleScreen:          INCLUDE "music/titlescreen.asm"
-Music_RuinsOfAlphInterior:  INCLUDE "music/ruinsofalphinterior.asm"
-Music_LookPokemaniac:       INCLUDE "music/lookpokemaniac.asm"
-Music_TrainerVictory:       INCLUDE "music/trainervictory.asm"
+Music_Route36:              INCLUDE "audio/music/route36.asm"
+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_ChampionBattle:       INCLUDE "audio/music/championbattle.asm"
+Music_SSAqua:               INCLUDE "audio/music/ssaqua.asm"
+Music_NewBarkTown:          INCLUDE "audio/music/newbarktown.asm"
+Music_GoldenrodCity:        INCLUDE "audio/music/goldenrodcity.asm"
+Music_VermilionCity:        INCLUDE "audio/music/vermilioncity.asm"
+Music_TitleScreen:          INCLUDE "audio/music/titlescreen.asm"
+Music_RuinsOfAlphInterior:  INCLUDE "audio/music/ruinsofalphinterior.asm"
+Music_LookPokemaniac:       INCLUDE "audio/music/lookpokemaniac.asm"
+Music_TrainerVictory:       INCLUDE "audio/music/trainervictory.asm"
 
 
 SECTION "bank3B",DATA,BANK[$3B]
 
 ;                           Songs II
 
-Music_Route1:               INCLUDE "music/route1.asm"
-Music_Route3:               INCLUDE "music/route3.asm"
-Music_Route12:              INCLUDE "music/route12.asm"
-Music_KantoGymBattle:       INCLUDE "music/kantogymleaderbattle.asm"
-Music_KantoTrainerBattle:   INCLUDE "music/kantotrainerbattle.asm"
-Music_KantoWildBattle:      INCLUDE "music/kantowildpokemonbattle.asm"
-Music_PokemonCenter:        INCLUDE "music/pokemoncenter.asm"
-Music_LookLass:             INCLUDE "music/looklass.asm"
-Music_LookOfficer:          INCLUDE "music/lookofficer.asm"
-Music_Route2:               INCLUDE "music/route2.asm"
-Music_MtMoon:               INCLUDE "music/mtmoon.asm"
-Music_ShowMeAround:         INCLUDE "music/showmearound.asm"
-Music_GameCorner:           INCLUDE "music/gamecorner.asm"
-Music_Bicycle:              INCLUDE "music/bicycle.asm"
-Music_LookSage:             INCLUDE "music/looksage.asm"
-Music_PokemonChannel:       INCLUDE "music/pokemonchannel.asm"
-Music_Lighthouse:           INCLUDE "music/lighthouse.asm"
-Music_LakeOfRage:           INCLUDE "music/lakeofrage.asm"
-Music_IndigoPlateau:        INCLUDE "music/indigoplateau.asm"
-Music_Route37:              INCLUDE "music/route37.asm"
-Music_RocketHideout:        INCLUDE "music/rockethideout.asm"
-Music_DragonsDen:           INCLUDE "music/dragonsden.asm"
-Music_RuinsOfAlphRadio:     INCLUDE "music/ruinsofalphradiosignal.asm"
-Music_LookBeauty:           INCLUDE "music/lookbeauty.asm"
-Music_Route26:              INCLUDE "music/route26.asm"
-Music_EcruteakCity:         INCLUDE "music/ecruteakcity.asm"
-Music_LakeOfRageRocketRadio:INCLUDE "music/lakeofragerocketsradiosignal.asm"
-Music_MagnetTrain:          INCLUDE "music/magnettrain.asm"
-Music_LavenderTown:         INCLUDE "music/lavendertown.asm"
-Music_DancingHall:          INCLUDE "music/dancinghall.asm"
-Music_ContestResults:       INCLUDE "music/bugcatchingcontestresults.asm"
-Music_Route30:              INCLUDE "music/route30.asm"
+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_KantoTrainerBattle:   INCLUDE "audio/music/kantotrainerbattle.asm"
+Music_KantoWildBattle:      INCLUDE "audio/music/kantowildpokemonbattle.asm"
+Music_PokemonCenter:        INCLUDE "audio/music/pokemoncenter.asm"
+Music_LookLass:             INCLUDE "audio/music/looklass.asm"
+Music_LookOfficer:          INCLUDE "audio/music/lookofficer.asm"
+Music_Route2:               INCLUDE "audio/music/route2.asm"
+Music_MtMoon:               INCLUDE "audio/music/mtmoon.asm"
+Music_ShowMeAround:         INCLUDE "audio/music/showmearound.asm"
+Music_GameCorner:           INCLUDE "audio/music/gamecorner.asm"
+Music_Bicycle:              INCLUDE "audio/music/bicycle.asm"
+Music_LookSage:             INCLUDE "audio/music/looksage.asm"
+Music_PokemonChannel:       INCLUDE "audio/music/pokemonchannel.asm"
+Music_Lighthouse:           INCLUDE "audio/music/lighthouse.asm"
+Music_LakeOfRage:           INCLUDE "audio/music/lakeofrage.asm"
+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_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_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_Route30:              INCLUDE "audio/music/route30.asm"
 
 SECTION "bank3C",DATA,BANK[$3C]
 
 ;                          Songs III
 
-Music_VioletCity:           INCLUDE "music/violetcity.asm"
-Music_Route29:              INCLUDE "music/route29.asm"
-Music_HallOfFame:           INCLUDE "music/halloffame.asm"
-Music_HealPokemon:          INCLUDE "music/healpokemon.asm"
-Music_Evolution:            INCLUDE "music/evolution.asm"
-Music_Printer:              INCLUDE "music/printer.asm"
+Music_VioletCity:           INCLUDE "audio/music/violetcity.asm"
+Music_Route29:              INCLUDE "audio/music/route29.asm"
+Music_HallOfFame:           INCLUDE "audio/music/halloffame.asm"
+Music_HealPokemon:          INCLUDE "audio/music/healpokemon.asm"
+Music_Evolution:            INCLUDE "audio/music/evolution.asm"
+Music_Printer:              INCLUDE "audio/music/printer.asm"
 
 INCBIN "baserom.gbc", $f0941, $f3fb6 - $f0941
 
@@ -66852,43 +66852,43 @@ SECTION "bank3D",DATA,BANK[$3D]
 
 ;                           Songs IV
 
-Music_ViridianCity:         INCLUDE "music/viridiancity.asm"
-Music_CeladonCity:          INCLUDE "music/celadoncity.asm"
-Music_WildPokemonVictory:   INCLUDE "music/wildpokemonvictory.asm"
-Music_SuccessfulCapture:    INCLUDE "music/successfulcapture.asm"
-Music_GymLeaderVictory:     INCLUDE "music/gymleadervictory.asm"
-Music_MtMoonSquare:         INCLUDE "music/mtmoonsquare.asm"
-Music_Gym:                  INCLUDE "music/gym.asm"
-Music_PalletTown:           INCLUDE "music/pallettown.asm"
-Music_ProfOaksPokemonTalk:  INCLUDE "music/profoakspokemontalk.asm"
-Music_ProfOak:              INCLUDE "music/profoak.asm"
-Music_LookRival:            INCLUDE "music/lookrival.asm"
-Music_AfterTheRivalFight:   INCLUDE "music/aftertherivalfight.asm"
-Music_Surf:                 INCLUDE "music/surf.asm"
-Music_NationalPark:         INCLUDE "music/nationalpark.asm"
-Music_AzaleaTown:           INCLUDE "music/azaleatown.asm"
-Music_CherrygroveCity:      INCLUDE "music/cherrygrovecity.asm"
-Music_UnionCave:            INCLUDE "music/unioncave.asm"
-Music_JohtoWildBattle:      INCLUDE "music/johtowildpokemonbattle.asm"
-Music_JohtoWildBattleNight: INCLUDE "music/johtowildpokemonbattlenight.asm"
-Music_JohtoTrainerBattle:   INCLUDE "music/johtotrainerbattle.asm"
-Music_LookYoungster:        INCLUDE "music/lookyoungster.asm"
-Music_TinTower:             INCLUDE "music/tintower.asm"
-Music_SproutTower:          INCLUDE "music/sprouttower.asm"
-Music_BurnedTower:          INCLUDE "music/burnedtower.asm"
-Music_Mom:                  INCLUDE "music/mom.asm"
-Music_VictoryRoad:          INCLUDE "music/victoryroad.asm"
-Music_PokemonLullaby:       INCLUDE "music/pokemonlullaby.asm"
-Music_PokemonMarch:         INCLUDE "music/pokemonmarch.asm"
-Music_GoldSilverOpening:    INCLUDE "music/goldsilveropening.asm"
-Music_GoldSilverOpening2:   INCLUDE "music/goldsilveropening2.asm"
-Music_LookHiker:            INCLUDE "music/lookhiker.asm"
-Music_LookRocket:           INCLUDE "music/lookrocket.asm"
-Music_RocketTheme:          INCLUDE "music/rockettheme.asm"
-Music_MainMenu:             INCLUDE "music/mainmenu.asm"
-Music_LookKimonoGirl:       INCLUDE "music/lookkimonogirl.asm"
-Music_PokeFluteChannel:     INCLUDE "music/pokeflutechannel.asm"
-Music_BugCatchingContest:   INCLUDE "music/bugcatchingcontest.asm"
+Music_ViridianCity:         INCLUDE "audio/music/viridiancity.asm"
+Music_CeladonCity:          INCLUDE "audio/music/celadoncity.asm"
+Music_WildPokemonVictory:   INCLUDE "audio/music/wildpokemonvictory.asm"
+Music_SuccessfulCapture:    INCLUDE "audio/music/successfulcapture.asm"
+Music_GymLeaderVictory:     INCLUDE "audio/music/gymleadervictory.asm"
+Music_MtMoonSquare:         INCLUDE "audio/music/mtmoonsquare.asm"
+Music_Gym:                  INCLUDE "audio/music/gym.asm"
+Music_PalletTown:           INCLUDE "audio/music/pallettown.asm"
+Music_ProfOaksPokemonTalk:  INCLUDE "audio/music/profoakspokemontalk.asm"
+Music_ProfOak:              INCLUDE "audio/music/profoak.asm"
+Music_LookRival:            INCLUDE "audio/music/lookrival.asm"
+Music_AfterTheRivalFight:   INCLUDE "audio/music/aftertherivalfight.asm"
+Music_Surf:                 INCLUDE "audio/music/surf.asm"
+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_JohtoTrainerBattle:   INCLUDE "audio/music/johtotrainerbattle.asm"
+Music_LookYoungster:        INCLUDE "audio/music/lookyoungster.asm"
+Music_TinTower:             INCLUDE "audio/music/tintower.asm"
+Music_SproutTower:          INCLUDE "audio/music/sprouttower.asm"
+Music_BurnedTower:          INCLUDE "audio/music/burnedtower.asm"
+Music_Mom:                  INCLUDE "audio/music/mom.asm"
+Music_VictoryRoad:          INCLUDE "audio/music/victoryroad.asm"
+Music_PokemonLullaby:       INCLUDE "audio/music/pokemonlullaby.asm"
+Music_PokemonMarch:         INCLUDE "audio/music/pokemonmarch.asm"
+Music_GoldSilverOpening:    INCLUDE "audio/music/goldsilveropening.asm"
+Music_GoldSilverOpening2:   INCLUDE "audio/music/goldsilveropening2.asm"
+Music_LookHiker:            INCLUDE "audio/music/lookhiker.asm"
+Music_LookRocket:           INCLUDE "audio/music/lookrocket.asm"
+Music_RocketTheme:          INCLUDE "audio/music/rockettheme.asm"
+Music_MainMenu:             INCLUDE "audio/music/mainmenu.asm"
+Music_LookKimonoGirl:       INCLUDE "audio/music/lookkimonogirl.asm"
+Music_PokeFluteChannel:     INCLUDE "audio/music/pokeflutechannel.asm"
+Music_BugCatchingContest:   INCLUDE "audio/music/bugcatchingcontest.asm"
 
 SECTION "bank3E",DATA,BANK[$3E]
 
@@ -69441,14 +69441,14 @@ INCBIN "baserom.gbc", $178000, $1f
 
 ;                          Songs V
 
-Music_MobileAdapterMenu: INCLUDE "music/mobileadaptermenu.asm"
-Music_BuenasPassword:    INCLUDE "music/buenaspassword.asm"
-Music_LookMysticalMan:   INCLUDE "music/lookmysticalman.asm"
-Music_CrystalOpening:    INCLUDE "music/crystalopening.asm"
-Music_BattleTowerTheme:  INCLUDE "music/battletowertheme.asm"
-Music_SuicuneBattle:     INCLUDE "music/suicunebattle.asm"
-Music_BattleTowerLobby:  INCLUDE "music/battletowerlobby.asm"
-Music_MobileCenter:      INCLUDE "music/mobilecenter.asm"
+Music_MobileAdapterMenu: INCLUDE "audio/music/mobileadaptermenu.asm"
+Music_BuenasPassword:    INCLUDE "audio/music/buenaspassword.asm"
+Music_LookMysticalMan:   INCLUDE "audio/music/lookmysticalman.asm"
+Music_CrystalOpening:    INCLUDE "audio/music/crystalopening.asm"
+Music_BattleTowerTheme:  INCLUDE "audio/music/battletowertheme.asm"
+Music_SuicuneBattle:     INCLUDE "audio/music/suicunebattle.asm"
+Music_BattleTowerLobby:  INCLUDE "audio/music/battletowerlobby.asm"
+Music_MobileCenter:      INCLUDE "audio/music/mobilecenter.asm"
 
 INCBIN "baserom.gbc",$17982d, $1799ef - $17982d