git.y1.nz

commit a5e9307de5ace7cba65c37439424f439a4d77bd5
parent ed346d7159540e8ee9d4065114f4cc925a38b18a
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Thu, 25 Jan 2024 01:50:01 -0800

Merge pull request #617 from bbbbbr/tools/png2hicolor_typos

png2hicolor: typos
Diffstat:
M
gbdk-lib/examples/gb/hicolor/Readme.md
2
+-
M
gbdk-support/png2hicolorgb/src/hicolor/defines.h
4
++--
M
gbdk-support/png2hicolorgb/src/hicolor/hicolour.c
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gbdk-lib/examples/gb/hicolor/Readme.md b/gbdk-lib/examples/gb/hicolor/Readme.md
@@ -7,7 +7,7 @@ To use them, include the automatically generated header file (based on the png f
 
 For the current GBDK example ISR implementation there is a limit of 6 sprites per line before the hi-color timing breaks down and there start to be background artifacts.
 
-# Pallete ISR
+# Palette ISR
 The new palette update ISR is contributed by Toxa
 https://github.com/untoxa
 
diff --git a/gbdk-support/png2hicolorgb/src/hicolor/defines.h b/gbdk-support/png2hicolorgb/src/hicolor/defines.h
@@ -22,8 +22,8 @@ typedef struct tagRGBQUAD {
 #define CGB_ATTR_NO_FLIP        0x00u
 #define CGB_ATTR_VFLIP          0x40u
 #define CGB_ATTR_HFLIP          0x20u
-#define CGB_ATTR_PALLETES_ONLY     0x07u
-#define CGB_ATTR_WITHOUT_PALLETES  (~(CGB_ATTR_PALLETES_ONLY))
+#define CGB_ATTR_PALETTES_ONLY     0x07u
+#define CGB_ATTR_WITHOUT_PALETTES  (~(CGB_ATTR_PALETTES_ONLY))
 
 #define CGB_TILES_START_BANK_0  0u
 #define CGB_TILES_START_BANK_1  256u
diff --git a/gbdk-support/png2hicolorgb/src/hicolor/hicolour.c b/gbdk-support/png2hicolorgb/src/hicolor/hicolour.c
@@ -357,7 +357,7 @@ static void DedupeTileset(void)
             // Update map data and attributes to new index
             // Mask out everything except palettes and then apply the new attribs (bank, vflip, hflip)
             MapTileIDs[mapx][mapy]    = new_tile_id;
-            MapAttributes[mapx][mapy] = (MapAttributes[mapx][mapy] & CGB_ATTR_PALLETES_ONLY) | new_attribs;
+            MapAttributes[mapx][mapy] = (MapAttributes[mapx][mapy] & CGB_ATTR_PALETTES_ONLY) | new_attribs;
         }
     }
     log_verbose("DedupeTileset(): Reduced tiles from %d (%d bytes) to %d (%d bytes) = %d bytes saved. %%%d of original size\n",

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.