From 8f832434e57a14a661d22b151d90af3bb55f463a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 13:08:46 -0600 Subject: Change drought colors table files to .bin --- graphics/weather/drought/0.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/1.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/2.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/3.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/4.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/5.gbapal | Bin 8192 -> 0 bytes graphics/weather/drought/colors_0.bin | Bin 0 -> 8192 bytes graphics/weather/drought/colors_1.bin | Bin 0 -> 8192 bytes graphics/weather/drought/colors_2.bin | Bin 0 -> 8192 bytes graphics/weather/drought/colors_3.bin | Bin 0 -> 8192 bytes graphics/weather/drought/colors_4.bin | Bin 0 -> 8192 bytes graphics/weather/drought/colors_5.bin | Bin 0 -> 8192 bytes src/field_weather.c | 12 ++++++------ 13 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 graphics/weather/drought/0.gbapal delete mode 100644 graphics/weather/drought/1.gbapal delete mode 100644 graphics/weather/drought/2.gbapal delete mode 100644 graphics/weather/drought/3.gbapal delete mode 100644 graphics/weather/drought/4.gbapal delete mode 100644 graphics/weather/drought/5.gbapal create mode 100644 graphics/weather/drought/colors_0.bin create mode 100644 graphics/weather/drought/colors_1.bin create mode 100644 graphics/weather/drought/colors_2.bin create mode 100644 graphics/weather/drought/colors_3.bin create mode 100644 graphics/weather/drought/colors_4.bin create mode 100644 graphics/weather/drought/colors_5.bin diff --git a/graphics/weather/drought/0.gbapal b/graphics/weather/drought/0.gbapal deleted file mode 100644 index e8249d55a..000000000 Binary files a/graphics/weather/drought/0.gbapal and /dev/null differ diff --git a/graphics/weather/drought/1.gbapal b/graphics/weather/drought/1.gbapal deleted file mode 100644 index 145423a26..000000000 Binary files a/graphics/weather/drought/1.gbapal and /dev/null differ diff --git a/graphics/weather/drought/2.gbapal b/graphics/weather/drought/2.gbapal deleted file mode 100644 index 4cdaa0103..000000000 Binary files a/graphics/weather/drought/2.gbapal and /dev/null differ diff --git a/graphics/weather/drought/3.gbapal b/graphics/weather/drought/3.gbapal deleted file mode 100644 index 793a8bb86..000000000 Binary files a/graphics/weather/drought/3.gbapal and /dev/null differ diff --git a/graphics/weather/drought/4.gbapal b/graphics/weather/drought/4.gbapal deleted file mode 100644 index 315ec5193..000000000 Binary files a/graphics/weather/drought/4.gbapal and /dev/null differ diff --git a/graphics/weather/drought/5.gbapal b/graphics/weather/drought/5.gbapal deleted file mode 100644 index a74504f96..000000000 Binary files a/graphics/weather/drought/5.gbapal and /dev/null differ diff --git a/graphics/weather/drought/colors_0.bin b/graphics/weather/drought/colors_0.bin new file mode 100644 index 000000000..e8249d55a Binary files /dev/null and b/graphics/weather/drought/colors_0.bin differ diff --git a/graphics/weather/drought/colors_1.bin b/graphics/weather/drought/colors_1.bin new file mode 100644 index 000000000..145423a26 Binary files /dev/null and b/graphics/weather/drought/colors_1.bin differ diff --git a/graphics/weather/drought/colors_2.bin b/graphics/weather/drought/colors_2.bin new file mode 100644 index 000000000..4cdaa0103 Binary files /dev/null and b/graphics/weather/drought/colors_2.bin differ diff --git a/graphics/weather/drought/colors_3.bin b/graphics/weather/drought/colors_3.bin new file mode 100644 index 000000000..793a8bb86 Binary files /dev/null and b/graphics/weather/drought/colors_3.bin differ diff --git a/graphics/weather/drought/colors_4.bin b/graphics/weather/drought/colors_4.bin new file mode 100644 index 000000000..315ec5193 Binary files /dev/null and b/graphics/weather/drought/colors_4.bin differ diff --git a/graphics/weather/drought/colors_5.bin b/graphics/weather/drought/colors_5.bin new file mode 100644 index 000000000..a74504f96 Binary files /dev/null and b/graphics/weather/drought/colors_5.bin differ diff --git a/src/field_weather.c b/src/field_weather.c index 21168426c..0db635c60 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -73,12 +73,12 @@ IWRAM_DATA static const u8 *sPaletteGammaTypes; // The drought weather effect uses a precalculated color lookup table. Presumably this // is because the underlying color shift calculation is slow. const u16 sDroughtWeatherColors[][0x1000] = { - INCBIN_U16("graphics/weather/drought/0.gbapal"), - INCBIN_U16("graphics/weather/drought/1.gbapal"), - INCBIN_U16("graphics/weather/drought/2.gbapal"), - INCBIN_U16("graphics/weather/drought/3.gbapal"), - INCBIN_U16("graphics/weather/drought/4.gbapal"), - INCBIN_U16("graphics/weather/drought/5.gbapal"), + INCBIN_U16("graphics/weather/drought/colors_0.bin"), + INCBIN_U16("graphics/weather/drought/colors_1.bin"), + INCBIN_U16("graphics/weather/drought/colors_2.bin"), + INCBIN_U16("graphics/weather/drought/colors_3.bin"), + INCBIN_U16("graphics/weather/drought/colors_4.bin"), + INCBIN_U16("graphics/weather/drought/colors_5.bin"), }; // This is a pointer to gWeather. All code in this file accesses gWeather directly, -- cgit v1.2.3