Update graphics modes

14 files changed, 159 insertions, 127 deletions

diff --git a/src/hardware_data/scripts/load/graphics/ppu_cgb.lua b/src/hardware_data/scripts/load/graphics/ppu_cgb.lua
index 0a89cbd..6ca179e 100644
--- a/src/hardware_data/scripts/load/graphics/ppu_cgb.lua
+++ b/src/hardware_data/scripts/load/graphics/ppu_cgb.lua
@@ -41,36 +41,44 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
     },
     transform = {
@@ -101,36 +109,44 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/ppu_gb.lua b/src/hardware_data/scripts/load/graphics/ppu_gb.lua
index 3206fc6..c07da7e 100644
--- a/src/hardware_data/scripts/load/graphics/ppu_gb.lua
+++ b/src/hardware_data/scripts/load/graphics/ppu_gb.lua
@@ -41,12 +41,14 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
     },
     transform = {
@@ -77,8 +79,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua b/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
index 36d05c9..b7ed0dd 100644
--- a/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
+++ b/src/hardware_data/scripts/load/graphics/ppu_rp2c02.lua
@@ -41,20 +41,24 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
     },
     transform = {
@@ -85,20 +89,24 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/ppu_sgb.lua b/src/hardware_data/scripts/load/graphics/ppu_sgb.lua
index 4a300ed..3ebb904 100644
--- a/src/hardware_data/scripts/load/graphics/ppu_sgb.lua
+++ b/src/hardware_data/scripts/load/graphics/ppu_sgb.lua
@@ -41,12 +41,14 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
       {
-        colours = 3,
-        keys    = 1,
+        total = 4,
+        limit = 3,
+        keys  = 1,
       },
     },
     transform = {
@@ -77,8 +79,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 3,
-            keys    = 1,
+            total = 4,
+            limit = 3,
+            keys  = 1,
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
index b6c3346..a6ab2bd 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode0.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -36,9 +36,10 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 2,
-            keys    = false,
+          {
+            total = '15+1',
+            limit = 2,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
index 3ff5574..b638de9 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode1.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -31,9 +31,10 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      free = {
-        colours = 1,
-        keys    = 1,
+      {
+        total = '15+1',
+        limit = 1,
+        keys  = 1,
       },
     },
     transform = {
@@ -63,9 +64,10 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 2,
-            keys    = false,
+          {
+            total = '15+1',
+            limit = 2,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
index ab88af5..d44cd2f 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode2.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -31,9 +31,10 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      free = {
-        colours = 1,
-        keys    = 1,
+      {
+        total = '15+1',
+        limit = 1,
+        keys  = 1,
       },
     },
     transform = {
@@ -63,9 +64,10 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 2,
-            keys    = false,
+          {
+            total = '15+1',
+            limit = 2,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua
index 990e2ea..7f792c8 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -36,9 +36,10 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 2,
-            keys    = false,
+          {
+            total = '15+1',
+            limit = 2,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua
index e494008..ca1cc0a 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -31,9 +31,10 @@ return {
     onLine    = 4,
     palettes  = {
       specify = true,
-      free = {
-        colours = 1,
-        keys    = 1,
+      {
+        total = '15+1',
+        limit = 1,
+        keys  = 1,
       },
     },
     transform = {
@@ -63,9 +64,10 @@ return {
         independent = false,
         palettes    = {
           specify = true,
-          free = {
-            colours = 2,
-            keys    = false,
+          {
+            total = '15+1',
+            limit = 2,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
index 7a18e04..2c3aa7a 100644
--- a/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
+++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode3.lua
@@ -12,7 +12,7 @@ return {
   },
   colours = {
     total       = '15+1',
-    limit       = '15+1',
+    limit       = false,
     background  = false,
     transparent = 'transparentColour',
   },
@@ -31,9 +31,10 @@ return {
     onLine    =  4,
     palettes  = {
       specify = true,
-      free = {
-        colours = 1,
-        keys    = 1,
+      {
+        total = '15+1',
+        limit = 1,
+        keys  = 1,
       },
     },
     transform = {
@@ -64,8 +65,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = '15+1',
-            keys    = false,
+            total = '15+1',
+            limit = false,
+            keys  = '1-optional',
           },
         },
         mirror      = false,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_gg_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_gg_mode4.lua
index d1cbf48..b9dcbb7 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_gg_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_gg_mode4.lua
@@ -41,8 +41,9 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 15,
-        keys    = 1,
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
@@ -73,12 +74,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 15,
-            keys    = 1,
-          },
-          sprite = {
-            colours = 15,
-            keys    = 1,
+            total = 16,
+            limit = 16,
+            keys  = '1-optional',
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_upd9004g-224_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_upd9004g-224_mode4.lua
index 9f6b505..51a5e66 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_upd9004g-224_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_upd9004g-224_mode4.lua
@@ -41,8 +41,9 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 15,
-        keys    = 1,
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
@@ -73,12 +74,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 15,
-            keys    = 1,
-          },
-          sprite = {
-            colours = 15,
-            keys    = 1,
+            total = 16,
+            limit = 16,
+            keys  = '1-optional',
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_upd9004g-240_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_upd9004g-240_mode4.lua
index 8bedb47..3e8b6bf 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_upd9004g-240_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_upd9004g-240_mode4.lua
@@ -41,8 +41,9 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 15,
-        keys    = 1,
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
@@ -73,12 +74,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 15,
-            keys    = 1,
-          },
-          sprite = {
-            colours = 15,
-            keys    = 1,
+            total = 16,
+            limit = 16,
+            keys  = '1-optional',
           },
         },
         mirror      = true,
diff --git a/src/hardware_data/scripts/load/graphics/vdp_ym2602_mode4.lua b/src/hardware_data/scripts/load/graphics/vdp_ym2602_mode4.lua
index b57cc49..47bf2da 100644
--- a/src/hardware_data/scripts/load/graphics/vdp_ym2602_mode4.lua
+++ b/src/hardware_data/scripts/load/graphics/vdp_ym2602_mode4.lua
@@ -41,8 +41,9 @@ return {
     palettes  = {
       specify = true,
       {
-        colours = 15,
-        keys    = 1,
+        total = 16,
+        limit = 15,
+        keys  = 1,
       },
     },
     transform = {
@@ -73,12 +74,9 @@ return {
         palettes    = {
           specify = true,
           {
-            colours = 15,
-            keys    = 1,
-          },
-          sprite = {
-            colours = 15,
-            keys    = 1,
+            total = 16,
+            limit = 16,
+            keys  = '1-optional',
           },
         },
         mirror      = true,