ref: 2ca81c9d73f4ae7210d6332fe8a0381b92745bb7
parent: 4fcabdc07b5f75b81cb4728c9b9097a625485133
parent: aae33da95b5ef1b329764065caf828717c00cf72
author: yenatch <[email protected]>
date: Fri Oct 25 12:55:41 EDT 2013
Merge commit 'aae33da9' into merge-mrwint
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2103,7 +2103,7 @@
add hl, bc
ld a, [hl]
; get byte
- call LoadMusicByte ; load data into CurMusicByte
+ call _LoadMusicByte ; load data into CurMusicByte
inc de ; advance to next byte for next time this is called
; update channeldata address
ld hl, Channel1MusicAddress - Channel1
@@ -2324,7 +2324,7 @@
ld e, [hl]
inc hl
ld d, [hl] ; music header address
- call FarLoadMusicByte ; store first byte of music header in a
+ call LoadMusicByte ; store first byte of music header in a
rlca
rlca
and a, $03 ; get number of channels
@@ -2379,7 +2379,7 @@
ld d, [hl]
; Read the cry's sound header
- call FarLoadMusicByte
+ call LoadMusicByte
; Top 2 bits contain the number of channels
rlca
rlca
@@ -2544,7 +2544,7 @@
inc hl
ld d, [hl]
; get # channels
- call FarLoadMusicByte
+ call LoadMusicByte
rlca ; top 2
rlca ; bits
and a, $03
@@ -2597,7 +2597,7 @@
ld d, [hl]
; bit 2-3
- call FarLoadMusicByte
+ call LoadMusicByte
rlca
rlca
and 3 ; ch1-4
@@ -2674,7 +2674,7 @@
; input:
; de:
; get pointer to current channel
- call FarLoadMusicByte
+ call LoadMusicByte
inc de
and a, $07 ; bit 0-2 (current channel)
ld [CurChannel], a
@@ -2693,10 +2693,10 @@
; load music pointer
ld hl, Channel1MusicAddress - Channel1
add hl, bc
- call FarLoadMusicByte
+ call LoadMusicByte
ld [hli], a
inc de
- call FarLoadMusicByte
+ call LoadMusicByte
ld [hl], a
inc de
; load music id
@@ -2745,13 +2745,13 @@
ret
; e8d76
-FarLoadMusicByte: ; e8d76
+LoadMusicByte: ; e8d76
; input:
; de = current music address
; output:
; a = CurMusicByte
ld a, [MusicBank]
- call LoadMusicByte
+ call _LoadMusicByte
ld a, [CurMusicByte]
ret
; e8d80
--- a/main.asm
+++ b/main.asm
@@ -3029,7 +3029,7 @@
; 3b86
-LoadMusicByte: ; 3b86
+_LoadMusicByte: ; 3b86
; CurMusicByte = [a:de]
ld [hROMBank], a