new and updated music macros

2025-04-09 05:44:44 -07:00 · 2015-12-07 11:28:58 -05:00
parent 02d05255fe
commit 159d3efc8f
118 changed files with 3314 additions and 3200 deletions
--- a/audio/cries.asm
+++ b/audio/cries.asm
--- a/audio/engine.asm
+++ b/audio/engine.asm
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -1,8 +1,8 @@
 Music_AfterTheRivalFight: ; f5127
-	dbw $c0, Music_AfterTheRivalFight_Ch1
-	dbw $01, Music_AfterTheRivalFight_Ch2
-	dbw $02, Music_AfterTheRivalFight_Ch3
-	dbw $03, Music_AfterTheRivalFight_Ch4
+	musicheader 4, 1, Music_AfterTheRivalFight_Ch1
+	musicheader 1, 2, Music_AfterTheRivalFight_Ch2
+	musicheader 1, 3, Music_AfterTheRivalFight_Ch3
+	musicheader 1, 4, Music_AfterTheRivalFight_Ch4
 ; f5133

 Music_AfterTheRivalFight_Ch1: ; f5133
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -1,8 +1,8 @@
 Music_AzaleaTown: ; f57e8
-	dbw $c0, Music_AzaleaTown_Ch1
-	dbw $01, Music_AzaleaTown_Ch2
-	dbw $02, Music_AzaleaTown_Ch3
-	dbw $03, Music_AzaleaTown_Ch4
+	musicheader 4, 1, Music_AzaleaTown_Ch1
+	musicheader 1, 2, Music_AzaleaTown_Ch2
+	musicheader 1, 3, Music_AzaleaTown_Ch3
+	musicheader 1, 4, Music_AzaleaTown_Ch4
 ; f57f4

 Music_AzaleaTown_Ch1: ; f57f4
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -1,8 +1,8 @@
 Music_BattleTowerLobby: ; 17948b
-	dbw $c0, Music_BattleTowerLobby_Ch1
-	dbw $01, Music_BattleTowerLobby_Ch2
-	dbw $02, Music_BattleTowerLobby_Ch3
-	dbw $03, Music_BattleTowerLobby_Ch4
+	musicheader 4, 1, Music_BattleTowerLobby_Ch1
+	musicheader 1, 2, Music_BattleTowerLobby_Ch2
+	musicheader 1, 3, Music_BattleTowerLobby_Ch3
+	musicheader 1, 4, Music_BattleTowerLobby_Ch4
 ; 179497

 Music_BattleTowerLobby_Ch1: ; 179497
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -1,8 +1,8 @@
 Music_BattleTowerTheme: ; 178889
-	dbw $c0, Music_BattleTowerTheme_Ch1
-	dbw $01, Music_BattleTowerTheme_Ch2
-	dbw $02, Music_BattleTowerTheme_Ch3
-	dbw $03, Music_BattleTowerTheme_Ch4
+	musicheader 4, 1, Music_BattleTowerTheme_Ch1
+	musicheader 1, 2, Music_BattleTowerTheme_Ch2
+	musicheader 1, 3, Music_BattleTowerTheme_Ch3
+	musicheader 1, 4, Music_BattleTowerTheme_Ch4
 ; 178895

 Music_BattleTowerTheme_Ch1: ; 178895
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -1,8 +1,8 @@
 Music_Bicycle: ; ee119
-	dbw $c0, Music_Bicycle_Ch1
-	dbw $01, Music_Bicycle_Ch2
-	dbw $02, Music_Bicycle_Ch3
-	dbw $03, Music_Bicycle_Ch4
+	musicheader 4, 1, Music_Bicycle_Ch1
+	musicheader 1, 2, Music_Bicycle_Ch2
+	musicheader 1, 3, Music_Bicycle_Ch3
+	musicheader 1, 4, Music_Bicycle_Ch4
 ; ee125

 Music_Bicycle_Ch1: ; ee125
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -1,8 +1,8 @@
 Music_BuenasPassword: ; 178153
