decompile up to sub_813D908

2 files changed, 95 insertions, 250 deletions

diff --git a/asm/intro.s b/asm/intro.s
index afe79b068..e98fbaf8c 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -6,256 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_813D788
-sub_813D788: @ 813D788
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x4
-	bhi _0813D830
-	lsls r0, 2
-	ldr r1, _0813D7A0 @ =_0813D7A4
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0813D7A0: .4byte _0813D7A4
-	.align 2, 0
-_0813D7A4:
-	.4byte _0813D7B8
-	.4byte _0813D7C6
-	.4byte _0813D7E4
-	.4byte _0813D80C
-	.4byte _0813D816
-_0813D7B8:
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnimIfDifferent
-	ldrh r0, [r4, 0x20]
-	subs r0, 0x1
-	b _0813D82E
-_0813D7C6:
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnimIfDifferent
-	ldr r0, _0813D7E0 @ =gIntroFrameCounter
-	ldr r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0813D87A
-	ldrh r0, [r4, 0x20]
-	adds r0, 0x1
-	b _0813D82E
-	.align 2, 0
-_0813D7E0: .4byte gIntroFrameCounter
-_0813D7E4:
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl StartSpriteAnimIfDifferent
-	ldrh r2, [r4, 0x20]
-	movs r1, 0x20
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x78
-	ble _0813D802
-	ldr r0, _0813D808 @ =gIntroFrameCounter
-	ldr r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	beq _0813D83C
-_0813D802:
-	adds r0, r2, 0x1
-	b _0813D82E
-	.align 2, 0
-_0813D808: .4byte gIntroFrameCounter
-_0813D80C:
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl StartSpriteAnimIfDifferent
-	b _0813D830
-_0813D816:
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnimIfDifferent
-	ldrh r2, [r4, 0x20]
-	movs r0, 0x20
-	ldrsh r1, [r4, r0]
-	movs r0, 0x20
-	negs r0, r0
-	cmp r1, r0
-	ble _0813D830
-	subs r0, r2, 0x2
-_0813D82E:
-	strh r0, [r4, 0x20]
-_0813D830:
-	ldr r0, _0813D84C @ =gIntroFrameCounter
-	ldr r0, [r0]
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0813D87A
-_0813D83C:
-	movs r1, 0x26
-	ldrsh r5, [r4, r1]
-	cmp r5, 0
-	beq _0813D850
-	movs r0, 0
-	strh r0, [r4, 0x26]
-	b _0813D87A
-	.align 2, 0
-_0813D84C: .4byte gIntroFrameCounter
-_0813D850:
-	bl Random
-	movs r1, 0x3
-	ands r1, r0
-	cmp r1, 0x1
-	beq _0813D878
-	cmp r1, 0x1
-	bgt _0813D866
-	cmp r1, 0
-	beq _0813D86E
-	b _0813D87A
-_0813D866:
-	cmp r1, 0x3
-	bgt _0813D87A
-	strh r5, [r4, 0x26]
-	b _0813D87A
-_0813D86E:
-	ldr r0, _0813D874 @ =0x0000ffff
-	strh r0, [r4, 0x26]
-	b _0813D87A
-	.align 2, 0
-_0813D874: .4byte 0x0000ffff
-_0813D878:
-	strh r1, [r4, 0x26]
-_0813D87A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813D788
-
-	thumb_func_start sub_813D880
-sub_813D880: @ 813D880
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _0813D89A
-	cmp r0, 0x1
-	ble _0813D8E2
-	cmp r0, 0x2
-	beq _0813D8BA
-	cmp r0, 0x3
-	beq _0813D8D4
-	b _0813D8E2
-_0813D89A:
-	movs r2, 0x24
-	ldrsh r0, [r4, r2]
-	movs r2, 0x20
-	ldrsh r1, [r4, r2]
-	adds r0, r1
-	ldr r1, _0813D8B0 @ =0x0000012f
-	cmp r0, r1
-	bgt _0813D8B4
-	ldrh r0, [r4, 0x24]
-	adds r0, 0x8
-	b _0813D8E0
-	.align 2, 0
-_0813D8B0: .4byte 0x0000012f
-_0813D8B4:
-	movs r0, 0x2
-	strh r0, [r4, 0x2E]
-	b _0813D8E2
-_0813D8BA:
-	movs r1, 0x24
-	ldrsh r0, [r4, r1]
-	movs r2, 0x20
-	ldrsh r1, [r4, r2]
-	adds r0, r1
-	cmp r0, 0x78
-	ble _0813D8CE
-	ldrh r0, [r4, 0x24]
-	subs r0, 0x1
-	b _0813D8E0
-_0813D8CE:
-	movs r0, 0x3
-	strh r0, [r4, 0x2E]
-	b _0813D8E2
-_0813D8D4:
-	ldrh r1, [r4, 0x24]
-	movs r2, 0x24
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	ble _0813D8E2
-	subs r0, r1, 0x2
-_0813D8E0:
-	strh r0, [r4, 0x24]
-_0813D8E2:
-	ldrh r0, [r4, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x8
-	bl Sin
-	ldr r1, _0813D904 @ =gUnknown_0203935A
-	ldrh r1, [r1]
-	subs r0, r1
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x4
-	strh r0, [r4, 0x30]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D904: .4byte gUnknown_0203935A
-	thumb_func_end sub_813D880
-
-	thumb_func_start sub_813D908
-sub_813D908: @ 813D908
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _0813D930 @ =gTasks
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _0813D934
-	adds r0, r3, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	b _0813D94E
-	.align 2, 0
-_0813D930: .4byte gTasks
-_0813D934:
-	cmp r0, 0x4
-	beq _0813D948
-	adds r2, r3, 0
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	b _0813D94E
-_0813D948:
-	adds r0, r3, 0
-	bl DestroySprite
-_0813D94E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813D908
-
 	thumb_func_start sub_813D954
 sub_813D954: @ 813D954
 	push {r4-r7,lr}
diff --git a/src/intro.c b/src/intro.c
index 1c695c6b7..cf371c8ee 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1350,3 +1350,98 @@ u8 sub_813D584(u16 a, s16 b, u16 c, u16 d, u16 e, u8 f)
     
     return oldSpriteId;
 }
