From 5c44f44ad23a335555fd0a6ae88038ead8f42e60 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Apr 2019 12:26:24 +0200 Subject: [PATCH] Organize new battle anim gfx --- graphics/battle_anims/sprites/energy_ball.png | Bin 0 -> 357 bytes .../sprites/{290.png => purple_jab.png} | Bin ...{toxicspike_color.png => toxic_spikes.png} | Bin .../sprites/{289.png => white_streak.png} | Bin include/constants/battle_anim.h | 1 + include/graphics.h | 14 +++++++----- src/battle_anim.c | 16 ++++++++------ src/graphics.c | 20 +++++++++++------- 8 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 graphics/battle_anims/sprites/energy_ball.png rename graphics/battle_anims/sprites/{290.png => purple_jab.png} (100%) mode change 100755 => 100644 rename graphics/battle_anims/sprites/{toxicspike_color.png => toxic_spikes.png} (100%) rename graphics/battle_anims/sprites/{289.png => white_streak.png} (100%) mode change 100755 => 100644 diff --git a/graphics/battle_anims/sprites/energy_ball.png b/graphics/battle_anims/sprites/energy_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..b3b26d6068cb2e1330e916c14dee664a5f380178 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*CkWB8L}7{x)~U@Ffd$Y z;P}t*|NnoWBrcF6sk;#<_rcS}F+^ix?nK9;!wNjEt_yzOI>$K6;GTBP?rfuFzx`yZ znv4D`hbZ;E?pw@z`0?kT9xmrko1A@Jc7KcAoLOh@)jz4>);5&W>E`Z_zFR&sm}!5E z*ujWX{F9l_mwSGX^O|Ta{7&exxWTzUON9<=H-uhr`^v!4V7;<+^Vg{-nbxSetEW4k z>pXdEb;K7xqs&Vh4l&vSj^{2j9kX{RtYiD7yF#wabZtXl*qg~V(&vtZ^QN(XP&jCF zFKdIDQsz5mfvl3lTpc1;&Ub3dEvTEn%m2!}sxQ-*wkippeYj^!fQp&tTHk4EZokai h?k@PY_zr({@cwKMOZK|ziPE5O@pScbS?83{1OQysh_3(u literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/sprites/290.png b/graphics/battle_anims/sprites/purple_jab.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/battle_anims/sprites/290.png rename to graphics/battle_anims/sprites/purple_jab.png diff --git a/graphics/battle_anims/sprites/toxicspike_color.png b/graphics/battle_anims/sprites/toxic_spikes.png similarity index 100% rename from graphics/battle_anims/sprites/toxicspike_color.png rename to graphics/battle_anims/sprites/toxic_spikes.png diff --git a/graphics/battle_anims/sprites/289.png b/graphics/battle_anims/sprites/white_streak.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/battle_anims/sprites/289.png rename to graphics/battle_anims/sprites/white_streak.png diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index c1d6d6804..a94cdd7d3 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -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 diff --git a/include/graphics.h b/include/graphics.h index 5d3e59f7b..1ba1f9963 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -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 diff --git a/src/battle_anim.c b/src/battle_anim.c index 0fdeba8ff..7e6d189db 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -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[] = diff --git a/src/graphics.c b/src/graphics.c index 87039592a..037304086 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -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");