From 4877509bbc81c398eb2ef2d699f51f374315809e Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 10 Jan 2017 22:14:36 -0300 Subject: Update graphics modes --- src/hardware_data/graphics/ppu_rp2c02+mmc2.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c02+mmc3.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c02+mmc5.lua | 39 +++++++++++++------------- src/hardware_data/graphics/ppu_rp2c02.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c03+mmc2.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c03+mmc3.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c03+mmc5.lua | 39 +++++++++++++------------- src/hardware_data/graphics/ppu_rp2c03.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c07+mmc2.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c07+mmc3.lua | 5 ++-- src/hardware_data/graphics/ppu_rp2c07+mmc5.lua | 39 +++++++++++++------------- src/hardware_data/graphics/ppu_rp2c07.lua | 5 ++-- 12 files changed, 87 insertions(+), 75 deletions(-) (limited to 'src') diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua index 77a3bb5..9d74e75 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 512, + unique = false, + maximum = 512, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua index 9c8fa81..302e401 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua index e33013a..977dcbd 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua @@ -13,8 +13,8 @@ return { y = -8, }, -- Total of unique texels, pixels and vertices on VRAM -- - pixels = 16785408, - texels = 65600, + pixels = 1081344, + texels = 16640, vertices = false, }, colours = { @@ -27,7 +27,7 @@ return { palettes = { { total = 1, - type = 'palettePerTexel', + type = 'perTexel', colours = 3, layers = false, }, @@ -45,7 +45,7 @@ return { physic = false, sprites = { -- Limit sprites on screen -- - onScreen = 64, + onScreen = 256, -- Limit sprites on line (scanline) without flickering -- onLine = 8, transform = { @@ -74,9 +74,9 @@ return { onVRAM = { screenSections = { all = { - Xtiles = 32, - Ytiles = 30, - tiles = 960, + Xtiles = 64, + Ytiles = 60, + tiles = 3840, pixels = 245760, }, }, @@ -89,9 +89,9 @@ return { -- On screen section with support scrolling X and/or Y, -- -- will be include one tile by axis -- all = { - Xtiles = 16+1, - Ytiles = 15+1, - tiles = 240+16+14+1, + Xtiles = 32+1, + Ytiles = 30+1, + tiles = 960+32+30+1, pixels = 61440, }, }, @@ -99,7 +99,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 65536, + unique = false, + maximum = 16384, screenSections = { main = { optional = false, @@ -115,8 +116,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = true, @@ -141,8 +142,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -167,8 +168,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -193,8 +194,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, diff --git a/src/hardware_data/graphics/ppu_rp2c02.lua b/src/hardware_data/graphics/ppu_rp2c02.lua index 1b270f6..f9807a9 100644 --- a/src/hardware_data/graphics/ppu_rp2c02.lua +++ b/src/hardware_data/graphics/ppu_rp2c02.lua @@ -96,7 +96,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -104,7 +104,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua index 16437f7..d7e14c2 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 512, + unique = false, + maximum = 512, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua index 76b75db..11d2a28 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua index d648fde..4b9fa42 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua @@ -13,8 +13,8 @@ return { y = -8, }, -- Total of unique texels, pixels and vertices on VRAM -- - pixels = 16785408, - texels = 65600, + pixels = 1081344, + texels = 16640, vertices = false, }, colours = { @@ -27,7 +27,7 @@ return { palettes = { { total = 1, - type = 'palettePerTexel', + type = 'perTexel', colours = 3, layers = false, }, @@ -45,7 +45,7 @@ return { physic = false, sprites = { -- Limit sprites on screen -- - onScreen = 64, + onScreen = 256, -- Limit sprites on line (scanline) without flickering -- onLine = 8, transform = { @@ -74,9 +74,9 @@ return { onVRAM = { screenSections = { all = { - Xtiles = 32, - Ytiles = 30, - tiles = 960, + Xtiles = 64, + Ytiles = 60, + tiles = 3840, pixels = 245760, }, }, @@ -89,9 +89,9 @@ return { -- On screen section with support scrolling X and/or Y, -- -- will be include one tile by axis -- all = { - Xtiles = 16+1, - Ytiles = 15+1, - tiles = 240+16+14+1, + Xtiles = 32+1, + Ytiles = 30+1, + tiles = 960+32+30+1, pixels = 61440, }, }, @@ -99,7 +99,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 65536, + unique = false, + maximum = 16384, screenSections = { main = { optional = false, @@ -115,8 +116,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = true, @@ -141,8 +142,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -167,8 +168,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -193,8 +194,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, diff --git a/src/hardware_data/graphics/ppu_rp2c03.lua b/src/hardware_data/graphics/ppu_rp2c03.lua index 7f6a08c..2b534b7 100644 --- a/src/hardware_data/graphics/ppu_rp2c03.lua +++ b/src/hardware_data/graphics/ppu_rp2c03.lua @@ -96,7 +96,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -104,7 +104,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua index 4c07bad..795750f 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 512, + unique = false, + maximum = 512, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua index c183cc4..ef896bf 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua @@ -97,7 +97,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -105,7 +105,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua index ce5a516..b108ca5 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua @@ -13,8 +13,8 @@ return { y = 0, }, -- Total of unique texels, pixels and vertices on VRAM -- - pixels = 16785408, - texels = 65600, + pixels = 1081344, + texels = 16640, vertices = false, }, colours = { @@ -27,7 +27,7 @@ return { palettes = { { total = 1, - type = 'palettePerTexel', + type = 'perTexel', colours = 3, layers = false, }, @@ -45,7 +45,7 @@ return { physic = false, sprites = { -- Limit sprites on screen -- - onScreen = 64, + onScreen = 256, -- Limit sprites on line (scanline) without flickering -- onLine = 8, transform = { @@ -74,9 +74,9 @@ return { onVRAM = { screenSections = { all = { - Xtiles = 32, - Ytiles = 30, - tiles = 960, + Xtiles = 64, + Ytiles = 60, + tiles = 3840, pixels = 245760, }, }, @@ -89,9 +89,9 @@ return { -- On screen section with support scrolling X and/or Y, -- -- will be include one tile by axis -- all = { - Xtiles = 16+1, - Ytiles = 15+1, - tiles = 240+16+14+1, + Xtiles = 32+1, + Ytiles = 30+1, + tiles = 960+32+30+1, pixels = 61440, }, }, @@ -99,7 +99,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 65536, + unique = false, + maximum = 16384, screenSections = { main = { optional = false, @@ -115,8 +116,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = true, @@ -141,8 +142,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -167,8 +168,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, @@ -193,8 +194,8 @@ return { }, size = { -- Tile size in pixels -- - width = 16, - height = 16, + width = 8, + height = 8, }, transform = { move = false, diff --git a/src/hardware_data/graphics/ppu_rp2c07.lua b/src/hardware_data/graphics/ppu_rp2c07.lua index b81cedc..79b7ebd 100644 --- a/src/hardware_data/graphics/ppu_rp2c07.lua +++ b/src/hardware_data/graphics/ppu_rp2c07.lua @@ -96,7 +96,7 @@ return { all = { Xtiles = 16+1, Ytiles = 15+1, - tiles = 240+16+14+1, + tiles = 240+16+15+1, pixels = 61440, }, }, @@ -104,7 +104,8 @@ return { pixels = 'screenSections', }, -- Total of unique tiles on VRAM -- - unique = 256, + unique = false, + maximum = 256, screenSections = { main = { optional = false, -- cgit v1.2.3-54-g00ecf