Update graphics modes

6 files changed, 32 insertions, 43 deletions

diff --git a/src/hardware_data/scripts/load/graphics/mali400.lua b/src/hardware_data/scripts/load/graphics/mali400.lua
index 233a11f..3202160 100644
--- a/src/hardware_data/scripts/load/graphics/mali400.lua
+++ b/src/hardware_data/scripts/load/graphics/mali400.lua
@@ -40,7 +40,7 @@ return {
     onLine    = false,
     palettes  = {
       specify = true,
-      {
+      free = {
         colours = '24bpp',
         keys    =  '8bpp',
       },
@@ -65,7 +65,7 @@ return {
         independent = true,
         palettes    = {
           specify = true,
-          {
+          free = {
             colours = '24bpp',
             keys    =  '8bpp',
           },
@@ -85,12 +85,7 @@ return {
             height = 'free',
           },
         },
-        maps        = {
-          {
-            width  = 'free',
-            height = 'free',
-          },
-        },
+        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua b/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
index aab853c..39913ad 100644
--- a/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
+++ b/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
@@ -113,12 +113,7 @@ return {
             height = 16,
           },
         },
-        maps        = {
-          {
-            width  = 16,
-            height = 16,
-          },
-        },
+        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
index 0f78d77..52ca6d6 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
@@ -33,7 +33,7 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          {
+          free = {
             colours = 2,
             keys    = false,
           },
@@ -53,11 +53,11 @@ return {
             height =   8,
           },
         },
-        maps        = {
-          {
-            width  = 240,
-            height = 192,
-          },
+        map         = {
+          width  = 240,
+          height = 192,
+          tiles  = false,
+          pixels = false,
         },
       },
     },
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
index a0b99b5..0f5d9c3 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
@@ -31,10 +31,11 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      {
+      free = {
         colours = 1,
         keys    = 1,
       },
+    },
     transform = {
       move   = true,
       rotate = false,
@@ -59,7 +60,7 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          {
+          free = {
             colours = 2,
             keys    = false,
           },
@@ -79,11 +80,11 @@ return {
             height =   8,
           },
         },
-        maps        = {
-          {
-            width  = 240,
-            height = 192,
-          },
+        map         = {
+          width  = false,
+          height = false,
+          tiles  = 8,
+          pixels = false,
         },
       },
     },
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
index 79d7f6b..fa2d7da 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
@@ -31,11 +31,11 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      {
+      free = {
         colours = 1,
         keys    = 1,
       },
-    animation = true,
+    },
     transform = {
       move   = true,
       rotate = false,
@@ -60,7 +60,7 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          {
+          free = {
             colours = 2,
             keys    = false,
           },
@@ -80,10 +80,13 @@ return {
             height =   8,
           },
         },
-        maps        = {
-          {
-            width  =  64,
-            height = 192,
+        map         = {
+          width  = 256,
+          height =  64,
+          tiles  = false,
+          pixels = {
+            width  = false,
+            height = 1,
           },
         },
       },
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
index a9334c5..80a80c5 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
@@ -31,11 +31,11 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      {
+      free = {
         colours = 1,
         keys    = 1,
       },
-    animation = true,
+    },
     transform = {
       move   = true,
       rotate = false,
@@ -60,7 +60,7 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          {
+          free = {
             colours = '15+1',
             keys    = false,
           },
@@ -80,12 +80,7 @@ return {
             height = 4,
           },
         },
-        maps        = {
-          {
-            width  = 4,
-            height = 4,
-          },
-        },
+        map         = false,
       },
     },
   },