-	dbw $c0, Music_BuenasPassword_Ch1
-	dbw $01, Music_BuenasPassword_Ch2
-	dbw $02, Music_BuenasPassword_Ch3
-	dbw $03, Music_BuenasPassword_Ch4
+	musicheader 4, 1, Music_BuenasPassword_Ch1
+	musicheader 1, 2, Music_BuenasPassword_Ch2
+	musicheader 1, 3, Music_BuenasPassword_Ch3
+	musicheader 1, 4, Music_BuenasPassword_Ch4
 ; 17815f

 Music_BuenasPassword_Ch1: ; 17815f
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -1,8 +1,8 @@
 Music_BugCatchingContest: ; f7c16
-	dbw $c0, Music_BugCatchingContest_Ch1
-	dbw $01, Music_BugCatchingContest_Ch2
-	dbw $02, Music_BugCatchingContest_Ch3
-	dbw $03, Music_BugCatchingContest_Ch4
+	musicheader 4, 1, Music_BugCatchingContest_Ch1
+	musicheader 1, 2, Music_BugCatchingContest_Ch2
+	musicheader 1, 3, Music_BugCatchingContest_Ch3
+	musicheader 1, 4, Music_BugCatchingContest_Ch4
 ; f7c22

 Music_BugCatchingContest_Ch1: ; f7c22
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -1,8 +1,8 @@
 Music_BurnedTower: ; f6a99
-	dbw $c0, Music_BurnedTower_Ch1
-	dbw $01, Music_BurnedTower_Ch2
-	dbw $02, Music_BurnedTower_Ch3
-	dbw $03, Music_BurnedTower_Ch4
+	musicheader 4, 1, Music_BurnedTower_Ch1
+	musicheader 1, 2, Music_BurnedTower_Ch2
+	musicheader 1, 3, Music_BurnedTower_Ch3
+	musicheader 1, 4, Music_BurnedTower_Ch4
 ; f6aa5

 Music_BurnedTower_Ch1: ; f6aa5
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -1,7 +1,7 @@
 Music_CeladonCity: ; f435b
-	dbw $80, Music_CeladonCity_Ch1
-	dbw $01, Music_CeladonCity_Ch2
-	dbw $02, Music_CeladonCity_Ch3
+	musicheader 3, 1, Music_CeladonCity_Ch1
+	musicheader 1, 2, Music_CeladonCity_Ch2
+	musicheader 1, 3, Music_CeladonCity_Ch3
 ; f4364

 Music_CeladonCity_Ch1: ; f4364
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -1,7 +1,7 @@
 Music_ChampionBattle: ; ea9c1
-	dbw $80, Music_ChampionBattle_Ch1
-	dbw $01, Music_ChampionBattle_Ch2
-	dbw $02, Music_ChampionBattle_Ch3
+	musicheader 3, 1, Music_ChampionBattle_Ch1
+	musicheader 1, 2, Music_ChampionBattle_Ch2
+	musicheader 1, 3, Music_ChampionBattle_Ch3
 ; ea9ca

 Music_ChampionBattle_Ch1: ; ea9ca
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -1,8 +1,8 @@
 Music_CherrygroveCity: ; f5b03
-	dbw $c0, Music_CherrygroveCity_Ch1
-	dbw $01, Music_CherrygroveCity_Ch2
-	dbw $02, Music_CherrygroveCity_Ch3
-	dbw $03, Music_CherrygroveCity_Ch4
+	musicheader 4, 1, Music_CherrygroveCity_Ch1
+	musicheader 1, 2, Music_CherrygroveCity_Ch2
+	musicheader 1, 3, Music_CherrygroveCity_Ch3
+	musicheader 1, 4, Music_CherrygroveCity_Ch4
 ; f5b0f

 Music_CherrygroveCity_Ch1: ; f5b0f
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -1,8 +1,8 @@
 Music_Clair: ; 1fa8d
