Merge pull request #1842 from GriffinRichards/gbagfx-pals

Automatically constrain png pixels to bit depth
2024-12-26 19:54:21 +01:00 · 2023-01-12 16:36:05 -05:00 · 2023-01-12 16:36:05 -05:00 · 89286c91e3
commit 89286c91e3
parent cf14c1fd13 3009cc7220
12 changed files with 1 additions and 4 deletions
--- a/graphics/door_anims/battle_dome_pre_battle_room.png
+++ b/graphics/door_anims/battle_dome_pre_battle_room.png
--- a/graphics/door_anims/dewford.png
+++ b/graphics/door_anims/dewford.png
--- a/graphics/door_anims/fallarbor_dark_roof.png
+++ b/graphics/door_anims/fallarbor_dark_roof.png
--- a/graphics/door_anims/lilycove_dept_store_elevator.png
+++ b/graphics/door_anims/lilycove_dept_store_elevator.png
--- a/graphics/door_anims/littleroot.png
+++ b/graphics/door_anims/littleroot.png
--- a/graphics/door_anims/mossdeep.png
+++ b/graphics/door_anims/mossdeep.png
--- a/graphics/door_anims/oldale.png
+++ b/graphics/door_anims/oldale.png
--- a/graphics/door_anims/poke_mart.png
+++ b/graphics/door_anims/poke_mart.png
--- a/graphics/door_anims/slateport.png
+++ b/graphics/door_anims/slateport.png
--- a/graphics/door_anims/trainer_hill_roof_elevator.png
+++ b/graphics/door_anims/trainer_hill_roof_elevator.png
--- a/graphics/door_anims/verdanturf.png
+++ b/graphics/door_anims/verdanturf.png
--- a/tools/gbagfx/convert_png.c
+++ b/tools/gbagfx/convert_png.c
@ -62,10 +62,7 @@ static unsigned char *ConvertBitDepth(unsigned char *src, int srcBitDepth, int d

        for (j = 8 - srcBitDepth; j >= 0; j -= srcBitDepth)
        {
-            unsigned char pixel = (srcByte >> j) % (1 << srcBitDepth);
-
-            if (pixel >= (1 << destBitDepth))
-                FATAL_ERROR("Image exceeds the maximum color value for a %ibpp image.\n", destBitDepth);
+            unsigned char pixel = (srcByte >> j) % (1 << destBitDepth);
            *dest |= pixel << destBit;
            destBit -= destBitDepth;
            if (destBit < 0)