duty3 -> wave

24 files changed, 24 insertions, 24 deletions

diff --git a/audio/music/battletheme1.asm b/audio/music/battletheme1.asm
index 338dc3c..9a061b0 100644
--- a/audio/music/battletheme1.asm
+++ b/audio/music/battletheme1.asm
@@ -1323,7 +1323,7 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32)
 	speed 7
 	musicdc 17
 	volume 32
-	duty3 4
+	wave 4
 	musice9 96
 	musice8 8
 	octave 1
diff --git a/audio/music/battletheme2.asm b/audio/music/battletheme2.asm
index 39a9923..e66504f 100644
--- a/audio/music/battletheme2.asm
+++ b/audio/music/battletheme2.asm
@@ -845,7 +845,7 @@ Music_BattleTheme2_Ch3: ; f61ac (3d:61ac)
 	speed 9
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 64
 	musice8 7
 	octave 1
diff --git a/audio/music/battletheme3.asm b/audio/music/battletheme3.asm
index 7ddeff8..71eeaba 100644
--- a/audio/music/battletheme3.asm
+++ b/audio/music/battletheme3.asm
@@ -911,7 +911,7 @@ Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2)
 	speed 11
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 96
 	vibrato_rate 8
 	vibrato_delay 0
diff --git a/audio/music/boosterpack.asm b/audio/music/boosterpack.asm
index dc319ff..b33bea9 100644
--- a/audio/music/boosterpack.asm
+++ b/audio/music/boosterpack.asm
@@ -89,7 +89,7 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e)
 
 Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb)
 	musicdc 17
-	duty3 1
+	wave 1
 	volume 32
 	musice8 8
 	musice9 0
diff --git a/audio/music/cardpop.asm b/audio/music/cardpop.asm
index bd1d1c9..339bc23 100644
--- a/audio/music/cardpop.asm
+++ b/audio/music/cardpop.asm
@@ -207,7 +207,7 @@ Music_CardPop_Ch2: ; f70df (3d:70df)
 
 Music_CardPop_Ch3: ; f713a (3d:713a)
 	speed 4
-	duty3 1
+	wave 1
 	musicdc 17
 	volume 32
 	musice9 0
diff --git a/audio/music/challengehall.asm b/audio/music/challengehall.asm
index deba329..0c3c525 100644
--- a/audio/music/challengehall.asm
+++ b/audio/music/challengehall.asm
@@ -774,7 +774,7 @@ Branch_f9a28:
 Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92)
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 0
 	musice8 8
 	musice8 8
diff --git a/audio/music/club1.asm b/audio/music/club1.asm
index d5fea0b..e16d946 100644
--- a/audio/music/club1.asm
+++ b/audio/music/club1.asm
@@ -575,7 +575,7 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4)
 	speed 5
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 96
 	musice8 7
 	octave 1
diff --git a/audio/music/club2.asm b/audio/music/club2.asm
index 11a5e64..cbef1ea 100644
--- a/audio/music/club2.asm
+++ b/audio/music/club2.asm
@@ -210,7 +210,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164)
 	speed 6
 	volume 32
 	musicdc 17
-	duty3 0
+	wave 0
 	vibrato_rate 4
 	vibrato_delay 35
 	musice8 6
diff --git a/audio/music/club3.asm b/audio/music/club3.asm
index 9a8f7dd..bfff7f4 100644
--- a/audio/music/club3.asm
+++ b/audio/music/club3.asm
@@ -802,7 +802,7 @@ Music_Club3_Ch3: ; fa63e (3e:663e)
 	speed 9
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 0
 	musice8 8
 	Loop 4
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index f8e54d0..b81c85f 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1794,7 +1794,7 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d)
 	speed 1
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 96
 	musice8 8
 	octave 1
diff --git a/audio/music/darkdiddly.asm b/audio/music/darkdiddly.asm
index 078d4f5..37b541a 100644
--- a/audio/music/darkdiddly.asm
+++ b/audio/music/darkdiddly.asm
@@ -87,7 +87,7 @@ Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17)
 Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47)
 	speed 6
 	musicdc 17
-	duty3 1
+	wave 1
 	volume 32
 	musice8 8
 	musice9 0
diff --git a/audio/music/deckmachine.asm b/audio/music/deckmachine.asm
index 50b6601..341293b 100644
--- a/audio/music/deckmachine.asm
+++ b/audio/music/deckmachine.asm
@@ -100,7 +100,7 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41)
 Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 96
 	musice8 8
 	MainLoop
