fix style issues

This commit is contained in:
Karathan 2019-07-06 05:25:56 +02:00
parent d9b54c3c1c
commit bcffc2655e
3 changed files with 23 additions and 23 deletions

View File

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

View File

@ -2994,26 +2994,26 @@ static void AnimMoveFeintSwipeStep(struct Sprite* sprite)
{ {
switch(sprite->data[5]) switch(sprite->data[5])
{ {
case 0: case 0:
if(AnimTranslateLinear(sprite)) if(AnimTranslateLinear(sprite))
{ {
//Not the most elegant solution here, but it works without messing up the sprites coordinates //Not the most elegant solution here, but it works without messing up the sprites coordinates
sprite->pos2.x = 0; sprite->pos2.x = 0;
sprite->pos1.x += 64; sprite->pos1.x += 64;
sprite->data[5]++; sprite->data[5]++;
sprite->data[0] = sprite->data[6]; sprite->data[0] = sprite->data[6];
sprite->data[1] = sprite->pos1.x; sprite->data[1] = sprite->pos1.x;
sprite->data[2] = sprite->pos1.x - 64; sprite->data[2] = sprite->pos1.x - 64;
sprite->data[3] = sprite->pos1.y; sprite->data[3] = sprite->pos1.y;
sprite->data[4] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y;
InitAnimLinearTranslation(sprite); InitAnimLinearTranslation(sprite);
} }
break; break;
case 1: case 1:
if(AnimTranslateLinear(sprite)) if(AnimTranslateLinear(sprite))
{ {
sprite->callback = DestroyAnimSprite; sprite->callback = DestroyAnimSprite;
} }
break; break;
} }
@ -3126,14 +3126,14 @@ static void AnimMoveAccupressureTransition(struct Sprite* sprite)
{ {
switch(sprite->data[5]) switch(sprite->data[5])
{ {
case 0: case 0:
if(AnimTranslateLinear(sprite)) if(AnimTranslateLinear(sprite))
{ {
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
sprite->data[5]++; sprite->data[5]++;
} }
break; break;
case 1: case 1:
if(sprite->affineAnimEnded) if(sprite->affineAnimEnded)
{ {
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);

View File

@ -116,8 +116,8 @@ const u32 gBattleAnimSpritePal_Hit2[] = INCBIN_U32("graphics/battle_anims/sprite
const u32 gBattleAnimSpritePal_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.gbapal.lz"); const u32 gBattleAnimSpritePal_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.gbapal.lz");
const u32 gBattleAnimSpriteGfx_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.4bpp.lz"); const u32 gBattleAnimSpriteGfx_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.4bpp.lz");
const u32 gBattleAnimSpriteGfx_Feint[] = INCBIN_U32("graphics/battle_anims/sprites/feint-punch.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Feint[] = INCBIN_U32("graphics/battle_anims/sprites/feint_punch.4bpp.lz");
const u32 gBattleAnimSpritePal_Feint[] = INCBIN_U32("graphics/battle_anims/sprites/feint-punch.gbapal.lz"); const u32 gBattleAnimSpritePal_Feint[] = INCBIN_U32("graphics/battle_anims/sprites/feint_punch.gbapal.lz");
const u32 gBattleAnimSpriteGfx_TrumpCard[] = INCBIN_U32("graphics/battle_anims/sprites/trump_cards.4bpp.lz"); const u32 gBattleAnimSpriteGfx_TrumpCard[] = INCBIN_U32("graphics/battle_anims/sprites/trump_cards.4bpp.lz");
const u32 gBattleAnimSpritePal_TrumpCard[] = INCBIN_U32("graphics/battle_anims/sprites/trump_cards.gbapal.lz"); const u32 gBattleAnimSpritePal_TrumpCard[] = INCBIN_U32("graphics/battle_anims/sprites/trump_cards.gbapal.lz");