sub_8126BC4

2 files changed, 26 insertions, 107 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 38abfb718..3c8502ddb 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,112 +6,6 @@
 
 	.text
 
-	thumb_func_start objid_set_invisible
-objid_set_invisible: @ 8126BA4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08126BC0 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_08126BC0: .4byte gSprites
-	thumb_func_end objid_set_invisible
-
-	thumb_func_start sub_8126BC4
-sub_8126BC4: @ 8126BC4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	lsls r2, 16
-	lsrs r7, r2, 16
-	lsls r3, 16
-	lsrs r6, r3, 16
-	lsls r0, r5, 4
-	adds r0, r5
-	lsls r0, 2
-	ldr r1, _08126C68 @ =gSprites
-	adds r2, r0, r1
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	bne _08126C0E
-	movs r0, 0x2E
-	ldrsh r1, [r2, r0]
-	lsls r0, r7, 16
-	asrs r0, 16
-	cmp r1, r0
-	bne _08126C0E
-	movs r0, 0x30
-	ldrsh r1, [r2, r0]
-	lsls r0, r6, 16
-	asrs r0, 16
-	cmp r1, r0
-	beq _08126C5A
-_08126C0E:
-	lsls r0, r7, 16
-	asrs r0, 16
-	lsls r1, r6, 16
-	asrs r1, 16
-	mov r4, sp
-	adds r4, 0x2
-	mov r2, sp
-	adds r3, r4, 0
-	bl sub_80603CC
-	lsls r0, r5, 4
-	adds r0, r5
-	lsls r0, 2
-	ldr r1, _08126C68 @ =gSprites
-	adds r2, r0, r1
-	mov r0, sp
-	ldrh r0, [r0]
-	adds r0, 0x8
-	strh r0, [r2, 0x20]
-	ldrh r0, [r4]
-	adds r0, 0x8
-	strh r0, [r2, 0x22]
-	adds r3, r2, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	strh r7, [r2, 0x2E]
-	strh r6, [r2, 0x30]
-	mov r1, r8
-	subs r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r2, 0
-	bl StartSpriteAnim
-_08126C5A:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08126C68: .4byte gSprites
-	thumb_func_end sub_8126BC4
-
 	thumb_func_start FldEff_Shadow
 FldEff_Shadow: @ 8126C6C
 	push {r4,r5,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 3607be0e4..e77665eee 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -202,7 +202,7 @@ u8 sub_8126B54(void)
     u8 spriteId;
     struct Sprite *sprite;
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[8], 0, 0, 0x52);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[8] /*gFieldEffectSpriteTemplate_Arrow*/, 0, 0, 0x52);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
@@ -212,3 +212,28 @@ u8 sub_8126B54(void)
     }
     return spriteId;
 }
+
+void objid_set_invisible(u8 spriteId)
+{
+    gSprites[spriteId].invisible = TRUE;
+}
+
+void sub_8126BC4(u8 spriteId, u8 animNum, s16 x, s16 y)
+{
+    s16 x2;
+    s16 y2;
+    struct Sprite *sprite;
+
+    sprite = &gSprites[spriteId];
+    if (sprite->invisible || sprite->data0 != x || sprite->data1 != y)
+    {
+        sub_80603CC(x, y, &x2, &y2);
+        sprite = &gSprites[spriteId];
+        sprite->pos1.x = x2 + 8;
+        sprite->pos1.y = y2 + 8;
+        sprite->invisible = FALSE;
+        sprite->data0 = x;
+        sprite->data1 = y;
+        StartSpriteAnim(sprite, animNum - 1);
+    }
+}