Rename title screen assets and remove dummied standalone pal

4 files changed, 46 insertions, 65 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 9d4464654..cea2a0ab3 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16531,44 +16531,44 @@ gCreditsPokeballBgGfxMap:: @ 8EAB30C
 
 	@ title_screen
 	.ifdef FIRERED
-gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4
+gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4
 	.incbin "graphics/title_screen/unk_8eab6c4.gbapal"
 
-gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4
+gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4
 	.incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz"
 
-gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390
+gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390
 	.incbin "graphics/title_screen/unk_8ead390.bin.lz"
 
-gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8
+gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8
 	.incbin "graphics/title_screen/unk_8ead5e8.gbapal"
 
-gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608
+gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608
 	.incbin "graphics/title_screen/unk_8ead608.4bpp.lz"
 
-gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4
+gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4
 	.incbin "graphics/title_screen/unk_8eadee4.bin.lz"
 
 gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
 	.incbin "graphics/title_screen/unk_8eae094.gbapal"
 	.else
 	.ifdef LEAFGREEN
-gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4
+gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4
 	.incbin "graphics/title_screen/unk_lg_8eab744.gbapal"
 
-gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4
+gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4
 	.incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz"
 
-gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390
+gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390
 	.incbin "graphics/title_screen/unk_lg_8ead508.bin.lz"
 
-gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8
+gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8
 	.incbin "graphics/title_screen/unk_lg_8ead768.gbapal"
 
-gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608
+gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608
 	.incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz"
 
-gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4
+gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4
 	.incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz"
 
 gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
@@ -16583,11 +16583,11 @@ gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374
 	.incbin "graphics/title_screen/unk_8eae374.bin.lz"
 
 	.ifdef FIRERED
-gGraphics_TitleScreen_FirePals:: @ 8EAE488
+gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488
 	.incbin "graphics/title_screen/unk_8eae488.gbapal"
 	.else
 	.ifdef LEAFGREEN
-gGraphics_TitleScreen_FirePals:: @ 8EAE488
+gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488
 	.incbin "graphics/title_screen/unk_lg_8eae77c.gbapal"
 	.endif
 	.endif
diff --git a/graphics/slot_machine/unk_846504c.pal b/graphics/slot_machine/unk_846504c.pal
deleted file mode 100644
index 9a5bab429..000000000
--- a/graphics/slot_machine/unk_846504c.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-238 172 0
-156 115 115
-246 205 205
-123 90 90
-222 164 164
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-222 123 32
-255 205 32
-205 90 0
diff --git a/include/graphics.h b/include/graphics.h
index 89541e748..dc0389420 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4297,17 +4297,17 @@ extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet[];
 extern const u32 gBattleAnimSpritePal_FlyingDirt[];
 
 // title_screen
-extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
-extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
-extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[];
-extern const u16 gGraphics_TitleScreen_CharizardPals[];
-extern const u8 gGraphics_TitleScreen_CharizardTiles[];
-extern const u8 gGraphics_TitleScreen_CharizardMap[];
+extern const u16 gGraphics_TitleScreen_GameTitleLogoPals[];
+extern const u8 gGraphics_TitleScreen_GameTitleLogoTiles[];
+extern const u8 gGraphics_TitleScreen_GameTitleLogoMap[];
+extern const u16 gGraphics_TitleScreen_BoxArtMonPals[];
+extern const u8 gGraphics_TitleScreen_BoxArtMonTiles[];
+extern const u8 gGraphics_TitleScreen_BoxArtMonMap[];
 extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match
 extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[];
 extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
-extern const u16 gGraphics_TitleScreen_FirePals[];
-extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
+extern const u16 gGraphics_TitleScreen_FireOrLeafPals[];
+extern const u32 gGraphics_TitleScreen_BlankObjTiles[];
 
 // battle_gfx_sfx_util
 extern const u32 gHealthboxSinglesPlayerGfx[];
