From 1907f0af82b59c0be9a81f0215cd0ef16b7be42b Mon Sep 17 00:00:00 2001 From: Larry Date: Thu, 24 Aug 2017 14:07:51 -0500 Subject: [PATCH] more music work, eventually I'll get this correct and pretty Former-commit-id: bc7d43aa7eefc5b5471dd37c85addd127af8d602 [formerly 73ca0427f3e8c56dd4e9ad0344dae81b42024a48] [formerly 846dca411c8271a903715a31aa49748d9433c5ef [formerly b206771e0af595c78593fcbf9a4e9a6be2f70431]] Former-commit-id: 20349ff8b753f8f30a31fcf9d094a8a93da5abf9 [formerly 9eb45d8fa5369d2df432f5dd218f5eb1fc8612fd] Former-commit-id: 854b7d7f1d5ed3c6e1b637be2cd1e7bf7b42d1ff --- Makefile.data.REMOVED.git-id | 2 +- ge007.u.ld.REMOVED.git-id | 2 +- ...MOVED.git-id => instruments.ctl.REMOVED.git-id} | 0 ...MOVED.git-id => instruments.tbl.REMOVED.git-id} | 0 music/music.s.REMOVED.git-id | 2 +- .../music_moresomethinginmusic.bin.REMOVED.git-id | 1 - music/{music_null.bin => music_null1.bin} | Bin music/music_null2.bin | Bin 0 -> 96 bytes music/music_null3.bin | Bin 0 -> 96 bytes music/music_sfx.bnk.bin.REMOVED.git-id | 2 +- music/music_somethinginmusic.bin.REMOVED.git-id | 1 - ...D.git-id => music_surface1x.bin.REMOVED.git-id} | 0 music/music_surface2x.bin.REMOVED.git-id | 1 + 13 files changed, 5 insertions(+), 6 deletions(-) rename music/{music_sounds.ptr.bin.REMOVED.git-id => instruments.ctl.REMOVED.git-id} (100%) rename music/{music_sounds.bnk.bin.REMOVED.git-id => instruments.tbl.REMOVED.git-id} (100%) delete mode 100644 music/music_moresomethinginmusic.bin.REMOVED.git-id rename music/{music_null.bin => music_null1.bin} (100%) create mode 100644 music/music_null2.bin create mode 100644 music/music_null3.bin delete mode 100644 music/music_somethinginmusic.bin.REMOVED.git-id rename music/{music_surfacex.bin.REMOVED.git-id => music_surface1x.bin.REMOVED.git-id} (100%) create mode 100644 music/music_surface2x.bin.REMOVED.git-id diff --git a/Makefile.data.REMOVED.git-id b/Makefile.data.REMOVED.git-id index aefb119..0b9b215 100644 --- a/Makefile.data.REMOVED.git-id +++ b/Makefile.data.REMOVED.git-id @@ -1 +1 @@ -a4cef5e839590c72a2c6f0528835794355ecd8ce \ No newline at end of file +5a19a83719903120351d182b057f57dc7467bf73 \ No newline at end of file diff --git a/ge007.u.ld.REMOVED.git-id b/ge007.u.ld.REMOVED.git-id index e3a5327..9311a1f 100644 --- a/ge007.u.ld.REMOVED.git-id +++ b/ge007.u.ld.REMOVED.git-id @@ -1 +1 @@ -733d1db04da495ea9c3b562d286a17596d38ef3c \ No newline at end of file +9f0c75b42cdc779f1f4857d2881447cf1f30c04f \ No newline at end of file diff --git a/music/music_sounds.ptr.bin.REMOVED.git-id b/music/instruments.ctl.REMOVED.git-id similarity index 100% rename from music/music_sounds.ptr.bin.REMOVED.git-id rename to music/instruments.ctl.REMOVED.git-id diff --git a/music/music_sounds.bnk.bin.REMOVED.git-id b/music/instruments.tbl.REMOVED.git-id similarity index 100% rename from music/music_sounds.bnk.bin.REMOVED.git-id rename to music/instruments.tbl.REMOVED.git-id diff --git a/music/music.s.REMOVED.git-id b/music/music.s.REMOVED.git-id index f28d5f3..962b26d 100644 --- a/music/music.s.REMOVED.git-id +++ b/music/music.s.REMOVED.git-id @@ -1 +1 @@ -b51b774bd9081d4f697b36ba8431767b7b8aea21 \ No newline at end of file +c5f1b1c07dd4fb7aff8d13177dd31a692a298bfb \ No newline at end of file diff --git a/music/music_moresomethinginmusic.bin.REMOVED.git-id b/music/music_moresomethinginmusic.bin.REMOVED.git-id deleted file mode 100644 index 2a5d9d4..0000000 --- a/music/music_moresomethinginmusic.bin.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -04e4e61c0a75a11b2dced88041a8f09c68da29bc \ No newline at end of file diff --git a/music/music_null.bin b/music/music_null1.bin similarity index 100% rename from music/music_null.bin rename to music/music_null1.bin diff --git a/music/music_null2.bin b/music/music_null2.bin new file mode 100644 index 0000000000000000000000000000000000000000..0617f1024d2010aa9d652890f32b54008e10837d GIT binary patch literal 96 scmZQzU~ple2rxD<{10SbsNitG^oqlOJ%;~F82;=2{|_{ii|M~U0M#xGTL1t6 literal 0 HcmV?d00001 diff --git a/music/music_null3.bin b/music/music_null3.bin new file mode 100644 index 0000000000000000000000000000000000000000..0617f1024d2010aa9d652890f32b54008e10837d GIT binary patch literal 96 scmZQzU~ple2rxD<{10SbsNitG^oqlOJ%;~F82;=2{|_{ii|M~U0M#xGTL1t6 literal 0 HcmV?d00001 diff --git a/music/music_sfx.bnk.bin.REMOVED.git-id b/music/music_sfx.bnk.bin.REMOVED.git-id index d8dd7b8..d567444 100644 --- a/music/music_sfx.bnk.bin.REMOVED.git-id +++ b/music/music_sfx.bnk.bin.REMOVED.git-id @@ -1 +1 @@ -3e515a3051a576cb711403c2db7bb2625c736030 \ No newline at end of file +638c276481de885f4eba6b1c7530bd2d275311fb \ No newline at end of file diff --git a/music/music_somethinginmusic.bin.REMOVED.git-id b/music/music_somethinginmusic.bin.REMOVED.git-id deleted file mode 100644 index 7417cfd..0000000 --- a/music/music_somethinginmusic.bin.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -8583a897f99cc038d9fbb3b020460e0f680e9842 \ No newline at end of file diff --git a/music/music_surfacex.bin.REMOVED.git-id b/music/music_surface1x.bin.REMOVED.git-id similarity index 100% rename from music/music_surfacex.bin.REMOVED.git-id rename to music/music_surface1x.bin.REMOVED.git-id diff --git a/music/music_surface2x.bin.REMOVED.git-id b/music/music_surface2x.bin.REMOVED.git-id new file mode 100644 index 0000000..e8e1722 --- /dev/null +++ b/music/music_surface2x.bin.REMOVED.git-id @@ -0,0 +1 @@ +b4a25ec5ecc1800c0bf54538df47d464346b5d3a \ No newline at end of file