Rename special anim scene graphics

This commit is contained in:
cbt6
2023-03-16 22:14:14 +08:00
parent 981d4a34d8
commit fed868ddf6
11 changed files with 21 additions and 78 deletions

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 152 B

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

@@ -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
@@ -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
@@ -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
+21 -21
View File
@@ -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);