summaryrefslogtreecommitdiff
path: root/tools/gbagfx/main.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-03 18:00:47 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-11-03 18:14:15 -0700
commit415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch)
tree8793240342d37104610f34756f6fee9db706ee8f /tools/gbagfx/main.c
parentae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff)
parent1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff)
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'tools/gbagfx/main.c')
-rw-r--r--tools/gbagfx/main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
index 37d3441fe..97db60e84 100644
--- a/tools/gbagfx/main.c
+++ b/tools/gbagfx/main.c
@@ -134,6 +134,14 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
ConvertPngToGba(inputPath, outputPath, numTiles, bitDepth);
}
+void HandlePngToGbaPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
+{
+ struct Palette palette;
+
+ ReadPngPalette(inputPath, &palette);
+ WriteGbaPalette(outputPath, &palette);
+}
+
void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
{
struct Palette palette;
@@ -353,6 +361,7 @@ int main(int argc, char **argv)
{ "png", "1bpp", HandlePngToGbaCommand },
{ "png", "4bpp", HandlePngToGbaCommand },
{ "png", "8bpp", HandlePngToGbaCommand },
+ { "png", "gbapal", HandlePngToGbaPaletteCommand },
{ "gbapal", "pal", HandleGbaToJascPaletteCommand },
{ "pal", "gbapal", HandleJascToGbaPaletteCommand },
{ "latfont", "png", HandleLatinFontToPngCommand },