Rename objects

src/npc/bigGoron.c

@@ -185,7 +185,7 @@ void sub_0806D164(Entity* this) {
     puVar2 = &ptr[-0x4000];
 
     for (index = 0x20, ptr = &puVar1[(xOffset >> 4) * 4]; index != 0; index--) {
-        DmaSet(3, ptr, puVar2, 0x80000020);
+        DmaCopy16(3, ptr, puVar2, 0x20 * 2);
         ptr += 0x100;
         puVar2 += 0x40;
     }
@@ -341,11 +341,11 @@ void sub_0806D41C(Entity* this) {
     if ((gRoomTransition.frameCount & 1) == 0) {
         if (CheckPlayerProximity(this->x.HALF.HI - 0x20, this->y.HALF.HI, 0x40, 0x40) != 0) {
             if (this->spriteOffsetY > -8) {
-                this->spriteOffsetY -= 1;
+                this->spriteOffsetY--;
             }
         } else {
             if (this->spriteOffsetY < 0) {
-                this->spriteOffsetY += 1;
+                this->spriteOffsetY++;
             }
         }
     }

src/npc/bladeBrothers.c

@@ -15,8 +15,8 @@ extern void (*gUnk_081115C0[])(Entity*);
 extern void (*gUnk_081115D0[])(Entity*);
 
 extern u16 gUnk_081115DC[];
-extern u8 gUnk_08111618[];
-extern u32* gUnk_081115EC[];
+extern u8 BladeBrothers_EquippedItem[];
+extern PlayerMacroEntry* BladeBrothers_PlayerMacros[];
 extern u8 gUnk_08111623[];
 extern u8 gUnk_0811162B[];
 extern u16 gUnk_08111664[];
@@ -98,7 +98,7 @@ void sub_08068AA4(Entity* this) {
         this->type2++;
         this->type2 &= 7;
         if (this->type2 == 0) {
-            this->type2 += 1;
+            this->type2++;
         }
         ChangeObjPalette(this, gUnk_081115DC[this->type2]);
     }
@@ -139,14 +139,14 @@ void sub_08068B70(Entity* this) {
     }
 }
 
-void sub_08068B84(Entity* this) {
+void BladeBrothers_StartPlayerDemonstration(Entity* this, ScriptExecutionContext* context) {
     u8 p;
 
-    if (gUnk_08111618) {}
-    if (p = this->timer, gUnk_08111618[p]) {
-        ForceEquipItem(gUnk_08111618[this->timer], 0);
+    if (BladeBrothers_EquippedItem) {}
+    if (p = this->timer, BladeBrothers_EquippedItem[p]) {
+        ForceEquipItem(BladeBrothers_EquippedItem[this->timer], 0);
     }
-    InitPlayerMacro(gUnk_081115EC[this->timer]);
+    InitPlayerMacro(BladeBrothers_PlayerMacros[this->timer]);
 }
 
 void sub_08068BB4(Entity* this) {
@@ -190,7 +190,7 @@ void sub_08068C28(Entity* this) {
     }
 }
 
-void sub_08068C6C(Entity* this) {
+void BladeBrothers_GetScroll(Entity* this) {
     InitItemGetSequence(gUnk_0811162B[this->timer] & 0xffffff7f, 0, 0);
 }
 
@@ -380,7 +380,7 @@ void sub_08068F3C(Entity* this) {
 
 void BladeBrothers_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 0;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 4);

src/npc/brocco.c

@@ -121,7 +121,7 @@ void sub_080636F4(Entity* this) {
 
 void Brocco_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         this->y.HALF.HI -= 4;
         InitAnimationForceUpdate(this, 2);

src/npc/castorWildsStatue.c

@@ -170,7 +170,7 @@ void sub_080675D4(Entity* this) {
 static const Hitbox gUnk_08110E94 = { 0, 3, { 5, 3, 3, 5 }, 12, 20 };
 
 void sub_080676D8(Entity* this) {
-    this->subAction += 1;
+    this->subAction++;
 }
 
 void sub_080676E0(Entity* this, ScriptExecutionContext* context) {
@@ -208,7 +208,7 @@ void sub_080676E0(Entity* this, ScriptExecutionContext* context) {
 
 void CastorWildsStatue_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         this->y.HALF.HI -= 0x18;
         InitializeAnimation(this, 1);

src/npc/cat.c

@@ -175,7 +175,7 @@ void sub_08067904(Entity* this) {
         return;
     }
 
-    this->field_0x70.HALF.HI -= 1;
+    this->field_0x70.HALF.HI--;
     if (this->field_0x70.HALF.HI == 0) {
         sub_08067B70(this);
         return;
@@ -405,7 +405,7 @@ u32 sub_08067D20(Entity* this) {
     Entity* entity;
     int iVar4;
     if (this->field_0x74.HALF.HI != 0) {
-        this->field_0x74.HALF.HI -= 1;
+        this->field_0x74.HALF.HI--;
     } else {
         entity = sub_08049DF4(2);
         if (entity != NULL) {
@@ -425,7 +425,7 @@ u32 sub_08067D74(Entity* this) {
 
     if (this->type != 5) {
         if (this->timer != 0) {
-            this->timer -= 1;
+            this->timer--;
         }
         entity = sub_08049DF4(2);
         if (entity != NULL) {
@@ -454,7 +454,7 @@ void sub_08067DDC(Entity* this) {
 
 void Cat_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 5);
     } else {

src/npc/cucco.c

@@ -14,7 +14,7 @@ void Cucco(Entity* this) {
 }
 
 void Cucco_Init(Entity* this) {
-    this->action += 1;
+    this->action++;
     this->field_0x68.HALF.LO = sub_0801E99C(this);
     sub_080787A8(this, this->field_0x68.HALF.LO);
     SetDefaultPriority(this, PRIO_MESSAGE);
@@ -24,7 +24,7 @@ void Cucco_Init(Entity* this) {
 
 void sub_0806E4EC(Entity* this) {
     if (this->subAction == 0) {
-        this->subAction += 1;
+        this->subAction++;
         this->timer = (Random() & 0x1f) + 60;
         InitAnimationForceUpdate(this, 0);
     }
@@ -122,7 +122,7 @@ void Cucco_ShowMessage(Entity* this) {
 
 void Cucco_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 1);
     } else {

src/npc/cuccoChick.c

@@ -22,7 +22,7 @@ void CuccoChick(Entity* this) {
 }
 
 void CuccoChick_Init(Entity* this) {
-    this->action += 1;
+    this->action++;
     this->field_0x68.HALF.LO = sub_0801E99C(this);
     sub_080787A8(this, this->field_0x68.HALF.LO);
     SetDefaultPriority(this, PRIO_MESSAGE);
@@ -32,7 +32,7 @@ void CuccoChick_Init(Entity* this) {
 
 void sub_0806E764(Entity* this) {
     if (this->subAction == 0) {
-        this->subAction += 1;
+        this->subAction++;
         this->timer = (Random() & 0x1f) + 30;
         this->frameIndex = 0;
     }
@@ -96,7 +96,7 @@ void sub_0806E884(Entity* this) {
 
 void CuccoChick_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         this->frameIndex = 1;
     } else {

src/npc/din.c

@@ -39,7 +39,7 @@ void sub_08064828(Entity* this) {
 
 void Din_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 6);
     } else {

src/npc/dog.c

@@ -88,7 +88,7 @@ void sub_08069C40(Entity* this) {
         }
         this->timer = 30;
     } else {
-        this->timer -= 1;
+        this->timer--;
         if (this->timer == 0) {
             this->action = 2;
             this->timer = (Random() & 0x1f) + 30;
@@ -132,7 +132,7 @@ void sub_08069D00(Entity* this) {
 void sub_08069D54(Entity* this) {
     u16 collisions;
     if (!sub_08069F90(this)) {
-        this->timer -= 1;
+        this->timer--;
         if (this->timer != 0) {
             UpdateAnimationSingleFrame(this);
             ProcessMovement0(this);
@@ -170,7 +170,7 @@ void sub_08069DF8(Entity* this) {
     if (sub_08069F90(this)) {
         this->action = 1;
     } else {
-        this->timer -= 1;
+        this->timer--;
         if (this->timer != 0) {
             sub_08069D00(this);
             return;
@@ -359,7 +359,7 @@ void sub_0806A144(Entity* this) {
 void Dog_Fusion(Entity* this) {
     if (this->action == 0) {
         if (sub_08069EF0(this) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             SetDefaultPriority(this, PRIO_MESSAGE);
             InitializeAnimation(this, 0x23);

src/npc/emma.c

@@ -8,7 +8,7 @@ extern ScreenTransitionData gUnk_0813AD38;
 
 void Emma(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         SetDefaultPriority(this, PRIO_MESSAGE);
         sub_0807DD50(this);
     } else {

src/npc/ezlo.c

@@ -6,7 +6,7 @@ const u8 gUnk_08114144[];
 // Ezlo as a cap in the Minish Woods, is destroyed as soon as link wears ezlo
 void Ezlo(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         SetDefaultPriority(this, PRIO_MESSAGE);
         sub_0807DD50(this);
     }

src/npc/farore.c

@@ -39,7 +39,7 @@ void sub_08064A28(Entity* this) {
 
 void Farore_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 6);
     } else {

src/npc/festari.c

@@ -110,7 +110,7 @@ void sub_0805FF2C(Entity* this, ScriptExecutionContext* context) {
 
 void Festari_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         SetDefaultPriority(this, PRIO_MESSAGE);
         InitAnimationForceUpdate(this, 8);

src/npc/ghostBrothers.c

@@ -229,7 +229,7 @@ void sub_08065F20(Entity* this) {
     if (this->interactType != 0) {
         this->interactType = 0;
         MessageFromTarget(0);
-        this->animIndex += 1;
+        this->animIndex++;
         if (gSpriteAnimations_GhostBrothers[this->animIndex] == 0) {
             this->animIndex = 0;
         }
@@ -285,7 +285,7 @@ void sub_08065F64(Entity* this) {
 
 void GhostBrothers_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 2);
     } else {

src/npc/gina.c

@@ -36,7 +36,7 @@ void Gina(Entity* this) {
 
 void Gina_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 2);
     } else {

src/npc/gorman.c

@@ -58,7 +58,7 @@ void sub_080697EC(Entity* this) {
                 InitializeAnimation(this, tmp);
             }
         } else {
-            this->subtimer -= 1;
+            this->subtimer--;
         }
     }
     if (this->interactType != 0) {
@@ -72,7 +72,7 @@ void sub_08069838(Entity* this) {
         if (LoadExtraSpriteData(this, &gUnk_08111C3C) == 0) {
             return;
         }
-        this->action += 1;
+        this->action++;
         this->field_0x68.HALF.LO = 0;
         this->field_0x68.HALF.HI = 0;
         sub_0807DD64(this);

src/npc/gregal.c

@@ -27,7 +27,7 @@ void sub_0806CAF4(Entity* this) {
     Entity* npc;
 
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         SetDefaultPriority(this, PRIO_MESSAGE);
         npc = CreateNPC(GREGAL, 1, 0);
         if (npc != NULL) {
@@ -52,7 +52,7 @@ void sub_0806CAF4(Entity* this) {
 
 void sub_0806CB80(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->animationState = 2;
         this->frameIndex = 0;
         SetDefaultPriority(this, PRIO_MESSAGE);
@@ -64,7 +64,7 @@ void sub_0806CB80(Entity* this) {
 
 void sub_0806CBB4(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->animationState = 2;
         SetDefaultPriority(this, PRIO_MESSAGE);
         InitializeAnimation(this, 0x11);
@@ -161,7 +161,7 @@ void sub_0806CD58(Entity* this) {
 
 void Gregal_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         SetDefaultPriority(this, PRIO_MESSAGE);
         InitAnimationForceUpdate(this, 6);

src/npc/hurdyGurdyMan.c

@@ -111,7 +111,7 @@ void HurdyGurdyMan_Fusion(Entity* this) {
     if (this->action == 0) {
         uVar1 = LoadExtraSpriteData(this, gUnk_081144F0);
         if (uVar1 != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             SetDefaultPriority(this, PRIO_MESSAGE);
             InitializeAnimation(this, 10);

src/npc/kid.c

@@ -229,7 +229,7 @@ void sub_080626E0(Entity* this, ScriptExecutionContext* context) {
     s32 uVar4;
 
     if (context->unk_18 == 0) {
-        context->unk_18 += 1;
+        context->unk_18++;
         context->unk_19 = 10;
         context->postScriptActions |= 2;
         sVar1 = *(s16*)&context->intVariable;
@@ -332,7 +332,7 @@ void sub_08062948(Entity* this, ScriptExecutionContext* context) {
     s32 iVar4;
 
     if (context->unk_18 == 0) {
-        context->unk_18 += 1;
+        context->unk_18++;
         context->unk_12 = (Random() & 0x3f) + 0x20;
         uVar3 = Random() & 0x18;
         switch (this->direction) {

src/npc/kingDaltus.c

@@ -52,7 +52,7 @@ void sub_08066688(Entity* this) {
         if (this->subtimer == 0) {
             this->subtimer = 16;
         } else {
-            this->subtimer -= 1;
+            this->subtimer--;
             tmp = this->animIndex;
         }
     }
@@ -112,7 +112,7 @@ void sub_0806673C(Entity* this) {
 
 void KingDaltus_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 6);
     } else {

src/npc/kingGustaf.c

@@ -7,7 +7,7 @@ void KingGustaf(Entity* this) {
     s32 speed;
 
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteRendering.alphaBlend = 1;
         this->collisionLayer = 2;
         SetDefaultPriority(this, PRIO_MESSAGE);

src/npc/marcy.c

@@ -6,7 +6,7 @@
 
 void Marcy(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         SetDefaultPriority(this, PRIO_MESSAGE);
         sub_0807DD64(this);
     }

src/npc/minishEzlo.c

@@ -25,7 +25,7 @@ void MinishEzlo(Entity* this) {
         if (LoadExtraSpriteData(this, gUnk_0810C48C) == 0) {
             return;
         }
-        this->action += 1;
+        this->action++;
         this->animationState = this->timer * 2;
         SetDefaultPriority(this, PRIO_MESSAGE);
         sub_0807DD50(this);

src/npc/ministerPotho.c

@@ -38,7 +38,7 @@ void sub_08066808(Entity* this) {
         if (this->subtimer == 0) {
             this->subtimer = 16;
         } else {
-            this->subtimer -= 1;
+            this->subtimer--;
             tmp = this->animIndex;
         }
     }
@@ -107,7 +107,7 @@ void sub_08066904(Entity* this) {
 
 void MinisterPotho_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 6);
     } else {

src/npc/mountainMinish.c

@@ -266,7 +266,7 @@ void MountainMinish_Head(Entity* this) {
 void MountainMinish_Fusion(Entity* this) {
     if (this->action == 0) {
         if (LoadExtraSpriteData(this, gUnk_08111358) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             InitializeAnimation(this, 6);
         }

src/npc/nayru.c

@@ -39,7 +39,7 @@ void sub_08064928(Entity* this) {
 
 void Nayru_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 6);
     } else {

src/npc/npc4E.c

@@ -15,8 +15,8 @@ typedef struct {
     s8 unk_04;
 } gUnk_0810C89C_struct;
 
-extern void script_Object3ELeftStoneOpening;  // Cutscene data type?
-extern void script_Object3ERightStoneOpening; // Cutscene data type?
+extern void script_MinishVillageObjectLeftStoneOpening;  // Cutscene data type?
+extern void script_MinishVillageObjectRightStoneOpening; // Cutscene data type?
 
 const Hitbox gUnk_08114154;
 const u8 gUnk_0811415C[];
@@ -137,15 +137,15 @@ void sub_0806DB44(Entity* this, ScriptExecutionContext* context) {
 void sub_0806DB84(Entity* this, ScriptExecutionContext* context) {
     Entity* ent;
     this->hitbox = (Hitbox*)&gUnk_08114154;
-    ent = CreateObject(OBJECT_3E, 4, 0);
+    ent = CreateObject(MINISH_VILLAGE_OBJECT, 4, 0);
     if (ent != NULL) {
         PositionRelative(this, ent, Q_16_16(-8.0), 0);
-        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ELeftStoneOpening);
+        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_MinishVillageObjectLeftStoneOpening);
     }
-    ent = CreateObject(OBJECT_3E, 5, 0);
+    ent = CreateObject(MINISH_VILLAGE_OBJECT, 5, 0);
     if (ent != NULL) {
         PositionRelative(this, ent, Q_16_16(8.0), 0);
-        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ERightStoneOpening);
+        *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_MinishVillageObjectRightStoneOpening);
     }
 }
 
@@ -209,7 +209,7 @@ void sub_0806DCC0(void) {
 
 void NPC4E_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         switch (this->type) {
             case 1:
             case 2:

src/npc/npc4F.c

@@ -2,7 +2,7 @@
 
 void NPC4F(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         InitAnimationForceUpdate(this, this->type);
     }
     UpdateAnimationSingleFrame(this);

src/npc/npc5.c

@@ -534,7 +534,7 @@ u32 sub_08061230(Entity* this) {
     }
     this->contactFlags = this->contactFlags & 0x7f;
     if (this->iframes != 0) {
-        this->iframes += 1;
+        this->iframes++;
     }
     return 0;
 }
@@ -557,7 +557,7 @@ void sub_08061358(Entity* this) {
             sub_08060E70(this, 0);
             break;
         case 1:
-            this->timer -= 1;
+            this->timer--;
             if (this->timer != 0) {
                 return;
             }

src/npc/percy.c

@@ -130,7 +130,7 @@ void sub_0806B540(Entity* this) {
             if (CheckLocalFlag(0x3f) != 0) {
                 return;
             }
-            context->unk_18 += 1;
+            context->unk_18++;
             SetLocalFlag(0x3f);
             break;
         case 1:
@@ -169,7 +169,7 @@ void sub_0806B60C(Entity* this) {
 void Percy_Fusion(Entity* this) {
     if (this->action == 0) {
         if (LoadExtraSpriteData(this, gUnk_08112E1C) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             InitializeAnimation(this, 2);
         }

src/npc/phonograph.c

@@ -15,7 +15,7 @@ void sub_0806EABC(Entity* this, u32 param);
 
 void Phonograph(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         this->field_0x68.HWORD = 1;
         this->field_0x6a.HWORD = 0xffff;

src/npc/picolyteBottle.c

@@ -92,7 +92,7 @@ void PicolyteBottle_Action2(PicolyteBottleEntity* this) {
     } else {
         if (super->timer != 0) {
             super->timer = 0;
-            obj = CreateObject(OBJECT_35, 2, super->subtimer);
+            obj = CreateObject(CARLOV_OBJECT, 2, super->subtimer);
             if (obj != NULL) {
                 obj->parent = super;
                 super->child = obj;

src/npc/pita.c

@@ -18,7 +18,7 @@ void Pita(Entity* this) {
 #endif
     };
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         SetDefaultPriority(this, PRIO_MESSAGE);
         SortEntityAbove(this, this);
         this->hitbox = (Hitbox*)&gUnk_0810C428;

src/npc/postman.c

@@ -150,7 +150,7 @@ void sub_08060528(Entity* this) {
             sub_080788E0(this);
             EnqueueSFX(SFX_PLY_JUMP);
         } else {
-            this->field_0x6a.HWORD -= 1;
+            this->field_0x6a.HWORD--;
         }
     }
     GravityUpdate(this, Q_8_8(24.0));
@@ -272,7 +272,7 @@ END_NONMATCH
 
 void Postman_Fusion(Entity* this) {
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         InitAnimationForceUpdate(this, 2);
     } else {

src/npc/rem.c

@@ -84,7 +84,7 @@ void sub_0806A458(Entity* this) {
     switch (this->subAction) {
         case 0:
             if (--this->timer == 0) {
-                this->subAction += 1;
+                this->subAction++;
             }
             break;
         case 1:
@@ -168,7 +168,7 @@ void sub_0806A5E8(Entity* this) {
         InitializeAnimation(this, 0x10);
         this->timer = (Random() & 0x3f) + 60;
     }
-    this->timer -= 1;
+    this->timer--;
     if (this->timer == 0) {
         this->timer = (Random() & 0x3f) + 120;
         SoundReq(SFX_REM_SLEEP);

src/npc/sittingPerson.c

@@ -6,9 +6,7 @@ extern void (*SittingPersion_Actions[])(Entity*);
 extern Dialog gUnk_0810CC08[];
 
 extern SpriteLoadData gUnk_0810CB78[];
-extern u8 gUnk_02002B0E[];
 extern u16 gUnk_0810CC04[];
-extern u8 gUnk_02002B0E[];
 extern u16 gUnk_0810CBE4[][4];
 extern u8 gUnk_0810CBC0[];
 extern u8 gUnk_0810CD88[][4];
@@ -90,7 +88,7 @@ void sub_0806387C(Entity* this) {
         if (CheckLocalFlag(SHOP05_OPEN) == 0) {
             r5 = 0;
             for (r4 = 1; r4 <= 0x82; r4++) {
-                if (ReadBit(gUnk_02002B0E, r4)) {
+                if (ReadBit(&gSave.stats.filler4[4], r4)) {
                     r5++;
                 }
             }
@@ -151,7 +149,7 @@ void sub_080639D0(Entity* this) {
 void SittingPerson_Fusion(Entity* this) {
     if (this->action == 0) {
         if (LoadExtraSpriteData(this, &gUnk_0810CB78[this->type * 3]) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             this->spriteSettings.flipX = 0;
             this->y.HALF.HI -= 4;

src/npc/smallTownMinish.c

@@ -11,7 +11,7 @@ void SmallTownMinish(Entity* this) {
     static const Hitbox gUnk_081142FC = { -2, 1, { 0, 0, 0, 0 }, 6, 6 };
     static const u8 gUnk_08114304[] = { -2, 1, 6, 6 };
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->hitbox = (Hitbox*)&gUnk_081142FC;
         sub_0807DD50(this);
         sub_08078850(this, 1, 0, gUnk_08114304);

src/npc/stockwell.c

@@ -130,7 +130,7 @@ void sub_0806522C(Entity* this) {
 void sub_08065250(Entity* this) {
     switch (sub_08056338()) {
         case 0:
-            this->subAction += 1;
+            this->subAction++;
             this->timer = 30;
             this->subtimer = 0;
             CreateSpeechBubbleExclamationMark(this, 8, 0xffffffe8);
@@ -152,7 +152,7 @@ void sub_0806528C(Entity* this) {
 
 void sub_080652B0(Entity* this) {
     if ((gMessage.doTextBox & 0x7f) == 0) {
-        this->subAction += 1;
+        this->subAction++;
         this->timer = 10;
         gRoomVars.animFlags = this->subtimer;
         CreateItemEntity(ITEM_QST_DOGFOOD, 0, 0);
@@ -161,10 +161,10 @@ void sub_080652B0(Entity* this) {
 
 void sub_080652E4(Entity* this) {
     if (this->timer != 0) {
-        this->timer -= 1;
+        this->timer--;
     } else {
         if (gPlayerEntity.action != PLAYER_ITEMGET) {
-            this->subAction += 1;
+            this->subAction++;
             MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x19), this);
         }
     }
@@ -172,7 +172,7 @@ void sub_080652E4(Entity* this) {
 
 void sub_08065314(Entity* this) {
     if ((gMessage.doTextBox & 0x7f) == 0) {
-        this->subAction += 1;
+        this->subAction++;
         MenuFadeIn(3, 3);
     }
 }
@@ -252,7 +252,7 @@ void sub_08065370(Entity* this, ScriptExecutionContext* context) {
                 SetLocalFlag(localFlag);
             }
             if (gSave.unk5C <= -2) {
-                gSave.unk5C += 1;
+                gSave.unk5C++;
             }
 
             if (gSave.unk5C >= 10) {

src/npc/sturgeon.c

@@ -153,7 +153,7 @@ void sub_08064D10(Entity* this) {
 void Sturgeon_Fusion(Entity* this) {
     if (this->action == 0) {
         if (LoadExtraSpriteData(this, &gUnk_0810FA38) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             InitializeAnimation(this, 6);
         }

src/npc/tingleSiblings.c

@@ -189,7 +189,7 @@ void sub_08064F28(Entity* this, ScriptExecutionContext* context) {
 void TingleSiblings_Fusion(Entity* this) {
     u32 tmp;
     if (this->action == 0) {
-        this->action += 1;
+        this->action++;
         this->spriteSettings.draw = 1;
         tmp = 6;
         if (this->type == 0) {

src/npc/townsperson.c

@@ -64,13 +64,18 @@ void sub_08061C00(Entity* this) {
     }
 }
 
-NONMATCH("asm/non_matching/townsperson/Townsperson_Head.inc", void Townsperson_Head(Entity* this)) {
-    SetExtraSpriteFrame(this, 0, *(gUnk_0810B78C + (this->animIndex & 3)) + gUnk_0810B680[this->type].frame1);
-    SetExtraSpriteFrame(this, 1, this->frameIndex + gUnk_0810B680[this->type].frame2);
+void Townsperson_Head(Entity* this) {
+    u32 tmp = this->animIndex & 3;
+    u32 tmp2 = gUnk_0810B78C[tmp];
+    u32 tmp3;
+    tmp3 = tmp2 + (tmp3 = gUnk_0810B680[this->type].frame1);
+    SetExtraSpriteFrame(this, 0, tmp3);
+    tmp3 = this->frameIndex;
+    tmp3 += gUnk_0810B680[this->type].frame2;
+    SetExtraSpriteFrame(this, 1, tmp3);
     SetSpriteSubEntryOffsetData1(this, 1, 0);
     sub_0807000C(this);
 }
-END_NONMATCH
 
 void sub_08061CB4(Entity* this, u32 arg1) {
     if (this->animIndex != arg1) {

src/npc/vaatiReborn.c

@@ -126,7 +126,7 @@ void VaatiRebornAction1(Entity* this) {
             switch (this->subAction) {
                 case 0:
                     if (--this->timer == 0) {
-                        this->subAction += 1;
+                        this->subAction++;
                     }
                     break;
                 case 1:

src/npc/windTribespeople.c

@@ -205,7 +205,7 @@ void sub_0806C99C(Entity* this, ScriptExecutionContext* context) {
         flagAsBool = 2;
     }
     if (CheckLocalFlag(99) != 0) {
-        flagAsBool += 1;
+        flagAsBool++;
     }
     MessageNoOverlap(messageIndices[flagAsBool], this);
 }
@@ -275,7 +275,7 @@ void sub_0806CA5C(Entity* this, ScriptExecutionContext* context) {
 void WindTribespeople_Fusion(Entity* this) {
     if (this->action == 0) {
         if (LoadExtraSpriteData(this, &gUnk_08113A1C[this->type * 4]) != 0) {
-            this->action += 1;
+            this->action++;
             this->spriteSettings.draw = 1;
             InitializeAnimation(this, 6);
         }