Merge pull request #46 from HookedBehemoth:leever_guard

Nonmatching (Leever, guard)

asm/non_matching/guard/sub_08063D44.inc

@@ -1,69 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _08063DA0 @ =gUnk_03003DBC
-	ldrb r0, [r0]
-	cmp r0, #0x46
-	bhi _08063DC6
-	ldrb r0, [r4, #9]
-	movs r1, #0x15
-	eors r0, r1
-	rsbs r1, r0, #0
-	orrs r1, r0
-	lsrs r1, r1, #0x1f
-	lsls r1, r1, #4
-	ldr r0, _08063DA4 @ =gUnk_0810F524
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl LoadExtraSpriteData
-	cmp r0, #0
-	beq _08063DC6
-	adds r0, r4, #0
-	movs r1, #4
-	bl InitializeAnimation
-	ldr r0, _08063DA8 @ =gUnk_0810F6BC
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	movs r2, #0
-	bl sub_0806EE04
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	blt _08063DB6
-	cmp r0, #3
-	bgt _08063DAC
-	movs r0, #0xc
-	bl sub_080A7EE0
-	str r4, [r0, #0x50]
-	movs r1, #0x3c
-	strb r1, [r0, #0xf]
-	b _08063DB6
-	.align 2, 0
-_08063DA0: .4byte gUnk_03003DBC
-_08063DA4: .4byte gUnk_0810F524
-_08063DA8: .4byte gUnk_0810F6BC
-_08063DAC:
-	cmp r0, #5
-	bgt _08063DB6
-	adds r0, r4, #0
-	bl sub_08078778
-_08063DB6:
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	movs r1, #0
-	strb r0, [r4, #0xc]
-	strb r1, [r4, #0xa]
-	adds r0, r4, #0
-	bl sub_08063DC8
-_08063DC6:
-	pop {r4, pc}
-	.syntax divided

asm/non_matching/guard/sub_08063E90.inc

@@ -1,73 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #9]
-	movs r1, #0x15
-	eors r0, r1
-	rsbs r1, r0, #0
-	orrs r1, r0
-	lsrs r1, r1, #0x1f
-	lsls r1, r1, #4
-	ldr r0, _08063EC8 @ =gUnk_0810F524
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl LoadExtraSpriteData
-	cmp r0, #0
-	beq _08063F1E
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0xe]
-	cmp r1, #0
-	beq _08063ECC
-	adds r1, r4, #0
-	adds r1, #0x70
-	movs r0, #8
-	strb r0, [r1]
-	b _08063ED2
-	.align 2, 0
-_08063EC8: .4byte gUnk_0810F524
-_08063ECC:
-	adds r0, r4, #0
-	adds r0, #0x70
-	strb r1, [r0]
-_08063ED2:
-	movs r0, #0
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	bl sub_0805ACC0
-	adds r2, r0, #0
-	cmp r2, #0
-	bne _08063EF2
-	ldrh r0, [r4, #0x2e]
-	adds r1, r4, #0
-	adds r1, #0x68
-	strh r0, [r1]
-	ldrh r0, [r4, #0x32]
-	adds r1, #2
-	strh r0, [r1]
-	b _08063EFE
-_08063EF2:
-	lsrs r1, r2, #0x10
-	adds r0, r4, #0
-	adds r0, #0x68
-	strh r1, [r0]
-	adds r0, #2
-	strh r2, [r0]
-_08063EFE:
-	adds r1, r4, #0
-	adds r1, #0x71
-	movs r0, #0
-	strb r0, [r1]
-	subs r1, #0x39
-	movs r0, #1
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	adds r0, r4, #0
-	bl sub_0807DD64
-	adds r0, r4, #0
-	bl sub_08063F20
-_08063F1E:
-	pop {r4, pc}
-    .syntax divided

asm/non_matching/leever/sub_0801FED4.inc

@@ -1,72 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	bne _0801FEEA
-	adds r1, r4, #0
-	adds r1, #0x74
-	movs r0, #1
-	strh r0, [r1]
-_0801FEEA:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r2, #0xf
-	adds r1, r2, #0
-	ands r1, r0
-	lsls r1, r1, #5
-	strh r1, [r4, #0x24]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0801FF28
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _0801FF4E
-	ldr r0, _0801FF24 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl sub_0800132C
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-	b _0801FF4E
-	.align 2, 0
-_0801FF24: .4byte gUnk_020000B0
-_0801FF28:
-	adds r0, r1, #0
-	adds r0, #0x40
-	strh r0, [r4, #0x24]
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	movs r0, #7
-	ands r0, r1
-	cmp r0, #0
-	bne _0801FF4E
-	ldr r0, _0801FF58 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl sub_0800132C
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-_0801FF4E:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	pop {r4, pc}
-	.align 2, 0
-_0801FF58: .4byte gUnk_020000B0
-.syntax divided

src/enemy/leever.c

@@ -22,25 +22,21 @@ extern Entity* gUnk_020000B0;
 extern u8 gUnk_080CA4C8[];
 extern u16 gUnk_080CA4CA[];
 extern s16 gSineTable[];
-void Leever(Entity *this)
+void Leever(Entity* this) {
-{
     EnemyFunctionHandler(this, gUnk_080CA49C);
     SetChildOffset(this, 0, 1, -0x10);
 }
 
-void sub_0801FC28(Entity *this)
+void sub_0801FC28(Entity* this) {
-{
     gUnk_080CA4B4[this->action](this);
 }
 
-void sub_0801FC40(Entity *this)
+void sub_0801FC40(Entity* this) {
-{
     if (this->bitfield == 0x80) {
         if (this->action == 3) {
             this->field_0x74 = 1;
         }
-  }
+    } else {
-  else {
         if (this->field_0x43 != 0) {
             sub_0804A9FC(this, 0x1c);
         }
@@ -48,25 +44,21 @@ void sub_0801FC40(Entity *this)
     sub_0804AA30(this, gUnk_080CA49C);
 }
 
-void sub_0801FC7C(Entity *this)
+void sub_0801FC7C(Entity* this) {
-{
     if ((this->entityType).form == 0) {
         sub_0804A7D4(this);
-  }
+    } else {
-  else {
         CreateDeathFx(this, 0xf1, 0);
     }
 }
 
-void sub_0801FC9C(Entity *this)
+void sub_0801FC9C(Entity* this) {
-{  
     sub_0804A720(this);
     this->action = 1;
     this->actionDelay = Random();
 }
 
-void sub_0801FCB0(Entity *this)
+void sub_0801FCB0(Entity* this) {
-{
     if (--this->actionDelay == 0) {
         if (sub_0801FE68(this, Random() & 0x1f) != 0) {
             this->action = 2;
@@ -74,15 +66,13 @@ void sub_0801FCB0(Entity *this)
             this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA4C8[Random() & 1]) & 0x1f;
             InitializeAnimation(this, 0);
             UpdateSpriteForCollisionLayer(this);
-    }
+        } else {
-    else {
             this->actionDelay = (Random() & 0x18) + 8;
         }
     }
 }
 
-void sub_0801FD2C(Entity *this)
+void sub_0801FD2C(Entity* this) {
-{
 
     GetNextFrame(this);
 
@@ -90,20 +80,17 @@ void sub_0801FD2C(Entity *this)
         this->action = 3;
         if (this->entityType.form == 0) {
             this->field_0x74 = 0xb4;
-    }
+        } else {
-    else {
             this->field_0x74 = 0x6e;
         }
-    InitializeAnimation(this,2);
+        InitializeAnimation(this, 2);
-  }
+    } else if (this->frames.b.f0 != 0) {
-  else if (this->frames.b.f0 != 0) {
         this->frames.all &= 0xfe;
         this->flags |= 0x80;
     }
 }
 
-void sub_0801FD80(Entity *this)
+void sub_0801FD80(Entity* this) {
-{
 
     sub_0801FED4(this);
     GetNextFrame(this);
@@ -115,8 +102,7 @@ void sub_0801FD80(Entity *this)
     }
 }
 
-void sub_0801FDB4(Entity *this)
+void sub_0801FDB4(Entity* this) {
-{
     sub_0801FED4(this);
     GetNextFrame(this);
     if ((this->frames.b.f3) != 0) {
@@ -126,10 +112,9 @@ void sub_0801FDB4(Entity *this)
     }
 }
 
-u32 sub_0801FDE4(Entity *ent, s32 x, s32 y)
+u32 sub_0801FDE4(Entity* ent, s32 x, s32 y) {
-{
     u32 uVar3;
-    u16 *puVar4;
+    u16* puVar4;
 
     if (sub_080002D4(x, y, gUnk_020000B0->collisionLayer) != 0) {
         return 0;
@@ -147,17 +132,14 @@ u32 sub_0801FDE4(Entity *ent, s32 x, s32 y)
     }
 }
 
-bool32 sub_0801FE68(Entity *ent, s32 arg2)
+bool32 sub_0801FE68(Entity* ent, s32 arg2) {
-{
     s32 sin, cos;
     s32 x, y;
     u32 i;
 
-
     if (sub_08049FDC(ent, 1) == 0) {
         return 0;
-  }
+    } else {
-  else {
         x = gUnk_020000B0->x.WORD;
         y = gUnk_020000B0->y.WORD;
         sin = gSineTable[arg2 * 8] << 11;
@@ -173,9 +155,9 @@ bool32 sub_0801FE68(Entity *ent, s32 arg2)
     }
 }
 
-#if NON_MATCHING
+extern u32 sub_0800132C(Entity*, Entity*);
-void sub_0801FED4(Entity *this)
+
-{
+void sub_0801FED4(Entity* this) {
     s16 sVar2;
 
     if (sub_08049FDC(this, 1) == 0) {
@@ -184,23 +166,14 @@ void sub_0801FED4(Entity *this)
     sVar2 = (this->frames.all & 0xf) * 0x20;
     this->nonPlanarMovement = sVar2;
     if (this->entityType.form == 0) {
-      this->field_0xf++;
+        if ((this->field_0xf++ & 0xf) == 0) {
-    if ((this->field_0xf & 0xf) == 0) {
             sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
         }
-  }
+    } else {
-  else {
         this->nonPlanarMovement = sVar2 + 0x40;
-    this->field_0xf++;
+        if ((this->field_0xf++ & 0x7) == 0) {
-    if ((this->field_0xf & 0x7) == 0) {
             sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
         }
     }
     sub_080AEF88(this);
 }
-#else
-NAKED
-void sub_0801FED4(Entity *this) {
-    asm(".include \"asm/non_matching/leever/sub_0801FED4.inc\"");
-}
-#endif

src/npc/guard.c

@@ -30,6 +30,12 @@ extern u32 sub_0805ACC0(Entity*);
 extern void sub_0807DDAC(Entity*, u32);
 extern void sub_0807DDE4(Entity*);
 extern void sub_0807000C(Entity*);
+extern void sub_0806EE04(Entity*, void*, u32);
+extern Entity* sub_080A7EE0(int);
+extern void sub_08078778(Entity*);
+extern void sub_0807DD64(Entity*);
+void sub_08063DC8(Entity*);
+void sub_08063F20(Entity*);
 
 extern void (*const gUnk_0810F544[])(Entity*);
 extern void (*const gUnk_0810F550[])(Entity*);
@@ -40,96 +46,139 @@ extern SpriteLoadData gUnk_0810F524[];
 extern void* gUnk_0810F6BC[];
 extern ScreenTransition gScreenTransition;
 
-void Guard(Entity *this)
+void Guard(Entity* this) {
-{
     if ((this->flags & 2) != 0) {
         gUnk_0810F544[this->action](this);
-  }
+    } else {
-  else {
         sub_08063D24(this);
     }
 }
 
-void sub_08063D24(Entity *this)
+void sub_08063D24(Entity* this) {
-{
     gUnk_0810F550[this->action](this);
     sub_0806ED78(this);
 }
 
-NAKED
 void sub_08063D44(Entity* this) {
-    asm(".include \"asm/non_matching/guard/sub_08063D44.inc\"");
+    Entity* ent;
+    u32 temp, idx;
+
+    if (gUnk_03003DBC > 0x46)
+        return;
+
+    temp = this->entityType.subtype;
+    temp ^= 0x15;
+    idx = ((-temp | temp) >> 0x1f) * 4;
+    if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
+        return;
+
+    InitializeAnimation(this, 4);
+    sub_0806EE04(this, gUnk_0810F6BC[this->entityType.form], 0);
+    switch (this->entityType.form) {
+        case 0 ... 3:
+            ent = sub_080A7EE0(0xc);
+            ent->parent = this;
+            ent->field_0xf = 0x3c;
+            break;
+        case 4 ... 5:
+            sub_08078778(this);
+            break;
+    }
+    this->action++;
+    this->entityType.form = 0;
+    sub_08063DC8(this);
 }
 
-void sub_08063DC8(Entity *this)
+void sub_08063DC8(Entity* this) {
-{  
     if ((this->entityType).form == 0xff) {
         this->action = 2;
         this->actionDelay = 0x1e;
-    this->animationState = sub_0806F5A4(GetFacingDirection(this,&gLinkEntity));
+        this->animationState = sub_0806F5A4(GetFacingDirection(this, &gLinkEntity));
         InitAnimationForceUpdate(this, this->animationState + 4);
-  }
+    } else {
-  else {
         sub_0806EE20(this);
         if (this->field_0x3e != this->animationState) {
             this->animationState = this->field_0x3e;
             InitializeAnimation(this, this->animationState + 4);
-    }
+        } else {
-    else {
             GetNextFrame(this);
         }
         if (this->interactType != 0) {
             this->action = 3;
             this->interactType = 0;
-      InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this,&gLinkEntity)));
+            InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)));
             sub_08064428(this);
         }
     }
 }
 
-void sub_08063E54(Entity *this)
+void sub_08063E54(Entity* this) {
-{
     if (--this->actionDelay == 0) {
         SetRoomFlag(0xf);
     }
 }
 
-void sub_08063E6C(Entity *this)
+void sub_08063E6C(Entity* this) {
-{
     if ((gTextBox.doTextBox & 0x7f) == 0) {
         this->action = 1;
         InitializeAnimation(this, this->animationState + 4);
     }
 }
 
-NAKED
 void sub_08063E90(Entity* this) {
-    asm(".include \"asm/non_matching/guard/sub_08063E90.inc\"");
+    Entity* ent;
+    u32 temp, idx;
+    u32 unk;
+
+    temp = this->entityType.subtype;
+    temp ^= 0x15;
+    idx = ((-temp | temp) >> 0x1f) * 4;
+    if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
+        return;
+
+    this->action++;
+    if (this->actionDelay) {
+        this->field_0x70.BYTES.byte0 = 8;
+    } else {
+        this->field_0x70.BYTES.byte0 = 0;
+    }
+    this->actionDelay = 0;
+
+    unk = sub_0805ACC0(this);
+    if (unk == 0) {
+        this->field_0x68.HWORD = this->x.HALF.HI;
+        this->field_0x6a.HWORD = this->y.HALF.HI;
+    } else {
+        this->field_0x68.HWORD = unk >> 0x10;
+        this->field_0x6a.HWORD = unk;
+    }
+    this->field_0x70.BYTES.byte1 = 0;
+    this->collisionLayer = 1;
+    UpdateSpriteForCollisionLayer(this);
+    sub_0807DD64(this);
+    sub_08063F20(this);
 }
 
-void sub_08063F20(Entity *this)
+void sub_08063F20(Entity* this) {
-{  
     sub_0807DDAC(this, 0);
     sub_0807DDE4(this);
     GetNextFrame(this);
     if (this->interactType != 0) {
         this->action++;
         this->interactType = 0;
-    InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + *(s8 *)&this->field_0x70);
+        InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + *(s8*)&this->field_0x70);
         sub_08064428(this);
     }
 }
 
-void sub_08063F78(Entity *this)
+void sub_08063F78(Entity* this) {
-{
     if ((gTextBox.doTextBox & 0x7f) == 0) {
         this->action = this->action - 1;
-    InitializeAnimation(this,(this->animationState >> 1) + 4 + *(s8 *)&this->field_0x70);
+        InitializeAnimation(this, (this->animationState >> 1) + 4 + *(s8*)&this->field_0x70);
     }
 }
 
-void Guard_Head(Entity *this)
+void Guard_Head(Entity* this) {
-{
     u8 bVar1;
     u32 uVar2;
     u32 pbVar3;
@@ -144,15 +193,13 @@ void Guard_Head(Entity *this)
             pbVar5 = pbVar5 + 0x21;
             pbVar3 = 0xffffffff;
             uVar4 = 0;
-    }
+        } else {
-    else {
             pbVar3 = (uVar2 + 0x19);
             if ((this->frameSpriteSettings & 0x3f) != 0) {
                 uVar4 += 0x1f;
             }
         }
-  }
+    } else {
-  else {
         pbVar3 = (uVar2 + 0x46);
         pbVar5 = pbVar5 + 0x2d;
         if ((this->frameSpriteSettings & 0x3f) != 0) {
@@ -168,18 +215,15 @@ void Guard_Head(Entity *this)
     sub_0807000C(this);
 }
 
-void sub_08064030(Entity *arg0,Entity *arg1)
+void sub_08064030(Entity* arg0, Entity* arg1) {
-{
     *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f;
 }
 
-void sub_08064044(void)
+void sub_08064044(void) {
-{
     gScreenTransition.unk = 1;
 }
 
-void sub_08064050(Entity *arg0, struct_08064050 *arg1)
+void sub_08064050(Entity* arg0, struct_08064050* arg1) {
-{
     u32 unk;
 
     arg1->unk2 = 0;