aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSik2019-04-23 03:31:56 -0300
committerSik2019-04-23 03:31:56 -0300
commitc012f5f3767bb358b027535007b922b276c87f2e (patch)
tree465f00ed4bb772de9e99fdd53490b6e504900053
parentceb1b7c96cf546b033375787481ee66d64c08fc8 (diff)
Well, that had backfired (and turned out that load instrument events reset the volume anyway), this seems to fix the channel unlock issues for real tho
-rw-r--r--README10
-rw-r--r--built/old-builds/prog-z80-1.64.binbin0 -> 5120 bytes
-rw-r--r--built/prog-z80.binbin5120 -> 5120 bytes
-rw-r--r--c/echoblob.h2
-rw-r--r--src-z80/core/bgm.z806
5 files changed, 9 insertions, 9 deletions
diff --git a/README b/README
index 6aca250..dbcc995 100644
--- a/README
+++ b/README
@@ -7,12 +7,12 @@
| | |_ |_ ___ | | | | | | | |
| |_______ |_ |___| _| | | | | |_ |_____| _|
|___________| |________| |___| |___| |_________|
- ___ ___ _ _ ___ __ ___ ___ ___ _ ___ ___ _ ___ _ _
- | _| | | | | \ | _| | _| | | _| | | | _| | |
- | |_| | | | | | | | | | |_| | | |_| | | | |_ _ _ ___ ___ | | | |_| | |
+ ___ ___ _ _ ___ __ ___ ___ ___ _ ___ ___ _ ___ ___
+ | _| | | | | \ | _| | _| | | _| | | | _| _|
+ | |_| | | | | | | | | | |_| | | |_| | | | |_ _ _ ___ ___ | | | |_| |_
|_ | | | | | | | | | | _| | | | | | | | _| | | | __| _ \ | | | |_ |
- _| | | | | | | | | | | |_| | | | | | | | |_ | | | __| /_ | |_| | | | |
- |___|___|___|_|_|__/ |___|_|_|___|_|_|_|___| \_/|___|_|_\_| |_|_|___| |_|
+ _| | | | | | | | | | | |_| | | | | | | | |_ | | | __| /_ | |_| | |_| |
+ |___|___|___|_|_|__/ |___|_|_|___|_|_|_|___| \_/|___|_|_\_| |_|_|___|___|
=============================================================================
diff --git a/built/old-builds/prog-z80-1.64.bin b/built/old-builds/prog-z80-1.64.bin
new file mode 100644
index 0000000..41765be
--- /dev/null
+++ b/built/old-builds/prog-z80-1.64.bin
Binary files differ
diff --git a/built/prog-z80.bin b/built/prog-z80.bin
index 41765be..7785dc1 100644
--- a/built/prog-z80.bin
+++ b/built/prog-z80.bin
Binary files differ
diff --git a/c/echoblob.h b/c/echoblob.h
index d84cde2..148a832 100644
--- a/c/echoblob.h
+++ b/c/echoblob.h
@@ -53,7 +53,7 @@ static uint8_t echo_blob[] = {
5, 58, 0, 64, 15,207, 58,240, 31,246, 2, 50,240, 31, 58, 0,
64, 15,207, 33,252, 31, 78, 44, 94, 44, 86, 58, 0, 64, 15,207,
175, 50,169, 19, 60, 33,153, 19,119, 44,119, 44,113, 44,115, 44,
- 114, 58, 0, 64, 15,207, 33, 7, 4, 34,194, 2, 6, 8, 14, 0,
+ 114, 58, 0, 64, 15,207, 33, 7, 4, 34,194, 2, 6, 8, 14,127,
33, 72, 19,113, 44, 16,252,195, 99, 2, 58,153, 19,183,202, 99,
2, 62, 1, 50,169, 19, 6,127, 14, 7, 33,143, 19, 58, 0, 64,
15,207,126,183, 32, 4,121,205,111, 10, 58, 0, 64, 15,207, 45,
diff --git a/src-z80/core/bgm.z80 b/src-z80/core/bgm.z80
index ddb9f74..595e9ec 100644
--- a/src-z80/core/bgm.z80
+++ b/src-z80/core/bgm.z80
@@ -45,9 +45,9 @@ PlayBGM:
ld hl, ProcessBGM ; Tell Echo to process BGM
ld (DoTick_BGM+1), hl
- ld b, 8 ; Force BGM volume of all FM channels to $00
- ld c, 0 ; (default value for older Echo versions)
- ld hl, RAM_BGMFMVol
+ ld b, 8 ; Force BGM volume of all FM channels to $7F
+ ld c, $7F ; (so trying to unlock an unused channel
+ ld hl, RAM_BGMFMVol ; doesn't result in audible garbage)
.playunmute:
ld (hl), c
inc l