get rid of external song labels

1 files changed, 103 insertions, 103 deletions

diff --git a/main.asm b/main.asm
index 1db558ecc..db66076a6 100644
--- a/main.asm
+++ b/main.asm
@@ -31202,9 +31202,9 @@ INCLUDE "tilesets/data_2.asm"
 
 ;                           Songs i
 
-Music_Credits:       INCLUDE "audio/music/credits.asm"
-Music_Clair:         INCLUDE "audio/music/clair.asm"
-Music_MobileAdapter: INCLUDE "audio/music/mobileadapter.asm"
+INCLUDE "audio/music/credits.asm"
+INCLUDE "audio/music/clair.asm"
+INCLUDE "audio/music/mobileadapter.asm"
 
 
 SECTION "bank8",ROMX,BANK[$8]
@@ -99336,7 +99336,7 @@ INCBIN "baserom.gbc",$ce85e,$cfd9e - $ce85e
 
 ;                          Songs iii
 
-Music_PostCredits: INCLUDE "audio/music/postcredits.asm"
+INCLUDE "audio/music/postcredits.asm"
 
 
 
@@ -105884,7 +105884,7 @@ INCLUDE "audio/trainer_encounters.asm"
 Music: INCLUDE "audio/music_pointers.asm"
 
 ; Empty song
-Music_Nothing: INCLUDE "audio/music/nothing.asm"
+INCLUDE "audio/music/nothing.asm"
 
 ; Pointer table for all 68 base cries
 Cries: INCLUDE "audio/cry_pointers.asm"
@@ -105895,70 +105895,70 @@ SFX: INCLUDE "audio/sfx_pointers.asm"
 
 ;                            Songs I
 
-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/johtogymbattle.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"
+INCLUDE "audio/music/route36.asm"
+INCLUDE "audio/music/rivalbattle.asm"
+INCLUDE "audio/music/rocketbattle.asm"
+INCLUDE "audio/music/elmslab.asm"
+INCLUDE "audio/music/darkcave.asm"
+INCLUDE "audio/music/johtogymbattle.asm"
+INCLUDE "audio/music/championbattle.asm"
+INCLUDE "audio/music/ssaqua.asm"
+INCLUDE "audio/music/newbarktown.asm"
+INCLUDE "audio/music/goldenrodcity.asm"
+INCLUDE "audio/music/vermilioncity.asm"
+INCLUDE "audio/music/titlescreen.asm"
+INCLUDE "audio/music/ruinsofalphinterior.asm"
+INCLUDE "audio/music/lookpokemaniac.asm"
+INCLUDE "audio/music/trainervictory.asm"
 
 
 SECTION "bank3B",ROMX,BANK[$3B]
 
 ;                           Songs II
 
-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/kantogymbattle.asm"
-Music_KantoTrainerBattle:   INCLUDE "audio/music/kantotrainerbattle.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"
-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/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/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/contestresults.asm"
-Music_Route30:              INCLUDE "audio/music/route30.asm"
+INCLUDE "audio/music/route1.asm"
+INCLUDE "audio/music/route3.asm"
+INCLUDE "audio/music/route12.asm"
+INCLUDE "audio/music/kantogymbattle.asm"
+INCLUDE "audio/music/kantotrainerbattle.asm"
+INCLUDE "audio/music/kantowildbattle.asm"
+INCLUDE "audio/music/pokemoncenter.asm"
+INCLUDE "audio/music/looklass.asm"
+INCLUDE "audio/music/lookofficer.asm"
+INCLUDE "audio/music/route2.asm"
+INCLUDE "audio/music/mtmoon.asm"
+INCLUDE "audio/music/showmearound.asm"
+INCLUDE "audio/music/gamecorner.asm"
+INCLUDE "audio/music/bicycle.asm"
+INCLUDE "audio/music/looksage.asm"
+INCLUDE "audio/music/pokemonchannel.asm"
+INCLUDE "audio/music/lighthouse.asm"
+INCLUDE "audio/music/lakeofrage.asm"
+INCLUDE "audio/music/indigoplateau.asm"
+INCLUDE "audio/music/route37.asm"
+INCLUDE "audio/music/rockethideout.asm"
+INCLUDE "audio/music/dragonsden.asm"
+INCLUDE "audio/music/ruinsofalphradio.asm"
+INCLUDE "audio/music/lookbeauty.asm"
+INCLUDE "audio/music/route26.asm"
+INCLUDE "audio/music/ecruteakcity.asm"
+INCLUDE "audio/music/lakeofragerocketradio.asm"
+INCLUDE "audio/music/magnettrain.asm"
+INCLUDE "audio/music/lavendertown.asm"
+INCLUDE "audio/music/dancinghall.asm"
+INCLUDE "audio/music/contestresults.asm"
+INCLUDE "audio/music/route30.asm"
 
 SECTION "bank3C",ROMX,BANK[$3C]
 
 ;                          Songs III
 
