Update graphics modes

16 files changed, 91 insertions, 161 deletions

diff --git a/src/hardware_data/graphics/mali400.lua b/src/hardware_data/graphics/mali400.lua
index ad190d3..ee54f08 100644
--- a/src/hardware_data/graphics/mali400.lua
+++ b/src/hardware_data/graphics/mali400.lua
@@ -98,46 +98,55 @@ return {
             total = '24bpp',
             limit = 256,
             keys  = false,
+            map   = false,
           },
           {
             total = '24bpp',
             limit = 255,
             keys  = 1,
+            map   = false,
           },
           {
             total = '32bpp',
             limit = 256,
             keys  = 'alpha',
+            map   = false,
           },
           {
             total = '24bpp',
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = '24bpp',
             limit = '24bpp-1',
             keys  = 1,
+            map   = false,
           },
           {
             total = '32bpp',
             limit = '24bpp',
             keys  = 'alpha',
+            map   = false,
           },
           {
             total = '48bpp',
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = '48bpp',
             limit = '48bpp-1',
             keys  = 1,
+            map   = false,
           },
           {
             total = '64bpp',
             limit = '48bpp',
             keys  = 'alpha',
+            map   = false,
           },
         },
         mirror      = true,
@@ -155,7 +164,6 @@ return {
             height = 'free',
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/ppu_lr35902-cgb.lua b/src/hardware_data/graphics/ppu_lr35902-cgb.lua
index 5e9e346..b6c8b0d 100644
--- a/src/hardware_data/graphics/ppu_lr35902-cgb.lua
+++ b/src/hardware_data/graphics/ppu_lr35902-cgb.lua
@@ -108,41 +108,49 @@ return {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
           {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
         },
         mirror      = true,
@@ -160,7 +168,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/ppu_lr35902-dmg.lua b/src/hardware_data/graphics/ppu_lr35902-dmg.lua
index 80c16ae..14bb01d 100644
--- a/src/hardware_data/graphics/ppu_lr35902-dmg.lua
+++ b/src/hardware_data/graphics/ppu_lr35902-dmg.lua
@@ -78,6 +78,7 @@ return {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
         },
         mirror      = true,
@@ -95,7 +96,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/ppu_lr35902-sgb.lua b/src/hardware_data/graphics/ppu_lr35902-sgb.lua
index 420655f..f332996 100644
--- a/src/hardware_data/graphics/ppu_lr35902-sgb.lua
+++ b/src/hardware_data/graphics/ppu_lr35902-sgb.lua
@@ -87,6 +87,7 @@ return {
             total = 4,
             limit = false,
             keys  = false,
+            map   = false,
           },
         },
         mirror      = true,
@@ -104,7 +105,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua b/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua
index 519fcdf..06dbb22 100644
--- a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua
+++ b/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua
@@ -1,6 +1,6 @@
 return {
   screen  = {
-    ntsc = {
+    ntsc    = {
       width   = 256,
       height  = 224,
       refresh =  60.0988,
@@ -9,7 +9,7 @@ return {
         y = -8,
       },
     },
-    pal  = {
+    pal     = {
       width   = 256,
       height  = 240,
       refresh =  50.0070,
@@ -28,7 +28,7 @@ return {
       },
     },
     pxps = 139264,
-    txps = 576,
+    txps =    576,
     plps = false,
   },
   colours = {
@@ -109,21 +109,25 @@ return {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
         },
         mirror      = true,
@@ -141,7 +145,6 @@ return {
             height = 16,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/ppu_rp2c0x.lua b/src/hardware_data/graphics/ppu_rp2c0x.lua
index 04e59ac..c41ca3b 100644
--- a/src/hardware_data/graphics/ppu_rp2c0x.lua
+++ b/src/hardware_data/graphics/ppu_rp2c0x.lua
@@ -1,6 +1,6 @@
 return {
   screen  = {
-    ntsc = {
+    ntsc    = {
       width   = 256,
       height  = 224,
       refresh =  60.0988,
@@ -9,7 +9,7 @@ return {
         y = -8,
       },
     },
-    pal  = {
+    pal     = {
       width   = 256,
       height  = 240,
       refresh =  50.0070,
@@ -28,7 +28,7 @@ return {
       },
     },
     pxps = 73728,
-    txps = 320,
+    txps =   320,
     plps = false,
   },
   colours = {
@@ -109,21 +109,25 @@ return {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
           {
             total = 4,
             limit = 3,
             keys  = 1,
+            map   = false,
           },
         },
         mirror      = true,
@@ -141,7 +145,6 @@ return {
             height = 16,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/tms9918a_mode0.lua b/src/hardware_data/graphics/tms9918a_mode0.lua
index 46882d7..5be8cf0 100644
--- a/src/hardware_data/graphics/tms9918a_mode0.lua
+++ b/src/hardware_data/graphics/tms9918a_mode0.lua
@@ -45,6 +45,12 @@ return {
             total = '15+1',
             limit = 2,
             keys  = '1-optional',
+            map   = {
+              width  = 240,
+              height = 192,
+              tiles  = false,
+              pixels = false,
+            },
           },
         },
         mirror      = false,
@@ -62,12 +68,6 @@ return {
             height = 8,
           },
         },
-        map         = {
-          width  = 240,
-          height = 192,
-          tiles  = false,
-          pixels = false,
-        },
       },
     },
   },
diff --git a/src/hardware_data/graphics/tms9918a_mode1.lua b/src/hardware_data/graphics/tms9918a_mode1.lua
index 921723a..bdb650b 100644
--- a/src/hardware_data/graphics/tms9918a_mode1.lua
+++ b/src/hardware_data/graphics/tms9918a_mode1.lua
@@ -73,6 +73,12 @@ return {
             total = '15+1',
             limit = 2,
             keys  = '1-optional',
+            map   = {
+              width  = false,
+              height = false,
+              tiles  = 8,
+              pixels = false,
+            },
           },
         },
         mirror      = false,
@@ -90,12 +96,6 @@ return {
             height = 8,
           },
         },
-        map         = {
-          width  = false,
-          height = false,
-          tiles  = 8,
-          pixels = false,
-        },
       },
     },
   },
diff --git a/src/hardware_data/graphics/tms9918a_mode2.lua b/src/hardware_data/graphics/tms9918a_mode2.lua
index 19a868d..1b99439 100644
--- a/src/hardware_data/graphics/tms9918a_mode2.lua
+++ b/src/hardware_data/graphics/tms9918a_mode2.lua
@@ -73,6 +73,15 @@ return {
             total = '15+1',
             limit = 2,
             keys  = '1-optional',
+            map   = {
+              width  = 256,
+              height =  64,
+              tiles  = false,
+              pixels = {
+                width  = false,
+                height = 1,
+              },
+            },
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/graphics/tms9918a_mode20.lua b/src/hardware_data/graphics/tms9918a_mode20.lua
index adbc744..75419f4 100644
--- a/src/hardware_data/graphics/tms9918a_mode20.lua
+++ b/src/hardware_data/graphics/tms9918a_mode20.lua
@@ -45,6 +45,15 @@ return {
             total = '15+1',
             limit = 2,
             keys  = '1-optional',
+            map   = {
+              width  = 240,
+              height =  64,
+              tiles  = false,
+              pixels = {
+                width  = false,
+                height = 1,
+              },
+            },
           },
         },
         mirror      = false,
@@ -62,15 +71,6 @@ return {
             height = 8,
           },
         },