+
+void sub_813D788(struct Sprite *sprite)
+{
+    switch (sprite->data0)
+    {
+        case 0:
+            StartSpriteAnimIfDifferent(sprite, 0);
+            sprite->pos1.x--;
+            break;
+        case 1:
+            StartSpriteAnimIfDifferent(sprite, 0);
+            if (gIntroFrameCounter & 7)
+                return;
+            sprite->pos1.x++;
+            break;
+        case 2:
+            StartSpriteAnimIfDifferent(sprite, 2);
+            if (sprite->pos1.x <= 0x78 || (gIntroFrameCounter & 7))
+                sprite->pos1.x++;
+            break;
+        case 3:
+            StartSpriteAnimIfDifferent(sprite, 3);
+            break;
+        case 4:
+            StartSpriteAnimIfDifferent(sprite, 0);
+            if (sprite->pos1.x > -32)
+                sprite->pos1.x -= 2;
+            break;
+    }
+    if (gIntroFrameCounter & 7)
+        return;
+    if (sprite->pos2.y != 0)
+    {
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        switch (Random() & 3)
+        {
+            case 0:
+                sprite->pos2.y = -1;
+                break;
+            case 1:
+                sprite->pos2.y = 1;
+                break;
+            case 2:
+            case 3:
+                sprite->pos2.y = 0;
+                break;
+        }
+    }
+}
+
+void sub_813D880(struct Sprite *sprite)
+{
+    switch (sprite->data0)
+    {
+        case 0:
+            break;
+        case 1:
+            if (sprite->pos2.x + sprite->pos1.x < 0x130)
+                sprite->pos2.x += 8;
+            else
+                sprite->data0 = 2;
+            break;
+        case 2:
+            if (sprite->pos2.x + sprite->pos1.x > 0x78)
+                sprite->pos2.x -= 1;
+            else
+                sprite->data0 = 3;
+            break;
+        case 3:
+            if (sprite->pos2.x > 0)
+                sprite->pos2.x -= 2;
+            break;
+    }
+    sprite->pos2.y = Sin((u8)sprite->data1, 8) - gUnknown_0203935A;
+    sprite->data1 += 4;
+}
+
+void sub_813D908(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].data[0] == 0)
+    {
+        sprite->invisible = TRUE;
+    }
+    else if (gTasks[sprite->data0].data[0] != 4)
+    {
+        sprite->invisible = FALSE;
+    }
+    else
+    {
+        DestroySprite(sprite);
+    }
+}