diff --git a/Makefile b/Makefile index 3103adc..1ac2e19 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ MAKEFILE_PATH := $(patsubst %/,%,$(dir $(abspath $(firstword $(MAKEFILE_LIST))))) -CFLAGS = -Isaturn -I. -D__saturn__ +CFLAGS += -Isaturn -I. -D__saturn__ +CFLAGS += -Wno-error=unused-but-set-variable OPT ?= -O2 LIB = ./saturn @@ -68,7 +69,27 @@ vdp2/nbg0_16color.elf: vdp2/nbg0_16color.o res/kirby.data.o res/kirby.data.pal.o vdp2/nbg0_aseprite.elf: vdp2/nbg0_aseprite.o aseprite/palette.bin.o aseprite/character_patterns.bin.o aseprite/pattern_name_table.bin.o -vdp2/nbg0_aseprite_rustboro.elf: vdp2/nbg0_aseprite_rustboro.o aseprite/rustboro/character_pattern__tileset_0.bin.o aseprite/rustboro/character_pattern__tileset_1.bin.o aseprite/rustboro/palette.bin.o aseprite/rustboro/pattern_name_table__layer_0.bin.o aseprite/rustboro/pattern_name_table__layer_1.bin.o +NBG0_ASEPRITE_RUSTBORO_OBJ = \ + aseprite/rustboro/character_pattern__tileset_0.bin.o \ + aseprite/rustboro/character_pattern__tileset_1.bin.o \ + aseprite/rustboro/palette.bin.o \ + aseprite/rustboro/pattern_name_table__layer_0.bin.o \ + aseprite/rustboro/pattern_name_table__layer_1.bin.o + +vdp2/nbg0_aseprite_rustboro.elf: vdp2/nbg0_aseprite_rustboro.o $(NBG0_ASEPRITE_RUSTBORO_OBJ) + +NBG_ASEPRITE_PIGSY_OBJ = \ + aseprite/pigsy/character_pattern__tileset_0.bin.o \ + aseprite/pigsy/character_pattern__tileset_1.bin.o \ + aseprite/pigsy/character_pattern__tileset_2.bin.o \ + aseprite/pigsy/character_pattern__tileset_3.bin.o \ + aseprite/pigsy/palette.bin.o \ + aseprite/pigsy/pattern_name_table__layer_0.bin.o \ + aseprite/pigsy/pattern_name_table__layer_1.bin.o \ + aseprite/pigsy/pattern_name_table__layer_2.bin.o \ + aseprite/pigsy/pattern_name_table__layer_3.bin.o + +vdp2/nbg_aseprite_pigsy.elf: vdp2/nbg_aseprite_pigsy.o $(NBG_ASEPRITE_PIGSY_OBJ) vdp2/nbg0_font.elf: vdp2/nbg0_font.o saturn/start.o font/hp_100lx_4bit.data.o diff --git a/aseprite/pigsy.aseprite b/aseprite/pigsy.aseprite new file mode 100644 index 0000000..7fde2cc Binary files /dev/null and b/aseprite/pigsy.aseprite differ diff --git a/aseprite/pigsy/character_pattern__tileset_0.bin.h b/aseprite/pigsy/character_pattern__tileset_0.bin.h new file mode 100644 index 0000000..4b3da7b --- /dev/null +++ b/aseprite/pigsy/character_pattern__tileset_0.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_0_bin_start __asm("_binary_aseprite_pigsy_character_pattern__tileset_0_bin_start"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_0_bin_end __asm("_binary_aseprite_pigsy_character_pattern__tileset_0_bin_end"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_0_bin_size __asm("_binary_aseprite_pigsy_character_pattern__tileset_0_bin_size"); diff --git a/aseprite/pigsy/character_pattern__tileset_1.bin.h b/aseprite/pigsy/character_pattern__tileset_1.bin.h new file mode 100644 index 0000000..cecdcfc --- /dev/null +++ b/aseprite/pigsy/character_pattern__tileset_1.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_1_bin_start __asm("_binary_aseprite_pigsy_character_pattern__tileset_1_bin_start"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_1_bin_end __asm("_binary_aseprite_pigsy_character_pattern__tileset_1_bin_end"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_1_bin_size __asm("_binary_aseprite_pigsy_character_pattern__tileset_1_bin_size"); diff --git a/aseprite/pigsy/character_pattern__tileset_2.bin.h b/aseprite/pigsy/character_pattern__tileset_2.bin.h new file mode 100644 index 0000000..0cc6c1c --- /dev/null +++ b/aseprite/pigsy/character_pattern__tileset_2.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_2_bin_start __asm("_binary_aseprite_pigsy_character_pattern__tileset_2_bin_start"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_2_bin_end __asm("_binary_aseprite_pigsy_character_pattern__tileset_2_bin_end"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_2_bin_size __asm("_binary_aseprite_pigsy_character_pattern__tileset_2_bin_size"); diff --git a/aseprite/pigsy/character_pattern__tileset_3.bin.h b/aseprite/pigsy/character_pattern__tileset_3.bin.h new file mode 100644 index 0000000..3fd8603 --- /dev/null +++ b/aseprite/pigsy/character_pattern__tileset_3.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_3_bin_start __asm("_binary_aseprite_pigsy_character_pattern__tileset_3_bin_start"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_3_bin_end __asm("_binary_aseprite_pigsy_character_pattern__tileset_3_bin_end"); +extern uint32_t _binary_aseprite_pigsy_character_pattern__tileset_3_bin_size __asm("_binary_aseprite_pigsy_character_pattern__tileset_3_bin_size"); diff --git a/aseprite/pigsy/palette.bin.h b/aseprite/pigsy/palette.bin.h new file mode 100644 index 0000000..69f9457 --- /dev/null +++ b/aseprite/pigsy/palette.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_palette_bin_start __asm("_binary_aseprite_pigsy_palette_bin_start"); +extern uint32_t _binary_aseprite_pigsy_palette_bin_end __asm("_binary_aseprite_pigsy_palette_bin_end"); +extern uint32_t _binary_aseprite_pigsy_palette_bin_size __asm("_binary_aseprite_pigsy_palette_bin_size"); diff --git a/aseprite/pigsy/pattern_name_table__layer_0.bin.h b/aseprite/pigsy/pattern_name_table__layer_0.bin.h new file mode 100644 index 0000000..32b5f87 --- /dev/null +++ b/aseprite/pigsy/pattern_name_table__layer_0.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_0_bin_start __asm("_binary_aseprite_pigsy_pattern_name_table__layer_0_bin_start"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_0_bin_end __asm("_binary_aseprite_pigsy_pattern_name_table__layer_0_bin_end"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_0_bin_size __asm("_binary_aseprite_pigsy_pattern_name_table__layer_0_bin_size"); diff --git a/aseprite/pigsy/pattern_name_table__layer_1.bin.h b/aseprite/pigsy/pattern_name_table__layer_1.bin.h new file mode 100644 index 0000000..9cf7787 --- /dev/null +++ b/aseprite/pigsy/pattern_name_table__layer_1.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_1_bin_start __asm("_binary_aseprite_pigsy_pattern_name_table__layer_1_bin_start"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_1_bin_end __asm("_binary_aseprite_pigsy_pattern_name_table__layer_1_bin_end"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_1_bin_size __asm("_binary_aseprite_pigsy_pattern_name_table__layer_1_bin_size"); diff --git a/aseprite/pigsy/pattern_name_table__layer_2.bin.h b/aseprite/pigsy/pattern_name_table__layer_2.bin.h new file mode 100644 index 0000000..4eded28 --- /dev/null +++ b/aseprite/pigsy/pattern_name_table__layer_2.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_2_bin_start __asm("_binary_aseprite_pigsy_pattern_name_table__layer_2_bin_start"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_2_bin_end __asm("_binary_aseprite_pigsy_pattern_name_table__layer_2_bin_end"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_2_bin_size __asm("_binary_aseprite_pigsy_pattern_name_table__layer_2_bin_size"); diff --git a/aseprite/pigsy/pattern_name_table__layer_3.bin.h b/aseprite/pigsy/pattern_name_table__layer_3.bin.h new file mode 100644 index 0000000..0236641 --- /dev/null +++ b/aseprite/pigsy/pattern_name_table__layer_3.bin.h @@ -0,0 +1,5 @@ +#pragma once +#include +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_3_bin_start __asm("_binary_aseprite_pigsy_pattern_name_table__layer_3_bin_start"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_3_bin_end __asm("_binary_aseprite_pigsy_pattern_name_table__layer_3_bin_end"); +extern uint32_t _binary_aseprite_pigsy_pattern_name_table__layer_3_bin_size __asm("_binary_aseprite_pigsy_pattern_name_table__layer_3_bin_size"); diff --git a/vdp2/nbg0_aseprite_rustboro.cpp b/vdp2/nbg0_aseprite_rustboro.cpp index faefbad..533e237 100644 --- a/vdp2/nbg0_aseprite_rustboro.cpp +++ b/vdp2/nbg0_aseprite_rustboro.cpp @@ -64,7 +64,7 @@ void pattern_name_table_data(const buf_size_t * buf_size, for (uint32_t i = 0; i < buf_size->size / 4; i++) { uint32_t data = buf_size->buf[i]; uint32_t character_number = (data & 0x7fff) * 8 + character_offset; - uint32_t flags = data & 0xffff0000; + uint32_t flags = data & 0xf0000000; vdp2.vram.u32[(vram_offset / 4) + i] = flags | character_number; } } diff --git a/vdp2/nbg_aseprite_pigsy.cpp b/vdp2/nbg_aseprite_pigsy.cpp new file mode 100644 index 0000000..ea65658 --- /dev/null +++ b/vdp2/nbg_aseprite_pigsy.cpp @@ -0,0 +1,250 @@ +#include + +#include "vdp2.h" +#include "../common/vdp2_func.hpp" + +#include "aseprite/pigsy/character_pattern__tileset_0.bin.h" +#include "aseprite/pigsy/character_pattern__tileset_1.bin.h" +#include "aseprite/pigsy/character_pattern__tileset_2.bin.h" +#include "aseprite/pigsy/character_pattern__tileset_3.bin.h" +#include "aseprite/pigsy/palette.bin.h" +#include "aseprite/pigsy/pattern_name_table__layer_0.bin.h" +#include "aseprite/pigsy/pattern_name_table__layer_1.bin.h" +#include "aseprite/pigsy/pattern_name_table__layer_2.bin.h" +#include "aseprite/pigsy/pattern_name_table__layer_3.bin.h" + +void palette_data() +{ + const uint16_t * buf = reinterpret_cast(&_binary_aseprite_pigsy_palette_bin_start); + const uint32_t buf_size = reinterpret_cast(&_binary_aseprite_pigsy_palette_bin_size); + + for (uint32_t i = 0; i < buf_size / 2; i++) { + vdp2.cram.u16[i] = buf[i]; + } +} + +typedef struct buf_size { + uint32_t const * const buf; + const uint32_t size; +} buf_size_t; + +const buf_size_t character_patterns[] = { + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_character_pattern__tileset_0_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_character_pattern__tileset_0_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_character_pattern__tileset_1_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_character_pattern__tileset_1_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_character_pattern__tileset_2_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_character_pattern__tileset_2_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_character_pattern__tileset_3_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_character_pattern__tileset_3_bin_size), + }, +}; + +uint32_t character_pattern_data(const buf_size_t * buf_size, const uint32_t top) +{ + const uint32_t base_address = top - buf_size->size; // in bytes + + for (uint32_t i = 0; i < (buf_size->size / 4); i++) { + vdp2.vram.u32[(base_address / 4) + i] = buf_size->buf[i]; + } + + return base_address; +} + +const buf_size_t pattern_name_tables[] = { + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_pattern_name_table__layer_0_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_pattern_name_table__layer_0_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_pattern_name_table__layer_1_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_pattern_name_table__layer_1_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_pattern_name_table__layer_2_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_pattern_name_table__layer_2_bin_size), + }, + { + .buf = (uint32_t *)(&_binary_aseprite_pigsy_pattern_name_table__layer_3_bin_start), + .size = (uint32_t)(&_binary_aseprite_pigsy_pattern_name_table__layer_3_bin_size), + }, +}; + +void pattern_name_table_data(const buf_size_t * buf_size, + const uint32_t vram_offset, + const uint32_t character_offset) +{ + for (uint32_t i = 0; i < buf_size->size / 4; i++) { + uint32_t data = buf_size->buf[i]; + uint32_t character_number = (data & 0x7fff) * 2 + character_offset; + uint32_t flags = data & 0xf0000000; + vdp2.vram.u32[(vram_offset / 4) + i] = flags | character_number; + } +} + +void main() +{ + v_blank_in(); + + // DISP: Please make sure to change this bit from 0 to 1 during V blank. + vdp2.reg.TVMD = ( TVMD__DISP | TVMD__LSMD__NON_INTERLACE + | TVMD__VRESO__240 | TVMD__HRESO__NORMAL_320); + + + /* set the color mode to 5bits per channel, 1024 colors */ + vdp2.reg.RAMCTL = RAMCTL__CRMD__RGB_5BIT_1024; + + vdp2.reg.PRINA = PRINA__N0PRIN(1) | PRINA__N1PRIN(2); + vdp2.reg.PRINB = PRINB__N2PRIN(3) | PRINB__N3PRIN(4); + + vdp2.reg.VRSIZE = 0; + + /* enable display of NBG0 */ + vdp2.reg.BGON = BGON__N0ON | BGON__N0TPON + | BGON__N1ON + | BGON__N2ON + | BGON__N3ON; + + /* set character format for NBG0 to palettized 16 color + set enable "cell format" for NBG0 + set character size for NBG0 to 1x1 cell */ + vdp2.reg.CHCTLA = CHCTLA__N0CHCN__256_COLOR + | CHCTLA__N0BMEN__CELL_FORMAT + | CHCTLA__N0CHSZ__1x1_CELL + | CHCTLA__N1CHCN__256_COLOR + | CHCTLA__N1BMEN__CELL_FORMAT + | CHCTLA__N1CHSZ__1x1_CELL; + + vdp2.reg.CHCTLB = CHCTLB__N2CHCN__256_COLOR + | CHCTLB__N2CHSZ__1x1_CELL + | CHCTLB__N3CHCN__256_COLOR + | CHCTLB__N3CHSZ__1x1_CELL; + + /* plane size */ + vdp2.reg.PLSZ = PLSZ__N0PLSZ__1x1 | PLSZ__N1PLSZ__2x1 | PLSZ__N2PLSZ__2x1 | PLSZ__N3PLSZ__2x1; + + /* map plane offset + 1-word: value of bit 6-0 * 0x2000 + 2-word: value of bit 5-0 * 0x4000 + */ + constexpr int plane_b = (0 << 1); + constexpr int plane_b_offset = (plane_b >> 1) * 0x8000; // plane size: 2x1 ; 0x00000 + + constexpr int plane_c = (1 << 1); + constexpr int plane_c_offset = (plane_c >> 1) * 0x8000; // plane size: 2x1 ; 0x08000 + + constexpr int plane_d = (2 << 1); + constexpr int plane_d_offset = (plane_d >> 1) * 0x8000; // plane size: 2x1 ; 0x10000 + + constexpr int plane_a = 6; + constexpr int plane_a_offset = plane_a * 0x4000; // plane size: 1x1 ; 0x18000 + +// Enable VRAM bank partitioning + vdp2.reg.RAMCTL = RAMCTL__VRAMD | RAMCTL__VRBMD; + + vdp2.reg.MPOFN = MPOFN__N1MP(0) | MPOFN__N0MP(0) + | MPOFN__N3MP(0) | MPOFN__N2MP(0); // bits 8~6 + + vdp2.reg.MPABN0 = MPABN0__N0MPB(plane_a) | MPABN0__N0MPA(plane_a); // bits 5~0 + vdp2.reg.MPCDN0 = MPCDN0__N0MPD(plane_a) | MPCDN0__N0MPC(plane_a); // bits 5~0 + vdp2.reg.PNCN0 = PNCN0__N0PNB__2WORD; + + vdp2.reg.MPABN1 = MPABN1__N1MPB(plane_b) | MPABN1__N1MPA(plane_b); // bits 5~0 + vdp2.reg.MPCDN1 = MPCDN1__N1MPD(plane_b) | MPCDN1__N1MPC(plane_b); // bits 5~0 + vdp2.reg.PNCN1 = PNCN1__N1PNB__2WORD; + + vdp2.reg.MPABN2 = MPABN2__N2MPB(plane_c) | MPABN2__N2MPA(plane_c); // bits 5~0 + vdp2.reg.MPCDN2 = MPCDN2__N2MPD(plane_c) | MPCDN2__N2MPC(plane_c); // bits 5~0 + vdp2.reg.PNCN2 = PNCN2__N2PNB__2WORD; + + vdp2.reg.MPABN3 = MPABN3__N3MPB(plane_d) | MPABN3__N3MPA(plane_d); // bits 5~0 + vdp2.reg.MPCDN3 = MPCDN3__N3MPD(plane_d) | MPCDN3__N3MPC(plane_d); // bits 5~0 + vdp2.reg.PNCN3 = PNCN3__N3PNB__2WORD; + + // cpu access + vdp2.reg.CYCA0 = 0xeeeeeeee; + vdp2.reg.CYCA1 = 0xeeeeeeee; + vdp2.reg.CYCB0 = 0xeeeeeeee; + vdp2.reg.CYCB1 = 0xeeeeeeee; + + uint32_t top = (sizeof (union vdp2_vram)); + palette_data(); + + top = character_pattern_data(&character_patterns[3], top); + uint32_t pattern_base_0 = top / 32; + + top = character_pattern_data(&character_patterns[0], top); + uint32_t pattern_base_1 = top / 32; + + top = character_pattern_data(&character_patterns[1], top); + uint32_t pattern_base_2 = top / 32; + + top = character_pattern_data(&character_patterns[2], top); + uint32_t pattern_base_3 = top / 32; + + pattern_name_table_data(&pattern_name_tables[0], + plane_a_offset, + pattern_base_0); + + pattern_name_table_data(&pattern_name_tables[1], + plane_b_offset, + pattern_base_1); + + pattern_name_table_data(&pattern_name_tables[2], + plane_c_offset, + pattern_base_2); + + pattern_name_table_data(&pattern_name_tables[3], + plane_d_offset, + pattern_base_3); + + int sx = 0; + int sy = 0; + int dsx = 1; + int dsy = 0; + + vdp2.reg.CYCA0 = 0x0123ffff; + vdp2.reg.CYCA1 = 0x0123ffff; + vdp2.reg.CYCB0 = 0x4567ffff; + vdp2.reg.CYCB1 = 0x4567ffff; + + while (true) { + vdp2.reg.SCXIN0 = sx >> 3; + vdp2.reg.SCXDN0 = (sx & 0b11) << 14; + vdp2.reg.SCYIN0 = sy >> 1; + vdp2.reg.SCYDN0 = (sy & 1) << 15; + + vdp2.reg.SCXIN1 = sx >> 2; + vdp2.reg.SCXDN1 = (sx & 0b11) << 14; + vdp2.reg.SCYIN1 = sy >> 1; + vdp2.reg.SCYDN1 = (sy & 1) << 15; + + vdp2.reg.SCXN2 = sx >> 1; + vdp2.reg.SCYN2 = sy >> 1; + + vdp2.reg.SCXN3 = sx >> 0; + vdp2.reg.SCYN3 = -96; + + if ((sx >> 2) >= 640 + 10) + dsx = -1; + if ((sx >> 2) <= 0 - 10) + dsx = +1; + if ((sy >> 1) >= 720 + 10) + dsy = -1; + if ((sy >> 1) <= 0 - 10) + dsy = +1; + + sx += dsx; + sy += dsy; + + while ((vdp2.reg.TVSTAT & TVSTAT__VBLANK) == 0); + while ((vdp2.reg.TVSTAT & TVSTAT__VBLANK) != 0); + } +}