Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-14 08:11:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

expansion sync: battle_anim_special <-> battle_anim_throw

Browse Source
This commit is contained in:
cawtds 2025-01-20 23:57:55 +01:00
parent 44bbb77933
commit c512d155f0
10 changed files with 747 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/battle_anim_scripts.s
View File

@ -16,7 +16,7 @@
.section script_data, "aw", %progbits
gBattleAnimGeneral_MonScared::
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1
createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 1
waitforvisualfinish
loadspritegfx ANIM_TAG_SWEAT_BEAD
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, 2, 0, 10, RGB(0, 23, 25)
@ -33,7 +33,7 @@ gBattleAnimGeneral_MonScared::
end
gBattleAnimGeneral_GhostGetOut::
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1
createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 1
waitforvisualfinish
fadetobg BG_GHOST
waitbgfadeout
@ -68,13 +68,13 @@ gBattleAnimGeneral_SilphScoped::
end
gBattleAnimGeneral_SafariRockThrow::
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0
createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0
waitforvisualfinish
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_IMPACT
delay 0
waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22
createsprite gSafariRockTemplate, ANIM_TARGET, 3, -17, 14, 8, 0
createsprite sSafariRockSpriteTemplate, ANIM_TARGET, 3, -17, 14, 8, 0
delay 50
monbg ANIM_DEF_PARTNER
setalpha 12, 8
@ -28155,7 +28155,7 @@ gBattleAnimGeneral_SubstituteAppear::
end
gBattleAnimGeneral_BaitThrow::
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0
createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0
createvisualtask AnimTask_LoadBaitGfx, 2
delay 0
waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22
@ -29049,7 +29049,7 @@ gBattleAnimSpecial_BallThrow::
delay 0
playsewithpan SE_BALL_THROW, 0
createvisualtask AnimTask_ThrowBall, 2
createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2
createvisualtask AnimTask_IsBallBlockedByTrainer, 2
jumpreteq -1, BallThrowTrainerBlock
jumpreteq -2, BallThrowGhostDodged
BallThrowEnd:
@ -29080,7 +29080,7 @@ BallThrowGhostDodged:
gBattleAnimSpecial_BallThrowWithTrainer::
createvisualtask AnimTask_LoadBallGfx, 2
delay 0
createvisualtask AnimTask_ThrowBallSpecial, 2
createvisualtask AnimTask_ThrowBall_StandingTrainer, 2
waitforvisualfinish
createvisualtask AnimTask_FreeBallGfx, 2
end
@ -29098,7 +29098,7 @@ gBattleAnimSpecial_CriticalCaptureBallThrow::
delay 0
playsewithpan SE_FALL, 0
createvisualtask AnimTask_ThrowBall, 2
createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2
createvisualtask AnimTask_IsBallBlockedByTrainer, 2
jumpreteq -1, BallThrowTrainerBlock
goto BallThrowEnd

4
include/battle_anim.h
View File

@ -493,8 +493,8 @@ void CopyBattlerSpriteToBg(s32 bgId, u8 x, u8 y, u8 battlerPosition, u8 palno, u
void TryShinyAnimation(u8 battler, struct Pokemon *mon);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
void DoLoadHealthboxPalsForLevelUp(u8 *, u8 *, u8 battlerId);
void DoFreeHealthboxPalsForLevelUp(u8 batterId);
void LoadHealthboxPalsForLevelUp(u8 *, u8 *, u8 battlerId);
void FreeHealthboxPalsForLevelUp(u8 batterId);
void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType);
u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType);

2
include/battle_main.h
View File

@ -78,7 +78,7 @@ void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude);
void EndBounceEffect(u8 battler, u8 which);
void SpriteCB_PlayerMonFromBall(struct Sprite *sprite);
void SpriteCB_PlayerMonSlideIn(struct Sprite *sprite);
void SpriteCB_PlayerThrowInit(struct Sprite *sprite);
void SpriteCB_TrainerThrowObject(struct Sprite *sprite);
void AnimSetCenterToCornerVecX(struct Sprite *sprite);
void BeginBattleIntroDummy(void);
void BeginBattleIntro(void);

4
include/graphics.h
View File

@ -4791,8 +4791,8 @@ extern const u32 gBattleAnimSpritePal_WhipHit[];
extern const u32 gBattleAnimSpritePal_BlueRing2[];
// battle anim task
extern const u32 gUnusedLevelupAnimationGfx[];
extern const u32 gUnusedLevelupAnimationTilemap[];
extern const u32 UnusedLevelupAnimationGfx[];
extern const u32 UnusedLevelupAnimationTilemap[];
extern const u32 gCureBubblesGfx[];
extern const u32 gCureBubblesPal[];
extern const u32 gCureBubblesTilemap[];