-	dbw $c0, Music_Clair_Ch1
-	dbw $01, Music_Clair_Ch2
-	dbw $02, Music_Clair_Ch3
-	dbw $03, Music_Clair_Ch4
+	musicheader 4, 1, Music_Clair_Ch1
+	musicheader 1, 2, Music_Clair_Ch2
+	musicheader 1, 3, Music_Clair_Ch3
+	musicheader 1, 4, Music_Clair_Ch4
 ; 1fa99

 Music_Clair_Ch1: ; 1fa99
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -1,8 +1,8 @@
 Music_ContestResults: ; efb3e
-	dbw $c0, Music_ContestResults_Ch1
-	dbw $01, Music_ContestResults_Ch2
-	dbw $02, Music_ContestResults_Ch3
-	dbw $03, Music_ContestResults_Ch4
+	musicheader 4, 1, Music_ContestResults_Ch1
+	musicheader 1, 2, Music_ContestResults_Ch2
+	musicheader 1, 3, Music_ContestResults_Ch3
+	musicheader 1, 4, Music_ContestResults_Ch4
 ; efb4a

 Music_ContestResults_Ch1: ; efb4a
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,8 +1,8 @@
 Music_Credits: ; 1f31c
-	dbw $c0, Music_Credits_Ch1
-	dbw $01, Music_Credits_Ch2
-	dbw $02, Music_Credits_Ch3
-	dbw $03, Music_Credits_Ch4
+	musicheader 4, 1, Music_Credits_Ch1
+	musicheader 1, 2, Music_Credits_Ch2
+	musicheader 1, 3, Music_Credits_Ch3
+	musicheader 1, 4, Music_Credits_Ch4
 ; 1f328

 Music_Credits_Ch1: ; 1f328
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -1,8 +1,8 @@
 Music_CrystalOpening: ; 1786e8
-	dbw $c0, Music_CrystalOpening_Ch1
-	dbw $01, Music_CrystalOpening_Ch2
-	dbw $02, Music_CrystalOpening_Ch3
-	dbw $03, Music_CrystalOpening_Ch4
+	musicheader 4, 1, Music_CrystalOpening_Ch1
+	musicheader 1, 2, Music_CrystalOpening_Ch2
+	musicheader 1, 3, Music_CrystalOpening_Ch3
+	musicheader 1, 4, Music_CrystalOpening_Ch4
 ; 1786f4

 Music_CrystalOpening_Ch1: ; 1786f4
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -1,7 +1,7 @@
 Music_DancingHall: ; ef9bc
-	dbw $80, Music_DancingHall_Ch1
-	dbw $01, Music_DancingHall_Ch2
-	dbw $02, Music_DancingHall_Ch3
+	musicheader 3, 1, Music_DancingHall_Ch1
+	musicheader 1, 2, Music_DancingHall_Ch2
+	musicheader 1, 3, Music_DancingHall_Ch3
 ; ef9c5

 	db $3
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -1,8 +1,8 @@
 Music_DarkCave: ; ea2be
-	dbw $c0, Music_DarkCave_Ch1
-	dbw $01, Music_DarkCave_Ch2
-	dbw $02, Music_DarkCave_Ch3
-	dbw $03, Music_DarkCave_Ch4
+	musicheader 4, 1, Music_DarkCave_Ch1
+	musicheader 1, 2, Music_DarkCave_Ch2
+	musicheader 1, 3, Music_DarkCave_Ch3
+	musicheader 1, 4, Music_DarkCave_Ch4
 ; ea2ca

 Music_DarkCave_Ch1: ; ea2ca
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -1,8 +1,8 @@
 Music_DragonsDen: ; eece8
-	dbw $c0, Music_DragonsDen_Ch1
-	dbw $01, Music_DragonsDen_Ch2
-	dbw $02, Music_DragonsDen_Ch3
-	dbw $03, Music_DragonsDen_Ch4
+	musicheader 4, 1, Music_DragonsDen_Ch1
+	musicheader 1, 2, Music_DragonsDen_Ch2
+	musicheader 1, 3, Music_DragonsDen_Ch3
+	musicheader 1, 4, Music_DragonsDen_Ch4
 ; eecf4

 Music_DragonsDen_Ch1: ; eecf4
--- a/Show More
+++ b/Show More