Update graphics modes

9 files changed, 100 insertions, 225 deletions

diff --git a/src/hardware_data/graphics/uze_atmega644_mode1.lua b/src/hardware_data/graphics/uze_atmega644_mode1.lua
index 0a5c290..5c163f8 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode1.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode1.lua
@@ -16,8 +16,12 @@ return {
   colours = {
     total       = 256,
     limit       = false,
-    background  = false,
-    transparent = false,
+    background  = true,
+    transparent = {
+      sprite = false,
+      tile   = false,
+    },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
@@ -58,7 +62,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = false,
               sizes     = {
                 width6 = {
                   width  = 6,
diff --git a/src/hardware_data/graphics/uze_atmega644_mode13-default.lua b/src/hardware_data/graphics/uze_atmega644_mode13-default.lua
index f74dddc..a4a4e22 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode13-default.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode13-default.lua
@@ -26,61 +26,22 @@ return {
     total       = 256,
     limit       = false,
     background  = true,
-    transparent = colourKey,
-    modes       = {
-      mode8  = {
-        palettes =  1,
-        type     = 'global',
-        colours  =  8,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     =  7,
-                key       =  1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-          },
-        },
+    transparent = {
+      sprite = colourKey,
+      tile   = false,
+    },
+    palettes    = {
+      {
+        total   =  1,
+        type    = 'global',
+        colours =  8,
+        layers  = false,
       },
-      mode15 = {
-        palettes =  1,
-        type     = 'global',
-        colours  = 15,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     = 14,
-                key       =  1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-              byColours = false,
-              },
-            },
-          },
-        },
+      {
+        total   =  1,
+        type    = 'global',
+        colours = 15,
+        layers  = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode13.lua b/src/hardware_data/graphics/uze_atmega644_mode13.lua
index f9cfafa..49c54b6 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode13.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode13.lua
@@ -29,61 +29,22 @@ return {
     total       = 256,
     limit       = false,
     background  = true,
-    transparent = colourKey,
-    modes       = {
-      mode8  = {
-        palettes =  1,
-        type     = 'global',
-        colours  =  8,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     =  7,
-                key       =  1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-          },
-        },
+    transparent = {
+      sprite = colourKey,
+      tile   = false,
+    },
+    palettes    = {
+      {
+        total   =  1,
+        type    = 'global',
+        colours =  8,
+        layers  = false,
       },
-      mode15 = {
-        palettes =  1,
-        type     = 'global',
-        colours  = 15,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     = 14,
-                key       =  1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-              byColours = false,
-              },
-            },
-          },
-        },
+      {
+        total   =  1,
+        type    = 'global',
+        colours = 15,
+        layers  = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode2.lua b/src/hardware_data/graphics/uze_atmega644_mode2.lua
index 7fe67f0..1a645c2 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode2.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode2.lua
@@ -16,8 +16,12 @@ return {
   colours = {
     total       = 256,
     limit       = false,
-    background  = false,
-    transparent = colourKey,
+    background  = true,
+    transparent = {
+      sprite = colourKey,
+      tile   = false,
+    },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
@@ -32,15 +36,6 @@ return {
   sprites = {
     onScreen  = 32,
     onLine    =  5,
-    palettes  = {
-      {
-        total    = 256,
-        limit    = 255,
-        keys     =   1,
-        byPixels = false,
-        colours  = false,
-      },
-    },
     transform = {
       move   = true,
       rotate = false,
@@ -82,7 +77,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 6,
@@ -109,7 +103,6 @@ return {
                 x = 'free',
                 y = 'free',
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 6,
diff --git a/src/hardware_data/graphics/uze_atmega644_mode3-default.lua b/src/hardware_data/graphics/uze_atmega644_mode3-default.lua
index dc6a968..83cfeca 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode3-default.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode3-default.lua
@@ -26,36 +26,11 @@ return {
     total       = 256,
     limit       = false,
     background  = true,
-    transparent = colourKey,
-    modes       = {
-      {
-        palettes = false,
-        type     = false,
-        colours  = false,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     = 255,
-                key       =   1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-          },
-        },
-      },
+    transparent = {
+      sprite = colourKey,
+      tile   = false,
     },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
diff --git a/src/hardware_data/graphics/uze_atmega644_mode3.lua b/src/hardware_data/graphics/uze_atmega644_mode3.lua
index a3d9f7f..3d7bc4e 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode3.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode3.lua
@@ -29,36 +29,11 @@ return {
     total       = 256,
     limit       = false,
     background  = true,
-    transparent = colourKey,
-    modes       = {
-      {
-        palettes = false,
-        type     = false,
-        colours  = false,
-        layers   = {
-          {
-            sprites = {
-              {
-                colours   = false,
-                limit     = 255,
-                key       =   1,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-            tiles   = {
-              {
-                colours   = false,
-                limit     = false,
-                key       = false,
-                byPixels  = false,
-                byColours = false,
-              },
-            },
-          },
-        },
-      },
+    transparent = {
+      sprite = colourKey,
+      tile   = false,
     },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
diff --git a/src/hardware_data/graphics/uze_atmega644_mode4.lua b/src/hardware_data/graphics/uze_atmega644_mode4.lua
index 6573679..2d9d592 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode4.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode4.lua
@@ -16,8 +16,12 @@ return {
   colours = {
     total       = 256,
     limit       = false,
-    background  = false,
-    transparent = colourKey,
+    background  = true,
+    transparent = {
+      sprite = false,
+      tile   = false,
+    },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
@@ -57,7 +61,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 16,
@@ -84,7 +87,6 @@ return {
                 x =   0,
                 y = -32,
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 8,
diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua
index 86497f5..8ccc369 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode5.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode5.lua
@@ -16,8 +16,12 @@ return {
   colours = {
     total       = 256,
     limit       = false,
-    background  = false,
-    transparent = false,
+    background  = true,
+    transparent = {
+      sprite = false,
+      tile   = false,
+    },
+    palettes    = false,
   },
   meshes  = false,
   shaders = {
@@ -57,7 +61,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 6,
diff --git a/src/hardware_data/graphics/uze_atmega644_mode6.lua b/src/hardware_data/graphics/uze_atmega644_mode6.lua
index 496fbce..5c3626b 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode6.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode6.lua
@@ -24,9 +24,44 @@ return {
   },
   colours = {
     total       = 256,
-    limit       = '2-inMainSectionOnly',
-    background  = false,
-    transparent = false,
+    limit       = false,
+    background  = true,
+    transparent = {
+      sprite = false,
+      tile   = false,
+    },
+    palettes    = {
+      {
+        total   =  1,
+        type    = 'section',
+        colours =  false,
+        layers  = {
+          {
+            screenSections = {
+              main = {
+                mode240 = {
+                  colours      = 2,
+                  byTiles      = 'all',
+                  byTilesSize  = false,
+                  limitColours = {
+                  },
+                },
+                mode288 = {
+                  colours      = 2,
+                  byTiles      = 'all',
+                  byTilesSize  = false,
+                  limitColours = {
+                    000000,
+                    ffffff,
+                  },
+                },
+              },
+              overlay = false,
+            },
+          },
+        },
+      },
+    },
   },
   meshes  = {
     wireframe  = true,
@@ -79,20 +114,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = {
-                {
-                  total    = 2,
-                  limit    = false,
-                  keys     = false,
-                  byTiles  = false,
-                  byPixels = false,
-                  byMap    = {
-                    width  = 240,
-                    height = 224,
-                  },
-                  colours  = false,
-                },
-              },
               sizes     = {
                 {
                   width  = 8,
@@ -116,23 +137,6 @@ return {
                 x = 0,
                 y = 0,
               },
-              palettes  = {
-                {
-                  total    = 2,
-                  limit    = false,
-                  keys     = false,
-                  byTiles  = false,
-                  byPixels = false,
-                  byMap    = {
-                    width  = 240,
-                    height = 224,
-                  },
-                  colours  = {
-                    000000,
-                    ffffff,
-                  },
-                },
-              },
               sizes     = {
                 {
                   width  = 8,
@@ -159,7 +163,6 @@ return {
                 x = 'free',
                 y = 'free',
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 8,
@@ -183,7 +186,6 @@ return {
                 x = 'free',
                 y = 'free',
               },
-              palettes  = false,
               sizes     = {
                 {
                   width  = 8,