diff options
19 files changed, 349 insertions, 521 deletions
diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc2.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc2.lua new file mode 120000 index 0000000..6f1ed5b --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc2.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c02+mmc2.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc5.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc5.lua new file mode 120000 index 0000000..7ba2419 --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc5.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c02+mmc5.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02.lua new file mode 120000 index 0000000..c40473e --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c02.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc2.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc2.lua new file mode 120000 index 0000000..208500a --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc2.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c07+mmc2.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc5.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc5.lua new file mode 120000 index 0000000..aa4b598 --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc5.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c07+mmc5.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07.lua new file mode 120000 index 0000000..080ac84 --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c07.lua
\ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c0x.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c0x.lua deleted file mode 120000 index 165735f..0000000 --- a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c0x.lua +++ /dev/null @@ -1 +0,0 @@ -../hardware_data/graphics/ppu_rp2c0x.lua
\ No newline at end of file diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua index f5727cb..a407396 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C02 with MMC2/MMC4 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0988, - origin = { + width = 256, + height = 224, + vsync = 60.0988, + origin = { x = 0, y = -8, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 512, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua index c8c63ad..8f5e1d7 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc5.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C02 with MMC5 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0988, - origin = { + width = 256, + height = 224, + vsync = 60.0988, + origin = { x = 0, y = -8, }, @@ -14,7 +19,7 @@ return { }, colours = { total = 64, - limit = 25, + limit = false, transparent = { sprite = colourKey, tile = colourKey, @@ -22,7 +27,7 @@ return { palettes = { { total = 1, - type = 'global', + type = 'palettePerTexel', colours = 3, layers = false, }, @@ -96,8 +101,7 @@ return { -- Total of unique tiles on VRAM -- unique = 65536, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -123,6 +127,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c02.lua b/src/hardware_data/graphics/ppu_rp2c02.lua index 5c3ab73..a8ca070 100644 --- a/src/hardware_data/graphics/ppu_rp2c02.lua +++ b/src/hardware_data/graphics/ppu_rp2c02.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C02 without MMC -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0988, - origin = { + width = 256, + height = 224, + vsync = 60.0988, + origin = { x = 0, y = -8, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 256, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua index ef373e0..5bbe30b 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C03/RP2C04/RP2C05 with MMC2/MMC4 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0985, - origin = { + width = 256, + height = 224, + vsync = 60.0985, + origin = { x = 0, y = -8, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 512, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua index 22fe456..bda312c 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc5.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C03/RP2C04/RP2C05 with MMC5 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0985, - origin = { + width = 256, + height = 224, + vsync = 60.0985, + origin = { x = 0, y = -8, }, @@ -14,7 +19,7 @@ return { }, colours = { total = 64, - limit = 25, + limit = false, transparent = { sprite = colourKey, tile = colourKey, @@ -22,7 +27,7 @@ return { palettes = { { total = 1, - type = 'global', + type = 'palettePerTexel', colours = 3, layers = false, }, @@ -96,8 +101,7 @@ return { -- Total of unique tiles on VRAM -- unique = 65536, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -123,6 +127,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c03.lua b/src/hardware_data/graphics/ppu_rp2c03.lua index f77054c..422e649 100644 --- a/src/hardware_data/graphics/ppu_rp2c03.lua +++ b/src/hardware_data/graphics/ppu_rp2c03.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C03/RP2C04/RP2C05 without MMC -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 224, - vsync = 60.0985, - origin = { + width = 256, + height = 224, + vsync = 60.0985, + origin = { x = 0, y = -8, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 256, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua index fd2973e..d1fbf3d 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C07 with MMC2/MMC4 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 240, - vsync = 50.0070, - origin = { + width = 256, + height = 240, + vsync = 50.0070, + origin = { x = 0, y = 0, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 512, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua index 0654619..04aab84 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc5.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C07 with MMC5 -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 240, - vsync = 50.0070, - origin = { + width = 256, + height = 240, + vsync = 50.0070, + origin = { x = 0, y = 0, }, @@ -14,7 +19,7 @@ return { }, colours = { total = 64, - limit = 25, + limit = false, transparent = { sprite = colourKey, tile = colourKey, @@ -22,7 +27,7 @@ return { palettes = { { total = 1, - type = 'global', + type = 'palettePerTexel', colours = 3, layers = false, }, @@ -96,8 +101,7 @@ return { -- Total of unique tiles on VRAM -- unique = 65536, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -123,6 +127,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c07.lua b/src/hardware_data/graphics/ppu_rp2c07.lua index 6f2a9a5..e58fce5 100644 --- a/src/hardware_data/graphics/ppu_rp2c07.lua +++ b/src/hardware_data/graphics/ppu_rp2c07.lua @@ -1,9 +1,14 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C07 without MMC -- +-- (Memory management controller) -- + return { screen = { - width = 256, - height = 240, - vsync = 50.0070, - origin = { + width = 256, + height = 240, + vsync = 50.0070, + origin = { x = 0, y = 0, }, @@ -22,13 +27,13 @@ return { palettes = { { total = 4, - type = 'tile', + type = 'tilePerPalette', colours = 3, layers = false, }, { total = 4, - type = 'sprite', + type = 'spritePerPalette', colours = 3, layers = false, }, @@ -102,8 +107,7 @@ return { -- Total of unique tiles on VRAM -- unique = 256, screenSections = { - mirror = true, - main = { + main = { optional = false, moveSection = false, { @@ -129,6 +133,32 @@ return { }, }, }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua b/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua deleted file mode 100644 index 1e4995c..0000000 --- a/src/hardware_data/graphics/ppu_rp2c0x+mmcx.lua +++ /dev/null @@ -1,223 +0,0 @@ -return { - screen = { - ntsc = { - width = 256, - height = 224, - refresh = 60.0988, - origin = { - x = 0, - y = -8, - }, - }, - pal = { - width = 256, - height = 240, - refresh = 50.0070, - origin = { - x = 0, - y = 0, - }, - }, - ntscVS = { - width = 256, - height = 224, - refresh = 60.0985, - origin = { - x = 0, - y = -8, - }, - }, - pixels = 139264, - texels = 576, - vertices = false, - }, - colours = { - total = 64, - limit = 25, - background = true, - transparent = 'colourKey', - }, - meshes = false, - shaders = { - api = false, - version = false, - fragment = false, - vectex = false, - geometry = false, - tessellation = false, - }, - physic = false, - sprites = { - onScreen = 64, - onLine = 8, - palettes = { - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - }, - transform = { - move = true, - rotate = false, - scale = 'flip', - shear = false, - affine = false, - }, - sizes = { - { - width = 8, - height = 8, - }, - { - width = 8, - height = 16, - }, - }, - }, - tiles = { - layers = { - { - total = { - x = 32, - y = 30, - 960, - }, - onScreen = { - ntsc = { - 255, - }, - pal = { - 272, - }, - ntscVS = { - 255, - }, - }, - unique = 512, - screenSections = { - mirror = true, - main = { - optional = false, - { - startCut = { - x = 0, - y = 0, - }, - endCut = { - x = 0, - y = 0, - }, - palettes = { - { - 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, - }, - }, - sizes = { - { - width = 16, - height = 16, - }, - }, - transform = { - move = true, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - multiples = { - optional = true, - { - startCut = { - x = 'free', - y = 'free', - }, - endCut = { - x = 'free', - y = 'free', - }, - palettes = { - { - 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, - }, - }, - sizes = { - { - width = 16, - height = 16, - }, - }, - transform = { - move = true, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} diff --git a/src/hardware_data/graphics/ppu_rp2c0x.lua b/src/hardware_data/graphics/ppu_rp2c0x.lua deleted file mode 100644 index 5d75f47..0000000 --- a/src/hardware_data/graphics/ppu_rp2c0x.lua +++ /dev/null @@ -1,223 +0,0 @@ -return { - screen = { - ntsc = { - width = 256, - height = 224, - refresh = 60.0988, - origin = { - x = 0, - y = -8, - }, - }, - pal = { - width = 256, - height = 240, - refresh = 50.0070, - origin = { - x = 0, - y = 0, - }, - }, - ntscVS = { - width = 256, - height = 224, - refresh = 60.0985, - origin = { - x = 0, - y = -8, - }, - }, - pixels = 73728, - texels = 320, - vertices = false, - }, - colours = { - total = 64, - limit = 25, - background = true, - transparent = 'colourKey', - }, - meshes = false, - shaders = { - api = false, - version = false, - fragment = false, - vectex = false, - geometry = false, - tessellation = false, - }, - physic = false, - sprites = { - onScreen = 64, - onLine = 8, - palettes = { - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - { - total = 4, - limit = 3, - keys = 1, - }, - }, - transform = { - move = true, - rotate = false, - scale = 'flip', - shear = false, - affine = false, - }, - sizes = { - { - width = 8, - height = 8, - }, - { - width = 8, - height = 16, - }, - }, - }, - tiles = { - layers = { - { - total = { - x = 32, - y = 30, - 960, - }, - onScreen = { - ntsc = { - 255, - }, - pal = { - 272, - }, - ntscVS = { - 255, - }, - }, - unique = 256, - screenSections = { - mirror = true, - main = { - optional = false, - { - startCut = { - x = 0, - y = 0, - }, - endCut = { - x = 0, - y = 0, - }, - palettes = { - { - 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, - }, - }, - sizes = { - { - width = 16, - height = 16, - }, - }, - transform = { - move = true, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - multiples = { - optional = true, - { - startCut = { - x = 'free', - y = 'free', - }, - endCut = { - x = 'free', - y = 'free', - }, - palettes = { - { - 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, - }, - }, - sizes = { - { - width = 16, - height = 16, - }, - }, - transform = { - move = true, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} diff --git a/src/hardware_data/graphics/uze_atmega644_mode3_static-mode.lua b/src/hardware_data/graphics/uze_atmega644_mode3_static-mode.lua index 4a7a6b4..e4b5d62 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode3_static-mode.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode3_static-mode.lua @@ -1,5 +1,5 @@ -- Information: -- --- Video Mode 3 (official) -- +-- ATmega644 Video Mode 3 (official) -- -- -- -- Scroll Mode and Static Mode, -- -- can be changed by compilation. -- @@ -169,7 +169,6 @@ return { -- Total of unique tiles on VRAM -- unique = 256, screenSections = { - mirror = false, main = { optional = false, moveSection = false, |