diff --git a/src/title_screen.c b/src/title_screen.c
index 442ce9896..af78893b9 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -82,15 +82,15 @@ static const u8 sBorderBgMap[] = INCBIN_U8("data/graphics/title_screen/lg_border
 #endif
 
 //sprites
-static const u8 sSlashSpriteTiles[] = INCBIN_U8("data/graphics/title_screen/unk_83bf64c.4bpp.lz");
+static const u32 sSlashSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf64c.4bpp.lz");
 #if defined(FIRERED)
 static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_83bf77c.gbapal");
-static const u8 sFireSpriteTiles[] = INCBIN_U8("data/graphics/title_screen/unk_83bf79c.4bpp.lz");
-static const u8 sBlankFireSpriteTiles[] = INCBIN_U8("data/graphics/title_screen/unk_83bfa14.4bpp.lz");
+static const u32 sFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf79c.4bpp.lz");
+static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bfa14.4bpp.lz");
 #elif defined(LEAFGREEN)
 static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_lg_83bf764.gbapal");
-static const u8 sLeafSpriteTiles[] = INCBIN_U8("data/graphics/title_screen/unk_lg_83bf784.4bpp.lz");
-static const u8 sBlankFireSpriteTiles[] = INCBIN_U8("data/graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
+static const u32 sLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf784.4bpp.lz");
+static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
 #endif
 
 static const struct OamData sOamData_FlameOrLeaf = {
@@ -274,23 +274,23 @@ static void (*const sSceneFuncs[])(s16 * data) = {
 
 #if defined(FIRERED)
 static const struct CompressedSpriteSheet sSpriteSheets[] = {
-    {(const void *)sFireSpriteTiles, 0x500, 0},
-    {(const void *)sBlankFireSpriteTiles, 0x500, 1},
-    {(const void *)gGraphics_TitleScreen_BlankObjTiles, 0x400, 2},
-    {(const void *)sSlashSpriteTiles, 0x800, 3}
+    {sFireSpriteTiles, 0x500, 0},
+    {sBlankFireSpriteTiles, 0x500, 1},
+    {gGraphics_TitleScreen_BlankObjTiles, 0x400, 2},
+    {sSlashSpriteTiles, 0x800, 3}
 };
 #elif defined(LEAFGREEN)
 static const struct CompressedSpriteSheet sSpriteSheets[] = {
-    {(const void *)sLeafSpriteTiles, 0x580, 0},
-    {(const void *)sBlankFireSpriteTiles, 0x100, 1},
-    {(const void *)gGraphics_TitleScreen_BlankObjTiles, 0x400, 2},
-    {(const void *)sSlashSpriteTiles, 0x800, 3}
+    {sLeafSpriteTiles, 0x580, 0},
+    {sBlankLeafSpriteTiles, 0x100, 1},
+    {gGraphics_TitleScreen_BlankObjTiles, 0x400, 2},
+    {sSlashSpriteTiles, 0x800, 3}
 };
 #endif
 
 static const struct SpritePalette sSpritePals[] = {
     {sSlashSpritePals, 0},
-    {gGraphics_TitleScreen_FirePals, 2},
+    {gGraphics_TitleScreen_FireOrLeafPals, 2},
     {}
 };
 
@@ -330,12 +330,12 @@ void CB2_InitTitleScreen(void)
         sTitleScreenTimerTaskId = 0xFF;
         break;
     case 1:
-        LoadPalette(gGraphics_TitleScreen_PokemonFireRedLogoPals, 0, 0x1A0);
-        DecompressAndCopyTileDataToVram(0, gGraphics_TitleScreen_PokemonFireRedLogoTiles, 0, 0, 0);
-        DecompressAndCopyTileDataToVram(0, gGraphics_TitleScreen_PokemonFireRedLogoMap, 0, 0, 1);
-        LoadPalette(gGraphics_TitleScreen_CharizardPals, 0xD0, 0x20);
-        DecompressAndCopyTileDataToVram(1, gGraphics_TitleScreen_CharizardTiles, 0, 0, 0);
-        DecompressAndCopyTileDataToVram(1, gGraphics_TitleScreen_CharizardMap, 0, 0, 1);
+        LoadPalette(gGraphics_TitleScreen_GameTitleLogoPals, 0, 0x1A0);
+        DecompressAndCopyTileDataToVram(0, gGraphics_TitleScreen_GameTitleLogoTiles, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(0, gGraphics_TitleScreen_GameTitleLogoMap, 0, 0, 1);
+        LoadPalette(gGraphics_TitleScreen_BoxArtMonPals, 0xD0, 0x20);
+        DecompressAndCopyTileDataToVram(1, gGraphics_TitleScreen_BoxArtMonTiles, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(1, gGraphics_TitleScreen_BoxArtMonMap, 0, 0, 1);
         LoadPalette(gGraphics_TitleScreen_BackgroundPals, 0xF0, 0x20);
         DecompressAndCopyTileDataToVram(2, gGraphics_TitleScreen_CopyrightPressStartTiles, 0, 0, 0);
         DecompressAndCopyTileDataToVram(2, gGraphics_TitleScreen_CopyrightPressStartMap, 0, 0, 1);
@@ -553,7 +553,7 @@ static void SetTitleScreenScene_FadeIn(s16 * data)
             BlendPalettes(r4, 0x10, RGB(30, 30, 31));
             BeginNormalPaletteFade(r4, 1, 0x10, 0x00, RGB(30, 30, 31));
             ShowBg(0);
-            CpuCopy16(gGraphics_TitleScreen_CharizardPals, gPlttBufferUnfaded + 0xD0, 0x20);
+            CpuCopy16(gGraphics_TitleScreen_BoxArtMonPals, gPlttBufferUnfaded + 0xD0, 0x20);
             sub_80717A8(0x2000, 1, 0x0F, 0x00, RGB(30, 30, 31), 0, 0);
             data[1]++;
         }
@@ -863,8 +863,8 @@ static void LoadMainTitleScreenPalsAndResetBgs(void)
 
     sub_8071898();
     ResetPaletteFadeControl();
-    LoadPalette(gGraphics_TitleScreen_PokemonFireRedLogoPals, 0x00, 0x1A0);
-    LoadPalette(gGraphics_TitleScreen_CharizardPals, 0xD0, 0x20);
+    LoadPalette(gGraphics_TitleScreen_GameTitleLogoPals, 0x00, 0x1A0);
+    LoadPalette(gGraphics_TitleScreen_BoxArtMonPals, 0xD0, 0x20);
     LoadPalette(gGraphics_TitleScreen_BackgroundPals, 0xF0, 0x20);
     LoadPalette(gGraphics_TitleScreen_BackgroundPals, 0xE0, 0x20);
     ResetBgPositions();
@@ -1129,7 +1129,7 @@ static void SetPalOnOrCreateBlankSprite(bool32 mode)
     if (mode)
     {
         palIdx = IndexOfSpritePaletteTag(2);
-        LoadPalette(gGraphics_TitleScreen_FirePals, palIdx * 16 + 0x100, 0x20);
+        LoadPalette(gGraphics_TitleScreen_FireOrLeafPals, palIdx * 16 + 0x100, 0x20);
     }
     else
         CreateBlankSprite();