-        map         = {
-          width  = 240,
-          height =  64,
-          tiles  = false,
-          pixels = {
-            width  = false,
-            height = 1,
-          },
-        },
       },
     },
   },
diff --git a/src/hardware_data/graphics/tms9918a_mode21.lua b/src/hardware_data/graphics/tms9918a_mode21.lua
index 70a1346..0eeae26 100644
--- a/src/hardware_data/graphics/tms9918a_mode21.lua
+++ b/src/hardware_data/graphics/tms9918a_mode21.lua
@@ -73,6 +73,15 @@ return {
             total = '15+1',
             limit = 2,
             keys  = '1-optional',
+            map   = {
+              width  = 256,
+              height =  64,
+              tiles  =   8,
+              pixels = {
+                width  = false,
+                height = 1,
+              },
+            },
           },
         },
         mirror      = false,
@@ -90,15 +99,6 @@ return {
             height = 8,
           },
         },
-        map         = {
-          width  = 256,
-          height =  64,
-          tiles  =   8,
-          pixels = {
-            width  = false,
-            height = 1,
-          },
-        },
       },
     },
   },
diff --git a/src/hardware_data/graphics/tms9918a_mode3.lua b/src/hardware_data/graphics/tms9918a_mode3.lua
index 8687004..e1d0d73 100644
--- a/src/hardware_data/graphics/tms9918a_mode3.lua
+++ b/src/hardware_data/graphics/tms9918a_mode3.lua
@@ -73,6 +73,7 @@ return {
             total = '15+1',
             limit = false,
             keys  = '1-optional',
+            map   = false,
           },
         },
         mirror      = false,
@@ -90,7 +91,6 @@ return {
             height = 4,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/vdp_gg_mode4.lua b/src/hardware_data/graphics/vdp_gg_mode4.lua
index 9fdedc9..44f0413 100644
--- a/src/hardware_data/graphics/vdp_gg_mode4.lua
+++ b/src/hardware_data/graphics/vdp_gg_mode4.lua
@@ -10,7 +10,7 @@ return {
       },
     },
     pxps = 39424,
