Finished decompiling wisp_fire

3 files changed, 154 insertions, 541 deletions

diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s
deleted file mode 100755
index 5fc7a07ab..000000000
--- a/asm/wisp_fire.s
+++ /dev/null
@@ -1,534 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ wisp_fire
-
-	thumb_func_start sub_80D5DDC
-sub_80D5DDC: @ 80D5DDC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _080D5E3C @ =gTasks
-	adds r4, r1, r0
-	ldr r0, _080D5E40 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	movs r2, 0x1
-	negs r2, r2
-	adds r1, r2, 0
-	cmp r0, 0
-	bne _080D5E02
-	movs r1, 0x1
-_080D5E02:
-	strh r1, [r4, 0x20]
-	ldr r0, _080D5E44 @ =gAnimBankTarget
-	ldrb r1, [r0]
-	movs r0, 0x2
-	eors r0, r1
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	strh r0, [r4, 0x22]
-	movs r0, 0x1
-	bl GetAnimBankSpriteId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x24]
-	movs r0, 0x3
-	bl GetAnimBankSpriteId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-	ldr r0, _080D5E48 @ =sub_80D5E4C
-	str r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5E3C: .4byte gTasks
-_080D5E40: .4byte gAnimBankAttacker
-_080D5E44: .4byte gAnimBankTarget
-_080D5E48: .4byte sub_80D5E4C
-	thumb_func_end sub_80D5DDC
-
-	thumb_func_start sub_80D5E4C
-sub_80D5E4C: @ 80D5E4C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _080D5E70 @ =gTasks
-	adds r2, r0, r1
-	movs r0, 0x8
-	ldrsh r3, [r2, r0]
-	cmp r3, 0x1
-	beq _080D5F14
-	cmp r3, 0x1
-	bgt _080D5E74
-	cmp r3, 0
-	beq _080D5E82
-	b _080D6074
-	.align 2, 0
-_080D5E70: .4byte gTasks
-_080D5E74:
-	cmp r3, 0x2
-	bne _080D5E7A
-	b _080D5F9C
-_080D5E7A:
-	cmp r3, 0x3
-	bne _080D5E80
-	b _080D6030
-_080D5E80:
-	b _080D6074
-_080D5E82:
-	movs r1, 0x20
-	ldrsh r0, [r2, r1]
-	lsls r0, 1
-	ldrh r5, [r2, 0x1C]
-	adds r0, r5
-	strh r0, [r2, 0x1C]
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5EB4
-	strh r3, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5EB0
-	movs r0, 0x2
-	b _080D5EB2
-_080D5EB0:
-	ldr r0, _080D5F0C @ =0x0000fffe
-_080D5EB2:
-	strh r0, [r2, 0x1E]
-_080D5EB4:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r7, 0x22
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080D5EF6
-	ldr r4, _080D5F10 @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5EC6:
-	movs r1, 0xE
-	ldrsh r0, [r2, r1]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r7, [r2, 0x1C]
-	adds r0, r7
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r5, 0x22
-	ldrsh r1, [r2, r5]
-	cmp r0, r1
-	blt _080D5EC6
-_080D5EF6:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	beq _080D5F06
-	b _080D6074
-_080D5F06:
-	movs r0, 0
-	strh r0, [r2, 0x1A]
-	b _080D6020
-	.align 2, 0
-_080D5F0C: .4byte 0x0000fffe
-_080D5F10: .4byte gSprites
-_080D5F14:
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _080D5F3C
-	movs r0, 0
-	strh r0, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	ands r0, r3
-	lsls r0, 16
-	cmp r0, 0
-	beq _080D5F38
-	movs r0, 0x2
-	b _080D5F3A
-_080D5F38:
-	ldr r0, _080D5F94 @ =0x0000fffe
-_080D5F3A:
-	strh r0, [r2, 0x1E]
-_080D5F3C:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r7, 0x22
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080D5F7E
-	ldr r4, _080D5F98 @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5F4E:
-	movs r1, 0xE
-	ldrsh r0, [r2, r1]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r7, [r2, 0x1C]
-	adds r0, r7
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r5, 0x22
-	ldrsh r1, [r2, r5]
-	cmp r0, r1
-	blt _080D5F4E
-_080D5F7E:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x60
-	bne _080D6074
-	movs r0, 0
-	strh r0, [r2, 0x1A]
-	b _080D6020
-	.align 2, 0
-_080D5F94: .4byte 0x0000fffe
-_080D5F98: .4byte gSprites
-_080D5F9C:
-	movs r7, 0x20
-	ldrsh r1, [r2, r7]
-	lsls r1, 1
-	ldrh r0, [r2, 0x1C]
-	subs r0, r1
-	strh r0, [r2, 0x1C]
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5FD0
-	movs r0, 0
-	strh r0, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5FCC
-	strh r3, [r2, 0x1E]
-	b _080D5FD0
-_080D5FCC:
-	ldr r0, _080D6028 @ =0x0000fffe
-	strh r0, [r2, 0x1E]
-_080D5FD0:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r3, 0x22
-	ldrsh r0, [r2, r3]
-	cmp r1, r0
-	bge _080D6012
-	ldr r4, _080D602C @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5FE2:
-	movs r5, 0xE
-	ldrsh r0, [r2, r5]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r7, 0
-	ldrsh r0, [r0, r7]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r5, [r2, 0x1C]
-	adds r0, r5
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r7, 0x22
-	ldrsh r1, [r2, r7]
-	cmp r0, r1
-	blt _080D5FE2
-_080D6012:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	bne _080D6074
-_080D6020:
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	b _080D6074
-	.align 2, 0
-_080D6028: .4byte 0x0000fffe
-_080D602C: .4byte gSprites
-_080D6030:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r3, 0x22
-	ldrsh r0, [r2, r3]
-	cmp r1, r0
-	bge _080D606E
-	ldr r6, _080D607C @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-	movs r5, 0
-_080D6044:
-	movs r7, 0xE
-	ldrsh r0, [r2, r7]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r7, 0
-	ldrsh r1, [r0, r7]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	strh r5, [r0, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r7, 0x22
-	ldrsh r1, [r2, r7]
-	cmp r0, r1
-	blt _080D6044
-_080D606E:
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-_080D6074:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D607C: .4byte gSprites
-	thumb_func_end sub_80D5E4C
-
-	thumb_func_start sub_80D6080
-sub_80D6080: @ 80D6080
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, sp
-	bl sub_8078914
-	mov r0, sp
-	ldrb r0, [r0, 0x8]
-	lsls r0, 4
-	ldr r1, _080D60B0 @ =gBattleAnimArgs
-	ldrb r2, [r1]
-	ldrh r3, [r1, 0x2]
-	movs r1, 0x10
-	bl BlendPalette
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D60B0: .4byte gBattleAnimArgs
-	thumb_func_end sub_80D6080
-
-	thumb_func_start sub_80D60B4
-sub_80D60B4: @ 80D60B4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r1, _080D610C @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r3, 0x8
-	ldrsh r0, [r2, r3]
-	mov r9, r1
-	ldr r4, _080D6110 @ =gBattleAnimArgs
-	mov r8, r4
-	cmp r0, 0
-	bne _080D60EA
-	ldrh r0, [r4]
-	strh r0, [r2, 0xA]
-	ldrh r0, [r4, 0x2]
-	strh r0, [r2, 0xC]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r2, 0xE]
-	ldrh r0, [r4, 0x6]
-	strh r0, [r2, 0x10]
-_080D60EA:
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	ldr r1, _080D6114 @ =gObjectBankIDs
-	ldr r0, _080D6118 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r6, [r0]
-	movs r5, 0x10
-	ldrsh r0, [r2, r5]
-	cmp r0, 0
-	bne _080D6120
-	ldr r4, _080D611C @ =gUnknown_083D9794
-	movs r1, 0x8
-	ldrsh r0, [r2, r1]
-	b _080D6126
-	.align 2, 0
-_080D610C: .4byte gTasks
-_080D6110: .4byte gBattleAnimArgs
-_080D6114: .4byte gObjectBankIDs
-_080D6118: .4byte gAnimBankTarget
-_080D611C: .4byte gUnknown_083D9794
-_080D6120:
-	ldr r4, _080D616C @ =gUnknown_083D97A4
-	movs r3, 0x8
-	ldrsh r0, [r2, r3]
-_080D6126:
-	movs r1, 0xA
-	bl __modsi3
-	lsls r0, 16
-	asrs r0, 16
-	adds r0, r4
-	ldrb r5, [r0]
-	lsls r0, r7, 2
-	adds r1, r0, r7
-	lsls r1, 3
-	add r1, r9
-	movs r4, 0xE
-	ldrsh r1, [r1, r4]
-	mov r12, r0
-	cmp r1, 0x1
-	bne _080D6174
-	ldr r2, _080D6170 @ =gSprites
-	lsls r3, r6, 4
-	adds r0, r3, r6
-	lsls r0, 2
-	adds r0, r2
-	mov r10, r0
-	mov r0, r8
-	movs r4, 0x2
-	ldrsh r1, [r0, r4]
-	lsls r0, r5, 24
-	asrs r0, 24
-	muls r0, r1
-	cmp r0, 0
-	bge _080D6164
-	negs r0, r0
-_080D6164:
-	mov r5, r10
-	strh r0, [r5, 0x26]
-	b _080D618E
-	.align 2, 0
-_080D616C: .4byte gUnknown_083D97A4
-_080D6170: .4byte gSprites
-_080D6174:
-	ldr r3, _080D61C4 @ =gSprites
-	lsls r4, r6, 4
-	adds r2, r4, r6
-	lsls r2, 2
-	adds r2, r3
-	lsls r0, r5, 24
-	asrs r0, 24
-	mov r5, r8
-	ldrh r1, [r5, 0x2]
-	muls r0, r1
-	strh r0, [r2, 0x24]
-	adds r2, r3, 0
-	adds r3, r4, 0
-_080D618E:
-	mov r1, r12
-	adds r0, r1, r7
-	lsls r0, 3
-	add r0, r9
-	movs r4, 0x8
-	ldrsh r1, [r0, r4]
-	movs r5, 0xA
-	ldrsh r0, [r0, r5]
-	cmp r1, r0
-	bne _080D61B4
-	adds r0, r3, r6
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0
-	strh r1, [r0, 0x24]
-	strh r1, [r0, 0x26]
-	adds r0, r7, 0
-	bl DestroyAnimVisualTask
-_080D61B4:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D61C4: .4byte gSprites
-	thumb_func_end sub_80D60B4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 125d288cf..3af44e1c6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -284,7 +284,6 @@ SECTIONS {
         src/battle/anim/heated_rock.o(.text);
         src/battle/anim/wisp_orb.o(.text);
         src/battle/anim/wisp_fire.o(.text);
-        asm/wisp_fire.o(.text);
         src/battle/anim/thunder.o(.text);
         src/battle/anim/beta_beat_up.o(.text);
         src/battle/anim/shock.o(.text);
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index e31c15d9c..348ce6426 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -1,12 +1,20 @@
 #include "global.h"
 #include "battle_anim.h"
+#include "blend_palette.h"
 #include "main.h"
 #include "rom_8077ABC.h"
+#include "task.h"
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankTarget;
-// extern u8 gAnimBankAttacker;
+extern u8 gAnimBankAttacker;
+
+extern u8 gObjectBankIDs[];
+extern s8 gUnknown_083D9794[16];
+extern s8 gUnknown_083D97A4[16];
+
+void sub_80D5E4C(u8 taskId);
 
 void sub_80D5CC0(struct Sprite *sprite)
 {
@@ -25,15 +33,19 @@ void sub_80D5CC0(struct Sprite *sprite)
     sprite->data[1] = (sprite->data[1] + 7) & 0xFF;
 
     if (gMain.inBattle)
-        if ((u16) (sprite->data[1] - 0x40) > 0x83)
+    {
+        if (sprite->data[1] < 64 || sprite->data[1] > 195)
             sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
         else
             sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+    }
     else
-        if ((u16) (sprite->data[1] - 0x40) > 0x83)
+    {
+        if (sprite->data[1] < 64 || sprite->data[1] > 195)
             sprite->subpriority = 0x1D;
         else
             sprite->subpriority = 0x1F;
+    }
 
     if (++sprite->data[2] > 0x14)
         sprite->invisible ^= 1;
@@ -42,7 +54,143 @@ void sub_80D5CC0(struct Sprite *sprite)
         DestroyAnimSprite(sprite);
 }
 
-// void sub_80D5DDC(struct Sprite *sprite)
-// {
+void sub_80D5DDC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[12] = !GetBankSide(gAnimBankAttacker) ? 1 : -1;
+    task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
+    task->data[14] = GetAnimBankSpriteId(1);
+    task->data[15] = GetAnimBankSpriteId(3);
+
+    task->func = sub_80D5E4C;
+}
+
+void sub_80D5E4C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+        case 0:
+            task->data[10] += task->data[12] * 2;
+            if (++task->data[1] >= 2)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
+
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 16)
+            {
+                task->data[9] = 0;
+                task->data[0]++;
+            }
+            break;
+        case 1:
+            if (++task->data[1] >= 5)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
+
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 96)
+            {
+                task->data[9] = 0;
+                task->data[0]++;
+            }
+            break;
+        case 2:
+            task->data[10] -= task->data[12] * 2;
+
+            if (++task->data[1] >= 2)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
 
