From 75e4f784924393ccedb27f2831e5a36fe11bada5 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 3 Jul 2018 13:36:50 -0400
Subject: Merge branch 'master' of
 https://github.com/luckytyphlosion/pokegold-spaceworld

---
 home/music.asm | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'home')

diff --git a/home/music.asm b/home/music.asm
index 8d908f0..4ad9d06 100755
--- a/home/music.asm
+++ b/home/music.asm
@@ -1,26 +1,26 @@
-SECTION "PlayMapMusic", ROM0[$3de1]
-
-PlayMapMusic: ; 00:3de1
-	push hl
-	push de
-	push bc
-	push af
-	call GetMapMusic
-	ld a, [wMapMusic]
-	cp e
-	jr z, .dont_play
-	push de
-	ld de, 0
-	call PlayMusic
-	call DelayFrame
-	pop de
-	ld a, e
-	ld [wMapMusic], a
-	call PlayMusic
-
-.dont_play
-	pop af
-	pop bc
-	pop de
-	pop hl
-	ret
+SECTION "PlayMapMusic", ROM0[$3de1]
+
+PlayMapMusic: ; 00:3de1
+	push hl
+	push de
+	push bc
+	push af
+	call GetMapMusic
+	ld a, [wMapMusic]
+	cp e
+	jr z, .dont_play
+	push de
+	ld de, 0
+	call PlayMusic
+	call DelayFrame
+	pop de
+	ld a, e
+	ld [wMapMusic], a
+	call PlayMusic
+
+.dont_play
+	pop af
+	pop bc
+	pop de
+	pop hl
+	ret
-- 
cgit v1.2.3