Update graphics modes

13 files changed, 351 insertions, 383 deletions

diff --git a/src/information_only/scripts/load/graphics/mali400.lua b/src/information_only/scripts/load/graphics/mali400.lua
index 3fbad18..233a11f 100644
--- a/src/information_only/scripts/load/graphics/mali400.lua
+++ b/src/information_only/scripts/load/graphics/mali400.lua
@@ -22,7 +22,7 @@ return {
   colours = {
     total       = '32bpp',
     limit       = false,
-    background  = '24bpp',
+    background  = true,
     transparent = 'alpha',
   },
   meshes  = true,
@@ -39,12 +39,12 @@ return {
     onScreen  = false,
     onLine    = false,
     palettes  = {
+      specify = true,
       {
         colours = '24bpp',
         keys    =  '8bpp',
       },
     },
-    animation = true,
     transform = {
       move   = true,
       rotate = true,
@@ -70,6 +70,7 @@ return {
             keys    =  '8bpp',
           },
         },
+        mirror      = true,
         transform   = {
           individual = true,
           move       = true,
@@ -90,29 +91,6 @@ return {
             height = 'free',
           },
         },
-        mirror      = {
-          singleScreen                     = true,
-          lShapedUpLeft                    = true,
-          lShapedUpRight                   = true,
-          lShapedDownLeft                  = true,
-          lShapedDownRight                 = true,
-          doubleScreensHorizontal          = true,
-          doubleScreensVertical            = true,
-          doubleScreensDiagonal            = true,
-          tripleScreensHorizontalUpLeft    = true,
-          tripleScreensHorizontalUpRight   = true,
-          tripleScreensHorizontalDownLeft  = true,
-          tripleScreensHorizontalDownRight = true,
-          tripleScreensVerticalUpLeft      = true,
-          tripleScreensVerticalUpRight     = true,
-          tripleScreensVerticalDownLeft    = true,
-          tripleScreensVerticalDownRight   = true,
-          tripleScreensDiagonalUpLeft      = true,
-          tripleScreensDiagonalUpRight     = true,
-          tripleScreensDiagonalDownLeft    = true,
-          tripleScreensDiagonalDownRight   = true,
-          quadrupleScreens                 = true,
-        },
       },
     },
   },
