diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 13:36:50 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 13:36:50 -0400 |
| commit | 75e4f784924393ccedb27f2831e5a36fe11bada5 (patch) | |
| tree | 41b13a63cfc8c1df1244287a4158864874215b8d /home | |
| parent | a655783735e1bd652eb6eff61af092b0414f2913 (diff) | |
Merge branch 'master' of https://github.com/luckytyphlosion/pokegold-spaceworld
Diffstat (limited to 'home')
| -rwxr-xr-x | home/music.asm | 52 |
1 files changed, 26 insertions, 26 deletions
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 |