Merge pull request #556 from hatal175/sub_0802CF8C

3 files changed, 47 insertions, 52 deletions

diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
index 0fea006f..540a9500 100644
--- a/src/enemy/gleerok.c
+++ b/src/enemy/gleerok.c
@@ -1409,87 +1409,87 @@ void sub_0802EA68(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3, u32 par
     param_1->filler2[param_2].unk0.HWORD = (param_1->filler2[param_2].unk0.HWORD + param_3) & 0x1fff;
 }
 
-NONMATCH("asm/non_matching/gleerok/sub_0802EA88.inc", bool32 sub_0802EA88(Gleerok_HeapStruct* this)) {
+bool32 sub_0802EA88(Gleerok_HeapStruct* this) {
     s32 bVar2;
     u32 uVar3;
     u32 bVar4;
-    u32 uVar5;
+    u32 i;
     u32 uVar6;
 
     uVar6 = FALSE;
 
-    for (uVar5 = 0; uVar5 < 5; uVar5++) {
-        if (this->filler[uVar5].unk0.HALF.HI != this->filler[uVar5 + 1].unk0.HALF.HI) {
+    for (i = 0; i < 5; i++) {
+        if (this->filler[i].unk0.HALF.HI != this->filler[i + 1].unk0.HALF.HI) {
             uVar6 = TRUE;
-            if ((s32)((this->filler[uVar5 + 1].unk0.HALF.HI - this->filler[uVar5].unk0.HALF.HI) & 0x1fU) > 0x10) {
+            if ((s32)((this->filler[i + 1].unk0.HALF.HI - this->filler[i].unk0.HALF.HI) & 0x1fU) > 0x10) {
                 uVar3 = 0;
             } else {
                 uVar3 = 1;
             }
-            sub_0802EA48(this, uVar5 + 1, 0x20, uVar3);
+            sub_0802EA48(this, i + 1, 0x20, uVar3);
             break;
         }
     }
 
-    for (uVar5 = 0; uVar5 <= 4; uVar5++) {
-        bVar4 = this->filler[uVar5 + 1].unk0.HALF.HI;
-        bVar2 = (bVar4 - this->filler[uVar5].unk0.HALF.HI) & 0x1f;
+    for (i = 0; i <= 4; i++) {
+        bVar4 = this->filler[i + 1].unk0.HALF.HI;
+        bVar2 = (bVar4 - this->filler[i].unk0.HALF.HI) & 0x1f;
+        uVar3 = bVar4;
         if (bVar2 >= 0x11) {
             if (bVar2 < 0x1f) {
-                bVar4 = (bVar4 + 1) & 0x1f;
+                uVar3++;
+                uVar3 &= 0x1f;
             }
         } else {
             if (1 < bVar2) {
-                bVar4 = (bVar4 - 1) & 0x1f;
+                uVar3--;
+                uVar3 &= 0x1f;
             }
         }
-        this->filler[uVar5 + 1].unk0.HALF.HI = bVar4;
+        this->filler[i + 1].unk0.HALF.HI = uVar3;
     }
     return uVar6;
 }
-END_NONMATCH
 
-NONMATCH("asm/non_matching/gleerok/sub_0802EB08.inc",
-         bool32 sub_0802EB08(Gleerok_HeapStruct* param_1, u32 param_2, s32 param_3)) {
+bool32 sub_0802EB08(Gleerok_HeapStruct* param_1, u32 param_2, s32 param_3) {
     s32 uVar2;
     u32 bVar4;
     u32 uVar5;
-    u32 uVar6;
+    u32 i;
     u32 uVar7;
 
     uVar7 = FALSE;
 
-    for (uVar6 = 0; uVar6 < 5; uVar6++) {
-        if (param_1->filler2[uVar6].unk0.HALF.HI != param_1->filler2[uVar6 + 1].unk0.HALF.HI) {
+    for (i = 0; i < 5; i++) {
+        if (param_1->filler2[i].unk0.HALF.HI != param_1->filler2[i + 1].unk0.HALF.HI) {
             uVar7 = TRUE;
-            if (0x10 <
-                (s32)((param_1->filler2[uVar6 + 1].unk0.HALF.HI - param_1->filler2[uVar6].unk0.HALF.HI) & 0x1fU)) {
+            if (0x10 < (s32)((param_1->filler2[i + 1].unk0.HALF.HI - param_1->filler2[i].unk0.HALF.HI) & 0x1fU)) {
                 uVar5 = 3;
             } else {
                 uVar5 = 2;
             }
-            sub_0802EA68(param_1, uVar6 + 1, param_2, uVar5);
+            sub_0802EA68(param_1, i + 1, param_2, uVar5);
             break;
         }
     }
 
-    for (uVar6 = 0; uVar6 <= 4; uVar6++) {
-        bVar4 = param_1->filler2[uVar6 + 1].unk0.HALF.HI;
-        uVar2 = (bVar4 - param_1->filler2[uVar6].unk0.HALF.HI) & 0x1f;
+    for (i = 0; i <= 4; i++) {
+        bVar4 = param_1->filler2[i + 1].unk0.HALF.HI;
+        uVar2 = (bVar4 - param_1->filler2[i].unk0.HALF.HI) & 0x1f;
+        uVar5 = bVar4;
         if (uVar2 >= 0x11) {
             if ((-param_3 & 0x1f) > uVar2) {
-                bVar4 = (bVar4 + 1) & 0x1f;
+                uVar5 = (uVar5 + 1) & 0x1f;
             }
         } else {
             if (param_3 < (int)uVar2) {
-                bVar4 = (bVar4 - 1) & 0x1f;
+                uVar5 = (uVar5 - 1) & 0x1f;
             }
         }
-        param_1->filler2[uVar6 + 1].unk0.HALF.HI = bVar4;
+        param_1->filler2[i + 1].unk0.HALF.HI = uVar5;
     }
     return uVar7;
 }
-END_NONMATCH
 
 void sub_0802EB9C(GleerokEntity* this) {
     this->unk_74 = gUnk_080CD854[GetRandomByWeight(gUnk_080CD850)];
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index 696b36ad..2669bddd 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -165,23 +165,26 @@ void sub_0802CF64(Entity* this) {
     sub_0802CF8C(this);
 }
 
-NONMATCH("asm/non_matching/wallMaster2/sub_0802CF8C.inc", void sub_0802CF8C(Entity* this)) {
+void sub_0802CF8C(Entity* this) {
     int iVar1;
-    u32 uVar2;
+    u32 dir;
     const u16* ptr;
-    u16* ptr2;
 
-    uVar2 = (this->direction + 2) & 0x1c;
-    if ((uVar2 - this->animationState * 4 + 6 > 0xc) ||
-        ((((this->direction + 1) & 7) > 2 && (uVar2 >> 2 != this->animationState)))) {
-        this->animationState = (uVar2 >> 2);
-        iVar1 = (uVar2 >> 3) * 2;
+    dir = Direction8RoundUp(this->direction);
+    if (dir - Direction8FromAnimationState(this->animationState) + 6 > 12) {
+        this->animationState = Direction8ToAnimationState(dir);
+        iVar1 = (dir >> 3) * 2;
+        ptr = &gUnk_080CD730[iVar1];
+        this->field_0x74.HWORD = ptr[0];
+        this->field_0x76.HWORD = ptr[1];
+    } else if (((this->direction + 1) & 7) > 2 && (Direction8ToAnimationState(dir) != this->animationState)) {
+        this->animationState = Direction8ToAnimationState(dir);
+        iVar1 = (dir >> 3) * 2;
         ptr = &gUnk_080CD730[iVar1];
         this->field_0x74.HWORD = ptr[0];
         this->field_0x76.HWORD = ptr[1];
     }
 }
-END_NONMATCH
 
 void sub_0802CFD8(Entity* this) {
     u32 unk = gUnk_080CD740[(this->field_0x7a.HALF.LO++ >> 3) & 7];
diff --git a/src/objectUtils.c b/src/objectUtils.c
index a3dc0132..dd78655a 100644
--- a/src/objectUtils.c
+++ b/src/objectUtils.c
@@ -214,28 +214,20 @@ Entity* CreateLargeWaterTrace(Entity* parent) {
     return ent;
 }
 
-NONMATCH("asm/non_matching/objectUtils/sub_080A2AF4.inc", void sub_080A2AF4(Entity* parent, s32 param_2, s32 param_3)) {
+void sub_080A2AF4(Entity* parent, s32 param_2, s32 param_3) {
     Entity* entity;
-    s32 rand;
     s32 radius;
-    u32 angle;
-    s32 tmp;
+    s32 angle;
 
     entity = CreateLargeWaterTrace(parent);
     if (entity != NULL) {
-        rand = Random();
-        radius = (rand % (param_3 - param_2 + 1)) + param_2;
-        angle = rand >> 0x10 & 0xff;
-        radius *= 0x100;
-        tmp = FixedMul(gSineTable[angle], radius);
-        tmp = FixedDiv(tmp, 0x100);
-        entity->x.WORD += ((tmp << 0x10) >> 8);
-        tmp = FixedMul(gSineTable[angle + 0x40], radius);
-        tmp = FixedDiv(tmp, 0x100);
-        entity->y.WORD -= ((tmp << 0x10) >> 8);
+        angle = Random();
+        radius = (angle % (param_3 - param_2 + 1)) + param_2;
+        angle = angle >> 0x10 & 0xff;
+        entity->x.WORD += FixedDiv(FixedMul(gSineTable[angle], radius << 8), 0x100) << 8;
+        entity->y.WORD -= FixedDiv(FixedMul(gSineTable[angle + 0x40], radius << 8), 0x100) << 8;
     }
 }
-END_NONMATCH
 
 void CreateSparkle(Entity* entity) {
     Entity* sparkle;