Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-30 21:10:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove B_ANIM_STATUS_WRAPPED

Browse Source
This commit is contained in:
cawtds
2024-09-01 14:04:30 +02:00
parent 838c5bcb1b
commit 880b5a377f
5 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/battle_anim_scripts.s
View File

@@ -27634,9 +27634,6 @@ Status_Nightmare::
clearmonbg ANIM_DEF_PARTNER
end
Status_Powder::
end
General_StatsChange::
createvisualtask AnimTask_StatsChange, 5
waitforvisualfinish

1
include/battle_anim_scripts.h
View File

@@ -948,7 +948,6 @@ extern const u8 Status_Paralysis[];
extern const u8 Status_Freeze[];
extern const u8 Status_Curse[];
extern const u8 Status_Nightmare[];
extern const u8 Status_Powder[];
// general animations
extern const u8 General_StatsChange[];

3
include/constants/battle_anim.h
View File

@@ -613,9 +613,8 @@
#define B_ANIM_STATUS_FRZ 6
#define B_ANIM_STATUS_CURSED 7
#define B_ANIM_STATUS_NIGHTMARE 8
#define B_ANIM_STATUS_WRAPPED 9 // does not actually exist
#define NUM_B_ANIMS_STATUS 10
#define NUM_B_ANIMS_STATUS 9
// Most tasks return a value to gBattleAnimArgs[7].
#define ARG_RET_ID 7

1
src/battle_anim.c
View File

@@ -193,7 +193,6 @@ static const u8* const sBattleAnims_StatusConditions[NUM_B_ANIMS_STATUS] =
[B_ANIM_STATUS_FRZ] = Status_Freeze,
[B_ANIM_STATUS_CURSED] = Status_Curse,
[B_ANIM_STATUS_NIGHTMARE] = Status_Nightmare,
[B_ANIM_STATUS_WRAPPED] = Status_Powder,
};
static const u8* const sBattleAnims_General[NUM_B_ANIMS_GENERAL] =

2
src/battle_gfx_sfx_util.c
View File

@@ -214,8 +214,6 @@ void InitAndLaunchChosenStatusAnimation(u32 battler, bool8 isStatus2, u32 status
LaunchStatusAnimation(battler, B_ANIM_STATUS_CURSED);
else if (status & STATUS2_NIGHTMARE)
LaunchStatusAnimation(battler, B_ANIM_STATUS_NIGHTMARE);
else if (status & STATUS2_WRAPPED)
LaunchStatusAnimation(battler, B_ANIM_STATUS_WRAPPED); // this animation doesn't actually exist
else // no animation
gBattleSpritesDataPtr->healthBoxesData[battler].statusAnimActive = 0;
}