From bcffc2655e0401bb129787d39f60137be1a9575c Mon Sep 17 00:00:00 2001 From: Karathan Date: Sat, 6 Jul 2019 05:25:56 +0200 Subject: [PATCH] fix style issues --- .../{feint-punch.png => feint_punch.png} | Bin src/battle_anim_effects_1.c | 42 +++++++++--------- src/graphics.c | 4 +- 3 files changed, 23 insertions(+), 23 deletions(-) rename graphics/battle_anims/sprites/{feint-punch.png => feint_punch.png} (100%) diff --git a/graphics/battle_anims/sprites/feint-punch.png b/graphics/battle_anims/sprites/feint_punch.png similarity index 100% rename from graphics/battle_anims/sprites/feint-punch.png rename to graphics/battle_anims/sprites/feint_punch.png diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 94ec21a801..e731fbf3f3 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2994,26 +2994,26 @@ static void AnimMoveFeintSwipeStep(struct Sprite* sprite) { switch(sprite->data[5]) { - case 0: - if(AnimTranslateLinear(sprite)) - { - //Not the most elegant solution here, but it works without messing up the sprites coordinates - sprite->pos2.x = 0; - sprite->pos1.x += 64; - sprite->data[5]++; - sprite->data[0] = sprite->data[6]; - sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sprite->pos1.x - 64; - sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sprite->pos1.y; - InitAnimLinearTranslation(sprite); - } + case 0: + if(AnimTranslateLinear(sprite)) + { + //Not the most elegant solution here, but it works without messing up the sprites coordinates + sprite->pos2.x = 0; + sprite->pos1.x += 64; + sprite->data[5]++; + sprite->data[0] = sprite->data[6]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x - 64; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sprite->pos1.y; + InitAnimLinearTranslation(sprite); + } break; - case 1: - if(AnimTranslateLinear(sprite)) - { - sprite->callback = DestroyAnimSprite; - } + case 1: + if(AnimTranslateLinear(sprite)) + { + sprite->callback = DestroyAnimSprite; + } break; } @@ -3126,14 +3126,14 @@ static void AnimMoveAccupressureTransition(struct Sprite* sprite) { switch(sprite->data[5]) { - case 0: + case 0: if(AnimTranslateLinear(sprite)) { StartSpriteAffineAnim(sprite, 1); sprite->data[5]++; } break; - case 1: + case 1: if(sprite->affineAnimEnded) { DestroyAnimSprite(sprite); diff --git a/src/graphics.c b/src/graphics.c index 7fd71cf731..7a31edea58 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -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 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 gBattleAnimSpritePal_Feint[] = INCBIN_U32("graphics/battle_anims/sprites/feint-punch.gbapal.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 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");