-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"
+INCLUDE "audio/music/violetcity.asm"
+INCLUDE "audio/music/route29.asm"
+INCLUDE "audio/music/halloffame.asm"
+INCLUDE "audio/music/healpokemon.asm"
+INCLUDE "audio/music/evolution.asm"
+INCLUDE "audio/music/printer.asm"
 
 INCBIN "baserom.gbc",$f0941,$f2787 - $f0941
 
@@ -105972,43 +105972,43 @@ SECTION "bank3D",ROMX,BANK[$3D]
 
 ;                           Songs IV
 
-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/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"
-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"
+INCLUDE "audio/music/viridiancity.asm"
+INCLUDE "audio/music/celadoncity.asm"
+INCLUDE "audio/music/wildpokemonvictory.asm"
+INCLUDE "audio/music/successfulcapture.asm"
+INCLUDE "audio/music/gymleadervictory.asm"
+INCLUDE "audio/music/mtmoonsquare.asm"
+INCLUDE "audio/music/gym.asm"
+INCLUDE "audio/music/pallettown.asm"
+INCLUDE "audio/music/profoakspokemontalk.asm"
+INCLUDE "audio/music/profoak.asm"
+INCLUDE "audio/music/lookrival.asm"
+INCLUDE "audio/music/aftertherivalfight.asm"
+INCLUDE "audio/music/surf.asm"
+INCLUDE "audio/music/nationalpark.asm"
+INCLUDE "audio/music/azaleatown.asm"
+INCLUDE "audio/music/cherrygrovecity.asm"
+INCLUDE "audio/music/unioncave.asm"
+INCLUDE "audio/music/johtowildbattle.asm"
+INCLUDE "audio/music/johtowildbattlenight.asm"
+INCLUDE "audio/music/johtotrainerbattle.asm"
+INCLUDE "audio/music/lookyoungster.asm"
+INCLUDE "audio/music/tintower.asm"
+INCLUDE "audio/music/sprouttower.asm"
+INCLUDE "audio/music/burnedtower.asm"
+INCLUDE "audio/music/mom.asm"
+INCLUDE "audio/music/victoryroad.asm"
+INCLUDE "audio/music/pokemonlullaby.asm"
+INCLUDE "audio/music/pokemonmarch.asm"
+INCLUDE "audio/music/goldsilveropening.asm"
+INCLUDE "audio/music/goldsilveropening2.asm"
+INCLUDE "audio/music/lookhiker.asm"
+INCLUDE "audio/music/lookrocket.asm"
+INCLUDE "audio/music/rockettheme.asm"
+INCLUDE "audio/music/mainmenu.asm"
+INCLUDE "audio/music/lookkimonogirl.asm"
+INCLUDE "audio/music/pokeflutechannel.asm"
+INCLUDE "audio/music/bugcatchingcontest.asm"
 
 SECTION "bank3E",ROMX,BANK[$3E]
 
@@ -123951,14 +123951,14 @@ Function178000:
 
 ;                          Songs V
 
-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"
+INCLUDE "audio/music/mobileadaptermenu.asm"
+INCLUDE "audio/music/buenaspassword.asm"
+INCLUDE "audio/music/lookmysticalman.asm"
+INCLUDE "audio/music/crystalopening.asm"
+INCLUDE "audio/music/battletowertheme.asm"
+INCLUDE "audio/music/suicunebattle.asm"
+INCLUDE "audio/music/battletowerlobby.asm"
+INCLUDE "audio/music/mobilecenter.asm"
 
 INCBIN "baserom.gbc",$17982d,$1799ef - $17982d