renaming things, fix battle_anim_scripts.s

4 files changed, 47 insertions, 47 deletions

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 8754eaacb..addbf5c80 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -3450,26 +3450,26 @@ Move_UPROAR: @ 81CBEFC
 
 Move_HEAT_WAVE: @ 81CBFC6
 	loadspritegfx 10261
-	createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, 31
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0)
 	createvisualtask do_boulder_dust, 5, 1
 	createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31
 	panse_1B SE_W257, 192, 63, 2, 0
 	delay 4
 	createvisualtask sub_80D5DDC, 5
 	delay 12
-	createsprite gSandstormDustSpriteTemplate, 40, 10, 2304, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 10, 2304, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 90, 2048, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 90, 2048, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 50, 2560, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 50, 2560, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 20, 2304, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 20, 2304, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 70, 1984, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 70, 1984, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 0, 2816, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 0, 2816, 96, 1
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 60, 2560, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 60, 2560, 96, 1
 	end
 
 Move_HAIL: @ 81CC076
@@ -3911,9 +3911,9 @@ Move_LUSTER_PURGE: @ 81CC95B
 	createsprite gBattleAnimSpriteTemplate_83DA9E0, 41, 0, 0, 0, 0
 	delay 20
 	createvisualtask sub_80E2A7C, 5, 5, 2, 0, 16, -1
-	createvisualtask AnimTask_BlendSpriteColor, 5, 10267, 2, 0, 16, -1
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10267, 2, 0, 16, rgb(-1, 0, 0)
 	waitforvisualfinish
-	createvisualtask AnimTask_BlendSpriteColor, 5, 10135, 0, 12, 12, 23552
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10135, 0, 12, 12, rgb(0, 0, 23)
 	waitforvisualfinish
 	createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
 	createvisualtask sub_812B30C, 5, 215, 63
@@ -4167,7 +4167,7 @@ Move_FAKE_TEARS: @ 81CD10D
 	loadspritegfx 10155
 	loadspritegfx 10209
 	loadspritegfx 10072
-	createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, 32108
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31)
 	waitforvisualfinish
 	createvisualtask sub_812E568, 5, 0, 2, 1
 	loopsewithpan SE_W039, 192, 12, 4
@@ -6340,19 +6340,19 @@ Move_SANDSTORM: @ 81D0304
 	playsewithpan SE_W201, 0
 	createvisualtask do_boulder_dust, 5, 0
 	delay 16
-	createsprite gSandstormDustSpriteTemplate, 40, 10, 2304, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 10, 2304, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 90, 2048, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 90, 2048, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 50, 2560, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 50, 2560, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 20, 2304, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 20, 2304, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 70, 1984, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 70, 1984, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 0, 2816, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 0, 2816, 96, 0
 	delay 10
-	createsprite gSandstormDustSpriteTemplate, 40, 60, 2560, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 60, 2560, 96, 0
 	end
 
 Move_WHIRLPOOL: @ 81D038C
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[] =