diff --git a/src/information_only/scripts/load/graphics/ppu_rp2c02.lua b/src/information_only/scripts/load/graphics/ppu_rp2c02.lua
index 98fc647..aab853c 100644
--- a/src/information_only/scripts/load/graphics/ppu_rp2c02.lua
+++ b/src/information_only/scripts/load/graphics/ppu_rp2c02.lua
@@ -22,8 +22,8 @@ return {
   colours = {
     total       = 54,
     limit       = 25,
-    background  = 1,
-    transparent = 'colorKey',
+    background  = true,
+    transparent = 'colourKey',
   },
   meshes  = false,
   shaders = {
@@ -39,6 +39,7 @@ return {
     onScreen  = 64,
     onLine    =  8,
     palettes  = {
+      specify = true,
       {
         colours = 3,
         keys    = 1,
@@ -56,7 +57,6 @@ return {
         keys    = 1,
       },
     },
-    animation = true,
     transform = {
       move   = true,
       rotate = false,
@@ -98,6 +98,7 @@ return {
             keys    = 1,
           },
         },
+        mirror      = true,
         transform   = {
           individual = true,
           move       = true,
@@ -108,39 +109,16 @@ return {
         },
         sizes       = {
           {
-            width  =  8,
-            height =  8,
+            width  = 16,
+            height = 16,
           },
         },
         maps        = {
           {
-            width  = 32,
-            height = 32,
+            width  = 16,
+            height = 16,
           },
         },
-        mirror      = {
-          singleScreen                     = true,
-          lShapedUpLeft                    = true,
-          lShapedUpRight                   = true,
-          lShapedDownLeft                  = true,
-          lShapedDownRight                 = true,
-          doubleScreensHorizontal          = true,
-          doubleScreensVertical            = true,
-          doubleScreensDiagonal            = true,
-          tripleScreensHorizontalUpLeft    = true,
-          tripleScreensHorizontalUpRight   = true,
-          tripleScreensHorizontalDownLeft  = true,
-          tripleScreensHorizontalDownRight = true,
-          tripleScreensVerticalUpLeft      = true,
-          tripleScreensVerticalUpRight     = true,
-          tripleScreensVerticalDownLeft    = true,
-          tripleScreensVerticalDownRight   = true,
-          tripleScreensDiagonalUpLeft      = true,
-          tripleScreensDiagonalUpRight     = true,
-          tripleScreensDiagonalDownLeft    = true,
-          tripleScreensDiagonalDownRight   = true,
-          quadrupleScreens                 = true,
-        },
       },
     },
   },
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode0.lua b/src/information_only/scripts/load/graphics/tms9918_mode0.lua
deleted file mode 100644
index 3a7ab16..0000000
--- a/src/information_only/scripts/load/graphics/tms9918_mode0.lua
+++ /dev/null
@@ -1,58 +0,0 @@
-return {
-  screen = {
-    default = {
-      width  = 240,
-      height = 192,
-      fps    = 29.97,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pal     = {
-      width  = 240,
-      height = 192,
-      fps    = 25,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-  },
-  colors = {
-    '5bpp',
-    limit       = '4bpp',
-    transparent = 'colorKey',
-  },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
-  },
-  physic = false,
-  sprite = {
-    false,
-  },
-  tile   = {
-    layers = 1,
-    {
-      tilesSet       = 'width',
-      colors         = '1bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 6,
-          height = 8,
-        },
-      },
-    },
-  },
-}
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode1.lua b/src/information_only/scripts/load/graphics/tms9918_mode1.lua
deleted file mode 100644
index ef492b1..0000000
--- a/src/information_only/scripts/load/graphics/tms9918_mode1.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-return {
-  screen = {
-    default = {
-      width  = 256,
-      height = 192,
-      fps    = 29.97,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pal     = {
-      width  = 256,
-      height = 192,
-      fps    = 25,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-  },
-  colors = {
-    '5bpp',
-    limit       = '4bpp',
-    transparent = 'colorKey',
-  },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
-  },
-  physic = false,
-  sprite = {
-    true,
-    colors = '0bpp',
-    limits = {
-      true,
-      screen = 32,
-      line   =  4,
-    },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      default = {
-        width  =  8,
-        height =  8,
-      },
-      big     = {
-        width  = 16,
-        height = 16,
-      },
-    },
-  },
-  tile   = {
-    layers = 1,
-    {
-      tilesSet       = 'width',
-      colors         = '1bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
-        },
-      },
-    },
-  },
-}
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode2.lua b/src/information_only/scripts/load/graphics/tms9918_mode2.lua
deleted file mode 100644
index c6e340e..0000000
--- a/src/information_only/scripts/load/graphics/tms9918_mode2.lua
+++ /dev/null
@@ -1,114 +0,0 @@
-return {
-  screen = {
-    default = {
-      width  = 256,
-      height = 192,
-      fps    = 29.97,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pal     = {
-      width  = 256,
-      height = 192,
-      fps    = 25,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-  },
-  colors = {
-    '5bpp',
-    limit       = '4bpp',
-    transparent = 'colorKey',
-  },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
-  },
-  physic = false,
-  sprite = {
-    true,
-    colors = '0bpp',
-    limits = {
-      true,
-      screen = 32,
-      line   =  4,
-    },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      default = {
-        width  =  8,
-        height =  8,
-      },
-      big     = {
-        width  = 16,
-        height = 16,
-      },
-    },
-  },
-  tile   = {
-    layers = 1,
-    a = {
-      tilesSet       = 'width',
-      colors         = '1bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = 'bc',
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
-        },
-      },
-    },
-    b = {
-      tilesSet       = 'width',
-      colors         = '1bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = 'ac',
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
-        },
-      },
-    },
-    c = {
-      tilesSet       = 'width',
-      colors         = '1bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = 'ab',
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 8,
-          height = 8,
-        },
-      },
-    },
-  },
-}
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode3.lua b/src/information_only/scripts/load/graphics/tms9918_mode3.lua
deleted file mode 100644
index 6f55ac2..0000000
--- a/src/information_only/scripts/load/graphics/tms9918_mode3.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-return {
-  screen = {
-    default = {
-      width  = 64,
-      height = 48,
-      fps    = 29.97,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pal     = {
-      width  = 64,
-      height = 48,
-      fps    = 25,
-      origin = {
-        x = 0,
-        y = 0,
-      },
-    },
-  },
-  colors = {
-    '5bpp',
-    limit       = '4bpp',
-    transparent = 'colorKey',
-  },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
-  },
-  physic = false,
-  sprite = {
-    true,
-    colors = '0bpp',
-    limits = {
-      true,
-      screen = 32,
-      line   =  4,
-    },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      default = {
-        width  =  8,
-        height =  8,
-      },
-      big     = {
-        width  = 16,
-        height = 16,
-      },
-    },
-  },
-  tile   = {
-    layers = 1,
-    {
-      tilesSet       = false,
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 4,
-          height = 4,
-        },
-      },
-    },
-  },
-}
diff --git a/src/information_only/scripts/load/graphics/tms9918a_mode0.lua b/src/information_only/scripts/load/graphics/tms9918a_mode0.lua
new file mode 100644
index 0000000..0f78d77
--- /dev/null
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode0.lua
@@ -0,0 +1,65 @@
+return {
+  screen  = {
+    ntsc = {
+      width  = 240,
+      height = 192,
+      fps    = 29.97,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+  },
+  colours = {
+    total       = '15+1',
+    limit       = '15+1',
+    background  = false,
+    transparent = 'transparentColour',
+  },
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
+  },
+  physic  = false,
+  sprites = false,
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          {
+            colours = 2,
+            keys    = false,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =   6,
+            height =   8,
+          },
+        },
+        maps        = {
+          {
+            width  = 240,
+            height = 192,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/information_only/scripts/load/graphics/tms9918a_mode1.lua b/src/information_only/scripts/load/graphics/tms9918a_mode1.lua
new file mode 100644
index 0000000..a0b99b5
--- /dev/null
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode1.lua
@@ -0,0 +1,91 @@
+return {
+  screen  = {
+    ntsc = {
+      width  = 256,
+      height = 192,
+      fps    = 29.97,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+  },
+  colours = {
+    total       = '15+1',
+    limit       = '15+1',
+    background  = false,
+    transparent = 'transparentColour',
+  },
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
+  },
+  physic  = false,
+  sprites = {
+    onScreen  = 32,
+    onLine    =  4,
+    palettes  = {
+      specify = true,
+      {
+        colours = 1,
+        keys    = 1,
+      },
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
+    },
+    sizes     = {
+      {
+        width  =  8,
+        height =  8,
+      },
+      {
+        width  = 16,
+        height = 16,
+      },
+    },
+  },
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          {
+            colours = 2,
+            keys    = false,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =   8,
+            height =   8,
+          },
+        },
+        maps        = {
+          {
+            width  = 240,
+            height = 192,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/information_only/scripts/load/graphics/tms9918a_mode2.lua b/src/information_only/scripts/load/graphics/tms9918a_mode2.lua
new file mode 100644
index 0000000..79d7f6b
--- /dev/null
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode2.lua
@@ -0,0 +1,92 @@
+return {
+  screen  = {
+    ntsc = {
+      width  = 256,
+      height = 192,
+      fps    = 29.97,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+  },
+  colours = {
+    total       = '15+1',
+    limit       = '15+1',
+    background  = false,
+    transparent = 'transparentColour',
+  },
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
+  },
+  physic  = false,
+  sprites = {
+    onScreen  = 32,
+    onLine    =  4,
+    palettes  = {
+      specify = true,
+      {
+        colours = 1,
+        keys    = 1,
+      },
+    animation = true,
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
+    },
+    sizes     = {
+      {
+        width  =  8,
+        height =  8,
+      },
+      {
+        width  = 16,
+        height = 16,
+      },
+    },
+  },
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          {
+            colours = 2,
+            keys    = false,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =   8,
+            height =   8,
+          },
+        },
+        maps        = {
+          {
+            width  =  64,
+            height = 192,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode20.lua b/src/information_only/scripts/load/graphics/tms9918a_mode20.lua
index 2ffd722..2ffd722 100644
--- a/src/information_only/scripts/load/graphics/tms9918_mode20.lua
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode20.lua
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode21.lua b/src/information_only/scripts/load/graphics/tms9918a_mode21.lua
index 1d17583..1d17583 100644
--- a/src/information_only/scripts/load/graphics/tms9918_mode21.lua
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode21.lua
diff --git a/src/information_only/scripts/load/graphics/tms9918_mode23.lua b/src/information_only/scripts/load/graphics/tms9918a_mode23.lua
index 1763b11..1763b11 100644
--- a/src/information_only/scripts/load/graphics/tms9918_mode23.lua
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode23.lua
diff --git a/src/information_only/scripts/load/graphics/tms9918a_mode3.lua b/src/information_only/scripts/load/graphics/tms9918a_mode3.lua
new file mode 100644
index 0000000..a9334c5
--- /dev/null
+++ b/src/information_only/scripts/load/graphics/tms9918a_mode3.lua
@@ -0,0 +1,92 @@
+return {
+  screen  = {
+    ntsc = {
+      width  = 64,
+      height = 48,
+      fps    = 29.97,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+  },
+  colours = {
+    total       = '15+1',
+    limit       = '15+1',
+    background  = false,
+    transparent = 'transparentColour',
+  },
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
+  },
+  physic  = false,
+  sprites = {
+    onScreen  = 32,
+    onLine    =  4,
+    palettes  = {
+      specify = true,
+      {
+        colours = 1,
+        keys    = 1,
+      },
+    animation = true,
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
+    },
+    sizes     = {
+      {
+        width  =  8,
+        height =  8,
+      },
+      {
+        width  = 16,
+        height = 16,
+      },
+    },
+  },
+  tiles   = {
+    layers = {
+      {
+        independent = false,
+        palettes    = {
+          specify = true,
+          {
+            colours = '15+1',
+            keys    = false,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = false,
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  = 4,
+            height = 4,
+          },
+        },
+        maps        = {
+          {
+            width  = 4,
+            height = 4,
+          },
+        },
+      },
+    },
+  },
+}