From fc059d36afb615b0859547bd088c8c82637bd32d Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 28 Dec 2022 21:25:19 -0600 Subject: [PATCH] Remove the inc_section macro the idea is nice, but it thwarts make's dependency change detection --- audio.asm | 466 ++++++++++++++++++++++--------------------- crysaudio/macros.asm | 5 - 2 files changed, 238 insertions(+), 233 deletions(-) diff --git a/audio.asm b/audio.asm index 042a97a4..22d65d4e 100644 --- a/audio.asm +++ b/audio.asm @@ -167,314 +167,324 @@ INCLUDE "crysaudio/sfx_pointers_red.asm" SECTION "Songs 1", ROMX - inc_section "crysaudio/music/route36.asm" - inc_section "crysaudio/music/rivalbattle.asm" - inc_section "crysaudio/music/rocketbattle.asm" - inc_section "crysaudio/music/elmslab.asm" - inc_section "crysaudio/music/darkcave.asm" - inc_section "crysaudio/music/johtogymbattle.asm" - inc_section "crysaudio/music/championbattle.asm" - inc_section "crysaudio/music/ssaqua.asm" - inc_section "crysaudio/music/newbarktown.asm" - inc_section "crysaudio/music/goldenrodcity.asm" - inc_section "crysaudio/music/vermilioncity.asm" - inc_section "crysaudio/music/titlescreen.asm" - inc_section "crysaudio/music/ruinsofalphinterior.asm" - inc_section "crysaudio/music/lookpokemaniac.asm" - inc_section "crysaudio/music/trainervictory.asm" +INCLUDE "crysaudio/music/route36.asm" +INCLUDE "crysaudio/music/rivalbattle.asm" +INCLUDE "crysaudio/music/rocketbattle.asm" +INCLUDE "crysaudio/music/elmslab.asm" +INCLUDE "crysaudio/music/darkcave.asm" +INCLUDE "crysaudio/music/johtogymbattle.asm" +INCLUDE "crysaudio/music/championbattle.asm" +INCLUDE "crysaudio/music/ssaqua.asm" +INCLUDE "crysaudio/music/newbarktown.asm" +INCLUDE "crysaudio/music/goldenrodcity.asm" +INCLUDE "crysaudio/music/vermilioncity.asm" +INCLUDE "crysaudio/music/titlescreen.asm" +INCLUDE "crysaudio/music/ruinsofalphinterior.asm" +INCLUDE "crysaudio/music/lookpokemaniac.asm" +INCLUDE "crysaudio/music/trainervictory.asm" SECTION "Songs 2", ROMX - inc_section "crysaudio/music/route1.asm" - inc_section "crysaudio/music/route3.asm" - inc_section "crysaudio/music/route12.asm" - inc_section "crysaudio/music/kantogymbattle.asm" - inc_section "crysaudio/music/kantotrainerbattle.asm" - inc_section "crysaudio/music/kantowildbattle.asm" - inc_section "crysaudio/music/pokemoncenter.asm" - inc_section "crysaudio/music/looklass.asm" - inc_section "crysaudio/music/lookofficer.asm" - inc_section "crysaudio/music/route2.asm" - inc_section "crysaudio/music/mtmoon.asm" - inc_section "crysaudio/music/showmearound.asm" - inc_section "crysaudio/music/gamecorner.asm" - inc_section "crysaudio/music/bicycle.asm" - inc_section "crysaudio/music/looksage.asm" - inc_section "crysaudio/music/pokemonchannel.asm" - inc_section "crysaudio/music/lighthouse.asm" - inc_section "crysaudio/music/lakeofrage.asm" - inc_section "crysaudio/music/indigoplateau.asm" - inc_section "crysaudio/music/route37.asm" - inc_section "crysaudio/music/rockethideout.asm" - inc_section "crysaudio/music/dragonsden.asm" - inc_section "crysaudio/music/ruinsofalphradio.asm" - inc_section "crysaudio/music/lookbeauty.asm" - inc_section "crysaudio/music/route26.asm" - inc_section "crysaudio/music/ecruteakcity.asm" - inc_section "crysaudio/music/lakeofragerocketradio.asm" - inc_section "crysaudio/music/magnettrain.asm" - inc_section "crysaudio/music/lavendertown.asm" - inc_section "crysaudio/music/dancinghall.asm" - inc_section "crysaudio/music/contestresults.asm" - inc_section "crysaudio/music/route30.asm" +INCLUDE "crysaudio/music/route1.asm" +INCLUDE "crysaudio/music/route3.asm" +INCLUDE "crysaudio/music/route12.asm" +INCLUDE "crysaudio/music/kantogymbattle.asm" +INCLUDE "crysaudio/music/kantotrainerbattle.asm" +INCLUDE "crysaudio/music/kantowildbattle.asm" +INCLUDE "crysaudio/music/pokemoncenter.asm" +INCLUDE "crysaudio/music/looklass.asm" +INCLUDE "crysaudio/music/lookofficer.asm" +INCLUDE "crysaudio/music/route2.asm" +INCLUDE "crysaudio/music/mtmoon.asm" +INCLUDE "crysaudio/music/showmearound.asm" +INCLUDE "crysaudio/music/gamecorner.asm" +INCLUDE "crysaudio/music/bicycle.asm" +INCLUDE "crysaudio/music/looksage.asm" +INCLUDE "crysaudio/music/pokemonchannel.asm" +INCLUDE "crysaudio/music/lighthouse.asm" +INCLUDE "crysaudio/music/lakeofrage.asm" +INCLUDE "crysaudio/music/indigoplateau.asm" +INCLUDE "crysaudio/music/route37.asm" +INCLUDE "crysaudio/music/rockethideout.asm" +INCLUDE "crysaudio/music/dragonsden.asm" +INCLUDE "crysaudio/music/ruinsofalphradio.asm" +INCLUDE "crysaudio/music/lookbeauty.asm" +INCLUDE "crysaudio/music/route26.asm" +INCLUDE "crysaudio/music/ecruteakcity.asm" +INCLUDE "crysaudio/music/lakeofragerocketradio.asm" +INCLUDE "crysaudio/music/magnettrain.asm" +INCLUDE "crysaudio/music/lavendertown.asm" +INCLUDE "crysaudio/music/dancinghall.asm" +INCLUDE "crysaudio/music/contestresults.asm" +INCLUDE "crysaudio/music/route30.asm" SECTION "Songs 3", ROMX - inc_section "crysaudio/music/violetcity.asm" - inc_section "crysaudio/music/route29.asm" - inc_section "crysaudio/music/halloffame.asm" - inc_section "crysaudio/music/healpokemon.asm" - inc_section "crysaudio/music/evolution.asm" - inc_section "crysaudio/music/printer.asm" +INCLUDE "crysaudio/music/violetcity.asm" +INCLUDE "crysaudio/music/route29.asm" +INCLUDE "crysaudio/music/halloffame.asm" +INCLUDE "crysaudio/music/healpokemon.asm" +INCLUDE "crysaudio/music/evolution.asm" +INCLUDE "crysaudio/music/printer.asm" SECTION "Songs 4", ROMX - inc_section "crysaudio/music/viridiancity.asm" - inc_section "crysaudio/music/celadoncity.asm" -SECTION "Wild Pokemon Victory and Successful Capture", ROMX - INCLUDE "crysaudio/music/wildpokemonvictory.asm" - INCLUDE "crysaudio/music/successfulcapture.asm" - inc_section "crysaudio/music/gymleadervictory.asm" - inc_section "crysaudio/music/mtmoonsquare.asm" - inc_section "crysaudio/music/gym.asm" - inc_section "crysaudio/music/pallettown.asm" - inc_section "crysaudio/music/profoakspokemontalk.asm" - inc_section "crysaudio/music/profoak.asm" -SECTION "Johto Rival", ROMX - INCLUDE "crysaudio/music/lookrival.asm" - INCLUDE "crysaudio/music/aftertherivalfight.asm" - inc_section "crysaudio/music/surf.asm" - inc_section "crysaudio/music/nationalpark.asm" - inc_section "crysaudio/music/azaleatown.asm" - inc_section "crysaudio/music/cherrygrovecity.asm" - inc_section "crysaudio/music/unioncave.asm" -SECTION "Johto Wild Battle", ROMX - INCLUDE "crysaudio/music/johtowildbattle.asm" - INCLUDE "crysaudio/music/johtowildbattlenight.asm" - inc_section "crysaudio/music/johtotrainerbattle.asm" - inc_section "crysaudio/music/lookyoungster.asm" - inc_section "crysaudio/music/tintower.asm" - inc_section "crysaudio/music/sprouttower.asm" - inc_section "crysaudio/music/burnedtower.asm" - inc_section "crysaudio/music/mom.asm" - inc_section "crysaudio/music/victoryroad.asm" - inc_section "crysaudio/music/pokemonlullaby.asm" - inc_section "crysaudio/music/pokemonmarch.asm" - inc_section "crysaudio/music/goldsilveropening.asm" - inc_section "crysaudio/music/goldsilveropening2.asm" - inc_section "crysaudio/music/lookhiker.asm" -SECTION "Johto Rocket Themes", ROMX - INCLUDE "crysaudio/music/lookrocket.asm" - INCLUDE "crysaudio/music/rockettheme.asm" - inc_section "crysaudio/music/mainmenu.asm" - inc_section "crysaudio/music/lookkimonogirl.asm" - inc_section "crysaudio/music/pokeflutechannel.asm" - inc_section "crysaudio/music/bugcatchingcontest.asm" +INCLUDE "crysaudio/music/viridiancity.asm" +INCLUDE "crysaudio/music/celadoncity.asm" + +INCLUDE "crysaudio/music/wildpokemonvictory.asm" +INCLUDE "crysaudio/music/successfulcapture.asm" +assert BANK(Music_WildPokemonVictory) == BANK(Music_SuccessfulCapture) + +INCLUDE "crysaudio/music/gymleadervictory.asm" +INCLUDE "crysaudio/music/mtmoonsquare.asm" +INCLUDE "crysaudio/music/gym.asm" +INCLUDE "crysaudio/music/pallettown.asm" +INCLUDE "crysaudio/music/profoakspokemontalk.asm" +INCLUDE "crysaudio/music/profoak.asm" + +INCLUDE "crysaudio/music/lookrival.asm" +INCLUDE "crysaudio/music/aftertherivalfight.asm" +assert BANK(Music_LookRival) == BANK(Music_AfterTheRivalFight) + +INCLUDE "crysaudio/music/surf.asm" +INCLUDE "crysaudio/music/nationalpark.asm" +INCLUDE "crysaudio/music/azaleatown.asm" +INCLUDE "crysaudio/music/cherrygrovecity.asm" +INCLUDE "crysaudio/music/unioncave.asm" + +INCLUDE "crysaudio/music/johtowildbattle.asm" +INCLUDE "crysaudio/music/johtowildbattlenight.asm" +assert BANK(Music_JohtoWildBattle) == BANK(Music_JohtoWildBattleNight) + +INCLUDE "crysaudio/music/johtotrainerbattle.asm" +INCLUDE "crysaudio/music/lookyoungster.asm" +INCLUDE "crysaudio/music/tintower.asm" +INCLUDE "crysaudio/music/sprouttower.asm" +INCLUDE "crysaudio/music/burnedtower.asm" +INCLUDE "crysaudio/music/mom.asm" +INCLUDE "crysaudio/music/victoryroad.asm" +INCLUDE "crysaudio/music/pokemonlullaby.asm" +INCLUDE "crysaudio/music/pokemonmarch.asm" +INCLUDE "crysaudio/music/goldsilveropening.asm" +INCLUDE "crysaudio/music/goldsilveropening2.asm" +INCLUDE "crysaudio/music/lookhiker.asm" + +INCLUDE "crysaudio/music/lookrocket.asm" +INCLUDE "crysaudio/music/rockettheme.asm" +assert BANK(Music_LookRocket) == BANK(Music_RocketTheme) + +INCLUDE "crysaudio/music/mainmenu.asm" +INCLUDE "crysaudio/music/lookkimonogirl.asm" +INCLUDE "crysaudio/music/pokeflutechannel.asm" +INCLUDE "crysaudio/music/bugcatchingcontest.asm" SECTION "Songs 5", ROMX - inc_section "crysaudio/music/mobileadaptermenu.asm" - inc_section "crysaudio/music/buenaspassword.asm" - inc_section "crysaudio/music/lookmysticalman.asm" - inc_section "crysaudio/music/crystalopening.asm" - inc_section "crysaudio/music/battletowertheme.asm" - inc_section "crysaudio/music/suicunebattle.asm" - inc_section "crysaudio/music/battletowerlobby.asm" - inc_section "crysaudio/music/mobilecenter.asm" +INCLUDE "crysaudio/music/mobileadaptermenu.asm" +INCLUDE "crysaudio/music/buenaspassword.asm" +INCLUDE "crysaudio/music/lookmysticalman.asm" +INCLUDE "crysaudio/music/crystalopening.asm" +INCLUDE "crysaudio/music/battletowertheme.asm" +INCLUDE "crysaudio/music/suicunebattle.asm" +INCLUDE "crysaudio/music/battletowerlobby.asm" +INCLUDE "crysaudio/music/mobilecenter.asm" SECTION "Extra Songs 1", ROMX - inc_section "crysaudio/music/credits.asm" - inc_section "crysaudio/music/clair.asm" - inc_section "crysaudio/music/mobileadapter.asm" +INCLUDE "crysaudio/music/credits.asm" +INCLUDE "crysaudio/music/clair.asm" +INCLUDE "crysaudio/music/mobileadapter.asm" SECTION "Extra Songs 2", ROMX - inc_section "crysaudio/music/postcredits.asm" +INCLUDE "crysaudio/music/postcredits.asm" SECTION "RBY Songs 1", ROMX - inc_section "crysaudio/music/RBY/pkmnhealed.asm" - inc_section "crysaudio/music/RBY/routes1.asm" - inc_section "crysaudio/music/RBY/routes2.asm" - inc_section "crysaudio/music/RBY/routes3.asm" - inc_section "crysaudio/music/RBY/routes4.asm" - inc_section "crysaudio/music/RBY/indigoplateau.asm" - inc_section "crysaudio/music/RBY/pallettown.asm" - inc_section "crysaudio/music/RBY/unusedsong.asm" - inc_section "crysaudio/music/RBY/cities1.asm" - inc_section "crysaudio/music/RBY/museumguy.asm" - inc_section "crysaudio/music/RBY/meetprofoak.asm" - inc_section "crysaudio/music/RBY/meetrival.asm" - inc_section "crysaudio/music/RBY/ssanne.asm" - inc_section "crysaudio/music/RBY/cities2.asm" - inc_section "crysaudio/music/RBY/celadon.asm" - inc_section "crysaudio/music/RBY/cinnabar.asm" - inc_section "crysaudio/music/RBY/vermilion.asm" - inc_section "crysaudio/music/RBY/lavender.asm" - inc_section "crysaudio/music/RBY/safarizone.asm" - inc_section "crysaudio/music/RBY/gym.asm" - inc_section "crysaudio/music/RBY/pokecenter.asm" +INCLUDE "crysaudio/music/RBY/pkmnhealed.asm" +INCLUDE "crysaudio/music/RBY/routes1.asm" +INCLUDE "crysaudio/music/RBY/routes2.asm" +INCLUDE "crysaudio/music/RBY/routes3.asm" +INCLUDE "crysaudio/music/RBY/routes4.asm" +INCLUDE "crysaudio/music/RBY/indigoplateau.asm" +INCLUDE "crysaudio/music/RBY/pallettown.asm" +INCLUDE "crysaudio/music/RBY/unusedsong.asm" +INCLUDE "crysaudio/music/RBY/cities1.asm" +INCLUDE "crysaudio/music/RBY/museumguy.asm" +INCLUDE "crysaudio/music/RBY/meetprofoak.asm" +INCLUDE "crysaudio/music/RBY/meetrival.asm" +INCLUDE "crysaudio/music/RBY/ssanne.asm" +INCLUDE "crysaudio/music/RBY/cities2.asm" +INCLUDE "crysaudio/music/RBY/celadon.asm" +INCLUDE "crysaudio/music/RBY/cinnabar.asm" +INCLUDE "crysaudio/music/RBY/vermilion.asm" +INCLUDE "crysaudio/music/RBY/lavender.asm" +INCLUDE "crysaudio/music/RBY/safarizone.asm" +INCLUDE "crysaudio/music/RBY/gym.asm" +INCLUDE "crysaudio/music/RBY/pokecenter.asm" SECTION "RBY Songs 2", ROMX - inc_section "crysaudio/music/RBY/gymleaderbattle.asm" - inc_section "crysaudio/music/RBY/trainerbattle.asm" - inc_section "crysaudio/music/RBY/wildbattle.asm" - inc_section "crysaudio/music/RBY/finalbattle.asm" - inc_section "crysaudio/music/RBY/defeatedtrainer.asm" - inc_section "crysaudio/music/RBY/defeatedwildmon.asm" - inc_section "crysaudio/music/RBY/defeatedgymleader.asm" +INCLUDE "crysaudio/music/RBY/gymleaderbattle.asm" +INCLUDE "crysaudio/music/RBY/trainerbattle.asm" +INCLUDE "crysaudio/music/RBY/wildbattle.asm" +INCLUDE "crysaudio/music/RBY/finalbattle.asm" +INCLUDE "crysaudio/music/RBY/defeatedtrainer.asm" +INCLUDE "crysaudio/music/RBY/defeatedwildmon.asm" +INCLUDE "crysaudio/music/RBY/defeatedgymleader.asm" SECTION "RBY Songs 3", ROMX - inc_section "crysaudio/music/RBY/bikeriding.asm" - inc_section "crysaudio/music/RBY/dungeon1.asm" - inc_section "crysaudio/music/RBY/gamecorner.asm" - inc_section "crysaudio/music/RBY/titlescreen.asm" - inc_section "crysaudio/music/RBY/dungeon2.asm" - inc_section "crysaudio/music/RBY/dungeon3.asm" - inc_section "crysaudio/music/RBY/cinnabarmansion.asm" - inc_section "crysaudio/music/RBY/oakslab.asm" - inc_section "crysaudio/music/RBY/pokemontower.asm" - inc_section "crysaudio/music/RBY/silphco.asm" - inc_section "crysaudio/music/RBY/meeteviltrainer.asm" - inc_section "crysaudio/music/RBY/meetfemaletrainer.asm" - inc_section "crysaudio/music/RBY/meetmaletrainer.asm" - inc_section "crysaudio/music/RBY/introbattle.asm" - inc_section "crysaudio/music/RBY/surfing.asm" - inc_section "crysaudio/music/RBY/jigglypuffsong.asm" - inc_section "crysaudio/music/RBY/halloffame.asm" - inc_section "crysaudio/music/RBY/credits.asm" +INCLUDE "crysaudio/music/RBY/bikeriding.asm" +INCLUDE "crysaudio/music/RBY/dungeon1.asm" +INCLUDE "crysaudio/music/RBY/gamecorner.asm" +INCLUDE "crysaudio/music/RBY/titlescreen.asm" +INCLUDE "crysaudio/music/RBY/dungeon2.asm" +INCLUDE "crysaudio/music/RBY/dungeon3.asm" +INCLUDE "crysaudio/music/RBY/cinnabarmansion.asm" +INCLUDE "crysaudio/music/RBY/oakslab.asm" +INCLUDE "crysaudio/music/RBY/pokemontower.asm" +INCLUDE "crysaudio/music/RBY/silphco.asm" +INCLUDE "crysaudio/music/RBY/meeteviltrainer.asm" +INCLUDE "crysaudio/music/RBY/meetfemaletrainer.asm" +INCLUDE "crysaudio/music/RBY/meetmaletrainer.asm" +INCLUDE "crysaudio/music/RBY/introbattle.asm" +INCLUDE "crysaudio/music/RBY/surfing.asm" +INCLUDE "crysaudio/music/RBY/jigglypuffsong.asm" +INCLUDE "crysaudio/music/RBY/halloffame.asm" +INCLUDE "crysaudio/music/RBY/credits.asm" SECTION "RBY Songs 4", ROMX - inc_section "crysaudio/music/RBY/yellowintro.asm" - inc_section "crysaudio/music/RBY/surfingpikachu.asm" - inc_section "crysaudio/music/RBY/yellowunusedsong.asm" - inc_section "crysaudio/music/RBY/meetjessiejames.asm" +INCLUDE "crysaudio/music/RBY/yellowintro.asm" +INCLUDE "crysaudio/music/RBY/surfingpikachu.asm" +INCLUDE "crysaudio/music/RBY/yellowunusedsong.asm" +INCLUDE "crysaudio/music/RBY/meetjessiejames.asm" SECTION "TCG Songs 1", ROMX - inc_section "crysaudio/music/TCG/titlescreen.asm" - inc_section "crysaudio/music/TCG/dueltheme1.asm" - inc_section "crysaudio/music/TCG/dueltheme2.asm" - inc_section "crysaudio/music/TCG/dueltheme3.asm" - inc_section "crysaudio/music/TCG/pausemenu.asm" - inc_section "crysaudio/music/TCG/pcmainmenu.asm" - inc_section "crysaudio/music/TCG/deckmachine.asm" - inc_section "crysaudio/music/TCG/cardpop.asm" - inc_section "crysaudio/music/TCG/overworld.asm" - inc_section "crysaudio/music/TCG/pokemondome.asm" - inc_section "crysaudio/music/TCG/challengehall.asm" - inc_section "crysaudio/music/TCG/club1.asm" - inc_section "crysaudio/music/TCG/club2.asm" - inc_section "crysaudio/music/TCG/club3.asm" +INCLUDE "crysaudio/music/TCG/titlescreen.asm" +INCLUDE "crysaudio/music/TCG/dueltheme1.asm" +INCLUDE "crysaudio/music/TCG/dueltheme2.asm" +INCLUDE "crysaudio/music/TCG/dueltheme3.asm" +INCLUDE "crysaudio/music/TCG/pausemenu.asm" +INCLUDE "crysaudio/music/TCG/pcmainmenu.asm" +INCLUDE "crysaudio/music/TCG/deckmachine.asm" +INCLUDE "crysaudio/music/TCG/cardpop.asm" +INCLUDE "crysaudio/music/TCG/overworld.asm" +INCLUDE "crysaudio/music/TCG/pokemondome.asm" +INCLUDE "crysaudio/music/TCG/challengehall.asm" +INCLUDE "crysaudio/music/TCG/club1.asm" +INCLUDE "crysaudio/music/TCG/club2.asm" +INCLUDE "crysaudio/music/TCG/club3.asm" SECTION "TCG Songs 2", ROMX - inc_section "crysaudio/music/TCG/ronald.asm" - inc_section "crysaudio/music/TCG/imakuni.asm" - inc_section "crysaudio/music/TCG/hallofhonor.asm" - inc_section "crysaudio/music/TCG/credits.asm" - inc_section "crysaudio/music/TCG/matchstart1.asm" - inc_section "crysaudio/music/TCG/matchstart2.asm" - inc_section "crysaudio/music/TCG/matchstart3.asm" - inc_section "crysaudio/music/TCG/matchvictory.asm" - inc_section "crysaudio/music/TCG/matchloss.asm" - inc_section "crysaudio/music/TCG/matchdraw.asm" - inc_section "crysaudio/music/TCG/boosterpack.asm" - inc_section "crysaudio/music/TCG/medal.asm" +INCLUDE "crysaudio/music/TCG/ronald.asm" +INCLUDE "crysaudio/music/TCG/imakuni.asm" +INCLUDE "crysaudio/music/TCG/hallofhonor.asm" +INCLUDE "crysaudio/music/TCG/credits.asm" +INCLUDE "crysaudio/music/TCG/matchstart1.asm" +INCLUDE "crysaudio/music/TCG/matchstart2.asm" +INCLUDE "crysaudio/music/TCG/matchstart3.asm" +INCLUDE "crysaudio/music/TCG/matchvictory.asm" +INCLUDE "crysaudio/music/TCG/matchloss.asm" +INCLUDE "crysaudio/music/TCG/matchdraw.asm" +INCLUDE "crysaudio/music/TCG/boosterpack.asm" +INCLUDE "crysaudio/music/TCG/medal.asm" SECTION "TCG2 Songs 1", ROMX - inc_section "crysaudio/music/TCG2/titlescreen.asm" - inc_section "crysaudio/music/TCG2/herecomesgr.asm" - inc_section "crysaudio/music/TCG2/groverworld.asm" - inc_section "crysaudio/music/TCG2/fort1.asm" - inc_section "crysaudio/music/TCG2/fort2.asm" - inc_section "crysaudio/music/TCG2/fort3.asm" - inc_section "crysaudio/music/TCG2/fort4.asm" - inc_section "crysaudio/music/TCG2/grcastle.asm" - inc_section "crysaudio/music/TCG2/grchallengecup.asm" +INCLUDE "crysaudio/music/TCG2/titlescreen.asm" +INCLUDE "crysaudio/music/TCG2/herecomesgr.asm" +INCLUDE "crysaudio/music/TCG2/groverworld.asm" +INCLUDE "crysaudio/music/TCG2/fort1.asm" +INCLUDE "crysaudio/music/TCG2/fort2.asm" +INCLUDE "crysaudio/music/TCG2/fort3.asm" +INCLUDE "crysaudio/music/TCG2/fort4.asm" +INCLUDE "crysaudio/music/TCG2/grcastle.asm" +INCLUDE "crysaudio/music/TCG2/grchallengecup.asm" SECTION "TCG2 Songs 2", ROMX - inc_section "crysaudio/music/TCG2/gamecorner.asm" - inc_section "crysaudio/music/TCG2/grblimp.asm" - inc_section "crysaudio/music/TCG2/grdueltheme1.asm" - inc_section "crysaudio/music/TCG2/grdueltheme2.asm" - inc_section "crysaudio/music/TCG2/grdueltheme3.asm" - inc_section "crysaudio/music/TCG2/ishihara.asm" +INCLUDE "crysaudio/music/TCG2/gamecorner.asm" +INCLUDE "crysaudio/music/TCG2/grblimp.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme1.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme2.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme3.asm" +INCLUDE "crysaudio/music/TCG2/ishihara.asm" SECTION "TCG2 Songs 3", ROMX - inc_section "crysaudio/music/TCG2/imakuni2.asm" - inc_section "crysaudio/music/TCG2/credits.asm" - inc_section "crysaudio/music/TCG2/diddly1.asm" - inc_section "crysaudio/music/TCG2/diddly2.asm" - inc_section "crysaudio/music/TCG2/diddly3.asm" - inc_section "crysaudio/music/TCG2/diddly4.asm" - inc_section "crysaudio/music/TCG2/diddly5.asm" - inc_section "crysaudio/music/TCG2/diddly6.asm" +INCLUDE "crysaudio/music/TCG2/imakuni2.asm" +INCLUDE "crysaudio/music/TCG2/credits.asm" +INCLUDE "crysaudio/music/TCG2/diddly1.asm" +INCLUDE "crysaudio/music/TCG2/diddly2.asm" +INCLUDE "crysaudio/music/TCG2/diddly3.asm" +INCLUDE "crysaudio/music/TCG2/diddly4.asm" +INCLUDE "crysaudio/music/TCG2/diddly5.asm" +INCLUDE "crysaudio/music/TCG2/diddly6.asm" SECTION "Pinball Songs 1", ROMX - inc_section "crysaudio/music/pinball/redfield.asm" - inc_section "crysaudio/music/pinball/catchemred.asm" - inc_section "crysaudio/music/pinball/hurryupred.asm" - inc_section "crysaudio/music/pinball/pokedex.asm" -SECTION "Gastly and Haunter Graveyard", ROMX - INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" - INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" - inc_section "crysaudio/music/pinball/gengarinthegraveyard.asm" +INCLUDE "crysaudio/music/pinball/redfield.asm" +INCLUDE "crysaudio/music/pinball/catchemred.asm" +INCLUDE "crysaudio/music/pinball/hurryupred.asm" +INCLUDE "crysaudio/music/pinball/pokedex.asm" + +INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" +INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" +assert BANK(Music_GastlyInTheGraveyard) == BANK(Music_HaunterInTheGraveyard) + +INCLUDE "crysaudio/music/pinball/gengarinthegraveyard.asm" SECTION "Pinball Songs 2", ROMX - inc_section "crysaudio/music/pinball/bluefield.asm" - inc_section "crysaudio/music/pinball/catchemblue.asm" - inc_section "crysaudio/music/pinball/hurryupblue.asm" - inc_section "crysaudio/music/pinball/hiscore.asm" - inc_section "crysaudio/music/pinball/gameover.asm" +INCLUDE "crysaudio/music/pinball/bluefield.asm" +INCLUDE "crysaudio/music/pinball/catchemblue.asm" +INCLUDE "crysaudio/music/pinball/hurryupblue.asm" +INCLUDE "crysaudio/music/pinball/hiscore.asm" +INCLUDE "crysaudio/music/pinball/gameover.asm" SECTION "Pinball Songs 3", ROMX - inc_section "crysaudio/music/pinball/whackthediglett.asm" - inc_section "crysaudio/music/pinball/whackthedugtrio.asm" - inc_section "crysaudio/music/pinball/seelstage.asm" - inc_section "crysaudio/music/pinball/title.asm" +INCLUDE "crysaudio/music/pinball/whackthediglett.asm" +INCLUDE "crysaudio/music/pinball/whackthedugtrio.asm" +INCLUDE "crysaudio/music/pinball/seelstage.asm" +INCLUDE "crysaudio/music/pinball/title.asm" SECTION "Pinball Songs 4", ROMX - inc_section "crysaudio/music/pinball/mewtwostage.asm" - inc_section "crysaudio/music/pinball/options.asm" - inc_section "crysaudio/music/pinball/fieldselect.asm" - inc_section "crysaudio/music/pinball/meowthstage.asm" +INCLUDE "crysaudio/music/pinball/mewtwostage.asm" +INCLUDE "crysaudio/music/pinball/options.asm" +INCLUDE "crysaudio/music/pinball/fieldselect.asm" +INCLUDE "crysaudio/music/pinball/meowthstage.asm" SECTION "Pinball Songs 5", ROMX - inc_section "crysaudio/music/pinball/endcredits.asm" - inc_section "crysaudio/music/pinball/nameentry.asm" +INCLUDE "crysaudio/music/pinball/endcredits.asm" +INCLUDE "crysaudio/music/pinball/nameentry.asm" SECTION "Sound Effects", ROMX diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index e423131f..cd3463c2 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -2,11 +2,6 @@ MACRO bigdw ; big-endian word db HIGH(\1), LOW(\1) ENDM -MACRO inc_section - SECTION \1, ROMX - include \1 ; "" ; trick scan_includes to ignore -ENDM - MACRO maskbits ; masks just enough bits to cover values 0 to \1 - 1 ; \2 is an optional shift amount