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

remove errors

Browse Source
This commit is contained in:
Evan
2019-11-28 11:13:26 -05:00
parent cba5ebbd5a
commit 52013cf052
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/pokeball.h
-3
View File
@@ -34,7 +34,4 @@ void LoadBallGfx(u8 ballId);
void FreeBallGfx(u8 ballId); void FreeBallGfx(u8 ballId);
void sub_804BD94(u8 battler); void sub_804BD94(u8 battler);
//temp
void SpriteCB_TestBallThrow(struct Sprite *sprite);
#endif // GUARD_POKEBALL_H #endif // GUARD_POKEBALL_H
src/pokeball.c
+6 -5
View File
@@ -27,7 +27,7 @@
// Function Declarations // Function Declarations
static void Task_DoPokeballSendOutAnim(u8 taskId); static void Task_DoPokeballSendOutAnim(u8 taskId);
//static void SpriteCB_TestBallThrow(struct Sprite *sprite); static void SpriteCB_TestBallThrow(struct Sprite *sprite);
static void sub_804AC88(struct Sprite *sprite); static void sub_804AC88(struct Sprite *sprite);
static void sub_804AC94(struct Sprite *sprite); static void sub_804AC94(struct Sprite *sprite);
static void sub_804AD00(struct Sprite *sprite); static void sub_804AD00(struct Sprite *sprite);
@@ -62,6 +62,7 @@ extern const struct SpriteTemplate gUnknown_82606F4[];
extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT]; extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT];
extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT]; extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT];
extern const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT];
// Functions // Functions
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow) u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
@@ -430,8 +431,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
} }
#endif #endif
//static static void SpriteCB_TestBallThrow(struct Sprite *sprite)
void SpriteCB_TestBallThrow(struct Sprite *sprite)
{ {
if (TranslateAnimHorizontalArc(sprite)) if (TranslateAnimHorizontalArc(sprite))
{ {
@@ -1112,11 +1112,12 @@ static void sub_804BAA4(struct Sprite *sprite)
} }
if (sprite->animEnded && r12 && r6) if (sprite->animEnded && r12 && r6)
{ {
if (gSprites[monSpriteId].data[7] == SPECIES_EGG) /*
if (gSprites[monSpriteId].data[7] == SPECIES_EGG)
DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], TRUE, 0); DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], TRUE, 0);
else else
DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], FALSE, 0); DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], FALSE, 0);
*/
DestroySpriteAndFreeResources(sprite); DestroySpriteAndFreeResources(sprite);
} }
} }