9
src/battle_anim.c
View File

@ -2188,12 +2188,3 @@ static void Cmd_createdragondartsprite(void)
subpriority) != MAX_SPRITES) // Don't increment the task count if the sprite couldn't be created(i.e. there are too many created sprites atm).
gAnimVisualTaskCount++;
}
// battle_anim_throw.c
bool32 IsCriticalCapture(void)
{
return gBattleSpritesDataPtr->animationData->isCriticalCapture;
}
//

1219
src/battle_anim_special.c
View File

File diff suppressed because it is too large Load Diff

6
src/battle_controller_oak_old_man.c
View File

@ -401,7 +401,7 @@ static void PrintOakText_ForPetesSake(u32 battler)
case 0:
if (!gPaletteFade.active)
{
DoLoadHealthboxPalsForLevelUp(&gBattleStruct->simulatedInputState[1], &gBattleStruct->simulatedInputState[3], GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT));
LoadHealthboxPalsForLevelUp(&gBattleStruct->simulatedInputState[1], &gBattleStruct->simulatedInputState[3], GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT));
BeginNormalPaletteFade(0xFFFFFF7E,
4,
0,
@ -476,7 +476,7 @@ static void PrintOakText_ForPetesSake(u32 battler)
case 8:
if (!gPaletteFade.active)
{
DoFreeHealthboxPalsForLevelUp(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT));
FreeHealthboxPalsForLevelUp(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT));
BtlCtrl_RemoveVoiceoverMessageFrame();
gBattleStruct->simulatedInputState[0] = 0;
OakOldManBufferExecCompleted(battler);
@ -580,7 +580,7 @@ static void PrintOakText_KeepAnEyeOnHP(u32 battler)
case 0:
if (!gPaletteFade.active)
{
DoLoadHealthboxPalsForLevelUp(&gBattleStruct->simulatedInputState[1], &gBattleStruct->simulatedInputState[3], battler);
LoadHealthboxPalsForLevelUp(&gBattleStruct->simulatedInputState[1], &gBattleStruct->simulatedInputState[3], battler);
BeginNormalPaletteFade(0xFFFFFF7E,
4,
0,

4
src/battle_controller_pokedude.c
View File

@ -1209,7 +1209,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
case 0:
if (!gPaletteFade.active)
{
DoLoadHealthboxPalsForLevelUp(&gBattleStruct->pdHealthboxPal2,
LoadHealthboxPalsForLevelUp(&gBattleStruct->pdHealthboxPal2,
&gBattleStruct->pdHealthboxPal1,
GetBattlerAtPosition(B_POSITION_PLAYER_LEFT));
BeginNormalPaletteFade(0xFFFFFF7F, 4, 0, 8, RGB_BLACK);
@ -1267,7 +1267,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
BattleStopLowHpSound();
PlayBGM(MUS_VICTORY_WILD);
}
DoFreeHealthboxPalsForLevelUp(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT));
FreeHealthboxPalsForLevelUp(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT));
BtlCtrl_RemoveVoiceoverMessageFrame();
ReturnFromPokedudeAction(battler);
}

2
src/battle_main.c
View File

@ -2545,7 +2545,7 @@ static void SpriteCB_TrainerThrowObject_Main(struct Sprite *sprite)
// Sprite callback for a trainer back pic to throw an object
// (Wally throwing a ball, throwing Pokéblocks/balls in the Safari Zone)
void SpriteCB_PlayerThrowInit(struct Sprite *sprite)
void SpriteCB_TrainerThrowObject(struct Sprite *sprite)
{
StartSpriteAnim(sprite, 1);
sprite->callback = SpriteCB_TrainerThrowObject_Main;

4
src/graphics.c
View File

@ -955,8 +955,8 @@ const u32 gBattleAnimSpriteGfx_TagHand[] = INCBIN_U32("graphics/battle_anims/spr
const u32 gBattleAnimSpriteGfx_NoiseLine[] = INCBIN_U32("graphics/battle_anims/sprites/noise_line.4bpp.lz");
const u32 gUnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.4bpp.lz");
const u32 gUnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.bin.lz");
const u32 UnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.4bpp.lz");
const u32 UnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.bin.lz");
const u32 gBattleAnimSpriteGfx_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.4bpp.lz");
const u32 gBattleAnimSpritePal_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.gbapal.lz");