Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move music/ into audio/

Browse Source
This commit is contained in:
yenatch
2013-02-05 18:08:20 -05:00
parent ff5bd60966
commit 31a907d7c7
105 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
main.asm
View File

@@ -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