Update graphics modes

3 files changed, 405 insertions, 163 deletions

diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
index ac9c758..9e571d6 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101+sh2_mode5.lua
@@ -1,6 +1,6 @@
 return {
   screen = {
-    default = {
+    ntsc = {
       width  = 320,
       height = 224,
       fps    = 29.97,
@@ -9,7 +9,7 @@ return {
         y = 0,
       },
     },
-    pal     = {
+    pal  = {
       width  = 320,
       height = 240,
       fps    = 25,
@@ -19,112 +19,149 @@ return {
       },
     },
   },
-  colors = {
-    '15bpp',
+  colours = {
+    total       = '15bpp',
     limit       = 61,
+    background  = true,
     transparent = 'colorKey',
   },
-  mesh   = true,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
+  meshes  = true,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
   },
-  physic = false,
-  sprite = {
-    true,
-    colors = '4bpp',
-    limits = {
-      true,
-      screen = 320,
-      line   =  80,
+  physic  = false,
+  sprites = {
+    onScreen  = 320,
+    onLine    =  80,
+    palettes  = {
+      specify = true,
+      free = {
+        colours = 15,
+        keys    = 1,
+      },
+    },
+    transform = {
+      move   = true,
+      rotate = true,
+      scale  = true,
+      shear  = true,
+      affine = true,
     },
-    rotate = true,
-    scale  = true,
-    shear  = true,
-    affine = true,
-    size   = {
-      small    = {
+    sizes     = {
+      {
         width  =  8,
         height =  8,
       },
-      default  = {
+      {
         width  = 16,
         height = 16,
       },
-      big      = {
+      {
         width  = 24,
         height = 24,
       },
-      huge     = {
+      {
         width  = 32,
         height = 32,
       },
     },
   },
-  tile   = {
-    layers = 2,
-    a = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = 'w',
-      independent    = 'w',
-      mirror         = 'b',
-      rotate         = true,
-      scale          = true,
-      shear          = true,
-      affine         = true,
-      size           = {
-        default = {
-          width  =  64,
-          height =  64,
+  tiles   = {
+    layers = {
+      a = {
+        independent    = 'w',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
         },
-        bigW    = {
-          width  = 128,
-          height =  32,
+        mirror      = 'b',
+        transform   = {
+          individual = 'w',
+          move       = true,
+          rotate     = true,
+          scale      = true,
+          shear      = true,
+          affine     = true,
         },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
       },
-    },
-    b = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = 'a',
-      rotate         = true,
-      scale          = true,
-      shear          = true,
-      affine         = true,
-      size           = {
-        default = {
-          width  =  64,
-          height =  64,
+      b = {
+        independent    = false,
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
         },
-        bigW    = {
-          width  = 128,
-          height =  32,
+        mirror      = 'a',
+        transform   = {
+          individual = false,
+          move       = true,
+          rotate     = true,
+          scale      = true,
+          shear      = true,
+          affine     = true,
         },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
       },
-    },
-    w = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = 'a',
-      independent    = 'a',
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 32,
-          height = 32,
+      w = {
+        independent    = 'a',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = 'a',
+          move       = true,
+          rotate     = true,
+          scale      = true,
+          shear      = true,
+          affine     = true,
         },
-        bigW    = {
-          width  = 64,
-          height = 32,
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  =  64,
+            height =  32,
+          },
         },
+        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua
new file mode 100644
index 0000000..1507da7
--- /dev/null
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101+vp_mode5.lua
@@ -0,0 +1,168 @@
+return {
+  screen = {
+    ntsc = {
+      width  = 320,
+      height = 224,
+      fps    = 29.97,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+    pal  = {
+      width  = 320,
+      height = 240,
+      fps    = 25,
+      origin = {
+        x = 0,
+        y = 0,
+      },
+    },
+  },
+  colours = {
+    total       = 512,
+    limit       =  61,
+    background  = true,
+    transparent = 'colorKey',
+  },
+  meshes  = true,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
+  },
+  physic  = false,
+  sprites = {
+    onScreen  = 80,
+    onLine    = 20,
+    palettes  = {
+      specify = true,
+      free = {
+        colours = 15,
+        keys    = 1,
+      },
+    },
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
+    },
+    sizes     = {
+      {
+        width  =  8,
+        height =  8,
+      },
+      {
+        width  = 16,
+        height = 16,
+      },
+      {
+        width  = 24,
+        height = 24,
+      },
+      {
+        width  = 32,
+        height = 32,
+      },
+    },
+  },
+  tiles   = {
+    layers = {
+      a = {
+        independent    = 'w',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = 'b',
+        transform   = {
+          individual = 'w',
+          move       = true,
+          rotate     = true,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
+      },
+      b = {
+        independent    = false,
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = 'a',
+        transform   = {
+          individual = false,
+          move       = true,
+          rotate     = true,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
+      },
+      w = {
+        independent    = 'a',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = 'a',
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
+        },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  =  64,
+            height =  32,
+          },
+        },
+        map         = false,
+      },
+    },
+  },
+}
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua b/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
index f9aa09c..18e0e4a 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym7101_mode5.lua
@@ -1,6 +1,6 @@
 return {
   screen = {
-    default = {
+    ntsc = {
       width  = 320,
       height = 224,
       fps    = 29.97,
@@ -9,7 +9,7 @@ return {
         y = 0,
       },
     },
-    pal     = {
+    pal  = {
       width  = 320,
       height = 240,
       fps    = 25,
@@ -19,112 +19,149 @@ return {
       },
     },
   },
-  colors = {
-    '9bpp',
-    limit       = 61,
+  colours = {
+    total       = 512,
+    limit       =  61,
+    background  = true,
     transparent = 'colorKey',
   },
-  mesh   = false,
-  api    = false,
-  shader = {
-    false,
-    fragment = false,
+  meshes  = false,
+  shaders = {
+    api          = false,
+    version      = false,
+    fragment     = false,
+    vectex       = false,
+    geometry     = false,
+    tessellation = false,
   },
-  physic = false,
-  sprite = {
-    true,
-    colors = '4bpp',
-    limits = {
-      true,
-      screen = 80,
-      line   = 20,
+  physic  = false,
+  sprites = {
+    onScreen  = 80,
+    onLine    = 20,
+    palettes  = {
+      specify = true,
+      free = {
+        colours = 15,
+        keys    = 1,
+      },
+    },
+    transform = {
+      move   = true,
+      rotate = false,
+      scale  = false,
+      shear  = false,
+      affine = false,
     },
-    rotate = false,
-    scale  = false,
-    shear  = false,
-    affine = false,
-    size   = {
-      small    = {
+    sizes     = {
+      {
         width  =  8,
         height =  8,
       },
-      default  = {
+      {
         width  = 16,
         height = 16,
       },
-      big      = {
+      {
         width  = 24,
         height = 24,
       },
-      huge     = {
+      {
         width  = 32,
         height = 32,
       },
     },
   },
-  tile   = {
-    layers = 2,
-    a = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = 'w',
-      independent    = 'w',
-      mirror         = 'b',
-      rotate         = true,
-      scale          = true,
-      shear          = true,
-      affine         = true,
-      size           = {
-        default = {
-          width  =  64,
-          height =  64,
+  tiles   = {
+    layers = {
+      a = {
+        independent    = 'w',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
         },
-        bigW    = {
-          width  = 128,
-          height =  32,
+        mirror      = 'b',
+        transform   = {
+          individual = 'w',
+          move       = true,
+          rotate     = true,
+          scale      = false,
+          shear      = false,
+          affine     = false,
         },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
       },
-    },
-    b = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = false,
-      independent    = false,
-      mirror         = 'a',
-      rotate         = true,
-      scale          = true,
-      shear          = true,
-      affine         = true,
-      size           = {
-        default = {
-          width  =  64,
-          height =  64,
+      b = {
+        independent    = false,
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
         },
-        bigW    = {
-          width  = 128,
-          height =  32,
+        mirror      = 'a',
+        transform   = {
+          individual = false,
+          move       = true,
+          rotate     = true,
+          scale      = false,
+          shear      = false,
+          affine     = false,
         },
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  = 128,
+            height =  32,
+          },
+        },
+        map         = false,
       },
-    },
-    w = {
-      colors         = '4bpp',
-      specifyColors  = false,
-      moveIndividual = 'a',
-      independent    = 'a',
-      mirror         = false,
-      rotate         = false,
-      scale          = false,
-      shear          = false,
-      affine         = false,
-      size           = {
-        default = {
-          width  = 32,
-          height = 32,
+      w = {
+        independent    = 'a',
+        palettes    = {
+          specify = true,
+          free = {
+            colours = 15,
+            keys    = 1,
+          },
+        },
+        mirror      = false,
+        transform   = {
+          individual = 'a',
+          move       = false,
+          rotate     = false,
+          scale      = false,
+          shear      = false,
+          affine     = false,
         },
-        bigW    = {
-          width  = 64,
-          height = 32,
+        sizes       = {
+          {
+            width  =  64,
+            height =  64,
+          },
+          {
+            width  =  64,
+            height =  32,
+          },
         },
+        map         = false,
       },
     },
   },