Merge branch 'master' of github.com:pret/pokefirered into misc_doc

2021-03-24 08:15:08 -04:00
parent a925d2b7b0 d8b76e6fb5
commit 6b64fbc522
23 changed files with 3255 additions and 4336 deletions
@@ -3464,7 +3464,7 @@ void AnimSmokeBallEscapeCloud(struct Sprite *sprite)

    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
-    sprite->callback = sub_80B1D3C;
+    sprite->callback = DestroyAnimSpriteAfterTimer;
 }

 static void sub_80E1990(u8 taskId)