Update graphics modes

8 files changed, 367 insertions, 272 deletions

diff --git a/src/hardware_data/graphics/uze_atmega644_mode1.lua b/src/hardware_data/graphics/uze_atmega644_mode1.lua
index 7d400ed..6e48022 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode1.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode1.lua
@@ -33,48 +33,50 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 40,
           y = 224,
           8960,
         },
-        onScreen    = {
-          width6 = 8960,
-          width8 = 6720,
-        },
-        unique      = 65536,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            width6 = 8960,
+            width8 = 6720,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 65536,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                width6 = {
+                  width  = 6,
+                  height = 'free',
+                },
+                width8 = {
+                  width  = 8,
+                  height = 'free',
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          width6 = {
-            width  = 6,
-            height = 'free',
-          },
-          width8 = {
-            width  = 8,
-            height = 'free',
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode10.lua b/src/hardware_data/graphics/uze_atmega644_mode10.lua
index 561d2e2..6cf1faa 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode10.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode10.lua
@@ -33,43 +33,45 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 16,
           y = 12,
           192,
         },
-        onScreen    = {
-          192,
-        },
-        unique      = 256,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            192,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 256,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 12,
+                  height = 16,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 12,
-            height = 16,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode12.lua b/src/hardware_data/graphics/uze_atmega644_mode12.lua
index 1f7d6ea..ef9e74c 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode12.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode12.lua
@@ -1,6 +1,6 @@
 return {
   screen  = {
-    {
+    mode064 = {
       width   =  64,
       height  =  32,
       refresh =  60,
@@ -9,7 +9,7 @@ return {
         y = 0,
       },
     },
-    {
+    mode128 = {
       width   = 128,
       height  =  64,
       refresh =  60,
@@ -42,47 +42,68 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 1,
           y = 1,
           1,
         },
-        onScreen    = {
-          1,
-        },
-        unique      = 1,
-        palettes    = {
-          specify = true,
-          {
-            total = 256,
-            limit = 2,
-            keys  = false,
-            map   = false,
-          },
+        onScreen       = {
+          mode064 = 1,
+          mode128 = 1,
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 1,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            mode064 = {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  =  64,
+                  height =  32,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
+            },
+            mode128 = {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 128,
+                  height =  64,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  =  64,
-            height =  32,
-          },
-          {
-            width  = 128,
-            height =  64,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode2.lua b/src/hardware_data/graphics/uze_atmega644_mode2.lua
index 900c0e4..2587486 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode2.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode2.lua
@@ -33,7 +33,6 @@ return {
     onScreen  = 32,
     onLine    =  5,
     palettes  = {
-      specify = true,
       {
         total = 256,
         limit = 255,
@@ -57,43 +56,45 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = true,
-        total       = {
+        total          = {
           x = 32,
           y = 32,
           1024,
         },
-        onScreen    = {
-          725,
-        },
-        unique      = 256,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            725,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              true,
+        unique         = 256,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 6,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = true,
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 6,
-            height = 8,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua
index 3fb661b..01e825e 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode5.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode5.lua
@@ -33,43 +33,45 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 40,
           y = 28,
           1120,
         },
-        onScreen    = {
-          1120,
-        },
-        unique      = 256,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            1120,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 256,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 6,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 6,
-            height = 8,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode6.lua b/src/hardware_data/graphics/uze_atmega644_mode6.lua
index d56b761..7d0191d 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode6.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode6.lua
@@ -52,75 +52,138 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = {
-          main = 'free',
-          overlay 'free',
-        },
-        total       = {
+        total          = {
           x = 36,
           y = 28,
           1008,
         },
-        onScreen    = {
-          mode240 =  840,
-          mode288 = 1008,
-        },
-        unique      = 256,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           mode240 = {
-            total = 256,
-            limit = 2,
-            keys  = false,
-            map   = false,
+             840,
           },
           mode288 = {
-            total = 2,
-            limit = {
-              000000,
-              ffffff,
-            },
-            keys  = false,
-            map   = false,
-          },
-          overlay = {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            1008,
           },
         },
-        mirror      = false,
-        transform   = {
+        unique         = 256,
+        screenSections = {
+          mirror  = false,
           main    = {
-            independent = false,
-            move        = {
-              mode240 = 'simulate',
-              mode288 = 'simulate',
+            optional = false,
+            mode240 = {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = {
+                {
+                  total = false,
+                  limit = 2,
+                  keys  = false,
+                  map   = false,
+                },
+              },
+              sizes     = {
+                {
+                  width  = 8,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
+            },
+            mode288 = {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = {
+                total = 2,
+                limit = {
+                  000000,
+                  ffffff,
+                },
+                keys  = false,
+                map   = false,
+              },
+              sizes     = {
+                {
+                  width  = 8,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
           },
           overlay = {
-            independent = false,
-            move        = {
-              mode240 = 'simulate',
-              mode288 = 'simulate',
+            optional = true,
+            mode240 = {
+              start     = {
+                x = 'free',
+                y = 'free',
+              },
+              end       = {
+                x = 'free',
+                y = 'free',
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 8,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
+            },
+            mode288 = {
+              start     = {
+                x = 'free',
+                y = 'free',
+              },
+              end       = {
+                x = 'free',
+                y = 'free',
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 8,
+                  height = 8,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 8,
-            height = 8,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode7.lua b/src/hardware_data/graphics/uze_atmega644_mode7.lua
index b7634e2..19bed89 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode7.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode7.lua
@@ -33,43 +33,45 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 1,
           y = 1,
           1,
         },
-        onScreen    = {
-          1,
-        },
-        unique      = 1,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = false,
-            keys  = false,
-            map   = false,
+            1,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 1,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 170,
+                  height = 114,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 170,
-            height = 114,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode8.lua b/src/hardware_data/graphics/uze_atmega644_mode8.lua
index a6ef07d..bc55970 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode8.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode8.lua
@@ -33,43 +33,45 @@ return {
   tiles   = {
     layers = {
       {
-        screenSections = false,
-        total       = {
+        total          = {
           x = 1,
           y = 1,
           1,
         },
-        onScreen    = {
-          1,
-        },
-        unique      = 1,
-        palettes    = {
-          specify = true,
+        onScreen       = {
           {
-            total = 256,
-            limit = 4,
-            keys  = false,
-            map   = false,
+            1,
           },
         },
-        mirror      = false,
-        transform   = {
-          {
-            independent = false,
-            move        = {
-              'simulate',
+        unique         = 1,
+        screenSections = {
+          mirror  = false,
+          main    = {
+            optional = false,
+            {
+              start     = {
+                x = 0,
+                y = 0,
+              },
+              end       = {
+                x = 0,
+                y = 0,
+              },
+              palettes  = false,
+              sizes     = {
+                {
+                  width  = 120,
+                  height =  96,
+                },
+              },
+              transform = {
+                move   = 'simulate',
+                rotate = false,
+                scale  = false,
+                shear  = false,
+                affine = false,
+              },
             },
-            rotate      = false,
-            scale       = false,
-            shear       = false,
-            affine      = false,
-            size        = false,
-          },
-        },
-        sizes       = {
-          {
-            width  = 120,
-            height =  96,
           },
         },
       },