sub_81285AC

2 files changed, 32 insertions, 122 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index adb0e2ec2..ffb23afeb 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,128 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_81285AC
-sub_81285AC: @ 81285AC
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrh r0, [r5, 0x32]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r5, 0x36]
-	lsls r2, 24
-	lsrs r2, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	beq _081285DC
-	ldrh r1, [r5, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl FieldEffectStop
-_081285DC:
-	ldr r4, _08128694 @ =gMapObjects
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	mov r1, sp
-	ldrb r2, [r1]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r4
-	ldrb r1, [r1, 0x4]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	ldr r1, _08128698 @ =gSprites
-	adds r2, r1
-	adds r1, r2, 0
-	adds r1, 0x3E
-	ldrb r1, [r1]
-	movs r3, 0x3E
-	adds r3, r5
-	mov r12, r3
-	movs r3, 0x4
-	ands r3, r1
-	mov r1, r12
-	ldrb r4, [r1]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r4
-	orrs r1, r3
-	mov r3, r12
-	strb r1, [r3]
-	ldrh r1, [r2, 0x20]
-	strh r1, [r5, 0x20]
-	ldrh r0, [r0, 0xA]
-	lsls r0, 16
-	asrs r0, 17
-	ldrh r1, [r2, 0x22]
-	adds r0, r1
-	subs r0, 0x10
-	strh r0, [r5, 0x22]
-	adds r2, 0x43
-	ldrb r0, [r2]
-	subs r0, 0x1
-	adds r1, r5, 0
-	adds r1, 0x43
-	strb r0, [r1]
-	ldrh r1, [r5, 0x2E]
-	movs r2, 0x2E
-	ldrsh r0, [r5, r2]
-	cmp r0, 0x1
-	bne _0812865C
-	adds r0, r1, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-_0812865C:
-	movs r3, 0x2E
-	ldrsh r0, [r5, r3]
-	ldrh r2, [r5, 0x2E]
-	cmp r0, 0x2
-	bne _08128678
-	adds r0, r5, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08128678
-	movs r0, 0x1
-	strh r0, [r5, 0x3C]
-_08128678:
-	lsls r0, r2, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bne _0812868C
-	ldrh r1, [r5, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl FieldEffectStop
-_0812868C:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08128694: .4byte gMapObjects
-_08128698: .4byte gSprites
-	thumb_func_end sub_81285AC
-
 	thumb_func_start sub_812869C
 sub_812869C: @ 812869C
 	push {lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index da406daeb..151efd400 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1372,4 +1372,36 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
     return spriteId;
 }
 
+void sub_81285AC(struct Sprite *sprite)
+{
+    u8 mapObjectId;
+    const struct MapObjectGraphicsInfo *graphicsInfo;
+    struct Sprite *linkedSprite;
 
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data2, sprite->data3, sprite->data4, &mapObjectId))
+    {
+        FieldEffectStop(sprite, sprite->data1);
+    }
+    // else {
+    graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
+    linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+    sprite->invisible = linkedSprite->invisible;
+    sprite->pos1.x = linkedSprite->pos1.x;
+    sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16;
+    sprite->subpriority = linkedSprite->subpriority - 1;
+    if (sprite->data0 == 1)
+    {
+        sprite->data0 ++;
+        StartSpriteAnim(sprite, 1);
+    }
+    if (sprite->data0 == 2 && sprite->animEnded)
+    {
+        sprite->data7 = 1;
+    }
+    if (sprite->data0 == 3)
+    {
+        FieldEffectStop(sprite, sprite->data1);
+    }
+    // }
+
+}