diff options
| author | Evan <eroelke@gmail.com> | 2019-12-04 18:53:21 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 18:53:21 -0700 |
| commit | 6581fdb69ddb2be974aa2278381c334b71a4a5ff (patch) | |
| tree | 8a555086f6e6494f951e08efc0ee5ceab6913d31 /src/battle_anim_special.c | |
| parent | 661a581176ecb6ad28e9d795fe02c3178c50b660 (diff) | |
almost all matching
Diffstat (limited to 'src/battle_anim_special.c')
| -rw-r--r-- | src/battle_anim_special.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 0ee1eee2e..7d512b950 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -40,7 +40,7 @@ #define LOHALF(n) ((n) & 0xFFFF) // IWRAM -EWRAM_DATA u16 gUnknown_3005424 = 0; +EWRAM_DATA int gUnknown_3005424 = 0; EWRAM_DATA u16 gUnknown_3005428 = 0; EWRAM_DATA u16 gUnknown_300542C = 0; @@ -104,8 +104,6 @@ static void PremierBallOpenParticleAnimation(u8); static void sub_80F1B3C(struct Sprite *); // Data -extern const struct SpriteTemplate gBallSpriteTemplates[]; //for now - struct BallCaptureSuccessStarData { s8 xOffset; @@ -910,8 +908,8 @@ static void sub_80EFA0C(struct Sprite *sprite) PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL); gTasks[taskId].data[10] = 256; gUnknown_3005424 = 28; - gUnknown_300542C = (gSprites[spriteId].pos2.y + gSprites[spriteId].pos1.y) - (sprite->pos2.y + sprite->pos1.y); - gUnknown_3005428 = (gUnknown_300542C * 256) / 28; + gUnknown_300542C = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); + gUnknown_3005428 = (u32)(gUnknown_300542C * 256) / 28; gTasks[taskId].data[2] = gUnknown_3005428; gTasks[taskId].data[0]++; break; @@ -1876,20 +1874,11 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) gBattleSpritesDataPtr->animationData->field_A--; if (gBattleSpritesDataPtr->animationData->field_A == 0) { - for (i = 0; i < POKEBALL_COUNT; i++) - { - if (FuncIsActiveTask(gBallParticleAnimationFuncs[i]) == TRUE) - break; - } - - if (i == POKEBALL_COUNT) - { - for (j = 0; j < POKEBALL_COUNT; j++) - { - FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag); - FreeSpritePaletteByTag(gBallParticlePalettes[j].tag); - } - } + for (j = 0; j < POKEBALL_COUNT; j++) + { + FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag); + FreeSpritePaletteByTag(gBallParticlePalettes[j].tag); + } DestroySprite(sprite); } |