nds: create dedicated tilemap renderer

I noticed I had a LOT of duplicate code lying around. Now I have gotten rid of it, and consolidated all the tilemap rendering to a single type.

Author: sukus21

example/nds/explore/runner.go

@@ -14,9 +14,7 @@ import (
 
 	"github.com/sukus21/nintil/compression/lz10"
 	"github.com/sukus21/nintil/compression/rlz"
-	"github.com/sukus21/nintil/nds"
 	"github.com/sukus21/nintil/util"
-	"github.com/sukus21/nintil/util/ezbin"
 )
 
 type RunnerFunc func(r *Runner) any
@@ -309,36 +307,3 @@ func drawImgBitmap(w int, h int, t4bpp bool, gfx *bytes.Reader, pal color.Palett
 
 	return img
 }
-
-func drawImgTilemap(w int, h int, tls []nds.Tile, tlm *bytes.Reader, pal color.Palette) image.Image {
-	img := image.NewPaletted(
-		image.Rect(0, 0, w*8, h*8),
-		pal,
-	)
-
-	xt := 0
-	yt := 0
-	for i := 0; i < int(tlm.Size())/2 && yt < h; i++ {
-		raw := ezbin.ReadSingle[uint16](tlm)
-		tileId := raw & 0x3FF
-		tileMirror := raw&0x0400 != 0
-		tileFlip := raw&0x0800 != 0
-		// tilePal := int(raw >> 12)
-
-		tile := &tls[tileId]
-		x := xt * 8
-		y := yt * 8
-		xt++
-		if xt >= w {
-			xt = 0
-			yt++
-		}
-		nds.DrawTileSamePalette(
-			img, tile,
-			x, y,
-			tileMirror, tileFlip,
-		)
-	}
-
-	return img
-}

example/nds/explore/runner_funcs.go

