From fed868ddf6f65269e77410d7663e56fef588a32b Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 16 Mar 2023 22:14:14 +0800 Subject: [PATCH] Rename special anim scene graphics --- .../{unk_845973C.bin => bg.bin} | Bin .../{unk_845963C.pal => bg.pal} | 0 .../{unk_845967C.png => bg.png} | Bin .../{unk_845965C.pal => bg_tm_hm.pal} | 0 .../{unk_8459888.png => level_up.png} | Bin ...nk_8459960.png => outward_spiral_dots.png} | Bin .../{unk_84598C4.png => star.png} | Bin graphics/pokemon_special_anim/unk_8459868.pal | 19 -------- graphics/pokemon_special_anim/unk_84598A4.pal | 19 -------- graphics/pokemon_special_anim/unk_8459940.pal | 19 -------- src/pokemon_special_anim_scene.c | 42 +++++++++--------- 11 files changed, 21 insertions(+), 78 deletions(-) rename graphics/pokemon_special_anim/{unk_845973C.bin => bg.bin} (100%) rename graphics/pokemon_special_anim/{unk_845963C.pal => bg.pal} (100%) rename graphics/pokemon_special_anim/{unk_845967C.png => bg.png} (100%) rename graphics/pokemon_special_anim/{unk_845965C.pal => bg_tm_hm.pal} (100%) rename graphics/pokemon_special_anim/{unk_8459888.png => level_up.png} (100%) rename graphics/pokemon_special_anim/{unk_8459960.png => outward_spiral_dots.png} (100%) rename graphics/pokemon_special_anim/{unk_84598C4.png => star.png} (100%) delete mode 100644 graphics/pokemon_special_anim/unk_8459868.pal delete mode 100644 graphics/pokemon_special_anim/unk_84598A4.pal delete mode 100644 graphics/pokemon_special_anim/unk_8459940.pal diff --git a/graphics/pokemon_special_anim/unk_845973C.bin b/graphics/pokemon_special_anim/bg.bin similarity index 100% rename from graphics/pokemon_special_anim/unk_845973C.bin rename to graphics/pokemon_special_anim/bg.bin diff --git a/graphics/pokemon_special_anim/unk_845963C.pal b/graphics/pokemon_special_anim/bg.pal similarity index 100% rename from graphics/pokemon_special_anim/unk_845963C.pal rename to graphics/pokemon_special_anim/bg.pal diff --git a/graphics/pokemon_special_anim/unk_845967C.png b/graphics/pokemon_special_anim/bg.png similarity index 100% rename from graphics/pokemon_special_anim/unk_845967C.png rename to graphics/pokemon_special_anim/bg.png diff --git a/graphics/pokemon_special_anim/unk_845965C.pal b/graphics/pokemon_special_anim/bg_tm_hm.pal similarity index 100% rename from graphics/pokemon_special_anim/unk_845965C.pal rename to graphics/pokemon_special_anim/bg_tm_hm.pal diff --git a/graphics/pokemon_special_anim/unk_8459888.png b/graphics/pokemon_special_anim/level_up.png similarity index 100% rename from graphics/pokemon_special_anim/unk_8459888.png rename to graphics/pokemon_special_anim/level_up.png diff --git a/graphics/pokemon_special_anim/unk_8459960.png b/graphics/pokemon_special_anim/outward_spiral_dots.png similarity index 100% rename from graphics/pokemon_special_anim/unk_8459960.png rename to graphics/pokemon_special_anim/outward_spiral_dots.png diff --git a/graphics/pokemon_special_anim/unk_84598C4.png b/graphics/pokemon_special_anim/star.png similarity index 100% rename from graphics/pokemon_special_anim/unk_84598C4.png rename to graphics/pokemon_special_anim/star.png diff --git a/graphics/pokemon_special_anim/unk_8459868.pal b/graphics/pokemon_special_anim/unk_8459868.pal deleted file mode 100644 index 9448351d8..000000000 --- a/graphics/pokemon_special_anim/unk_8459868.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -230 230 255 -213 213 255 -197 197 255 -180 180 255 -164 164 255 -148 148 255 -131 131 255 -115 115 255 -98 98 255 -82 82 255 -65 65 255 -49 49 255 -32 32 255 -16 16 255 diff --git a/graphics/pokemon_special_anim/unk_84598A4.pal b/graphics/pokemon_special_anim/unk_84598A4.pal deleted file mode 100644 index a13a09ed3..000000000 --- a/graphics/pokemon_special_anim/unk_84598A4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -98 90 8 -197 189 24 -246 246 0 -148 139 16 -246 238 32 -222 213 0 -213 197 0 -180 164 0 -49 41 0 -172 148 32 -189 164 49 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon_special_anim/unk_8459940.pal b/graphics/pokemon_special_anim/unk_8459940.pal deleted file mode 100644 index 7354e267b..000000000 --- a/graphics/pokemon_special_anim/unk_8459940.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 106 255 -255 255 255 -230 230 230 -213 213 213 -197 197 197 -180 180 180 -164 164 164 -148 148 148 -131 131 131 -115 115 115 -98 98 98 -82 82 82 -65 65 65 -49 49 49 -32 32 32 -16 16 16 diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index e88399ea2..216966921 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -49,16 +49,16 @@ static void Task_LevelUpVerticalSprites(u8 taskId); static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data); static void SpriteCB_LevelUpVertical(struct Sprite *sprite); -static const u16 sBgPals_PSA_Any[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845963C.gbapal"); -static const u16 sBgPals_PSA_Anim4[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845965C.gbapal"); -static const u32 sBg3Tiles_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845967C.4bpp.lz"); -static const u32 sBg3Map_PSA[] = INCBIN_U32("graphics/pokemon_special_anim/unk_845973C.bin.lz"); -static const u16 sSpritePals_LevelUpVertical[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459868.gbapal"); -static const u32 sSpriteTiles_LevelUpVertical[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459888.4bpp.lz"); -static const u16 sSpritePals_Star[] = INCBIN_U16("graphics/pokemon_special_anim/unk_84598A4.gbapal"); -static const u32 sSpriteTiles_Star[] = INCBIN_U32("graphics/pokemon_special_anim/unk_84598C4.4bpp.lz"); -static const u16 sSpritePals_UseItem_OutwardSpiralDots[] = INCBIN_U16("graphics/pokemon_special_anim/unk_8459940.gbapal"); -static const u32 sSpriteTiles_UseItem_OutwardSpiralDots[] = INCBIN_U32("graphics/pokemon_special_anim/unk_8459960.4bpp.lz"); +static const u16 sBg_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg.gbapal"); +static const u16 sBg_TmHm_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/bg_tm_hm.gbapal"); +static const u32 sBg_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/bg.4bpp.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/pokemon_special_anim/bg.bin.lz"); +static const u16 sLevelUp_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/level_up.gbapal"); +static const u32 sLevelUp_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/level_up.4bpp.lz"); +static const u16 sStar_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/star.gbapal"); +static const u32 sStar_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/star.4bpp.lz"); +static const u16 sOutwardSpiralDots_Pal[] = INCBIN_U16("graphics/pokemon_special_anim/outward_spiral_dots.gbapal"); +static const u32 sOutwardSpiralDots_Gfx[] = INCBIN_U32("graphics/pokemon_special_anim/outward_spiral_dots.4bpp.lz"); static const struct BgTemplate sBgTemplates[] = { { @@ -116,24 +116,24 @@ static const s8 sStarCoordOffsets[][2] = { }; static const struct CompressedSpriteSheet sSpriteSheet_Star = { - sSpriteTiles_Star, + sStar_Gfx, 0x80, 2 }; static const struct SpritePalette sSpritePalette_Star = { - sSpritePals_Star, + sStar_Pal, 2 }; static const struct CompressedSpriteSheet sSpriteSheet_UseItem_OutwardSpiralDots = { - sSpriteTiles_UseItem_OutwardSpiralDots, + sOutwardSpiralDots_Gfx, 0x60, 5 }; static const struct SpritePalette sSpritePalette_UseItem_OutwardSpiralDots = { - sSpritePals_UseItem_OutwardSpiralDots, + sOutwardSpiralDots_Pal, 5 }; @@ -633,12 +633,12 @@ bool8 PSA_IsCopyingLevelUpWindowToVram(void) static void LoadBgGfxByAnimType(u16 animType) { - CopyToBgTilemapBuffer(3, sBg3Map_PSA, 0, 0x000); - DecompressAndCopyTileDataToVram(3, sBg3Tiles_PSA, 0, 0x000, 0); + CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0x000); + DecompressAndCopyTileDataToVram(3, sBg_Gfx, 0, 0x000, 0); if (animType != 4) - LoadPalette(sBgPals_PSA_Any, 0x00, 0x20); + LoadPalette(sBg_Pal, 0x00, 0x20); else - LoadPalette(sBgPals_PSA_Anim4, 0x00, 0x20); + LoadPalette(sBg_TmHm_Pal, 0x00, 0x20); } void PSA_CreateMonSpriteAtCloseness(u8 closeness) @@ -1382,9 +1382,9 @@ void CreateLevelUpVerticalSpritesTask(u16 x, u16 y, u16 tileTag, u16 paletteTag, static struct SpritePalette spritePalette; u8 taskId; spriteSheet.tag = tileTag; - spriteSheet.data = sSpriteTiles_LevelUpVertical; - spriteSheet.size = sSpriteTiles_LevelUpVertical[0] >> 8; - spritePalette.data = sSpritePals_LevelUpVertical; + spriteSheet.data = sLevelUp_Gfx; + spriteSheet.size = sLevelUp_Gfx[0] >> 8; + spritePalette.data = sLevelUp_Pal; spritePalette.tag = paletteTag; LoadCompressedSpriteSheet(&spriteSheet); LoadSpritePalette(&spritePalette);