diff options
| author | Evan <eroelke@gmail.com> | 2019-11-28 11:13:26 -0500 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-28 11:13:26 -0500 |
| commit | 52013cf052e9398987f76cf115ca08091e16288d (patch) | |
| tree | 66ddbc78491405c3a1d93aa18632362065accea6 | |
| parent | cba5ebbd5af599736f84a8ef0142382f5a96f4af (diff) | |
remove errors
| -rw-r--r-- | include/pokeball.h | 3 | ||||
| -rw-r--r-- | src/pokeball.c | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/pokeball.h b/include/pokeball.h index 263dc8742..9a4299531 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -34,7 +34,4 @@ void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); void sub_804BD94(u8 battler); -//temp -void SpriteCB_TestBallThrow(struct Sprite *sprite); - #endif // GUARD_POKEBALL_H diff --git a/src/pokeball.c b/src/pokeball.c index cbba77bb2..0626b4714 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -27,7 +27,7 @@ // Function Declarations 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_804AC94(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 CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT]; +extern const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT]; // Functions u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow) @@ -430,8 +431,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) } #endif -//static -void SpriteCB_TestBallThrow(struct Sprite *sprite) +static void SpriteCB_TestBallThrow(struct Sprite *sprite) { if (TranslateAnimHorizontalArc(sprite)) { @@ -1112,11 +1112,12 @@ static void sub_804BAA4(struct Sprite *sprite) } 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); else DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], FALSE, 0); - + */ DestroySpriteAndFreeResources(sprite); } } |