Rename Music_MatchDraw

6 files changed, 14 insertions, 14 deletions

diff --git a/src/audio/music/darkdiddly.asm b/src/audio/music/matchdraw.asm
index a82dd00..c7c105f 100644
--- a/src/audio/music/darkdiddly.asm
+++ b/src/audio/music/matchdraw.asm
@@ -1,4 +1,4 @@
-Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf)
+Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf)
 	speed 3
 	musicdc 17
 	musice8 8
@@ -45,7 +45,7 @@ Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf)
 	music_end
 
 
-Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17)
+Music_MatchDraw_Ch2: ; f7d17 (3d:7d17)
 	speed 3
 	musicdc 17
 	musice8 8
@@ -84,7 +84,7 @@ Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17)
 	music_end
 
 
-Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47)
+Music_MatchDraw_Ch3: ; f7d47 (3d:7d47)
 	speed 6
 	musicdc 17
 	wave 1
diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 03c55b9..450e99f 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1885,7 +1885,7 @@ INCLUDE "audio/music/matchstart2.asm"
 INCLUDE "audio/music/matchstart3.asm"
 INCLUDE "audio/music/matchvictory.asm"
 INCLUDE "audio/music/matchloss.asm"
-INCLUDE "audio/music/darkdiddly.asm"
+INCLUDE "audio/music/matchdraw.asm"
 INCLUDE "audio/music/boosterpack.asm"
 INCLUDE "audio/music/medal.asm"
 
diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm
index f5008fe..05f33bb 100644
--- a/src/audio/music1_headers.asm
+++ b/src/audio/music1_headers.asm
@@ -28,7 +28,7 @@ SongBanks1: ; f4ee6 (3d:4ee6)
 	db BANK(Music_MatchStart3)
 	db BANK(Music_MatchVictory)
 	db BANK(Music_MatchLoss)
-	db BANK(Music_DarkDiddly)
+	db BANK(Music_MatchDraw)
 	db BANK(Music_Unused1b)
 	db BANK(Music_BoosterPack)
 	db BANK(Music_Medal)
@@ -61,7 +61,7 @@ SongHeaderPointers1: ; f4f05 (3d:4f05)
 	dw Music_MatchStart3
 	dw Music_MatchVictory
 	dw Music_MatchLoss
-	dw Music_DarkDiddly
+	dw Music_MatchDraw
 	dw Music_Unused1b
 	dw Music_BoosterPack
 	dw Music_Medal
@@ -245,11 +245,11 @@ Music_MatchLoss: ; f501c (3d:501c)
 	dw Music_MatchLoss_Ch3
 	dw $0000
 
-Music_DarkDiddly: ; f5025 (3d:5025)
+Music_MatchDraw: ; f5025 (3d:5025)
 	db %0111
-	dw Music_DarkDiddly_Ch1
-	dw Music_DarkDiddly_Ch2
-	dw Music_DarkDiddly_Ch3
+	dw Music_MatchDraw_Ch1
+	dw Music_MatchDraw_Ch2
+	dw Music_MatchDraw_Ch3
 	dw $0000
 
 Music_Unused1b: ; f502e (3d:502e)
diff --git a/src/audio/music2_headers.asm b/src/audio/music2_headers.asm
index cafaa4f..206d8fd 100644
--- a/src/audio/music2_headers.asm
+++ b/src/audio/music2_headers.asm
@@ -28,7 +28,7 @@ SongBanks2: ; f8ee6 (3e:4ee6)
 	db BANK(Music_MatchStart3)
 	db BANK(Music_MatchVictory)
 	db BANK(Music_MatchLoss)
-	db BANK(Music_DarkDiddly)
+	db BANK(Music_MatchDraw)
 	db BANK(Music_Unused1b)
 	db BANK(Music_BoosterPack)
 	db BANK(Music_Medal)
@@ -245,7 +245,7 @@ Music_Credits: ; f8fdd (3e:4fdd)
 	dw $0000
 	dw $0000
 
-;Music_DarkDiddly
+;Music_MatchDraw
 	db %0000
 	dw $0000
 	dw $0000
diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm
index c6c50f7..d9ebb2b 100644
--- a/src/constants/music_constants.asm
+++ b/src/constants/music_constants.asm
@@ -25,7 +25,7 @@
 	const MUSIC_MATCH_START_3  ; $17
 	const MUSIC_MATCH_VICTORY  ; $18
 	const MUSIC_MATCH_LOSS     ; $19
-	const MUSIC_DARK_DIDDLY    ; $1a
+	const MUSIC_MATCH_DRAW     ; $1a
 	const MUSIC_UNUSED_1B      ; $1b
 	const MUSIC_BOOSTER_PACK   ; $1c
 	const MUSIC_MEDAL          ; $1d
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index a7184a6..572109f 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -189,7 +189,7 @@ MainDuelLoop: ; 40ee (1:40ee)
 	cp TURN_PLAYER_LOST
 	jr z, .active_duelist_lost_battle
 	ld a, $5f
-	ld c, MUSIC_DARK_DIDDLY
+	ld c, MUSIC_MATCH_DRAW
 	ldtx hl, DuelWasADrawText
 	jr .handle_duel_finished