@@ -7,6 +7,7 @@ import (
 	"image"
 	"io"
 	"os"
+	"path/filepath"
 
 	"github.com/sukus21/nintil/nds"
 	"github.com/sukus21/nintil/nds/pit"
@@ -45,22 +46,22 @@ func addNdsFuncs(r *Runner) {
 
 	// Explain whats here at given ROM address
 	// - uint32				address
-	// + string
 	r.AddFunc("here", func(r *Runner) any {
 		addr := ReadArg[uint32](r)
 		rom := ReadVar[*nds.Rom](r, "nds")
 		entry := rom.WhatsHere(addr)
 		if entry == nil {
-			return "address not mapped"
+			fmt.Println("address not mapped")
 		} else {
-			return fmt.Sprintf(
+			fmt.Printf(
 				"%s [0x%X] [0x%X - 0x%X]\n",
 				entry.Name(),
 				addr-entry.From(),
 				entry.From(),
 				entry.From()+entry.To(),
 			)
 		}
+		return nil
 	})
 
 	// Opens a .dat entry from memory
@@ -84,12 +85,39 @@ func addNdsFuncs(r *Runner) {
 
 	// Opens a .dat entry
 	// - int				index
+	// + []byte
 	r.AddFunc("dat", func(r *Runner) any {
 		index := ReadArg[int](r)
 		dat := ReadVar[[][]byte](r, "dat_open")
 		return dat[index]
 	})
 
+	// Get number of entries in a .dat
+	r.AddFunc("dat_len", func(r *Runner) any {
+		dat := ReadVar[[][]byte](r, "dat_open")
+		fmt.Println(len(dat))
+		return nil
+	})
+
+	// Dump a .dat archive completely
+	// - string				number of folder to dump to
+	r.AddFunc("dat_dump", func(r *Runner) any {
+		dat := ReadVar[[][]byte](r, "dat_open")
+		fname := ReadArg[string](r)
+		os.MkdirAll(fname, os.ModePerm)
+		_, basename := filepath.Split(fname)
+		for i := range dat {
+			os.WriteFile(
+				filepath.Join(fname, fmt.Sprintf("%s_%d.bin", basename, i)),
+				dat[i],
+				os.ModePerm,
+			)
+		}
+
+		fmt.Println(".dat dumped")
+		return nil
+	})
+
 	// Get bitmap image from data
 	// - int 				width
 	// - int				height
@@ -131,7 +159,9 @@ func addNdsFuncs(r *Runner) {
 			panic("unknown bitdepth for timemap, only 4 and 8 supported")
 		}
 
-		return drawImgTilemap(w, h, tls, tlm, pal)
+		img := nds.NewTilemap(w, h, tls, pal)
+		binary.Read(tlm, binary.LittleEndian, img.Attributes)
+		return img
 	})
 
 	// Get tilemap image from data
@@ -162,10 +192,12 @@ func addNdsFuncs(r *Runner) {
 		for i := range tls {
 			binary.LittleEndian.PutUint16(tlmbuf[i*2:], uint16(i))
 		}
+		tlm := bytes.NewReader(tlmbuf)
 
 		// Yup, do thing
-		tlm := bytes.NewReader(tlmbuf)
-		return drawImgTilemap(w, h, tls, tlm, pal)
+		img := nds.NewTilemap(w, h, tls, pal)
+		binary.Read(tlm, binary.LittleEndian, img.Attributes)
+		return img
 	})
 
 	// Exports a palette

example/nds/pit/dump/main.go

@@ -1,13 +1,15 @@
 package main
 
 import (
+	"encoding/binary"
 	"fmt"
-	"io"
-	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
+	"strconv"
 
+	"github.com/sukus21/nintil/compression/lz10"
+	"github.com/sukus21/nintil/compression/rlz"
 	"github.com/sukus21/nintil/nds"
 	"github.com/sukus21/nintil/nds/pit"
 	"github.com/sukus21/nintil/util"
@@ -22,37 +24,30 @@ func main() {
 	defer f.Close()
 	rom := util.Must1(nds.OpenROM(f))
 
-	// Dump NitroFS filesystem
-	util.Must(fs.WalkDir(rom.Filesystem, ".", func(path string, d fs.DirEntry, err error) error {
-		if err != nil || d.IsDir() {
-			return err
-		}
-
-		// Create directory for file
-		outPath := filepath.Join("nitrofs", path)
-		dname := filepath.Dir(outPath)
-		util.Must(os.MkdirAll(dname, os.ModePerm))
-
-		// Read file contents
-		nitroFile := util.Must1(rom.Filesystem.Open(path))
-		fileContent := util.Must1(io.ReadAll(nitroFile))
-		nitroFile.Close()
+	// Dump ARM9 binary in the stupidest way probably
+	fout := util.Must1(os.Create("arm9.s"))
+	defer fout.Close()
+	for i := 0; i < len(rom.Arm9Binary); i += 4 {
+		fmt.Fprintf(fout, "    .word 0x%08X\n", binary.LittleEndian.Uint32(rom.Arm9Binary[i:]))
+	}
+}
 
-		// Just dump regular files
-		if filepath.Ext(path) != ".dat" || !pit.IsDat(fileContent) {
-			util.Must(os.WriteFile(outPath, fileContent, os.ModePerm))
-			return nil
+func writeFile(fname string, content []byte) error {
+	if pit.IsDat(content) {
+		util.Must(os.MkdirAll(fname, os.ModePerm))
+		for i, content := range pit.UnpackDat(content) {
+			outPath := filepath.Join(fname, strconv.Itoa(i))
+			util.Must(writeFile(outPath, content))
 		}
+		return nil
+	}
 
-		// .dat file, NOW we are cooking!
-		datPath := outPath
-		util.Must(os.Mkdir(datPath, os.ModePerm))
-		for i, content := range pit.UnpackDat(fileContent) {
-			outPath := filepath.Join(datPath, fmt.Sprintf("%d", i))
-			util.Must(os.WriteFile(outPath, content, os.ModePerm))
-		}
+	if decomp, err := rlz.Decompress(content); err == nil {
+		return os.WriteFile(fname+".rlz", decomp, os.ModePerm)
+	}
+	if decomp, err := lz10.Decompress(content); err == nil {
+		return os.WriteFile(fname+".lz10", decomp, os.ModePerm)
+	}
 
-		// Yup, all good
-		return nil
-	}))
+	return os.WriteFile(fname, content, os.ModePerm)
 }

example/nds/pit/savephotos/main.go

@@ -11,7 +11,7 @@ import (
 )
 
 func main() {
-	if len(os.Args) < 2 {
+	if len(os.Args) != 2 {
 		fmt.Println("usage:", os.Args[0], "<PiT ROM path>")
 		return
 	}
@@ -20,8 +20,8 @@ func main() {
 	defer f.Close()
 	rom := util.Must1(nds.OpenROM(f))
 
-	util.Must(os.MkdirAll("savephoto", os.ModePerm))
-	for i := 0; i < 10; i++ {
+	util.Must(os.MkdirAll("savephotos", os.ModePerm))
+	for i := range 10 {
 		img := pit.DecodeSavePhoto(rom, i)
 		ipath := fmt.Sprintf("savephotos/%d.png", i)
 		outf := util.Must1(os.Create(ipath))

nds/banner.go

@@ -147,7 +147,7 @@ func SerializeIcon(src image.Image) ([]byte, image.PalettedImage, error) {
 	tiles := make([]Tile, 16)
 	for i := range tiles {
 		t := &tiles[i]
-		for j := 0; j < 64; j++ {
+		for j := range 64 {
 			x := 8*(i&3) + (j & 7)
 			y := 8*(i>>2) + (j >> 3)
 			if !isPaletted {
@@ -228,12 +228,10 @@ func OpenBanner(r io.Reader) (*banner, error) {
 	tiles := DeserializeTiles4BPP(tilesRaw)
 
 	// Turn into one big image
-	icon := image.NewPaletted(image.Rect(0, 0, 32, 32), palette)
+	icon := NewTilemap(4, 4, tiles, palette)
 	b.icon = icon
-	for i := range tiles {
-		x := (i & 3) * 8
-		y := (i >> 2) * 8
-		DrawTileSamePalette(icon, &tiles[i], x, y, false, false)
+	for i := range icon.Attributes {
+		icon.Attributes[i] = TilemapAttributes(i)
 	}
 
 	// Read titles