Update graphics modes

6 files changed, 111 insertions, 177 deletions

diff --git a/src/hardware_data/graphics/uze_atmega644_mode1.lua b/src/hardware_data/graphics/uze_atmega644_mode1.lua
index 3542337..529eeb4 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode1.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode1.lua
@@ -9,10 +9,9 @@ return {
         y = 0,
       },
     },
-    pixels   = 117440512,
-    texels   =     65536,
+    pixels   = 3145728,
+    texels   =   65536,
     vertices = false,
-    vram     =     53760,
   },
   colours = {
     total       = 256,
@@ -34,6 +33,7 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = false,
         total       = {
           x = 40,
           y = 224,
@@ -44,7 +44,6 @@ return {
           width8 = 6720,
         },
         unique      = 65536,
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -56,14 +55,17 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            'simulate',
+          {
+            independent = false,
+            move        = {
+              'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           width6 = {
diff --git a/src/hardware_data/graphics/uze_atmega644_mode10.lua b/src/hardware_data/graphics/uze_atmega644_mode10.lua
index f824d6f..9501611 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode10.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode10.lua
@@ -12,7 +12,6 @@ return {
     pixels   = 36864,
     texels   =   192,
     vertices = false,
-    vram     = 36864,
   },
   colours = {
     total       = 256,
@@ -34,6 +33,7 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = false,
         total       = {
           x = 16,
           y = 12,
@@ -43,7 +43,6 @@ return {
           192,
         },
         unique      = 256,
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -55,14 +54,17 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            'simulate',
+          {
+            independent = false,
+            move        = {
+              'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           {
diff --git a/src/hardware_data/graphics/uze_atmega644_mode2.lua b/src/hardware_data/graphics/uze_atmega644_mode2.lua
index c1c10bd..7537be8 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode2.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode2.lua
@@ -9,10 +9,9 @@ return {
         y = 0,
       },
     },
-    pixels   = '(32*6*8)+(256*6*8)+layers',
-    texels   = '32+256+layers',
+    pixels   = 13824,
+    texels   =   288,
     vertices = false,
-    vram     = '(1024*6*8)+layers',
   },
   colours = {
     total       = 256,
@@ -58,6 +57,7 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = true,
         total       = {
           x = 32,
           y = 32,
@@ -67,7 +67,6 @@ return {
           725,
         },
         unique      = 256,
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -79,57 +78,22 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            true,
-          },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
-        },
-        sizes       = {
-          {
-            width  = 6,
-            height = 8,
-          },
-        },
-      },
-      free = {
-        total       = {
-          x = 32,
-          y = 32,
-          1024,
-        },
-        onScreen    = {
-          725,
-        },
-        unique      = 'free',
-        independent = false,
-        palettes    = {
-          specify = true,
           {
-            total = 256,
-            limit = 255,
-            keys  =   1,
-            map   = false,
-          },
-        },
-        mirror      = false,
-        transform   = {
-          individual = true,
-          move       = {
-            'free',
+            independent = false,
+            move        = {
+              true,
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           {
             width  = 6,
-            height = 'free',
+            height = 8,
           },
         },
       },
diff --git a/src/hardware_data/graphics/uze_atmega644_mode3.lua b/src/hardware_data/graphics/uze_atmega644_mode3.lua
index 94aac15..809d0bb 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode3.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode3.lua
@@ -18,10 +18,9 @@ return {
         y = 0,
       },
     },
-    pixels   =  34048,
-    texels   =    532,
+    pixels   = 17664,
+    texels   =   276,
     vertices = false,
-    vram     = 132352,
   },
   colours = {
     total       = 256,
@@ -67,6 +66,10 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = {
+          main = 'free',
+          overlay 'free',
+        },
         total       = {
           x = 32,
           y = 32,
@@ -77,7 +80,6 @@ return {
           staticMode = 840,
         },
         unique      = 256,
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -89,55 +91,30 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            scrollMode = true,
-            staticMode = 'simulate',
-          },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
-        },
-        sizes       = {
-          {
-            width  = 8,
-            height = 8,
+          main    = {
+            independent = false,
+            move        = {
+              scrollMode = true,
+              staticMode = 'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-        },
-      },
-      ui = {
-        total       = {
-          x = 32,
-          y = 32,
-          1024,
-        },
-        onScreen    = {
-          scrollMode = 840,
-          staticMode = 840,
-        },
-        unique      = 256,
-        independent = false,
-        palettes    = {
-          specify = true,
-          {
-            total = 256,
-            limit = 255,
-            keys  =   1,
-            map   = false,
-          },
-        },
-        mirror      = false,
-        transform   = {
-          individual = true,
-          move       = {
-            scrollMode = 'simulate',
-            staticMode = 'simulate',
+          overlay = {
+            independent = false,
+            move        = {
+              scrollMode = 'simulate',
+              staticMode = 'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           {
diff --git a/src/hardware_data/graphics/uze_atmega644_mode4.lua b/src/hardware_data/graphics/uze_atmega644_mode4.lua
index 4c17787..8e6a16d 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode4.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode4.lua
@@ -12,7 +12,6 @@ return {
     pixels   = '?',
     texels   = '?',
     vertices = false,
-    vram     = '>129024',
   },
   colours = {
     total       = 256,
@@ -34,16 +33,25 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = {
+          main = {
+            x =  0
+            y =  0
+          },
+          text = {
+            x =  0
+            y = 12
+          },
+        },
         total       = {
           x = '?',
           y = '?',
           '?',
         },
         onScreen    = {
-           285,
+          285,
         },
         unique      = '?',
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -55,14 +63,31 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            true,
+          main = {
+            independent = false,
+            move        = {
+              true,
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
+          },
+          text = {
+            independent = false,
+            move        = {
+              'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size    = {
+              width  = 8,
+              height = 8,
+            },
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           {
@@ -71,44 +96,6 @@ return {
           },
         },
       },
-      text = {
-        total       = {
-          x = '?',
-          y = '?',
-          '?',
-        },
-        onScreen    = {
-          1008,
-        },
-        unique      = '?',
-        independent = false,
-        palettes    = {
-          specify = true,
-          {
-            total = 256,
-            limit = 255,
-            keys  =   1,
-            map   = false,
-          },
-        },
-        mirror      = false,
-        transform   = {
-          individual = true,
-          move       = {
-            'simulate',
-          },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
-        },
-        sizes       = {
-          {
-            width  =  8,
-            height =  8,
-          },
-        },
-      },
     },
   },
 }
diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua
index c6e5338..6321d1c 100644
--- a/src/hardware_data/graphics/uze_atmega644_mode5.lua
+++ b/src/hardware_data/graphics/uze_atmega644_mode5.lua
@@ -12,7 +12,6 @@ return {
     pixels   = 12288,
     texels   =   256,
     vertices = false,
-    vram     = 53760,
   },
   colours = {
     total       = 256,
@@ -34,6 +33,7 @@ return {
   tiles   = {
     layers = {
       {
+        screenSections = false,
         total       = {
           x = 40,
           y = 28,
@@ -43,7 +43,6 @@ return {
           1120,
         },
         unique      = 256,
-        independent = false,
         palettes    = {
           specify = true,
           {
@@ -55,14 +54,17 @@ return {
         },
         mirror      = false,
         transform   = {
-          individual = true,
-          move       = {
-            'simulate',
+          {
+            independent = false,
+            move        = {
+              'simulate',
+            },
+            rotate      = false,
+            scale       = false,
+            shear       = false,
+            affine      = false,
+            size        = false,
           },
-          rotate     = false,
-          scale      = false,
-          shear      = false,
-          affine     = false,
         },
         sizes       = {
           {