From ee5e65d9edf859290e0e99c5fecbc941f9258041 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 03:57:44 -0500 Subject: Rename generic title screen tilemaps --- graphics/title_screen/clouds.bin | Bin 0 -> 2048 bytes graphics/title_screen/pokemon_logo.bin | Bin 0 -> 1024 bytes graphics/title_screen/title_screen1.bin | Bin 2048 -> 0 bytes graphics/title_screen/title_screen2.bin | Bin 1024 -> 0 bytes graphics/title_screen/unk_853EF78.pal | 115 -------------------------------- graphics/title_screen/unused.pal | 115 ++++++++++++++++++++++++++++++++ src/graphics.c | 4 +- src/title_screen.c | 2 +- 8 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 graphics/title_screen/clouds.bin create mode 100644 graphics/title_screen/pokemon_logo.bin delete mode 100644 graphics/title_screen/title_screen1.bin delete mode 100644 graphics/title_screen/title_screen2.bin delete mode 100644 graphics/title_screen/unk_853EF78.pal create mode 100644 graphics/title_screen/unused.pal diff --git a/graphics/title_screen/clouds.bin b/graphics/title_screen/clouds.bin new file mode 100644 index 000000000..161f23cc1 Binary files /dev/null and b/graphics/title_screen/clouds.bin differ diff --git a/graphics/title_screen/pokemon_logo.bin b/graphics/title_screen/pokemon_logo.bin new file mode 100644 index 000000000..0e6b7e775 Binary files /dev/null and b/graphics/title_screen/pokemon_logo.bin differ diff --git a/graphics/title_screen/title_screen1.bin b/graphics/title_screen/title_screen1.bin deleted file mode 100644 index 161f23cc1..000000000 Binary files a/graphics/title_screen/title_screen1.bin and /dev/null differ diff --git a/graphics/title_screen/title_screen2.bin b/graphics/title_screen/title_screen2.bin deleted file mode 100644 index 0e6b7e775..000000000 Binary files a/graphics/title_screen/title_screen2.bin and /dev/null differ diff --git a/graphics/title_screen/unk_853EF78.pal b/graphics/title_screen/unk_853EF78.pal deleted file mode 100644 index 0cc3bebc1..000000000 --- a/graphics/title_screen/unk_853EF78.pal +++ /dev/null @@ -1,115 +0,0 @@ -JASC-PAL -0100 -112 -0 0 0 -0 0 0 -16 16 16 -32 32 32 -49 49 49 -65 65 65 -90 90 90 -106 106 106 -123 123 123 -139 139 139 -156 156 156 -180 180 180 -197 197 197 -213 213 213 -255 255 255 -255 0 0 -0 0 0 -98 148 16 -98 156 16 -106 164 24 -115 172 32 -123 180 41 -131 197 49 -139 205 57 -148 213 65 -156 222 74 -180 106 172 -0 0 0 -0 0 0 -148 115 115 -123 131 65 -197 197 197 -123 131 65 -255 255 255 -255 255 255 -255 255 255 -0 32 0 -8 41 8 -24 57 16 -41 74 32 -49 90 41 -65 106 49 -82 123 65 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -189 106 8 -0 139 74 -255 255 255 -8 106 49 -8 115 57 -16 123 65 -16 131 74 -24 148 82 -24 156 90 -32 164 98 -41 180 115 -8 65 57 -205 255 197 -255 255 255 -255 0 0 -0 0 0 -123 131 65 -255 255 255 -255 255 255 -255 255 255 -0 0 0 -8 8 8 -24 24 24 -41 41 41 -49 49 49 -65 65 65 -82 82 82 -0 123 230 -255 255 255 -255 255 255 -255 0 0 -255 189 0 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -0 0 0 -41 74 32 -65 106 49 -90 139 74 -115 180 98 -139 213 123 -172 255 148 -0 123 230 -255 255 255 -255 255 255 -255 0 0 -255 189 0 -189 106 8 -0 139 74 -255 255 255 -8 106 49 -8 115 57 -16 123 65 -16 131 74 -24 148 82 -24 156 90 -32 164 98 -41 180 115 -8 65 57 -180 230 172 -255 255 255 -255 0 0 -255 189 0 diff --git a/graphics/title_screen/unused.pal b/graphics/title_screen/unused.pal new file mode 100644 index 000000000..0cc3bebc1 --- /dev/null +++ b/graphics/title_screen/unused.pal @@ -0,0 +1,115 @@ +JASC-PAL +0100 +112 +0 0 0 +0 0 0 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +90 90 90 +106 106 106 +123 123 123 +139 139 139 +156 156 156 +180 180 180 +197 197 197 +213 213 213 +255 255 255 +255 0 0 +0 0 0 +98 148 16 +98 156 16 +106 164 24 +115 172 32 +123 180 41 +131 197 49 +139 205 57 +148 213 65 +156 222 74 +180 106 172 +0 0 0 +0 0 0 +148 115 115 +123 131 65 +197 197 197 +123 131 65 +255 255 255 +255 255 255 +255 255 255 +0 32 0 +8 41 8 +24 57 16 +41 74 32 +49 90 41 +65 106 49 +82 123 65 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +189 106 8 +0 139 74 +255 255 255 +8 106 49 +8 115 57 +16 123 65 +16 131 74 +24 148 82 +24 156 90 +32 164 98 +41 180 115 +8 65 57 +205 255 197 +255 255 255 +255 0 0 +0 0 0 +123 131 65 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +8 8 8 +24 24 24 +41 41 41 +49 49 49 +65 65 65 +82 82 82 +0 123 230 +255 255 255 +255 255 255 +255 0 0 +255 189 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +41 74 32 +65 106 49 +90 139 74 +115 180 98 +139 213 123 +172 255 148 +0 123 230 +255 255 255 +255 255 255 +255 0 0 +255 189 0 +189 106 8 +0 139 74 +255 255 255 +8 106 49 +8 115 57 +16 123 65 +16 131 74 +24 148 82 +24 156 90 +32 164 98 +41 180 115 +8 65 57 +180 230 172 +255 255 255 +255 0 0 +255 189 0 diff --git a/src/graphics.c b/src/graphics.c index 73825aebf..26eae14e2 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1505,12 +1505,12 @@ const u16 gMonIconPalettes[][16] = const u16 gTitleScreenBgPalettes[] = INCBIN_U16("graphics/title_screen/pokemon_logo.gbapal", "graphics/title_screen/rayquaza_and_clouds.gbapal"); const u16 gTitleScreenEmeraldVersionPal[] = INCBIN_U16("graphics/title_screen/emerald_version.gbapal"); -const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/title_screen1.bin.lz"); +const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/clouds.bin.lz"); const u32 gTitleScreenPokemonLogoGfx[] = INCBIN_U32("graphics/title_screen/pokemon_logo.8bpp.lz"); const u32 gTitleScreenEmeraldVersionGfx[] = INCBIN_U32("graphics/title_screen/emerald_version.8bpp.lz"); const u16 gTitleScreenPressStartPal[] = INCBIN_U16("graphics/title_screen/press_start.gbapal"); const u32 gTitleScreenPressStartGfx[] = INCBIN_U32("graphics/title_screen/press_start.4bpp.lz"); -const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/title_screen2.bin.lz"); +const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/pokemon_logo.bin.lz"); // size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well const u16 gFrontierPassBg_Pal[][16] = INCBIN_U16("graphics/frontier_pass/bg.gbapal"); diff --git a/src/title_screen.c b/src/title_screen.c index 93e01327c..d64ee6024 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -52,7 +52,7 @@ static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite); static void SpriteCB_PokemonLogoShine(struct Sprite *sprite); // const rom data -static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal"); +static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unused.gbapal"); static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz"); static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz"); -- cgit v1.2.3