-    txps = 552,
+    txps =   552,
     plps = false,
   },
   colours = {
@@ -76,6 +76,7 @@ return {
             total = 16,
             limit = false,
             keys  = '1-optional',
+            map   = false,
           },
         },
         mirror      = true,
@@ -93,7 +94,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/vdp_upd9004g-224_mode4.lua b/src/hardware_data/graphics/vdp_upd9004g-224_mode4.lua
deleted file mode 100644
index eecd6ff..0000000
--- a/src/hardware_data/graphics/vdp_upd9004g-224_mode4.lua
+++ /dev/null
@@ -1,109 +0,0 @@
-return {
-  screen  = {
-    ntsc = {
-      width   = 256,
-      height  = 224,
-      refresh =  59.922743,
-      origin  = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pal  = {
-      width   = 256,
-      height  = 224,
-      refresh =  49.701459,
-      origin  = {
-        x = 0,
-        y = 0,
-      },
-    },
-    pxps = 39424,
-    txps = 552,
-    plps = false,
-  },
-  colours = {
-    total       = 64,
-    limit       = 31,
-    background  = false,
-    transparent = 'transparentColour',
-  },
-  meshes  = false,
-  shaders = {
-    api          = false,
-    version      = false,
-    fragment     = false,
-    vectex       = false,
-    geometry     = false,
-    tessellation = false,
-  },
-  physic  = false,
-  sprites = {
-    onScreen  = 64,
-    onLine    =  8,
-    palettes  = {
-      specify = true,
-      {
-        total = 16,
-        limit = 15,
-        keys  = 1,
-      },
-    },
-    transform = {
-      move   = true,
-      rotate = false,
-      scale  = '2x,flip',
-      shear  = false,
-      affine = false,
-    },
-    sizes     = {
-      {
-        width  =  8,
-        height =  8,
-      },
-      {
-        width  =  8,
-        height = 16,
-      },
-    },
-  },
-  tiles   = {
-    layers = {
-      {
-        total       = {
-          x = '?',
-          y = '?',
-          '?',
-        },
-        onScreen    = 927,
-        limit       = false,
-        unique      = 488,
-        independent = false,
-        palettes    = {
-          specify = true,
-          {
-            total = 16,
-            limit = false,
-            keys  = '1-optional',
-          },
-        },
-        mirror      = true,
-        transform   = {
-          individual = true,
-          move       = true,
-          rotate     = false,
-          scale      = '2x,flip',
-          shear      = false,
-          affine     = false,
-        },
-        sizes       = {
-          {
-            width  = 8,
-            height = 8,
-          },
-        },
-        map         = false,
-      },
-    },
-  },
-}
diff --git a/src/hardware_data/graphics/vdp_upd9004g-240_mode4.lua b/src/hardware_data/graphics/vdp_upd9004g_mode4.lua
index e2c63d6..d88ec30 100644
--- a/src/hardware_data/graphics/vdp_upd9004g-240_mode4.lua
+++ b/src/hardware_data/graphics/vdp_upd9004g_mode4.lua
@@ -1,15 +1,24 @@
 return {
   screen  = {
-    ntsc = {
+    ntsc    = {
       width   = 256,
-      height  = 240,
+      height  = 224,
       refresh =  59.922743,
       origin  = {
         x = 0,
         y = 0,
       },
     },
-    pal  = {
+    pal     = {
+      width   = 256,
+      height  = 224,
+      refresh =  49.701459,
+      origin  = {
+        x = 0,
+        y = 0,
+      },
+    },
+    pal-240 = {
       width   = 256,
       height  = 240,
       refresh =  49.701459,
@@ -19,7 +28,7 @@ return {
       },
     },
     pxps = 39424,
-    txps = 552,
+    txps =   552,
     plps = false,
   },
   colours = {
@@ -85,6 +94,7 @@ return {
             total = 16,
             limit = false,
             keys  = '1-optional',
+            map   = false,
           },
         },
         mirror      = true,
@@ -102,7 +112,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },
diff --git a/src/hardware_data/graphics/vdp_ym2602_mode4.lua b/src/hardware_data/graphics/vdp_ym2602_mode4.lua
index 591d4b3..5b49b3d 100644
--- a/src/hardware_data/graphics/vdp_ym2602_mode4.lua
+++ b/src/hardware_data/graphics/vdp_ym2602_mode4.lua
@@ -19,7 +19,7 @@ return {
       },
     },
     pxps = 39424,
-    txps = 552,
+    txps =   552,
     plps = false,
   },
   colours = {
@@ -85,6 +85,7 @@ return {
             total = 16,
             limit = false,
             keys  = '1-optional',
+            map   = false,
           },
         },
         mirror      = true,
@@ -102,7 +103,6 @@ return {
             height = 8,
           },
         },
-        map         = false,
       },
     },
   },