Review suggestions
This commit is contained in:
+19
-14
@@ -76,7 +76,7 @@ static void CB2_EndLinkBattle(void);
|
|||||||
static void EndLinkBattleInSteps(void);
|
static void EndLinkBattleInSteps(void);
|
||||||
static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite);
|
static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite);
|
||||||
static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite);
|
static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite);
|
||||||
static void SpriteCB_8011E28_Step(struct Sprite *sprite);
|
static void SpriteCB_Flicker(struct Sprite *sprite);
|
||||||
static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
|
static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
|
||||||
static void SpriteCB_BlinkVisible(struct Sprite *sprite);
|
static void SpriteCB_BlinkVisible(struct Sprite *sprite);
|
||||||
static void oac_poke_ally_(struct Sprite *sprite);
|
static void oac_poke_ally_(struct Sprite *sprite);
|
||||||
@@ -1917,24 +1917,26 @@ void SpriteCallbackDummy_2(struct Sprite *sprite)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unused
|
#define sNumFlickers data[3]
|
||||||
static void SpriteCB_8011E28(struct Sprite *sprite)
|
#define sDelay data[4]
|
||||||
{
|
|
||||||
sprite->data[3] = 6;
|
|
||||||
sprite->data[4] = 1;
|
|
||||||
sprite->callback = SpriteCB_8011E28_Step;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unused
|
// Unused
|
||||||
static void SpriteCB_8011E28_Step(struct Sprite *sprite)
|
static void SpriteCB_InitFlicker(struct Sprite *sprite)
|
||||||
{
|
{
|
||||||
--sprite->data[4];
|
sprite->sNumFlickers = 6;
|
||||||
if (sprite->data[4] == 0)
|
sprite->sDelay = 1;
|
||||||
|
sprite->callback = SpriteCB_Flicker;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SpriteCB_Flicker(struct Sprite *sprite)
|
||||||
|
{
|
||||||
|
sprite->sDelay--;
|
||||||
|
if (sprite->sDelay == 0)
|
||||||
{
|
{
|
||||||
sprite->data[4] = 8;
|
sprite->sDelay = 8;
|
||||||
sprite->invisible ^= 1;
|
sprite->invisible ^= 1;
|
||||||
--sprite->data[3];
|
sprite->sNumFlickers--;
|
||||||
if (sprite->data[3] == 0)
|
if (sprite->sNumFlickers == 0)
|
||||||
{
|
{
|
||||||
sprite->invisible = FALSE;
|
sprite->invisible = FALSE;
|
||||||
sprite->callback = SpriteCallbackDummy_2;
|
sprite->callback = SpriteCallbackDummy_2;
|
||||||
@@ -1943,6 +1945,9 @@ static void SpriteCB_8011E28_Step(struct Sprite *sprite)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#undef sNumFlickers
|
||||||
|
#undef sDelay
|
||||||
|
|
||||||
void SpriteCB_FaintOpponentMon(struct Sprite *sprite)
|
void SpriteCB_FaintOpponentMon(struct Sprite *sprite)
|
||||||
{
|
{
|
||||||
u8 battler = sprite->sBattler;
|
u8 battler = sprite->sBattler;
|
||||||
|
|||||||
Reference in New Issue
Block a user