ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Organize new battle anim gfx

Browse Source
This commit is contained in:
DizzyEggg 2019-04-02 12:26:24 +02:00
parent 7f07aae89b
commit 5c44f44ad2
8 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/battle_anims/sprites/energy_ball.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

0
graphics/battle_anims/sprites/290.png → graphics/battle_anims/sprites/purple_jab.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

0
graphics/battle_anims/sprites/toxicspike_color.png → graphics/battle_anims/sprites/toxic_spikes.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

0
graphics/battle_anims/sprites/289.png → graphics/battle_anims/sprites/white_streak.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

1
include/constants/battle_anim.h
View File

@ -299,6 +299,7 @@
#define ANIM_TAG_WHITE_STREAK (ANIM_SPRITES_START + 289)
#define ANIM_TAG_PURPLE_JAB (ANIM_SPRITES_START + 290)
#define ANIM_TAG_TOXIC_SPIKES (ANIM_SPRITES_START + 291)
#define ANIM_TAG_ENERGY_BALL (ANIM_SPRITES_START + 292)
// battlers
#define ANIM_ATTACKER 0

14
include/graphics.h
View File

@ -4663,8 +4663,6 @@ extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[];
extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[];
extern const u32 gBattleAnimSpriteSheet_284[];
extern const u32 gBattleAnimSpriteSheet_285[];
extern const u32 gBattleAnimSpriteSheet_289[];
extern const u32 gBattleAnimSpriteSheet_290[];
extern const u32 gBattleAnimSpritePalette_000[];
extern const u32 gBattleAnimSpritePalette_001[];
@ -4948,9 +4946,6 @@ extern const u32 gBattleAnimSpritePalette_285[];
extern const u32 gBattleAnimSpritePalette_286[];
extern const u32 gBattleAnimSpritePalette_287[];
extern const u32 gBattleAnimSpritePalette_288[];
extern const u32 gBattleAnimSpritePalette_289[];
extern const u32 gBattleAnimSpritePalette_290[];
extern const u32 gBattleAnimSpritePalette_291[];
extern const u32 gBattleAnimBackgroundImage_00[];
extern const u32 gBattleAnimBackgroundImage_02[];
@ -5200,4 +5195,13 @@ extern const u16 gPokenavConditionCancel_Pal[];
extern const u32 gUnknown_08DE34B8[];
extern const u16 gUnknown_08DE3398[];
// New Battle Anim Particles
extern const u32 gBattleAnimSpriteGfx_WhiteStreak[];
extern const u32 gBattleAnimSpritePal_WhiteStreak[];
extern const u32 gBattleAnimSpriteGfx_PurpleJab[];
extern const u32 gBattleAnimSpritePal_PurpleJab[];
extern const u32 gBattleAnimSpritePal_ToxicSpikes[];
extern const u32 gBattleAnimSpriteGfx_EnergyBall[];
extern const u32 gBattleAnimSpritePal_EnergyBall[];
#endif //GUARD_GRAPHICS_H

16
src/battle_anim.c
View File

@ -1055,9 +1055,11 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
{gBattleAnimSpriteSheet_183, 0x0800, ANIM_TAG_SLASH_2},
{gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_WHIP_HIT},
{gBattleAnimSpriteSheet_163, 0x0100, ANIM_TAG_BLUE_RING_2},
{gBattleAnimSpriteSheet_289, 0x1000, ANIM_TAG_WHITE_STREAK},
{gBattleAnimSpriteSheet_290, 0x800, ANIM_TAG_PURPLE_JAB},
{gBattleAnimSpriteSheet_152, 0x0080, ANIM_TAG_TOXIC_SPIKES},
// New
{gBattleAnimSpriteGfx_WhiteStreak, 0x0200, ANIM_TAG_WHITE_STREAK},
{gBattleAnimSpriteGfx_PurpleJab, 0x0100, ANIM_TAG_PURPLE_JAB},
{gBattleAnimSpriteSheet_152, 0x0080, ANIM_TAG_TOXIC_SPIKES},
{gBattleAnimSpriteGfx_EnergyBall, 0x0200, ANIM_TAG_ENERGY_BALL},
};
@ -1352,9 +1354,11 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePalette_286, ANIM_TAG_SLASH_2},
{gBattleAnimSpritePalette_287, ANIM_TAG_WHIP_HIT},
{gBattleAnimSpritePalette_288, ANIM_TAG_BLUE_RING_2},
{gBattleAnimSpritePalette_289, ANIM_TAG_WHITE_STREAK},
{gBattleAnimSpritePalette_290, ANIM_TAG_PURPLE_JAB},
{gBattleAnimSpritePalette_291, ANIM_TAG_TOXIC_SPIKES},
// New
{gBattleAnimSpritePal_WhiteStreak, ANIM_TAG_WHITE_STREAK},
{gBattleAnimSpritePal_PurpleJab, ANIM_TAG_PURPLE_JAB},
{gBattleAnimSpritePal_ToxicSpikes, ANIM_TAG_TOXIC_SPIKES},
{gBattleAnimSpritePal_EnergyBall, ANIM_TAG_ENERGY_BALL},
};
const struct BattleAnimBackground gBattleAnimBackgroundTable[] =

