Merge branch 'master' into decompressed

Also some pendant receipt and palette fixes
2023-08-02 17:40:38 -04:00
parent d446bd3c1b 421740cdae
commit cb16ffc20b
47 changed files with 866 additions and 437 deletions
--- a/data/99ff1_bombos.gfx
+++ b/data/99ff1_bombos.gfx
--- a/data/99ff1_quake.gfx
+++ b/data/99ff1_quake.gfx
--- a/data/a6fc4_bombos.gfx
+++ b/data/a6fc4_bombos.gfx
--- a/data/a6fc4_ether.gfx
+++ b/data/a6fc4_ether.gfx
--- a/data/c2807_v3.gfx
+++ b/data/c2807_v3.gfx
--- a/data/newitems.gfx
+++ b/data/newitems.gfx
--- a/data/output.txt
+++ b/data/output.txt
@@ -1,3 +0,0 @@
-llh@tinymagnet.com:~/DBMS/Run$ ./dbms -?
-(Lena Hellstrom) bad option...should be "f" or "b" or "a"
-llh@tinymagnet.com:~/DBMS/Run$ 
--- a/data/text_unscramble1.bin
+++ b/data/text_unscramble1.bin