chore(cartridge): Change mapper fields from byte to uint8

gabe565 · Aug 24, 2024 · 640d1f7 · 640d1f7
1 parent 152ef6e
commit 640d1f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/gonesutil/ls/entry.go b/cmd/gonesutil/ls/entry.go
@@ -16,7 +16,7 @@ func newEntry(file string, cart *cartridge.Cartridge) *entry {
 type entry struct {
 	Path    string `json:"path" yaml:"path"`
 	Name    string `json:"name" yaml:"name"`
-	Mapper  byte   `json:"mapper" yaml:"mapper"`
+	Mapper  uint8  `json:"mapper" yaml:"mapper"`
 	Mirror  string `json:"mirror" yaml:"mirror"`
 	Battery bool   `json:"battery" yaml:"battery"`
 	Hash    string `json:"hash" yaml:"hash"`

diff --git a/internal/cartridge/cartridge.go b/internal/cartridge/cartridge.go
@@ -19,8 +19,8 @@ type Cartridge struct {
 	prg       []byte
 	CHR       []byte `msgpack:"alias:Chr"`
 	SRAM      []byte `msgpack:"alias:Sram"`
-	Mapper    byte   `msgpack:"-"`
-	Submapper byte   `msgpack:"-"`
+	Mapper    uint8  `msgpack:"-"`
+	Submapper uint8  `msgpack:"-"`
 	Mirror    Mirror
 	Battery   bool `msgpack:"-"`
 }

diff --git a/internal/cartridge/ines.go b/internal/cartridge/ines.go
@@ -24,7 +24,7 @@ type iNESFileHeader struct {
 	_        [7]byte
 }
 
-func (i iNESFileHeader) Mapper() byte {
+func (i iNESFileHeader) Mapper() uint8 {
 	return i.Control[1]&0xF0 | i.Control[0]>>4
 }
 
@@ -43,7 +43,7 @@ func (i iNESFileHeader) NESv2() bool {
 	return i.Control[1]&0xC == 0x8
 }
 
-func (i iNESFileHeader) Submapper() byte {
+func (i iNESFileHeader) Submapper() uint8 {
 	return i.Control[2] >> 4
 }