-// }
\ No newline at end of file
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 16)
+            {
+                task->data[0]++;
+            }
+            break;
+        case 3:
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = 0;
+            }
+
+            DestroyAnimVisualTask(taskId);
+            break;
+    }
+}
+
+void sub_80D6080(u8 taskId)
+{
+    struct Struct_sub_8078914 unk;
+    sub_8078914(&unk);
+    BlendPalette(unk.field_8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor
+    DestroyAnimVisualTask(taskId);
+}
+
+void sub_80D60B4(u8 taskId)
+{
+    s8 unk;
+    u8 spriteId;
+
+    if (gTasks[taskId].data[0] == 0)
+    {
+        gTasks[taskId].data[1] = gBattleAnimArgs[0];
+        gTasks[taskId].data[2] = gBattleAnimArgs[1];
+        gTasks[taskId].data[3] = gBattleAnimArgs[2];
+        gTasks[taskId].data[4] = gBattleAnimArgs[3];
+    }
+    gTasks[taskId].data[0]++;
+
+    spriteId = gObjectBankIDs[gAnimBankTarget];
+
+    if (!gTasks[taskId].data[4])
+        unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10];
+    else
+        unk = gUnknown_083D97A4[gTasks[taskId].data[0] % 10];
+
+    if (gTasks[taskId].data[3] == 1)
+        gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk;
+    else
+        gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk;
+
+    if (gTasks[taskId].data[0] == gTasks[taskId].data[1])
+    {
+        gSprites[spriteId].pos2.x = 0;
+        gSprites[spriteId].pos2.y = 0;
+        DestroyAnimVisualTask(taskId);
+    }
+}
\ No newline at end of file