From 7042c996c43399eb2a1a4afdf25b48b5a17bdee8 Mon Sep 17 00:00:00 2001 From: tianmaru Date: Wed, 2 Sep 2020 22:25:39 +0200 Subject: [PATCH 1/3] renamed title screen sprites --- .../{unk_8eae4a8.png => blank_obj.png} | Bin .../{unk_83BF58C.png => border_bg.png} | Bin ..._8eae374.bin => copyright_press_start.bin} | Bin ..._8eae0b4.png => copyright_press_start.png} | Bin .../background.pal} | 0 .../blank_fire_sprite.png} | Bin .../border_bg.bin} | 0 .../box_art_mon.bin} | Bin .../box_art_mon.pal} | 0 .../box_art_mon.png} | Bin .../fire_or_leaf.pal} | 0 .../fire_or_leaf.png} | Bin .../game_title_logo.bin} | Bin .../game_title_logo.pal} | 0 .../game_title_logo.png} | Bin .../slash_sprite.pal} | 0 .../background.pal} | 0 .../blank_leaf_sprite.png} | Bin .../border_bg.bin} | 0 .../box_art_mon.bin} | Bin .../box_art_mon.pal} | 0 .../box_art_mon.png} | Bin .../fire_or_leaf.pal} | 0 .../fire_or_leaf.png} | Bin .../game_title_logo.bin} | Bin .../game_title_logo.pal} | 0 .../game_title_logo.png} | Bin .../slash_sprite.pal} | 0 .../{unk_83bf64c.png => slash_sprite.png} | Bin src/graphics.c | 44 +++++++++--------- src/title_screen.c | 20 ++++---- 31 files changed, 32 insertions(+), 32 deletions(-) rename graphics/title_screen/{unk_8eae4a8.png => blank_obj.png} (100%) rename graphics/title_screen/{unk_83BF58C.png => border_bg.png} (100%) rename graphics/title_screen/{unk_8eae374.bin => copyright_press_start.bin} (100%) rename graphics/title_screen/{unk_8eae0b4.png => copyright_press_start.png} (100%) rename graphics/title_screen/{unk_8eae094.pal => firered/background.pal} (100%) rename graphics/title_screen/{unk_83bfa14.png => firered/blank_fire_sprite.png} (100%) rename graphics/title_screen/{unk_83BF5A8.bin => firered/border_bg.bin} (100%) rename graphics/title_screen/{unk_8eadee4.bin => firered/box_art_mon.bin} (100%) rename graphics/title_screen/{unk_8ead5e8.pal => firered/box_art_mon.pal} (100%) rename graphics/title_screen/{unk_8ead608.png => firered/box_art_mon.png} (100%) rename graphics/title_screen/{unk_8eae488.pal => firered/fire_or_leaf.pal} (100%) rename graphics/title_screen/{unk_83bf79c.png => firered/fire_or_leaf.png} (100%) rename graphics/title_screen/{unk_8ead390.bin => firered/game_title_logo.bin} (100%) rename graphics/title_screen/{unk_8eab6c4.pal => firered/game_title_logo.pal} (100%) rename graphics/title_screen/{unk_8eab8c4.png => firered/game_title_logo.png} (100%) rename graphics/title_screen/{unk_83bf77c.pal => firered/slash_sprite.pal} (100%) rename graphics/title_screen/{unk_lg_8eae388.pal => leafgreen/background.pal} (100%) rename graphics/title_screen/{unk_lg_83bf89c.png => leafgreen/blank_leaf_sprite.png} (100%) rename graphics/title_screen/{lg_border_bg.bin => leafgreen/border_bg.bin} (100%) rename graphics/title_screen/{unk_lg_8eae1ec.bin => leafgreen/box_art_mon.bin} (100%) rename graphics/title_screen/{unk_lg_8ead768.pal => leafgreen/box_art_mon.pal} (100%) rename graphics/title_screen/{unk_lg_8ead788.png => leafgreen/box_art_mon.png} (100%) rename graphics/title_screen/{unk_lg_8eae77c.pal => leafgreen/fire_or_leaf.pal} (100%) rename graphics/title_screen/{unk_lg_83bf784.png => leafgreen/fire_or_leaf.png} (100%) rename graphics/title_screen/{unk_lg_8ead508.bin => leafgreen/game_title_logo.bin} (100%) rename graphics/title_screen/{unk_lg_8eab744.pal => leafgreen/game_title_logo.pal} (100%) rename graphics/title_screen/{unk_lg_8eab944.png => leafgreen/game_title_logo.png} (100%) rename graphics/title_screen/{unk_lg_83bf764.pal => leafgreen/slash_sprite.pal} (100%) rename graphics/title_screen/{unk_83bf64c.png => slash_sprite.png} (100%) diff --git a/graphics/title_screen/unk_8eae4a8.png b/graphics/title_screen/blank_obj.png similarity index 100% rename from graphics/title_screen/unk_8eae4a8.png rename to graphics/title_screen/blank_obj.png diff --git a/graphics/title_screen/unk_83BF58C.png b/graphics/title_screen/border_bg.png similarity index 100% rename from graphics/title_screen/unk_83BF58C.png rename to graphics/title_screen/border_bg.png diff --git a/graphics/title_screen/unk_8eae374.bin b/graphics/title_screen/copyright_press_start.bin similarity index 100% rename from graphics/title_screen/unk_8eae374.bin rename to graphics/title_screen/copyright_press_start.bin diff --git a/graphics/title_screen/unk_8eae0b4.png b/graphics/title_screen/copyright_press_start.png similarity index 100% rename from graphics/title_screen/unk_8eae0b4.png rename to graphics/title_screen/copyright_press_start.png diff --git a/graphics/title_screen/unk_8eae094.pal b/graphics/title_screen/firered/background.pal similarity index 100% rename from graphics/title_screen/unk_8eae094.pal rename to graphics/title_screen/firered/background.pal diff --git a/graphics/title_screen/unk_83bfa14.png b/graphics/title_screen/firered/blank_fire_sprite.png similarity index 100% rename from graphics/title_screen/unk_83bfa14.png rename to graphics/title_screen/firered/blank_fire_sprite.png diff --git a/graphics/title_screen/unk_83BF5A8.bin b/graphics/title_screen/firered/border_bg.bin similarity index 100% rename from graphics/title_screen/unk_83BF5A8.bin rename to graphics/title_screen/firered/border_bg.bin diff --git a/graphics/title_screen/unk_8eadee4.bin b/graphics/title_screen/firered/box_art_mon.bin similarity index 100% rename from graphics/title_screen/unk_8eadee4.bin rename to graphics/title_screen/firered/box_art_mon.bin diff --git a/graphics/title_screen/unk_8ead5e8.pal b/graphics/title_screen/firered/box_art_mon.pal similarity index 100% rename from graphics/title_screen/unk_8ead5e8.pal rename to graphics/title_screen/firered/box_art_mon.pal diff --git a/graphics/title_screen/unk_8ead608.png b/graphics/title_screen/firered/box_art_mon.png similarity index 100% rename from graphics/title_screen/unk_8ead608.png rename to graphics/title_screen/firered/box_art_mon.png diff --git a/graphics/title_screen/unk_8eae488.pal b/graphics/title_screen/firered/fire_or_leaf.pal similarity index 100% rename from graphics/title_screen/unk_8eae488.pal rename to graphics/title_screen/firered/fire_or_leaf.pal diff --git a/graphics/title_screen/unk_83bf79c.png b/graphics/title_screen/firered/fire_or_leaf.png similarity index 100% rename from graphics/title_screen/unk_83bf79c.png rename to graphics/title_screen/firered/fire_or_leaf.png diff --git a/graphics/title_screen/unk_8ead390.bin b/graphics/title_screen/firered/game_title_logo.bin similarity index 100% rename from graphics/title_screen/unk_8ead390.bin rename to graphics/title_screen/firered/game_title_logo.bin diff --git a/graphics/title_screen/unk_8eab6c4.pal b/graphics/title_screen/firered/game_title_logo.pal similarity index 100% rename from graphics/title_screen/unk_8eab6c4.pal rename to graphics/title_screen/firered/game_title_logo.pal diff --git a/graphics/title_screen/unk_8eab8c4.png b/graphics/title_screen/firered/game_title_logo.png similarity index 100% rename from graphics/title_screen/unk_8eab8c4.png rename to graphics/title_screen/firered/game_title_logo.png diff --git a/graphics/title_screen/unk_83bf77c.pal b/graphics/title_screen/firered/slash_sprite.pal similarity index 100% rename from graphics/title_screen/unk_83bf77c.pal rename to graphics/title_screen/firered/slash_sprite.pal diff --git a/graphics/title_screen/unk_lg_8eae388.pal b/graphics/title_screen/leafgreen/background.pal similarity index 100% rename from graphics/title_screen/unk_lg_8eae388.pal rename to graphics/title_screen/leafgreen/background.pal diff --git a/graphics/title_screen/unk_lg_83bf89c.png b/graphics/title_screen/leafgreen/blank_leaf_sprite.png similarity index 100% rename from graphics/title_screen/unk_lg_83bf89c.png rename to graphics/title_screen/leafgreen/blank_leaf_sprite.png diff --git a/graphics/title_screen/lg_border_bg.bin b/graphics/title_screen/leafgreen/border_bg.bin similarity index 100% rename from graphics/title_screen/lg_border_bg.bin rename to graphics/title_screen/leafgreen/border_bg.bin diff --git a/graphics/title_screen/unk_lg_8eae1ec.bin b/graphics/title_screen/leafgreen/box_art_mon.bin similarity index 100% rename from graphics/title_screen/unk_lg_8eae1ec.bin rename to graphics/title_screen/leafgreen/box_art_mon.bin diff --git a/graphics/title_screen/unk_lg_8ead768.pal b/graphics/title_screen/leafgreen/box_art_mon.pal similarity index 100% rename from graphics/title_screen/unk_lg_8ead768.pal rename to graphics/title_screen/leafgreen/box_art_mon.pal diff --git a/graphics/title_screen/unk_lg_8ead788.png b/graphics/title_screen/leafgreen/box_art_mon.png similarity index 100% rename from graphics/title_screen/unk_lg_8ead788.png rename to graphics/title_screen/leafgreen/box_art_mon.png diff --git a/graphics/title_screen/unk_lg_8eae77c.pal b/graphics/title_screen/leafgreen/fire_or_leaf.pal similarity index 100% rename from graphics/title_screen/unk_lg_8eae77c.pal rename to graphics/title_screen/leafgreen/fire_or_leaf.pal diff --git a/graphics/title_screen/unk_lg_83bf784.png b/graphics/title_screen/leafgreen/fire_or_leaf.png similarity index 100% rename from graphics/title_screen/unk_lg_83bf784.png rename to graphics/title_screen/leafgreen/fire_or_leaf.png diff --git a/graphics/title_screen/unk_lg_8ead508.bin b/graphics/title_screen/leafgreen/game_title_logo.bin similarity index 100% rename from graphics/title_screen/unk_lg_8ead508.bin rename to graphics/title_screen/leafgreen/game_title_logo.bin diff --git a/graphics/title_screen/unk_lg_8eab744.pal b/graphics/title_screen/leafgreen/game_title_logo.pal similarity index 100% rename from graphics/title_screen/unk_lg_8eab744.pal rename to graphics/title_screen/leafgreen/game_title_logo.pal diff --git a/graphics/title_screen/unk_lg_8eab944.png b/graphics/title_screen/leafgreen/game_title_logo.png similarity index 100% rename from graphics/title_screen/unk_lg_8eab944.png rename to graphics/title_screen/leafgreen/game_title_logo.png diff --git a/graphics/title_screen/unk_lg_83bf764.pal b/graphics/title_screen/leafgreen/slash_sprite.pal similarity index 100% rename from graphics/title_screen/unk_lg_83bf764.pal rename to graphics/title_screen/leafgreen/slash_sprite.pal diff --git a/graphics/title_screen/unk_83bf64c.png b/graphics/title_screen/slash_sprite.png similarity index 100% rename from graphics/title_screen/unk_83bf64c.png rename to graphics/title_screen/slash_sprite.png diff --git a/src/graphics.c b/src/graphics.c index 391913eb7..e6f2b6dcc 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1377,31 +1377,31 @@ const u32 gCreditsPokeballBgGfxTiles[] = INCBIN_U32("graphics/credits/unk_8EAAB9 const u32 gCreditsPokeballBgGfxMap[] = INCBIN_U32("graphics/credits/unk_8EAB30C.bin.lz"); #ifdef FIRERED -const u16 gGraphics_TitleScreen_GameTitleLogoPals[] = INCBIN_U16("graphics/title_screen/unk_8eab6c4.gbapal"); -const u8 gGraphics_TitleScreen_GameTitleLogoTiles[] = INCBIN_U8("graphics/title_screen/unk_8eab8c4.8bpp.lz"); -const u8 gGraphics_TitleScreen_GameTitleLogoMap[] = INCBIN_U8("graphics/title_screen/unk_8ead390.bin.lz"); -const u16 gGraphics_TitleScreen_BoxArtMonPals[] = INCBIN_U16("graphics/title_screen/unk_8ead5e8.gbapal"); -const u8 gGraphics_TitleScreen_BoxArtMonTiles[] = INCBIN_U8("graphics/title_screen/unk_8ead608.4bpp.lz"); -const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen/unk_8eadee4.bin.lz"); -const u16 gGraphics_TitleScreen_BackgroundPals[] = INCBIN_U16("graphics/title_screen/unk_8eae094.gbapal"); -const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[] = INCBIN_U8("graphics/title_screen/unk_8eae0b4.4bpp.lz"); -const u8 gGraphics_TitleScreen_CopyrightPressStartMap[] = INCBIN_U8("graphics/title_screen/unk_8eae374.bin.lz"); -const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/unk_8eae488.gbapal"); -const u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/unk_8eae4a8.4bpp.lz"); +const u16 gGraphics_TitleScreen_GameTitleLogoPals[] = INCBIN_U16("graphics/title_screen/firered/game_title_logo.gbapal"); +const u8 gGraphics_TitleScreen_GameTitleLogoTiles[] = INCBIN_U8("graphics/title_screen/firered/game_title_logo.8bpp.lz"); +const u8 gGraphics_TitleScreen_GameTitleLogoMap[] = INCBIN_U8("graphics/title_screen/firered/game_title_logo.bin.lz"); +const u16 gGraphics_TitleScreen_BoxArtMonPals[] = INCBIN_U16("graphics/title_screen/firered/box_art_mon.gbapal"); +const u8 gGraphics_TitleScreen_BoxArtMonTiles[] = INCBIN_U8("graphics/title_screen/firered/box_art_mon.4bpp.lz"); +const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen/firered/box_art_mon.bin.lz"); +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 u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/blank_obj.4bpp.lz"); #endif #ifdef LEAFGREEN -const u16 gGraphics_TitleScreen_GameTitleLogoPals[] = INCBIN_U16("graphics/title_screen/unk_lg_8eab744.gbapal"); -const u8 gGraphics_TitleScreen_GameTitleLogoTiles[] = INCBIN_U8("graphics/title_screen/unk_lg_8eab944.8bpp.lz"); -const u8 gGraphics_TitleScreen_GameTitleLogoMap[] = INCBIN_U8("graphics/title_screen/unk_lg_8ead508.bin.lz"); -const u16 gGraphics_TitleScreen_BoxArtMonPals[] = INCBIN_U16("graphics/title_screen/unk_lg_8ead768.gbapal"); -const u8 gGraphics_TitleScreen_BoxArtMonTiles[] = INCBIN_U8("graphics/title_screen/unk_lg_8ead788.4bpp.lz"); -const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen/unk_lg_8eae1ec.bin.lz"); -const u16 gGraphics_TitleScreen_BackgroundPals[] = INCBIN_U16("graphics/title_screen/unk_lg_8eae388.gbapal"); -const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[] = INCBIN_U8("graphics/title_screen/unk_8eae0b4.4bpp.lz"); -const u8 gGraphics_TitleScreen_CopyrightPressStartMap[] = INCBIN_U8("graphics/title_screen/unk_8eae374.bin.lz"); -const u16 gGraphics_TitleScreen_FireOrLeafPals[] = INCBIN_U16("graphics/title_screen/unk_lg_8eae77c.gbapal"); -const u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/unk_8eae4a8.4bpp.lz"); +const u16 gGraphics_TitleScreen_GameTitleLogoPals[] = INCBIN_U16("graphics/title_screen/leafgreen/game_title_logo.gbapal"); +const u8 gGraphics_TitleScreen_GameTitleLogoTiles[] = INCBIN_U8("graphics/title_screen/leafgreen/game_title_logo.8bpp.lz"); +const u8 gGraphics_TitleScreen_GameTitleLogoMap[] = INCBIN_U8("graphics/title_screen/leafgreen/game_title_logo.bin.lz"); +const u16 gGraphics_TitleScreen_BoxArtMonPals[] = INCBIN_U16("graphics/title_screen/leafgreen/box_art_mon.gbapal"); +const u8 gGraphics_TitleScreen_BoxArtMonTiles[] = INCBIN_U8("graphics/title_screen/leafgreen/box_art_mon.4bpp.lz"); +const u8 gGraphics_TitleScreen_BoxArtMonMap[] = INCBIN_U8("graphics/title_screen/leafgreen/box_art_mon.bin.lz"); +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 u32 gGraphics_TitleScreen_BlankObjTiles[] = INCBIN_U32("graphics/title_screen/blank_obj.4bpp.lz"); #endif const u16 gCreditsAllRightsReservedGfxPal[] = INCBIN_U16("graphics/credits/unk_8EAE548.gbapal"); diff --git a/src/title_screen.c b/src/title_screen.c index 156dfa50d..673dd9ed3 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -69,23 +69,23 @@ static bool32 IsSlashSpriteHidden(u8 spriteId); static void SpriteCallback_Slash(struct Sprite * sprite); // bg3 -static const u8 sBorderBgTiles[] = INCBIN_U8("graphics/title_screen/unk_83BF58C.4bpp.lz"); +static const u8 sBorderBgTiles[] = INCBIN_U8("graphics/title_screen/border_bg.4bpp.lz"); #if defined(FIRERED) -static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/unk_83BF5A8.bin.lz"); +static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/firered/border_bg.bin.lz"); #elif defined(LEAFGREEN) -static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/lg_border_bg.bin.lz"); +static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/leafgreen/border_bg.bin.lz"); #endif //sprites -static const u32 sSlashSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf64c.4bpp.lz"); +static const u32 sSlashSpriteTiles[] = INCBIN_U32("graphics/title_screen/slash_sprite.4bpp.lz"); #if defined(FIRERED) -static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_83bf77c.gbapal"); -static const u32 sFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf79c.4bpp.lz"); -static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bfa14.4bpp.lz"); +static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/firered/slash_sprite.gbapal"); +static const u32 sFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/firered/fire_sprite.4bpp.lz"); +static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/firered/blank_fire_sprite.4bpp.lz"); #elif defined(LEAFGREEN) -static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_lg_83bf764.gbapal"); -static const u32 sLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf784.4bpp.lz"); -static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf89c.4bpp.lz"); +static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/leafgreen/slash_sprite.gbapal"); +static const u32 sLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/leafgreen/leaf_sprite.4bpp.lz"); +static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/leafgreen/blank_leaf_sprite.4bpp.lz"); #endif static const struct OamData sOamData_FlameOrLeaf = { From 1b5d054e0b2d4d56170e84bd7f0dce2e57c98487 Mon Sep 17 00:00:00 2001 From: tianmaru Date: Wed, 2 Sep 2020 23:04:54 +0200 Subject: [PATCH 2/3] fix wrong file names --- .../firered/{fire_or_leaf.pal => fire_sprite.pal} | 0 .../firered/{fire_or_leaf.png => fire_sprite.png} | Bin .../leafgreen/{fire_or_leaf.pal => leaf_sprite.pal} | 0 .../leafgreen/{fire_or_leaf.png => leaf_sprite.png} | Bin src/graphics.c | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename graphics/title_screen/firered/{fire_or_leaf.pal => fire_sprite.pal} (100%) rename graphics/title_screen/firered/{fire_or_leaf.png => fire_sprite.png} (100%) rename graphics/title_screen/leafgreen/{fire_or_leaf.pal => leaf_sprite.pal} (100%) rename graphics/title_screen/leafgreen/{fire_or_leaf.png => leaf_sprite.png} (100%) diff --git a/graphics/title_screen/firered/fire_or_leaf.pal b/graphics/title_screen/firered/fire_sprite.pal similarity index 100% rename from graphics/title_screen/firered/fire_or_leaf.pal rename to graphics/title_screen/firered/fire_sprite.pal diff --git a/graphics/title_screen/firered/fire_or_leaf.png b/graphics/title_screen/firered/fire_sprite.png similarity index 100% rename from graphics/title_screen/firered/fire_or_leaf.png rename to graphics/title_screen/firered/fire_sprite.png diff --git a/graphics/title_screen/leafgreen/fire_or_leaf.pal b/graphics/title_screen/leafgreen/leaf_sprite.pal similarity index 100% rename from graphics/title_screen/leafgreen/fire_or_leaf.pal rename to graphics/title_screen/leafgreen/leaf_sprite.pal diff --git a/graphics/title_screen/leafgreen/fire_or_leaf.png b/graphics/title_screen/leafgreen/leaf_sprite.png similarity index 100% rename from graphics/title_screen/leafgreen/fire_or_leaf.png rename to graphics/title_screen/leafgreen/leaf_sprite.png 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 From 22811953d8f1ea2d29b5447ad7e28951677b46a9 Mon Sep 17 00:00:00 2001 From: tianmaru Date: Thu, 3 Sep 2020 00:36:59 +0200 Subject: [PATCH 3/3] update make rules for graphics --- graphics_file_rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 7a2173172..64e173aa4 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -483,10 +483,10 @@ $(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png $(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 82 -$(TITLESCREENGFXDIR)/unk_8ead608.4bpp: %.4bpp: %.png +$(TITLESCREENGFXDIR)/firered/box_art_mon.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 135 -$(TITLESCREENGFXDIR)/unk_lg_8ead788.4bpp: %.4bpp: %.png +$(TITLESCREENGFXDIR)/leafgreen/box_art_mon.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 123 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png