From 1b5d054e0b2d4d56170e84bd7f0dce2e57c98487 Mon Sep 17 00:00:00 2001 From: tianmaru Date: Wed, 2 Sep 2020 23:04:54 +0200 Subject: fix wrong file names --- graphics/title_screen/firered/fire_or_leaf.pal | 19 ------------------- graphics/title_screen/firered/fire_or_leaf.png | Bin 539 -> 0 bytes graphics/title_screen/firered/fire_sprite.pal | 19 +++++++++++++++++++ graphics/title_screen/firered/fire_sprite.png | Bin 0 -> 539 bytes graphics/title_screen/leafgreen/fire_or_leaf.pal | 19 ------------------- graphics/title_screen/leafgreen/fire_or_leaf.png | Bin 350 -> 0 bytes graphics/title_screen/leafgreen/leaf_sprite.pal | 19 +++++++++++++++++++ graphics/title_screen/leafgreen/leaf_sprite.png | Bin 0 -> 350 bytes src/graphics.c | 4 ++-- 9 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 graphics/title_screen/firered/fire_or_leaf.pal delete mode 100644 graphics/title_screen/firered/fire_or_leaf.png create mode 100644 graphics/title_screen/firered/fire_sprite.pal create mode 100644 graphics/title_screen/firered/fire_sprite.png delete mode 100644 graphics/title_screen/leafgreen/fire_or_leaf.pal delete mode 100644 graphics/title_screen/leafgreen/fire_or_leaf.png create mode 100644 graphics/title_screen/leafgreen/leaf_sprite.pal create mode 100644 graphics/title_screen/leafgreen/leaf_sprite.png diff --git a/graphics/title_screen/firered/fire_or_leaf.pal b/graphics/title_screen/firered/fire_or_leaf.pal deleted file mode 100644 index 7a29ab72c..000000000 --- a/graphics/title_screen/firered/fire_or_leaf.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -82 205 180 -189 197 205 -164 164 172 -123 131 131 -213 213 222 -255 246 74 -255 213 32 -164 131 24 -246 164 24 -131 90 16 -106 98 90 -65 57 41 -230 82 16 -205 41 0 -139 8 8 -246 246 246 diff --git a/graphics/title_screen/firered/fire_or_leaf.png b/graphics/title_screen/firered/fire_or_leaf.png deleted file mode 100644 index 66a57a899..000000000 Binary files a/graphics/title_screen/firered/fire_or_leaf.png and /dev/null differ diff --git a/graphics/title_screen/firered/fire_sprite.pal b/graphics/title_screen/firered/fire_sprite.pal new file mode 100644 index 000000000..7a29ab72c --- /dev/null +++ b/graphics/title_screen/firered/fire_sprite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 205 180 +189 197 205 +164 164 172 +123 131 131 +213 213 222 +255 246 74 +255 213 32 +164 131 24 +246 164 24 +131 90 16 +106 98 90 +65 57 41 +230 82 16 +205 41 0 +139 8 8 +246 246 246 diff --git a/graphics/title_screen/firered/fire_sprite.png b/graphics/title_screen/firered/fire_sprite.png new file mode 100644 index 000000000..66a57a899 Binary files /dev/null and b/graphics/title_screen/firered/fire_sprite.png differ diff --git a/graphics/title_screen/leafgreen/fire_or_leaf.pal b/graphics/title_screen/leafgreen/fire_or_leaf.pal deleted file mode 100644 index 4b0df85f2..000000000 --- a/graphics/title_screen/leafgreen/fire_or_leaf.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 213 -172 180 197 -49 57 65 -115 123 131 -246 246 246 -57 82 82 -90 115 115 -123 131 123 -49 74 57 -16 32 24 -0 82 0 -32 82 24 -16 98 0 -57 164 16 -90 222 24 -189 255 8 diff --git a/graphics/title_screen/leafgreen/fire_or_leaf.png b/graphics/title_screen/leafgreen/fire_or_leaf.png deleted file mode 100644 index d4f7dd622..000000000 Binary files a/graphics/title_screen/leafgreen/fire_or_leaf.png and /dev/null differ diff --git a/graphics/title_screen/leafgreen/leaf_sprite.pal b/graphics/title_screen/leafgreen/leaf_sprite.pal new file mode 100644 index 000000000..4b0df85f2 --- /dev/null +++ b/graphics/title_screen/leafgreen/leaf_sprite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 213 +172 180 197 +49 57 65 +115 123 131 +246 246 246 +57 82 82 +90 115 115 +123 131 123 +49 74 57 +16 32 24 +0 82 0 +32 82 24 +16 98 0 +57 164 16 +90 222 24 +189 255 8 diff --git a/graphics/title_screen/leafgreen/leaf_sprite.png b/graphics/title_screen/leafgreen/leaf_sprite.png new file mode 100644 index 000000000..d4f7dd622 Binary files /dev/null and b/graphics/title_screen/leafgreen/leaf_sprite.png differ diff --git a/src/graphics.c b/src/graphics.c index e6f2b6dcc..a262ef8e2 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1386,7 +1386,7 @@ const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen const u16 gGraphics_TitleScreen_BackgroundPals[] = INCBIN_U16("graphics/title_screen/firered/background.gbapal"); const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[] = INCBIN_U8("graphics/title_screen/copyright_press_start.4bpp.lz"); const u8 gGraphics_TitleScreen_CopyrightPressStartMap[] = INCBIN_U8("graphics/title_screen/copyright_press_start.bin.lz"); -const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/firered/fire_or_leaf.gbapal"); +const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/firered/fire_sprite.gbapal"); const u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/blank_obj.4bpp.lz"); #endif @@ -1400,7 +1400,7 @@ const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen const u16 gGraphics_TitleScreen_BackgroundPals[] = INCBIN_U16("graphics/title_screen/leafgreen/background.gbapal"); const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[] = INCBIN_U8("graphics/title_screen/copyright_press_start.4bpp.lz"); const u8 gGraphics_TitleScreen_CopyrightPressStartMap[] = INCBIN_U8("graphics/title_screen/copyright_press_start.bin.lz"); -const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/leafgreen/fire_or_leaf.gbapal"); +const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/leafgreen/leaf_sprite.gbapal"); const u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/blank_obj.4bpp.lz"); #endif -- cgit v1.2.3