Update graphics modes

3 files changed, 58 insertions, 46 deletions

diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
index 9e571d6..f8b84b9 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
@@ -1,5 +1,5 @@
 return {
-  screen = {
+  screen  = {
     ntsc = {
       width  = 320,
       height = 224,
@@ -20,7 +20,7 @@ return {
     },
   },
   colours = {
-    total       = '15bpp',
+    total       = '512*3',
     limit       = 61,
     background  = true,
     transparent = 'colorKey',
@@ -40,9 +40,10 @@ return {
     onLine    =  80,
     palettes  = {
       specify = true,
-      free = {
-        colours = 15,
-        keys    = 1,
+      {
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
@@ -77,9 +78,10 @@ return {
         independent    = 'w',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'b',
@@ -107,9 +109,10 @@ return {
         independent    = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'a',
@@ -137,9 +140,10 @@ return {
         independent    = 'a',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua
index 1507da7..8699b9d 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua
@@ -1,5 +1,5 @@
 return {
-  screen = {
+  screen  = {
     ntsc = {
       width  = 320,
       height = 224,
@@ -20,8 +20,8 @@ return {
     },
   },
   colours = {
-    total       = 512,
-    limit       =  61,
+    total       = '512*3',
+    limit       = 61,
     background  = true,
     transparent = 'colorKey',
   },
@@ -40,15 +40,16 @@ return {
     onLine    = 20,
     palettes  = {
       specify = true,
-      free = {
-        colours = 15,
-        keys    = 1,
+      {
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
       move   = true,
       rotate = false,
-      scale  = false,
+      scale  = 'flip',
       shear  = false,
       affine = false,
     },
@@ -77,9 +78,10 @@ return {
         independent    = 'w',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'b',
@@ -107,9 +109,10 @@ return {
         independent    = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'a',
@@ -137,9 +140,10 @@ return {
         independent    = 'a',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
index 18e0e4a..a831cba 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
@@ -1,5 +1,5 @@
 return {
-  screen = {
+  screen  = {
     ntsc = {
       width  = 320,
       height = 224,
@@ -20,8 +20,8 @@ return {
     },
   },
   colours = {
-    total       = 512,
-    limit       =  61,
+    total       = '512*3',
+    limit       = 61,
     background  = true,
     transparent = 'colorKey',
   },
@@ -40,15 +40,16 @@ return {
     onLine    = 20,
     palettes  = {
       specify = true,
-      free = {
-        colours = 15,
-        keys    = 1,
+      {
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
       move   = true,
       rotate = false,
-      scale  = false,
+      scale  = 'flip',
       shear  = false,
       affine = false,
     },
@@ -77,9 +78,10 @@ return {
         independent    = 'w',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'b',
@@ -107,9 +109,10 @@ return {
         independent    = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = 'a',
@@ -137,9 +140,10 @@ return {
         independent    = 'a',
         palettes    = {
           specify = true,
-          free = {
-            colours = 15,
-            keys    = 1,
+          {
+            total = 16,
+            limit = 15,
+            keys  = 1,
           },
         },
         mirror      = false,