20
src/graphics.c
View File

@ -20,6 +20,18 @@ const u32 gSmokescreenImpactPalette[] = INCBIN_U32("graphics/battle_anims/sprite
const u32 gBlankGfxCompressed[] = INCBIN_U32("graphics/interface/blank.4bpp.lz");
// New Battle anims Particles
const u32 gBattleAnimSpriteGfx_WhiteStreak[] = INCBIN_U32("graphics/battle_anims/sprites/white_streak.4bpp.lz");
const u32 gBattleAnimSpritePal_WhiteStreak[] = INCBIN_U32("graphics/battle_anims/sprites/white_streak.gbapal.lz");
const u32 gBattleAnimSpriteGfx_PurpleJab[] = INCBIN_U32("graphics/battle_anims/sprites/purple_jab.4bpp.lz");
const u32 gBattleAnimSpritePal_PurpleJab[] = INCBIN_U32("graphics/battle_anims/sprites/purple_jab.gbapal.lz");
const u32 gBattleAnimSpritePal_ToxicSpikes[] = INCBIN_U32("graphics/battle_anims/sprites/toxic_spikes.gbapal.lz");
const u32 gBattleAnimSpriteGfx_EnergyBall[] = INCBIN_U32("graphics/battle_anims/sprites/energy_ball.4bpp.lz");
const u32 gBattleAnimSpritePal_EnergyBall[] = INCBIN_U32("graphics/battle_anims/sprites/energy_ball.gbapal.lz");
// Battle anims
const u32 gBattleAnimSpriteSheet_146[] = INCBIN_U32("graphics/battle_anims/sprites/146.4bpp.lz");
const u32 gBattleAnimSpriteSheet_000[] = INCBIN_U32("graphics/battle_anims/sprites/000.4bpp.lz");
@ -565,14 +577,6 @@ const u32 gBattleAnimSpritePalette_163[] = INCBIN_U32("graphics/battle_anims/spr
const u32 gBattleAnimSpritePalette_288[] = INCBIN_U32("graphics/battle_anims/sprites/288.gbapal.lz");
const u32 gBattleAnimSpriteSheet_289[] = INCBIN_U32("graphics/battle_anims/sprites/289.4bpp.lz");
const u32 gBattleAnimSpritePalette_289[] = INCBIN_U32("graphics/battle_anims/sprites/289.gbapal.lz");
const u32 gBattleAnimSpriteSheet_290[] = INCBIN_U32("graphics/battle_anims/sprites/290.4bpp.lz");
const u32 gBattleAnimSpritePalette_290[] = INCBIN_U32("graphics/battle_anims/sprites/290.gbapal.lz");
const u32 gBattleAnimSpritePalette_291[] = INCBIN_U32("graphics/battle_anims/sprites/toxicspike_color.gbapal.lz"); //reuse the spike image
const u32 gBattleAnimSpritePalette_164[] = INCBIN_U32("graphics/battle_anims/sprites/164.gbapal.lz");
const u32 gBattleAnimSpritePalette_165[] = INCBIN_U32("graphics/battle_anims/sprites/165.gbapal.lz");