finish main.c

src/npc/beedle.c

@@ -159,5 +159,5 @@ void sub_08063504(Entity* this, u32* param_2) {
     u32 uVar1;
 
     uVar1 = sub_080544DC(gUnk_0810C88C[this->entityType.parameter]);
-    param_2[5] = (-uVar1 | uVar1) >> 0x1F;
+    param_2[5] = BOOLCAST(uVar1);
 }

src/npc/forestMinish.c

@@ -154,7 +154,7 @@ void sub_080601D4(Entity* this) {
         uVar2 = 2;
     } else {
         temp = CheckKinstoneFused(0x17);
-        uVar2 = (-temp | temp) >> 0x1f;
+        uVar2 = BOOLCAST(temp);
     }
     TextboxNoOverlap(gUnk_0810A354[uVar2], this);
 }
@@ -169,7 +169,7 @@ void sub_0806021C(Entity* this) {
 
     // jabber nut
     uVar1 = GetInventoryValue(0x5B);
-    uVar2 = (-uVar1 | uVar1) >> 0x1f;
+    uVar2 = BOOLCAST(uVar1);
 
     // earth element
     if (GetInventoryValue(0x40)) {

src/npc/goron.c

@@ -64,7 +64,7 @@ void sub_080693D0(Entity* this) {
     sub_0807DD94(this, 0);
     if (this->animIndex == 8) {
         u32 var0 = this->field_0x82.HWORD & 0xF;
-        bool32 createFx65 = ((-var0) | var0) >> 0x1F; // = !var0
+        bool32 createFx65 = BOOLCAST(var0); // = !var0
 
         if (this->frames.all == 1) {
             this->frames.all = 0;

src/npc/goronMerchant.c

@@ -114,7 +114,7 @@ u32 sub_080696BC(Entity* this) {
     }
 
     temp = CheckGlobalFlag(0x3e);
-    uVar1 = (-temp | temp) >> 0x1f;
+    uVar1 = BOOLCAST(temp);
 
     if (CheckGlobalFlag(0x3f)) {
         uVar1 = 2;

src/npc/guard.c

@@ -68,7 +68,7 @@ void sub_08063D44(Entity* this) {
 
     temp = this->entityType.subtype;
     temp ^= 0x15;
-    idx = ((-temp | temp) >> 0x1f) * 4;
+    idx = BOOLCAST(temp) * 4;
     if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
         return;
 
@@ -132,7 +132,7 @@ void sub_08063E90(Entity* this) {
 
     temp = this->entityType.subtype;
     temp ^= 0x15;
-    idx = ((-temp | temp) >> 0x1f) * 4;
+    idx = BOOLCAST(temp) * 4;
     if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
         return;
 

src/npc/mutoh.c

@@ -66,7 +66,7 @@ void sub_080670B4(Entity* this) {
     uVar2 = 0;
     if (GetInventoryValue(0x11) == 0) {
         uVar1 = CheckGlobalFlag(TABIDACHI);
-        uVar2 = (-uVar1 | uVar1) >> 0x1f;
+        uVar2 = BOOLCAST(uVar1);
     }
     TextboxNoOverlap(gUnk_08110C0C[uVar2], this);
 }

src/npc/townMinish.c

@@ -299,7 +299,7 @@ void sub_0806B098(Entity* this) {
         idx = 1;
         if (CheckGlobalFlag(0x29)) {
             f = CheckGlobalFlag(0x2a);
-            idx = (-f | f) >> 0x1f;
+            idx = BOOLCAST(f);
         }
     }
     TextboxNoOverlap(gUnk_08112C50[(this->entityType.parameter - 7) * 3 + idx], this);