diff --git a/audio/music/hallofhonor.asm b/audio/music/hallofhonor.asm
index 798dad6..76eba8e 100644
--- a/audio/music/hallofhonor.asm
+++ b/audio/music/hallofhonor.asm
@@ -174,7 +174,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5)
 	speed 7
 	volume 64
 	musicdc 17
-	duty3 2
+	wave 2
 	vibrato_rate 4
 	vibrato_delay 35
 	musice8 6
diff --git a/audio/music/imakuni.asm b/audio/music/imakuni.asm
index bb5588f..64d1de2 100644
--- a/audio/music/imakuni.asm
+++ b/audio/music/imakuni.asm
@@ -294,7 +294,7 @@ Branch_faea5:
 Music_Imakuni_Ch3: ; faebc (3e:6ebc)
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	vibrato_rate 6
 	vibrato_delay 0
 	musice9 0
diff --git a/audio/music/matchloss.asm b/audio/music/matchloss.asm
index 7b1b75c..a41f968 100644
--- a/audio/music/matchloss.asm
+++ b/audio/music/matchloss.asm
@@ -90,7 +90,7 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87)
 
 Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7)
 	musicdc 17
-	duty3 1
+	wave 1
 	volume 32
 	musice8 8
 	musice9 64
diff --git a/audio/music/matchvictory.asm b/audio/music/matchvictory.asm
index 0d18824..ca0ff50 100644
--- a/audio/music/matchvictory.asm
+++ b/audio/music/matchvictory.asm
@@ -118,7 +118,7 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0)
 
 Music_MatchVictory_Ch3: ; f7c09 (3d:7c09)
 	musicdc 17
-	duty3 1
+	wave 1
 	volume 32
 	musice8 8
 	musice9 0
diff --git a/audio/music/medal.asm b/audio/music/medal.asm
index 45f8bab..0ed5f8b 100644
--- a/audio/music/medal.asm
+++ b/audio/music/medal.asm
@@ -127,7 +127,7 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b)
 
 Music_Medal_Ch3: ; f7e9d (3d:7e9d)
 	musicdc 17
-	duty3 1
+	wave 1
 	volume 32
 	musice8 8
 	musice9 0
diff --git a/audio/music/overworld.asm b/audio/music/overworld.asm
index 5854d82..73505c5 100644
--- a/audio/music/overworld.asm
+++ b/audio/music/overworld.asm
@@ -754,7 +754,7 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1)
 	speed 7
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 64
 	musice8 7
 	octave 1
diff --git a/audio/music/pausemenu.asm b/audio/music/pausemenu.asm
index 9a9ea2f..39b2f8d 100644
--- a/audio/music/pausemenu.asm
+++ b/audio/music/pausemenu.asm
@@ -434,7 +434,7 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e)
 
 Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
 	speed 1
-	duty3 3
+	wave 3
 	musicdc 17
 	volume 64
 	musice9 96
diff --git a/audio/music/pcmainmenu.asm b/audio/music/pcmainmenu.asm
index e9482ca..99924b0 100644
--- a/audio/music/pcmainmenu.asm
+++ b/audio/music/pcmainmenu.asm
@@ -215,7 +215,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189)
 	speed 7
 	volume 32
 	musicdc 17
-	duty3 1
+	wave 1
 	musice8 7
 	musice9 0
 	MainLoop
diff --git a/audio/music/pokemondome.asm b/audio/music/pokemondome.asm
index 369c291..5045119 100644
--- a/audio/music/pokemondome.asm
+++ b/audio/music/pokemondome.asm
@@ -622,7 +622,7 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579)
 	speed 7
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 64
 	musice8 6
 	octave 1
diff --git a/audio/music/ronald.asm b/audio/music/ronald.asm
index 28261df..4e3ba48 100644
--- a/audio/music/ronald.asm
+++ b/audio/music/ronald.asm
@@ -853,7 +853,7 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0)
 	speed 1
 	musicdc 17
 	volume 32
-	duty3 1
+	wave 1
 	musice9 0
 	musice8 8
 	MainLoop
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 3bd92c9..6462632 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -410,7 +410,7 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193)
 
 Music_TitleScreen_Ch3: ; f5286 (3d:5286)
 	speed 7
-	duty3 4
+	wave 4
 	volume 32
 	musice9 0
 	musicdc 17
diff --git a/macros.asm b/macros.asm
index bf18a88..d49d1a2 100755
--- a/macros.asm
+++ b/macros.asm
@@ -129,7 +129,7 @@ volume: MACRO
 	db $e6, \1
 ENDM
 
-duty3: MACRO
+wave: MACRO
 	db $e7, \1
 ENDM