diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/anim/normal.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/rock.c | 8 | ||||
| -rwxr-xr-x | src/battle/battle_anim_813F0F4.c | 48 |
3 files changed, 29 insertions, 29 deletions
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 51c575b5e..54524f2ef 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -1049,7 +1049,7 @@ void sub_80E2B74(u8 taskId) // arg 0: spriteId // arg 1: ??? unknown // arg 2: ??? unknown -// arg 3: opacity [0,15] +// arg 3: coefficient // arg 4: color code void AnimTask_BlendSpriteColor(u8 taskId) { diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index 92a27c115..fa53df5b8 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -28,7 +28,7 @@ extern void AnimMoveTwisterParticle(struct Sprite *sprite); void sub_80DCE9C(struct Sprite *sprite); void sub_80DCF60(struct Sprite *sprite); void sub_80DCFE4(struct Sprite *sprite); -void AnimSandstormParticleAcrossScreen(struct Sprite *sprite); +void AnimDirtParticleAcrossScreen(struct Sprite *sprite); void AnimRaiseSprite(struct Sprite *sprite); void sub_80DD87C(struct Sprite *sprite); void sub_80DD8E8(struct Sprite *sprite); @@ -136,7 +136,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = .callback = sub_80DCFE4, }; -const struct SpriteTemplate gSandstormDustSpriteTemplate = +const struct SpriteTemplate gFlyingDirtSpriteTemplate = { .tileTag = 10261, .paletteTag = 10261, @@ -144,7 +144,7 @@ const struct SpriteTemplate gSandstormDustSpriteTemplate = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimSandstormParticleAcrossScreen, + .callback = AnimDirtParticleAcrossScreen, }; const struct Subsprite gSubspriteTable_83DAD00[] = @@ -516,7 +516,7 @@ static void sub_80DD190(u8 taskId) // arg 1: projectile speed // arg 2: y pixel drop // arg 3: ??? unknown (possibly a color bit) -void AnimSandstormParticleAcrossScreen(struct Sprite *sprite) +void AnimDirtParticleAcrossScreen(struct Sprite *sprite) { if (sprite->data[0] == 0) { diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 2bcc30273..312cdf8c9 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -84,35 +84,35 @@ static void sub_8141D20(struct Sprite *sprite); extern const u8 gBattleAnimSpriteSheet_Particles[]; const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] = { - {gBattleAnimSpriteSheet_Particles, 0x100, 55020}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55021}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55022}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55023}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55024}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55025}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55026}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55027}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55028}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55029}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55030}, - {gBattleAnimSpriteSheet_Particles, 0x100, 55031}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EC}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6ED}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EE}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EF}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F0}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F1}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F2}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F3}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F4}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F5}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F6}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F7}, }; extern const u8 gBattleAnimSpritePalette_136[]; const struct CompressedSpritePalette gBallOpenParticlePalettes[] = { - {gBattleAnimSpritePalette_136, 55020}, - {gBattleAnimSpritePalette_136, 55021}, - {gBattleAnimSpritePalette_136, 55022}, - {gBattleAnimSpritePalette_136, 55023}, - {gBattleAnimSpritePalette_136, 55024}, - {gBattleAnimSpritePalette_136, 55025}, - {gBattleAnimSpritePalette_136, 55026}, - {gBattleAnimSpritePalette_136, 55027}, - {gBattleAnimSpritePalette_136, 55028}, - {gBattleAnimSpritePalette_136, 55029}, - {gBattleAnimSpritePalette_136, 55030}, - {gBattleAnimSpritePalette_136, 55031}, + {gBattleAnimSpritePalette_136, 0xD6EC}, + {gBattleAnimSpritePalette_136, 0xD6ED}, + {gBattleAnimSpritePalette_136, 0xD6EE}, + {gBattleAnimSpritePalette_136, 0xD6EF}, + {gBattleAnimSpritePalette_136, 0xD6F0}, + {gBattleAnimSpritePalette_136, 0xD6F1}, + {gBattleAnimSpritePalette_136, 0xD6F2}, + {gBattleAnimSpritePalette_136, 0xD6F3}, + {gBattleAnimSpritePalette_136, 0xD6F4}, + {gBattleAnimSpritePalette_136, 0xD6F5}, + {gBattleAnimSpritePalette_136, 0xD6F6}, + {gBattleAnimSpritePalette_136, 0xD6F7}, }; const union AnimCmd gSpriteAnim_840B318[] = |