From 301a0fd58e860d9f3ce03896e7bbe20e4d8cbbf1 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 21 Dec 2016 04:12:00 -0300 Subject: Update graphics modes --- src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua | 8 ++--- src/hardware_data/graphics/ppu_rp2c0x.lua | 8 ++--- src/hardware_data/graphics/uze_atmega644_mode1.lua | 4 +-- .../graphics/uze_atmega644_mode10.lua | 4 +-- .../graphics/uze_atmega644_mode12.lua | 8 ++--- src/hardware_data/graphics/uze_atmega644_mode2.lua | 8 ++--- src/hardware_data/graphics/uze_atmega644_mode3.lua | 16 ++++----- src/hardware_data/graphics/uze_atmega644_mode4.lua | 8 ++--- src/hardware_data/graphics/uze_atmega644_mode5.lua | 4 +-- src/hardware_data/graphics/uze_atmega644_mode6.lua | 16 ++++----- src/hardware_data/graphics/uze_atmega644_mode7.lua | 4 +-- src/hardware_data/graphics/uze_atmega644_mode8.lua | 4 +-- src/hardware_data/graphics/uze_atmega644_mode9.lua | 41 +++++++++++++--------- 13 files changed, 70 insertions(+), 63 deletions(-) (limited to 'src/hardware_data') diff --git a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua b/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua index 133a211..1e4995c 100644 --- a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua +++ b/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua @@ -115,11 +115,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -167,11 +167,11 @@ return { multiples = { optional = true, { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, diff --git a/src/hardware_data/graphics/ppu_rp2c0x.lua b/src/hardware_data/graphics/ppu_rp2c0x.lua index 00d45bd..5d75f47 100644 --- a/src/hardware_data/graphics/ppu_rp2c0x.lua +++ b/src/hardware_data/graphics/ppu_rp2c0x.lua @@ -115,11 +115,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -167,11 +167,11 @@ return { multiples = { optional = true, { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode1.lua b/src/hardware_data/graphics/uze_atmega644_mode1.lua index 6e48022..0a5c290 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode1.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode1.lua @@ -50,11 +50,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode10.lua b/src/hardware_data/graphics/uze_atmega644_mode10.lua index 6cf1faa..ee8f55c 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode10.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode10.lua @@ -49,11 +49,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode12.lua b/src/hardware_data/graphics/uze_atmega644_mode12.lua index ef9e74c..99fbaa0 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode12.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode12.lua @@ -57,11 +57,11 @@ return { main = { optional = false, mode064 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -81,11 +81,11 @@ return { }, }, mode128 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode2.lua b/src/hardware_data/graphics/uze_atmega644_mode2.lua index 3fe3d16..7fe67f0 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode2.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode2.lua @@ -74,11 +74,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -101,11 +101,11 @@ return { multiples = { optional = true, { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode3.lua b/src/hardware_data/graphics/uze_atmega644_mode3.lua index eff1b75..26400f2 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode3.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode3.lua @@ -86,11 +86,11 @@ return { main = { optional = false, scrollMode = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -110,11 +110,11 @@ return { }, }, staticMode = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -137,11 +137,11 @@ return { overlay = { optional = true, scrollMode = { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, @@ -161,11 +161,11 @@ return { }, }, staticMode = { - start = { + startCup = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode4.lua b/src/hardware_data/graphics/uze_atmega644_mode4.lua index 6b97192..6573679 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode4.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode4.lua @@ -49,11 +49,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -76,11 +76,11 @@ return { text = { optional = false, { - start = { + startCut = { x = 0, y = 192, }, - end = { + endCut = { x = 0, y = -32, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua index 01e825e..86497f5 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode5.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode5.lua @@ -49,11 +49,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode6.lua b/src/hardware_data/graphics/uze_atmega644_mode6.lua index 9cb013c..496fbce 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode6.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode6.lua @@ -71,11 +71,11 @@ return { main = { optional = false, mode240 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -108,11 +108,11 @@ return { }, }, mode288 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -151,11 +151,11 @@ return { overlay = { optional = true, mode240 = { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, @@ -175,11 +175,11 @@ return { }, }, mode288 = { - start = { + startCut = { x = 'free', y = 'free', }, - end = { + endCut = { x = 'free', y = 'free', }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode7.lua b/src/hardware_data/graphics/uze_atmega644_mode7.lua index 19bed89..707f0e2 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode7.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode7.lua @@ -49,11 +49,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode8.lua b/src/hardware_data/graphics/uze_atmega644_mode8.lua index 2338a16..660d8ec 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode8.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode8.lua @@ -49,11 +49,11 @@ return { main = { optional = false, { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, diff --git a/src/hardware_data/graphics/uze_atmega644_mode9.lua b/src/hardware_data/graphics/uze_atmega644_mode9.lua index 264896c..76454ad 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode9.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode9.lua @@ -2,7 +2,7 @@ return { screen = { mode360 = { width = 360, - height = 240, + height = 224, refresh = 60, origin = { x = 0, @@ -11,15 +11,15 @@ return { }, mode480 = { width = 480, - height = 240, + height = 224, refresh = 60, origin = { x = 0, y = 0, }, }, - pixels = '?', - texels = '?', + pixels = 12288, + texels = 256, vertices = false, }, colours = { @@ -43,29 +43,36 @@ return { layers = { { total = { - x = 80, - y = 30, - 2400, + mode360 = { + x = 60, + y = 28, + 1680, + }, + mode480 = { + x = 80, + y = 28, + 2240, + }, }, onScreen = { - mode240 = { - 840, + mode360 = { + 1680, }, - mode288 = { - 1008, + mode480 = { + 2240, }, }, - unique = '?', + unique = 256, screenSections = { mirror = false, main = { optional = false, mode360 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -85,11 +92,11 @@ return { }, }, mode480 = { - start = { + startCut = { x = 0, y = 0, }, - end = { + endCut = { x = 0, y = 0, }, @@ -102,7 +109,7 @@ return { byPixels = false, byMap = { width = 480, - height = 240, + height = 224, }, colours = false, }, -- cgit v1.2.3-54-g00ecf