greatFairy.c finished

asm/greatFairy.s

@@ -1,230 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_080872F8
-sub_080872F8: @ 0x080872F8
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_0806F69C
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r2, r4, #0
-	adds r2, #0x68
-	ldrh r0, [r2]
-	ldrh r1, [r4, #0x2e]
-	subs r0, r0, r1
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0xc
-	bhi _0808732A
-	adds r0, r4, #0
-	adds r0, #0x6a
-	ldrh r0, [r0]
-	ldrh r1, [r4, #0x32]
-	subs r0, r0, r1
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0xc
-	bls _0808735C
-_0808732A:
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	movs r3, #0x32
-	ldrsh r1, [r4, r3]
-	movs r5, #0
-	ldrsh r2, [r2, r5]
-	adds r3, r4, #0
-	adds r3, #0x6a
-	movs r5, #0
-	ldrsh r3, [r3, r5]
-	bl sub_080045D4
-	strb r0, [r4, #0x15]
-	bl Random
-	ldr r2, _08087378 @ =gUnk_081207AC
-	movs r1, #3
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	ldrb r1, [r4, #0x15]
-	adds r0, r0, r1
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-_0808735C:
-	ldr r1, _0808737C @ =gSineTable
-	ldrb r0, [r4, #0xe]
-	adds r0, #0x40
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	movs r3, #0
-	ldrsh r0, [r0, r3]
-	asrs r0, r0, #6
-	subs r0, #8
-	strh r0, [r4, #0x36]
-	ldrb r0, [r4, #0xe]
-	adds r0, #1
-	strb r0, [r4, #0xe]
-	pop {r4, r5, pc}
-	.align 2, 0
-_08087378: .4byte gUnk_081207AC
-_0808737C: .4byte gSineTable
-
-	thumb_func_start GreatFairy_InitializeAnimation
-GreatFairy_InitializeAnimation: @ 0x08087380
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r0, [r4, #0xa]
-	movs r1, #0xb
-	bl __modsi3
-	strb r0, [r4, #0xb]
-	adds r1, r4, #0
-	adds r1, #0x38
-	movs r0, #2
-	strb r0, [r1]
-	ldrb r1, [r4, #0xb]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-	pop {r4, pc}
-
-	thumb_func_start GreatFairy_CreateForm
-GreatFairy_CreateForm: @ 0x080873AC
-	push {r4, r5, r6, lr}
-	adds r5, r1, #0
-	adds r6, r2, #0
-	ldrb r0, [r0, #0xa]
-	movs r4, #0xb
-	movs r1, #0xb
-	bl __divsi3
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	adds r1, r0, #0
-	muls r1, r4, r1
-	adds r1, r1, r5
-	movs r0, #0x1b
-	adds r2, r6, #0
-	bl CreateObject
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_080873D0
-sub_080873D0: @ 0x080873D0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	beq _080873DE
-	subs r0, #1
-	b _080873F6
-_080873DE:
-	adds r0, r4, #0
-	movs r1, #8
-	movs r2, #0
-	bl GreatFairy_CreateForm
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _080873F8
-	adds r0, r4, #0
-	bl CopyPosition
-	movs r0, #0x30
-_080873F6:
-	strb r0, [r4, #0xe]
-_080873F8:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080873FC
-sub_080873FC: @ 0x080873FC
-	push {lr}
-	movs r0, #0xf7
-	bl PlaySFX
-	ldr r1, _0808740C @ =gRoomControls
-	movs r0, #0
-	str r0, [r1, #0x30]
-	b _08087414
-	.align 2, 0
-_0808740C: .4byte gRoomControls
-_08087410:
-	bl DeleteEntity
-_08087414:
-	movs r0, #6
-	movs r1, #0x1b
-	movs r2, #6
-	bl sub_0805EB00
-	cmp r0, #0
-	bne _08087410
-	pop {pc}
-
-	thumb_func_start sub_08087424
-sub_08087424: @ 0x08087424
-	push {r4, r5, lr}
-	adds r5, r1, #0
-	bl sub_080791D0
-	movs r0, #0x64
-	movs r1, #0
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0808744E
-	ldr r0, _0808745C @ =gPlayerEntity
-	str r0, [r4, #0x50]
-	adds r1, r4, #0
-	bl CopyPosition
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-_0808744E:
-	ldr r1, [r5, #4]
-	cmp r1, #0
-	beq _08087460
-	cmp r1, #1
-	beq _0808746C
-	b _08087474
-	.align 2, 0
-_0808745C: .4byte gPlayerEntity
-_08087460:
-	ldr r0, _08087468 @ =gUnk_02002A40
-	adds r0, #0xad
-	b _08087472
-	.align 2, 0
-_08087468: .4byte gUnk_02002A40
-_0808746C:
-	ldr r0, _08087478 @ =gUnk_02002A40
-	adds r0, #0xac
-	movs r1, #0
-_08087472:
-	strb r1, [r0]
-_08087474:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08087478: .4byte gUnk_02002A40
-
-	thumb_func_start sub_0808747C
-sub_0808747C: @ 0x0808747C
-	push {r4, lr}
-	sub sp, #4
-	adds r4, r1, #0
-	movs r0, #0
-	str r0, [sp]
-	movs r0, #6
-	movs r1, #0xf
-	movs r2, #6
-	movs r3, #0xb
-	bl sub_0805EB2C
-	cmp r0, #0
-	beq _08087498
-	movs r0, #1
-_08087498:
-	str r0, [r4, #0x14]
-	add sp, #4
-	pop {r4, pc}
-	.align 2, 0

asm/greatFairy/sub_080871F8.inc

@@ -1,38 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r3, [r4, #0x54]
-	movs r0, #0x2e
-	ldrsh r1, [r3, r0]
-	movs r2, #0x2e
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _0808721E
-	movs r5, #0x32
-	ldrsh r0, [r3, r5]
-	subs r0, #0x20
-	movs r2, #0x32
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bne _0808721E
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	b _0808723C
-_0808721E:
-	movs r5, #0x2e
-	ldrsh r0, [r4, r5]
-	movs r2, #0x32
-	ldrsh r1, [r4, r2]
-	movs r5, #0x2e
-	ldrsh r2, [r3, r5]
-	movs r5, #0x32
-	ldrsh r3, [r3, r5]
-	subs r3, #0x20
-	bl sub_080045D4
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	bl sub_0806F69C
-_0808723C:
-	pop {r4, r5, pc}
-	.align 2, 0
-	.syntax divided

include/greatFairy.h

@@ -15,10 +15,13 @@ extern void sub_0805EC9C();
 extern void sub_0805EC60();
 extern void sub_080873D0();
 extern void DeleteEntity();
-extern void sub_080045D4();
+extern u32 sub_080045D4();
 extern void sub_0806F69C();
 extern u32 Random();
-
+extern void sub_0805E3A0(Entity*, u32);
+extern Entity* sub_0805EB00(u32, u32, u32);
+extern void sub_080791D0();
+extern u32 sub_0805EB2C(u32, u32, u32, u32, u32);
 extern void (*const GreatFairy_Main[])(Entity*);
 extern void (*const GreatFairy_Behaviors[])(Entity*);
 extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
@@ -42,5 +45,13 @@ extern RoomVars gRoomVars;
 extern Screen gScreen;
 extern u32 gUnk_02033280;
 extern u8 gUnk_0812079C[8];
+extern s16 gSineTable[];
+extern s8 gUnk_081207AC[];
+
+
+typedef struct {
+    s32 unk0;
+    s32 unk4;
+} struct_08087424;
 
 #endif

linker.ld

@@ -698,7 +698,6 @@ SECTIONS {
 		src/object/houseDoorExterior.o(.text);
 		src/object/object1A.o(.text);
 		src/object/greatFairy.o(.text);
-		asm/greatFairy.o(.text);
 		src/object/object1C.o(.text);
 		src/object/object1D.o(.text);
 		asm/object1E.o(.text);

src/object/greatFairy.c

@@ -3,6 +3,7 @@
 #include "room.h"
 #include "screen.h"
 #include "greatFairy.h"
+#include "structures.h"
 
 enum {
     BEHAVIORS,
@@ -371,19 +372,20 @@ void sub_08087114(Entity* this) {
 }
 
 #ifdef NON_MATCHING
-void sub_08087150(Entity* this) {
+extern u8 gUnk_0812079C;
-    u8 var;
-    u32 var2;
 
-    GreatFairy_InitializeAnimation(this);
+void sub_08087150(Entity *this) {
-    this->spriteSettings.b.draw = 1;
+    u32 temp;
-    this->spriteOrientation &= 63;
+
+  GreatFairy_InitializeAnimation();
+  this->spriteSettings.b.draw = TRUE;
+  this->spriteOrientation.flipY = 0;
   this->spriteRendering.b0 = 0;
   this->spritePriority.b0 = 3;
-    this->nonPlanarMovement = 128;
+  this->nonPlanarMovement = 0x80;
-    this->direction = 16;
+  this->direction = 0x10;
-    var = gUnk_0812079C[0];
+  temp = gUnk_0812079C;
-    this->palette = ((var & 15) * 16) | this->direction;
+  this->palette.raw = ((temp & 0xf) << 4) | 0xf;
 }
 #else
 NAKED
@@ -412,26 +414,16 @@ void sub_080871D0(Entity* this) {
     }
 }
 
-#ifdef NON_MATCHING
 void sub_080871F8(Entity *this) {
-    s32 bVar1;
+    Entity* temp = this->attachedEntity;
   
-    if (((this->attachedEntity->x.HALF.HI == (this->x).HALF.HI) &&
+    if ((temp->x.HALF.HI == this->x.HALF.HI) && (temp->y.HALF.HI - 0x20 == this->y.HALF.HI)) {
-         ((Entity*)this->attachedEntity)->y.HALF.HI + -32 == (this->y).HALF.HI)) {
         this->action = 2;
     } else {
-        bVar1 = (this->x).HALF.HI;
+        this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, temp->x.HALF.HI, temp->y.HALF.HI - 0x20);
-        sub_080045D4();
-        this->direction = bVar1;
         sub_0806F69C(this);
     }
 }
-#else
-NAKED
-void sub_080871F8(Entity* this) {
-    asm(".include \"asm/greatFairy/sub_080871F8.inc\"");
-}
-#endif
 
 void sub_08087240(Entity* this) {
     if ((gRoomVars.greatFairyState & 4) != 0) {
@@ -470,6 +462,102 @@ void sub_080872AC(Entity* this) {
     GreatFairy_InitializeAnimation(this);
 }
 
+void sub_080872F8(Entity *this) {
+    s32 temp;
+    sub_0806F69C(this);
+    GetNextFrame(this);
+    if (((u16)(this->field_0x68.HWORD - this->x.HALF.HI) > 0xc) || ((u16)(this->field_0x6a.HWORD - this->y.HALF.HI) > 0xc)) {
+        this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, (s16)this->field_0x68.HWORD, (s16)this->field_0x6a.HWORD);
+        this->direction = (this->direction + gUnk_081207AC[Random() & 3]) & 0x1f;
+    }
+    temp = gSineTable[this->actionDelay + 0x40];
+    this->height.HALF.HI = (temp >> 6) - 8;
+    this->actionDelay++;
+}
+
+void GreatFairy_InitializeAnimation(Entity *this)
+{
+  s32 temp;
+  
+  this->action = 1;
+  temp = this->entityType.form;
+  this->entityType.parameter = temp % 11;
+  this->collisionLayer = 2;
+  InitializeAnimation(this, this->entityType.parameter);
+  sub_0805E3A0(this, 2);
+}
+
+Entity* GreatFairy_CreateForm(Entity *this, u32 curForm, u32 parameter) {
+  s32 nextForm;
+  Entity *ent;
+  
+  nextForm = this->entityType.form;
+  nextForm /= 11;
+
+  ent = CreateObject(0x1b, (u8)nextForm * 11 + curForm, parameter);
+  return ent;
+}
+
+void sub_080873D0(Entity *this)
+{
+  Entity *ent;
+  
+    if (this->actionDelay != 0) {
+        this->actionDelay--;
+    } else {
+        ent = GreatFairy_CreateForm(this,8,0);
+        if (ent != NULL) {
+            CopyPosition(this, ent);
+            this->actionDelay = 0x30;
+        }
+    }
+}
+
+void sub_080873FC(void)
+{
+  Entity *ent;
+  
+  PlaySFX(0xf7);
+  gRoomControls.cameraTarget = NULL;
+
+  while (ent = sub_0805EB00(0x6, 0x1b, 0x6), ent != NULL) {
+    DeleteEntity(ent);
+  }
+}
+
+void sub_08087424(Entity *arg0, struct_08087424 *arg1)
+{
+    Entity *ent;
+  
+    sub_080791D0();
+    ent = CreateObject(0x64, 0, 0);
+    if (ent != NULL) {
+        ent->parent = &gPlayerEntity;
+        CopyPosition(&gPlayerEntity, ent);
+        sub_0805E3A0(ent, 2);
+    }
+
+    switch (arg1->unk4) {
+        case 0:
+            gUnk_02002A40.stats.arrowCount = arg1->unk4;
+            break;
+        case 1:
+            gUnk_02002A40.stats.bombCount = 0;
+            break;
+    }
+}
+
+void sub_0808747C(u32 arg0, u32 arg1)
+{
+  u32 iVar1;
+  
+  iVar1 = sub_0805EB2C(0x6, 0xf, 0x6, 0xb, 0x0);
+  if (iVar1 != 0) {
+    iVar1 = 1;
+  }
+  *(u32 *)(arg1 + 0x14) = iVar1;
+}
+
 //clang-format off
 void (*const GreatFairy_Main[])(Entity*) = {
     GreatFairy_CallBehavior,