Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-02 22:04:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

expansion sync: battle_anim_effects_3

Browse Source
This commit is contained in:
cawtds 2025-01-20 18:43:38 +01:00
parent 971ecf68e3
commit 4640852091
6 changed files with 461 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_anim.h
View File

@ -554,7 +554,7 @@ void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
void ResetSpriteRotScale(u8 spriteId); void ResetSpriteRotScale(u8 spriteId);
void SetBattlerSpriteYOffsetFromRotation(u8 spriteId); void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation); void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
void TryResetSpriteAffineState(struct Sprite *sprite); void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite);
u16 ArcTan2Neg(s16 a, s16 b); u16 ArcTan2Neg(s16 a, s16 b);
void SetGrayscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor); void SetGrayscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7); u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7);

6
include/graphics.h
View File

@ -4799,9 +4799,9 @@ extern const u32 gCureBubblesTilemap[];
extern const u32 gBattleAnimBgTilemap_Attract[]; extern const u32 gBattleAnimBgTilemap_Attract[];
extern const u32 gBattleAnimBgImage_Attract[]; extern const u32 gBattleAnimBgImage_Attract[];
extern const u32 gBattleAnimBgPalette_Attract[]; extern const u32 gBattleAnimBgPalette_Attract[];
extern const u32 gBattleAnim_MorningSunGfx[]; extern const u32 gBattleAnimMaskImage_LightBeam[];
extern const u32 gBattleAnim_MorningSunTilemap[]; extern const u32 gBattleAnimMaskTilemap_LightBeam[];
extern const u32 gBattleAnim_MorningSunPal[]; extern const u32 gBattleAnimMaskPalette_LightBeam[];
// battle bg // battle bg
extern const u32 gBattleAnimBgImage_Dark[]; extern const u32 gBattleAnimBgImage_Dark[];

749
src/battle_anim_effects_3.c
View File

File diff suppressed because it is too large Load Diff

2
src/battle_anim_flying.c
View File

@ -1174,7 +1174,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
sprite->y2 = t2; sprite->y2 = t2;
if (sprite->data[2] == 24) if (sprite->data[2] == 24)
{ {
TryResetSpriteAffineState(sprite); ResetSpriteRotScale_PreserveAffine(sprite);
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
break; break;

2
src/battle_anim_mons.c
View File

@ -1183,7 +1183,7 @@ void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 x
} }
} }
void TryResetSpriteAffineState(struct Sprite *sprite) void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite)
{ {
TrySetSpriteRotScale(sprite, TRUE, 0x100, 0x100, 0); TrySetSpriteRotScale(sprite, TRUE, 0x100, 0x100, 0);
sprite->affineAnimPaused = FALSE; sprite->affineAnimPaused = FALSE;

6
src/graphics.c
View File

@ -886,9 +886,9 @@ const u32 gBattleAnimBgPalette_Bug[] = INCBIN_U32("graphics/battle_anims/backgro
const u32 gBattleAnimBgImage_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.4bpp.lz"); const u32 gBattleAnimBgImage_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.4bpp.lz");
const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_player.bin.lz"); const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_player.bin.lz");
const u32 gBattleAnim_MorningSunGfx[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.4bpp.lz"); const u32 gBattleAnimMaskImage_LightBeam[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.4bpp.lz");
const u32 gBattleAnim_MorningSunPal[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.gbapal.lz"); const u32 gBattleAnimMaskPalette_LightBeam[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.gbapal.lz");
const u32 gBattleAnim_MorningSunTilemap[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.bin.lz"); const u32 gBattleAnimMaskTilemap_LightBeam[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.bin.lz");
const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz"); const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz");
const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_player.bin.lz"); const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_player.bin.lz");