dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-09 23:39:43 +08:00
parent a4a44dd18e
commit 17b55f50db
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_anim.h
+4 -20
View File
@@ -91,18 +91,19 @@ extern const struct OamData gOamData_83ACB48;
extern const struct OamData gOamData_83ACB28; extern const struct OamData gOamData_83ACB28;
extern const struct OamData gOamData_83ACAC8; extern const struct OamData gOamData_83ACAC8;
// battle_anim.s
void MoveBattlerSpriteToBG(u8 battlerId, u8);
void sub_8073128(u8);
void ClearBattleAnimationVars(void); void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move); void DoMoveAnim(u16 move);
void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim); void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
void DestroyAnimSprite(struct Sprite *sprite); void DestroyAnimSprite(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 taskId); void DestroyAnimVisualTask(u8 taskId);
void DestroyAnimSoundTask(u8 taskId); void DestroyAnimSoundTask(u8 taskId);
bool8 IsAnimBankSpriteVisible(u8 bank); bool8 IsAnimBankSpriteVisible(u8 battlerId);
void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible);
bool8 IsContest(void); bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan); s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan); s8 BattleAnimAdjustPanning2(s8 pan);
s16 sub_80A52EC(s16 a);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
bool8 IsBattlerSpriteVisible(u8 battlerId); bool8 IsBattlerSpriteVisible(u8 battlerId);
s16 KeepPanInRange(s16 a, s32 oldPan); s16 KeepPanInRange(s16 a, s32 oldPan);
@@ -141,23 +142,6 @@ enum
BATTLER_COORD_ATTR_RAW_BOTTOM, BATTLER_COORD_ATTR_RAW_BOTTOM,
}; };
u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);
bool8 IsBankSpritePresent(u8 battlerId);
void sub_80A6C68(u8 arg0);
u8 GetAnimBattlerSpriteId(u8 wantedBank);
bool8 IsDoubleBattle(void);
u8 sub_80A6D94(void);
u8 sub_80A8364(u8);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *));
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 battlerId);
u8 sub_80A82E4(u8 battlerId);
u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
u8 GetGhostSpriteDefault_Y(u8 battlerId);
void MoveBattlerSpriteToBG(u8 battlerId, u8);
void sub_8073128(u8);
// battle_anim_status_effects.s // battle_anim_status_effects.s
#define STAT_ANIM_PLUS1 15 #define STAT_ANIM_PLUS1 15
#define STAT_ANIM_PLUS2 39 #define STAT_ANIM_PLUS2 39
src/electric.c
+2 -2
View File
@@ -548,8 +548,8 @@ static void sub_80ADD4C(struct Sprite *sprite)
sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
matrixNum = sprite->oam.matrixNum; matrixNum = sprite->oam.matrixNum;
sineVal = gSineTable[gBattleAnimArgs[2]]; sineVal = gSineTable[gBattleAnimArgs[2]];
gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[gBattleAnimArgs[2] + 64]; gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[gBattleAnimArgs[2] + 64];
gOamMatrices[matrixNum].b = sineVal; gOamMatrices[matrixNum].b = sineVal;
gOamMatrices[matrixNum].c = -sineVal; gOamMatrices[matrixNum].c = -sineVal;
sprite->data[0] = gBattleAnimArgs[3]; sprite->data[0] = gBattleAnimArgs[3];
sprite->callback = sub_80B1D3C; sprite->callback = sub_80B1D3C;