summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-10-25 16:17:52 -0400
committeryenatch <yenatch@gmail.com>2013-10-25 16:17:52 -0400
commit7a13251d0333d4914034ac8b370ddad2a6190d1d (patch)
tree4eafe30b2d4d680027f0f63afd9ed035ff476c63
parentb8603ecb924de7f324bc1d7100c7268e746712fd (diff)
parent4ac678313f9c7b9d28774a1a936b8de64350b478 (diff)
Merge commit '4ac6783' into merge-mrwint
-rw-r--r--audio/engine.asm4
-rw-r--r--main.asm2
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/engine.asm b/audio/engine.asm
index e54bda967..46bc29c11 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -5,7 +5,7 @@
; Notable functions:
; UpdateSound (called during VBlank)
; FadeMusic
-; PlaySFX
+; PlayStereoSFX
; PlayCry
SoundRestart: ; e8000
@@ -2566,7 +2566,7 @@ LoadSFX: ; e8c04
; e8ca6
-PlaySFX: ; e8ca6
+PlayStereoSFX: ; e8ca6
; play sfx de
call MusicOff
diff --git a/main.asm b/main.asm
index 6be22eedd..36abfda4a 100644
--- a/main.asm
+++ b/main.asm
@@ -93990,7 +93990,7 @@ Functioncc7cd: ; cc7cd (33:47cd)
call Function3af0
ld e, a
ld d, $0
- callab PlaySFX
+ callab PlayStereoSFX
ret
; cc7f8 (33:47f8)