From 31a907d7c74a7cd5b35d8cd95a6b4a738e3967b6 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 5 Feb 2013 18:08:20 -0500 Subject: [PATCH] Move music/ into audio/ --- {music => audio/music}/aftertherivalfight.asm | 0 {music => audio/music}/azaleatown.asm | 0 {music => audio/music}/battletowerlobby.asm | 0 {music => audio/music}/battletowertheme.asm | 0 {music => audio/music}/bicycle.asm | 0 {music => audio/music}/buenaspassword.asm | 0 {music => audio/music}/bugcatchingcontest.asm | 0 .../music}/bugcatchingcontestresults.asm | 0 {music => audio/music}/burnedtower.asm | 0 {music => audio/music}/celadoncity.asm | 0 {music => audio/music}/championbattle.asm | 0 {music => audio/music}/cherrygrovecity.asm | 0 {music => audio/music}/clair.asm | 0 {music => audio/music}/credits.asm | 0 {music => audio/music}/crystalopening.asm | 0 {music => audio/music}/dancinghall.asm | 0 {music => audio/music}/darkcave.asm | 0 {music => audio/music}/dragonsden.asm | 0 {music => audio/music}/ecruteakcity.asm | 0 {music => audio/music}/elmslab.asm | 0 {music => audio/music}/evolution.asm | 0 {music => audio/music}/gamecorner.asm | 0 {music => audio/music}/goldenrodcity.asm | 0 {music => audio/music}/goldsilveropening.asm | 0 {music => audio/music}/goldsilveropening2.asm | 0 {music => audio/music}/gym.asm | 0 {music => audio/music}/gymleadervictory.asm | 0 {music => audio/music}/halloffame.asm | 0 {music => audio/music}/healpokemon.asm | 0 {music => audio/music}/indigoplateau.asm | 0 .../music}/johtogymleaderbattle.asm | 0 {music => audio/music}/johtotrainerbattle.asm | 0 .../music}/johtowildpokemonbattle.asm | 0 .../music}/johtowildpokemonbattlenight.asm | 0 .../music}/kantogymleaderbattle.asm | 0 {music => audio/music}/kantotrainerbattle.asm | 0 .../music}/kantowildpokemonbattle.asm | 0 {music => audio/music}/lakeofrage.asm | 0 .../music}/lakeofragerocketsradiosignal.asm | 0 {music => audio/music}/lavendertown.asm | 0 {music => audio/music}/lighthouse.asm | 0 {music => audio/music}/lookbeauty.asm | 0 {music => audio/music}/lookhiker.asm | 0 {music => audio/music}/lookkimonogirl.asm | 0 {music => audio/music}/looklass.asm | 0 {music => audio/music}/lookmysticalman.asm | 0 {music => audio/music}/lookofficer.asm | 0 {music => audio/music}/lookpokemaniac.asm | 0 {music => audio/music}/lookrival.asm | 0 {music => audio/music}/lookrocket.asm | 0 {music => audio/music}/looksage.asm | 0 {music => audio/music}/lookyoungster.asm | 0 {music => audio/music}/magnettrain.asm | 0 {music => audio/music}/mainmenu.asm | 0 {music => audio/music}/mobileadapter.asm | 0 {music => audio/music}/mobileadaptermenu.asm | 0 {music => audio/music}/mobilecenter.asm | 0 {music => audio/music}/mom.asm | 0 {music => audio/music}/mtmoon.asm | 0 {music => audio/music}/mtmoonsquare.asm | 0 {music => audio/music}/music_labels.txt | 0 {music => audio/music}/nationalpark.asm | 0 {music => audio/music}/newbarktown.asm | 0 {music => audio/music}/nothing.asm | 0 {music => audio/music}/pallettown.asm | 0 {music => audio/music}/pokeflutechannel.asm | 0 {music => audio/music}/pokemoncenter.asm | 0 {music => audio/music}/pokemonchannel.asm | 0 {music => audio/music}/pokemonlullaby.asm | 0 {music => audio/music}/pokemonmarch.asm | 0 {music => audio/music}/postcredits.asm | 0 {music => audio/music}/printer.asm | 0 {music => audio/music}/profoak.asm | 0 .../music}/profoakspokemontalk.asm | 0 {music => audio/music}/rivalbattle.asm | 0 {music => audio/music}/rocketbattle.asm | 0 {music => audio/music}/rockethideout.asm | 0 {music => audio/music}/rockettheme.asm | 0 {music => audio/music}/route1.asm | 0 {music => audio/music}/route12.asm | 0 {music => audio/music}/route2.asm | 0 {music => audio/music}/route26.asm | 0 {music => audio/music}/route29.asm | 0 {music => audio/music}/route3.asm | 0 {music => audio/music}/route30.asm | 0 {music => audio/music}/route36.asm | 0 {music => audio/music}/route37.asm | 0 .../music}/ruinsofalphinterior.asm | 0 .../music}/ruinsofalphradiosignal.asm | 0 {music => audio/music}/showmearound.asm | 0 {music => audio/music}/sprouttower.asm | 0 {music => audio/music}/ssaqua.asm | 0 {music => audio/music}/successfulcapture.asm | 0 {music => audio/music}/suicunebattle.asm | 0 {music => audio/music}/surf.asm | 0 {music => audio/music}/tintower.asm | 0 {music => audio/music}/titlescreen.asm | 0 {music => audio/music}/trainervictory.asm | 0 {music => audio/music}/unioncave.asm | 0 {music => audio/music}/vermilioncity.asm | 0 {music => audio/music}/victoryroad.asm | 0 {music => audio/music}/violetcity.asm | 0 {music => audio/music}/viridiancity.asm | 0 {music => audio/music}/wildpokemonvictory.asm | 0 main.asm | 206 +++++++++--------- 105 files changed, 103 insertions(+), 103 deletions(-) rename {music => audio/music}/aftertherivalfight.asm (100%) rename {music => audio/music}/azaleatown.asm (100%) rename {music => audio/music}/battletowerlobby.asm (100%) rename {music => audio/music}/battletowertheme.asm (100%) rename {music => audio/music}/bicycle.asm (100%) rename {music => audio/music}/buenaspassword.asm (100%) rename {music => audio/music}/bugcatchingcontest.asm (100%) rename {music => audio/music}/bugcatchingcontestresults.asm (100%) rename {music => audio/music}/burnedtower.asm (100%) rename {music => audio/music}/celadoncity.asm (100%) rename {music => audio/music}/championbattle.asm (100%) rename {music => audio/music}/cherrygrovecity.asm (100%) rename {music => audio/music}/clair.asm (100%) rename {music => audio/music}/credits.asm (100%) rename {music => audio/music}/crystalopening.asm (100%) rename {music => audio/music}/dancinghall.asm (100%) rename {music => audio/music}/darkcave.asm (100%) rename {music => audio/music}/dragonsden.asm (100%) rename {music => audio/music}/ecruteakcity.asm (100%) rename {music => audio/music}/elmslab.asm (100%) rename {music => audio/music}/evolution.asm (100%) rename {music => audio/music}/gamecorner.asm (100%) rename {music => audio/music}/goldenrodcity.asm (100%) rename {music => audio/music}/goldsilveropening.asm (100%) rename {music => audio/music}/goldsilveropening2.asm (100%) rename {music => audio/music}/gym.asm (100%) rename {music => audio/music}/gymleadervictory.asm (100%) rename {music => audio/music}/halloffame.asm (100%) rename {music => audio/music}/healpokemon.asm (100%) rename {music => audio/music}/indigoplateau.asm (100%) rename {music => audio/music}/johtogymleaderbattle.asm (100%) rename {music => audio/music}/johtotrainerbattle.asm (100%) rename {music => audio/music}/johtowildpokemonbattle.asm (100%) rename {music => audio/music}/johtowildpokemonbattlenight.asm (100%) rename {music => audio/music}/kantogymleaderbattle.asm (100%) rename {music => audio/music}/kantotrainerbattle.asm (100%) rename {music => audio/music}/kantowildpokemonbattle.asm (100%) rename {music => audio/music}/lakeofrage.asm (100%) rename {music => audio/music}/lakeofragerocketsradiosignal.asm (100%) rename {music => audio/music}/lavendertown.asm (100%) rename {music => audio/music}/lighthouse.asm (100%) rename {music => audio/music}/lookbeauty.asm (100%) rename {music => audio/music}/lookhiker.asm (100%) rename {music => audio/music}/lookkimonogirl.asm (100%) rename {music => audio/music}/looklass.asm (100%) rename {music => audio/music}/lookmysticalman.asm (100%) rename {music => audio/music}/lookofficer.asm (100%) rename {music => audio/music}/lookpokemaniac.asm (100%) rename {music => audio/music}/lookrival.asm (100%) rename {music => audio/music}/lookrocket.asm (100%) rename {music => audio/music}/looksage.asm (100%) rename {music => audio/music}/lookyoungster.asm (100%) rename {music => audio/music}/magnettrain.asm (100%) rename {music => audio/music}/mainmenu.asm (100%) rename {music => audio/music}/mobileadapter.asm (100%) rename {music => audio/music}/mobileadaptermenu.asm (100%) rename {music => audio/music}/mobilecenter.asm (100%) rename {music => audio/music}/mom.asm (100%) rename {music => audio/music}/mtmoon.asm (100%) rename {music => audio/music}/mtmoonsquare.asm (100%) rename {music => audio/music}/music_labels.txt (100%) rename {music => audio/music}/nationalpark.asm (100%) rename {music => audio/music}/newbarktown.asm (100%) rename {music => audio/music}/nothing.asm (100%) rename {music => audio/music}/pallettown.asm (100%) rename {music => audio/music}/pokeflutechannel.asm (100%) rename {music => audio/music}/pokemoncenter.asm (100%) rename {music => audio/music}/pokemonchannel.asm (100%) rename {music => audio/music}/pokemonlullaby.asm (100%) rename {music => audio/music}/pokemonmarch.asm (100%) rename {music => audio/music}/postcredits.asm (100%) rename {music => audio/music}/printer.asm (100%) rename {music => audio/music}/profoak.asm (100%) rename {music => audio/music}/profoakspokemontalk.asm (100%) rename {music => audio/music}/rivalbattle.asm (100%) rename {music => audio/music}/rocketbattle.asm (100%) rename {music => audio/music}/rockethideout.asm (100%) rename {music => audio/music}/rockettheme.asm (100%) rename {music => audio/music}/route1.asm (100%) rename {music => audio/music}/route12.asm (100%) rename {music => audio/music}/route2.asm (100%) rename {music => audio/music}/route26.asm (100%) rename {music => audio/music}/route29.asm (100%) rename {music => audio/music}/route3.asm (100%) rename {music => audio/music}/route30.asm (100%) rename {music => audio/music}/route36.asm (100%) rename {music => audio/music}/route37.asm (100%) rename {music => audio/music}/ruinsofalphinterior.asm (100%) rename {music => audio/music}/ruinsofalphradiosignal.asm (100%) rename {music => audio/music}/showmearound.asm (100%) rename {music => audio/music}/sprouttower.asm (100%) rename {music => audio/music}/ssaqua.asm (100%) rename {music => audio/music}/successfulcapture.asm (100%) rename {music => audio/music}/suicunebattle.asm (100%) rename {music => audio/music}/surf.asm (100%) rename {music => audio/music}/tintower.asm (100%) rename {music => audio/music}/titlescreen.asm (100%) rename {music => audio/music}/trainervictory.asm (100%) rename {music => audio/music}/unioncave.asm (100%) rename {music => audio/music}/vermilioncity.asm (100%) rename {music => audio/music}/victoryroad.asm (100%) rename {music => audio/music}/violetcity.asm (100%) rename {music => audio/music}/viridiancity.asm (100%) rename {music => audio/music}/wildpokemonvictory.asm (100%) diff --git a/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm similarity index 100% rename from music/aftertherivalfight.asm rename to audio/music/aftertherivalfight.asm diff --git a/music/azaleatown.asm b/audio/music/azaleatown.asm similarity index 100% rename from music/azaleatown.asm rename to audio/music/azaleatown.asm diff --git a/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm similarity index 100% rename from music/battletowerlobby.asm rename to audio/music/battletowerlobby.asm diff --git a/music/battletowertheme.asm b/audio/music/battletowertheme.asm similarity index 100% rename from music/battletowertheme.asm rename to audio/music/battletowertheme.asm diff --git a/music/bicycle.asm b/audio/music/bicycle.asm similarity index 100% rename from music/bicycle.asm rename to audio/music/bicycle.asm diff --git a/music/buenaspassword.asm b/audio/music/buenaspassword.asm similarity index 100% rename from music/buenaspassword.asm rename to audio/music/buenaspassword.asm diff --git a/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm similarity index 100% rename from music/bugcatchingcontest.asm rename to audio/music/bugcatchingcontest.asm diff --git a/music/bugcatchingcontestresults.asm b/audio/music/bugcatchingcontestresults.asm similarity index 100% rename from music/bugcatchingcontestresults.asm rename to audio/music/bugcatchingcontestresults.asm diff --git a/music/burnedtower.asm b/audio/music/burnedtower.asm similarity index 100% rename from music/burnedtower.asm rename to audio/music/burnedtower.asm diff --git a/music/celadoncity.asm b/audio/music/celadoncity.asm similarity index 100% rename from music/celadoncity.asm rename to audio/music/celadoncity.asm diff --git a/music/championbattle.asm b/audio/music/championbattle.asm similarity index 100% rename from music/championbattle.asm rename to audio/music/championbattle.asm diff --git a/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm similarity index 100% rename from music/cherrygrovecity.asm rename to audio/music/cherrygrovecity.asm diff --git a/music/clair.asm b/audio/music/clair.asm similarity index 100% rename from music/clair.asm rename to audio/music/clair.asm diff --git a/music/credits.asm b/audio/music/credits.asm similarity index 100% rename from music/credits.asm rename to audio/music/credits.asm diff --git a/music/crystalopening.asm b/audio/music/crystalopening.asm similarity index 100% rename from music/crystalopening.asm rename to audio/music/crystalopening.asm diff --git a/music/dancinghall.asm b/audio/music/dancinghall.asm similarity index 100% rename from music/dancinghall.asm rename to audio/music/dancinghall.asm diff --git a/music/darkcave.asm b/audio/music/darkcave.asm similarity index 100% rename from music/darkcave.asm rename to audio/music/darkcave.asm diff --git a/music/dragonsden.asm b/audio/music/dragonsden.asm similarity index 100% rename from music/dragonsden.asm rename to audio/music/dragonsden.asm diff --git a/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm similarity index 100% rename from music/ecruteakcity.asm rename to audio/music/ecruteakcity.asm diff --git a/music/elmslab.asm b/audio/music/elmslab.asm similarity index 100% rename from music/elmslab.asm rename to audio/music/elmslab.asm diff --git a/music/evolution.asm b/audio/music/evolution.asm similarity index 100% rename from music/evolution.asm rename to audio/music/evolution.asm diff --git a/music/gamecorner.asm b/audio/music/gamecorner.asm similarity index 100% rename from music/gamecorner.asm rename to audio/music/gamecorner.asm diff --git a/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm similarity index 100% rename from music/goldenrodcity.asm rename to audio/music/goldenrodcity.asm diff --git a/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm similarity index 100% rename from music/goldsilveropening.asm rename to audio/music/goldsilveropening.asm diff --git a/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm similarity index 100% rename from music/goldsilveropening2.asm rename to audio/music/goldsilveropening2.asm diff --git a/music/gym.asm b/audio/music/gym.asm similarity index 100% rename from music/gym.asm rename to audio/music/gym.asm diff --git a/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm similarity index 100% rename from music/gymleadervictory.asm rename to audio/music/gymleadervictory.asm diff --git a/music/halloffame.asm b/audio/music/halloffame.asm similarity index 100% rename from music/halloffame.asm rename to audio/music/halloffame.asm diff --git a/music/healpokemon.asm b/audio/music/healpokemon.asm similarity index 100% rename from music/healpokemon.asm rename to audio/music/healpokemon.asm diff --git a/music/indigoplateau.asm b/audio/music/indigoplateau.asm similarity index 100% rename from music/indigoplateau.asm rename to audio/music/indigoplateau.asm diff --git a/music/johtogymleaderbattle.asm b/audio/music/johtogymleaderbattle.asm similarity index 100% rename from music/johtogymleaderbattle.asm rename to audio/music/johtogymleaderbattle.asm diff --git a/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm similarity index 100% rename from music/johtotrainerbattle.asm rename to audio/music/johtotrainerbattle.asm diff --git a/music/johtowildpokemonbattle.asm b/audio/music/johtowildpokemonbattle.asm similarity index 100% rename from music/johtowildpokemonbattle.asm rename to audio/music/johtowildpokemonbattle.asm diff --git a/music/johtowildpokemonbattlenight.asm b/audio/music/johtowildpokemonbattlenight.asm similarity index 100% rename from music/johtowildpokemonbattlenight.asm rename to audio/music/johtowildpokemonbattlenight.asm diff --git a/music/kantogymleaderbattle.asm b/audio/music/kantogymleaderbattle.asm similarity index 100% rename from music/kantogymleaderbattle.asm rename to audio/music/kantogymleaderbattle.asm diff --git a/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm similarity index 100% rename from music/kantotrainerbattle.asm rename to audio/music/kantotrainerbattle.asm diff --git a/music/kantowildpokemonbattle.asm b/audio/music/kantowildpokemonbattle.asm similarity index 100% rename from music/kantowildpokemonbattle.asm rename to audio/music/kantowildpokemonbattle.asm diff --git a/music/lakeofrage.asm b/audio/music/lakeofrage.asm similarity index 100% rename from music/lakeofrage.asm rename to audio/music/lakeofrage.asm diff --git a/music/lakeofragerocketsradiosignal.asm b/audio/music/lakeofragerocketsradiosignal.asm similarity index 100% rename from music/lakeofragerocketsradiosignal.asm rename to audio/music/lakeofragerocketsradiosignal.asm diff --git a/music/lavendertown.asm b/audio/music/lavendertown.asm similarity index 100% rename from music/lavendertown.asm rename to audio/music/lavendertown.asm diff --git a/music/lighthouse.asm b/audio/music/lighthouse.asm similarity index 100% rename from music/lighthouse.asm rename to audio/music/lighthouse.asm diff --git a/music/lookbeauty.asm b/audio/music/lookbeauty.asm similarity index 100% rename from music/lookbeauty.asm rename to audio/music/lookbeauty.asm diff --git a/music/lookhiker.asm b/audio/music/lookhiker.asm similarity index 100% rename from music/lookhiker.asm rename to audio/music/lookhiker.asm diff --git a/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm similarity index 100% rename from music/lookkimonogirl.asm rename to audio/music/lookkimonogirl.asm diff --git a/music/looklass.asm b/audio/music/looklass.asm similarity index 100% rename from music/looklass.asm rename to audio/music/looklass.asm diff --git a/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm similarity index 100% rename from music/lookmysticalman.asm rename to audio/music/lookmysticalman.asm diff --git a/music/lookofficer.asm b/audio/music/lookofficer.asm similarity index 100% rename from music/lookofficer.asm rename to audio/music/lookofficer.asm diff --git a/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm similarity index 100% rename from music/lookpokemaniac.asm rename to audio/music/lookpokemaniac.asm diff --git a/music/lookrival.asm b/audio/music/lookrival.asm similarity index 100% rename from music/lookrival.asm rename to audio/music/lookrival.asm diff --git a/music/lookrocket.asm b/audio/music/lookrocket.asm similarity index 100% rename from music/lookrocket.asm rename to audio/music/lookrocket.asm diff --git a/music/looksage.asm b/audio/music/looksage.asm similarity index 100% rename from music/looksage.asm rename to audio/music/looksage.asm diff --git a/music/lookyoungster.asm b/audio/music/lookyoungster.asm similarity index 100% rename from music/lookyoungster.asm rename to audio/music/lookyoungster.asm diff --git a/music/magnettrain.asm b/audio/music/magnettrain.asm similarity index 100% rename from music/magnettrain.asm rename to audio/music/magnettrain.asm diff --git a/music/mainmenu.asm b/audio/music/mainmenu.asm similarity index 100% rename from music/mainmenu.asm rename to audio/music/mainmenu.asm diff --git a/music/mobileadapter.asm b/audio/music/mobileadapter.asm similarity index 100% rename from music/mobileadapter.asm rename to audio/music/mobileadapter.asm diff --git a/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm similarity index 100% rename from music/mobileadaptermenu.asm rename to audio/music/mobileadaptermenu.asm diff --git a/music/mobilecenter.asm b/audio/music/mobilecenter.asm similarity index 100% rename from music/mobilecenter.asm rename to audio/music/mobilecenter.asm diff --git a/music/mom.asm b/audio/music/mom.asm similarity index 100% rename from music/mom.asm rename to audio/music/mom.asm diff --git a/music/mtmoon.asm b/audio/music/mtmoon.asm similarity index 100% rename from music/mtmoon.asm rename to audio/music/mtmoon.asm diff --git a/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm similarity index 100% rename from music/mtmoonsquare.asm rename to audio/music/mtmoonsquare.asm diff --git a/music/music_labels.txt b/audio/music/music_labels.txt similarity index 100% rename from music/music_labels.txt rename to audio/music/music_labels.txt diff --git a/music/nationalpark.asm b/audio/music/nationalpark.asm similarity index 100% rename from music/nationalpark.asm rename to audio/music/nationalpark.asm diff --git a/music/newbarktown.asm b/audio/music/newbarktown.asm similarity index 100% rename from music/newbarktown.asm rename to audio/music/newbarktown.asm diff --git a/music/nothing.asm b/audio/music/nothing.asm similarity index 100% rename from music/nothing.asm rename to audio/music/nothing.asm diff --git a/music/pallettown.asm b/audio/music/pallettown.asm similarity index 100% rename from music/pallettown.asm rename to audio/music/pallettown.asm diff --git a/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm similarity index 100% rename from music/pokeflutechannel.asm rename to audio/music/pokeflutechannel.asm diff --git a/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm similarity index 100% rename from music/pokemoncenter.asm rename to audio/music/pokemoncenter.asm diff --git a/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm similarity index 100% rename from music/pokemonchannel.asm rename to audio/music/pokemonchannel.asm diff --git a/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm similarity index 100% rename from music/pokemonlullaby.asm rename to audio/music/pokemonlullaby.asm diff --git a/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm similarity index 100% rename from music/pokemonmarch.asm rename to audio/music/pokemonmarch.asm diff --git a/music/postcredits.asm b/audio/music/postcredits.asm similarity index 100% rename from music/postcredits.asm rename to audio/music/postcredits.asm diff --git a/music/printer.asm b/audio/music/printer.asm similarity index 100% rename from music/printer.asm rename to audio/music/printer.asm diff --git a/music/profoak.asm b/audio/music/profoak.asm similarity index 100% rename from music/profoak.asm rename to audio/music/profoak.asm diff --git a/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm similarity index 100% rename from music/profoakspokemontalk.asm rename to audio/music/profoakspokemontalk.asm diff --git a/music/rivalbattle.asm b/audio/music/rivalbattle.asm similarity index 100% rename from music/rivalbattle.asm rename to audio/music/rivalbattle.asm diff --git a/music/rocketbattle.asm b/audio/music/rocketbattle.asm similarity index 100% rename from music/rocketbattle.asm rename to audio/music/rocketbattle.asm diff --git a/music/rockethideout.asm b/audio/music/rockethideout.asm similarity index 100% rename from music/rockethideout.asm rename to audio/music/rockethideout.asm diff --git a/music/rockettheme.asm b/audio/music/rockettheme.asm similarity index 100% rename from music/rockettheme.asm rename to audio/music/rockettheme.asm diff --git a/music/route1.asm b/audio/music/route1.asm similarity index 100% rename from music/route1.asm rename to audio/music/route1.asm diff --git a/music/route12.asm b/audio/music/route12.asm similarity index 100% rename from music/route12.asm rename to audio/music/route12.asm diff --git a/music/route2.asm b/audio/music/route2.asm similarity index 100% rename from music/route2.asm rename to audio/music/route2.asm diff --git a/music/route26.asm b/audio/music/route26.asm similarity index 100% rename from music/route26.asm rename to audio/music/route26.asm diff --git a/music/route29.asm b/audio/music/route29.asm similarity index 100% rename from music/route29.asm rename to audio/music/route29.asm diff --git a/music/route3.asm b/audio/music/route3.asm similarity index 100% rename from music/route3.asm rename to audio/music/route3.asm diff --git a/music/route30.asm b/audio/music/route30.asm similarity index 100% rename from music/route30.asm rename to audio/music/route30.asm diff --git a/music/route36.asm b/audio/music/route36.asm similarity index 100% rename from music/route36.asm rename to audio/music/route36.asm diff --git a/music/route37.asm b/audio/music/route37.asm similarity index 100% rename from music/route37.asm rename to audio/music/route37.asm diff --git a/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm similarity index 100% rename from music/ruinsofalphinterior.asm rename to audio/music/ruinsofalphinterior.asm diff --git a/music/ruinsofalphradiosignal.asm b/audio/music/ruinsofalphradiosignal.asm similarity index 100% rename from music/ruinsofalphradiosignal.asm rename to audio/music/ruinsofalphradiosignal.asm diff --git a/music/showmearound.asm b/audio/music/showmearound.asm similarity index 100% rename from music/showmearound.asm rename to audio/music/showmearound.asm diff --git a/music/sprouttower.asm b/audio/music/sprouttower.asm similarity index 100% rename from music/sprouttower.asm rename to audio/music/sprouttower.asm diff --git a/music/ssaqua.asm b/audio/music/ssaqua.asm similarity index 100% rename from music/ssaqua.asm rename to audio/music/ssaqua.asm diff --git a/music/successfulcapture.asm b/audio/music/successfulcapture.asm similarity index 100% rename from music/successfulcapture.asm rename to audio/music/successfulcapture.asm diff --git a/music/suicunebattle.asm b/audio/music/suicunebattle.asm similarity index 100% rename from music/suicunebattle.asm rename to audio/music/suicunebattle.asm diff --git a/music/surf.asm b/audio/music/surf.asm similarity index 100% rename from music/surf.asm rename to audio/music/surf.asm diff --git a/music/tintower.asm b/audio/music/tintower.asm similarity index 100% rename from music/tintower.asm rename to audio/music/tintower.asm diff --git a/music/titlescreen.asm b/audio/music/titlescreen.asm similarity index 100% rename from music/titlescreen.asm rename to audio/music/titlescreen.asm diff --git a/music/trainervictory.asm b/audio/music/trainervictory.asm similarity index 100% rename from music/trainervictory.asm rename to audio/music/trainervictory.asm diff --git a/music/unioncave.asm b/audio/music/unioncave.asm similarity index 100% rename from music/unioncave.asm rename to audio/music/unioncave.asm diff --git a/music/vermilioncity.asm b/audio/music/vermilioncity.asm similarity index 100% rename from music/vermilioncity.asm rename to audio/music/vermilioncity.asm diff --git a/music/victoryroad.asm b/audio/music/victoryroad.asm similarity index 100% rename from music/victoryroad.asm rename to audio/music/victoryroad.asm diff --git a/music/violetcity.asm b/audio/music/violetcity.asm similarity index 100% rename from music/violetcity.asm rename to audio/music/violetcity.asm diff --git a/music/viridiancity.asm b/audio/music/viridiancity.asm similarity index 100% rename from music/viridiancity.asm rename to audio/music/viridiancity.asm diff --git a/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm similarity index 100% rename from music/wildpokemonvictory.asm rename to 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