Document some player item stuff

src/enemy/armos.c

@@ -69,11 +69,11 @@ void sub_080300E8(void) {
     }
 }
 
-void sub_08030118(u32 param_1) {
-    if (((s32)(u32)gRoomTransition.armos_data.field_0xac >> (param_1)&1) != 0) {
-        SetLocalFlagByBank(FLAG_BANK_3, param_1 + 0x67);
+void sub_08030118(u32 armosId) {
+    if (((gRoomTransition.armos_data.field_0xac >> armosId) & 1) != 0) {
+        SetLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
     } else {
-        ClearLocalFlagByBank(FLAG_BANK_3, param_1 + 0x67);
+        ClearLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
     }
 }
 

src/enemy/beetle.c

@@ -252,7 +252,7 @@ void sub_08021B64(Entity* this) {
         } else {
             gPlayerState.mobility |= 0x80;
             gPlayerState.speed_modifier -= 0x50;
-            gPlayerState.field_0xaa++;
+            gPlayerState.attachedBeetleCount++;
             CopyPositionAndSpriteOffset(&gPlayerEntity, this);
             this->x.HALF.HI += gUnk_080CB5E4[(this->subtimer++ & 0xe) >> 1];
             this->z.HALF.HI--;

src/enemy/chuchuBoss.c

@@ -1830,7 +1830,7 @@ Entity* sub_08027D20(ChuchuBossEntity* this) {
         r4->spriteVramOffset = super->spriteVramOffset;
         r4->palette.b.b0 = super->palette.b.b0;
 #endif
-        r4->y.HALF.HI += 1;
+        r4->y.HALF.HI++;
         r4->spriteOffsetY = 8;
 #ifndef EU
         LoadFixedGFX(r4, 0x3e);

src/enemy/dust.c

@@ -277,7 +277,7 @@ void sub_08044498(DustEntity* this) {
     u32 xdiff, ydiff;
 
     uVar4 = COORD_TO_TILE(&gPlayerEntity);
-    tmp = (gPlayerState.playerInput.field_0x92 & 0xf00);
+    tmp = (gPlayerState.playerInput.newInput & 0xf00);
     if (tmp != this->unk_75 || uVar4 != this->unk_76) {
         this->unk_75 = tmp;
         this->unk_76 = uVar4;

src/enemy/enemy64.c

@@ -411,13 +411,13 @@ void Enemy64_Action4_SubAction5(Enemy64Entity* this) {
         super->subAction = 6;
         super->spriteSettings.draw = 0;
         entity = super->child;
-        entity->flags &= 0x7f;
+        entity->flags &= ~0x80;
         entity->spriteSettings.draw = 0;
         entity = entity->child;
-        entity->flags &= 0x7f;
+        entity->flags &= ~0x80;
         entity->spriteSettings.draw = 0;
         entity = entity->child;
-        entity->flags &= 0x7f;
+        entity->flags &= ~0x80;
         entity->spriteSettings.draw = 0;
         entity = &gPlayerEntity;
         entity->x.HALF.HI = gRoomControls.origin_x + 0xa8;

src/enemy/ghini.c

@@ -384,7 +384,7 @@ void sub_0803F6EC(GhiniEntity* this) {
 }
 
 void sub_0803F738(GhiniEntity* this) {
-    ResetPlayerItem();
+    ResetActiveItems();
     gPlayerState.mobility |= 0x80;
     gPlayerState.field_0xa |= 0x80;
     sub_0806FA90(&gPlayerEntity, super, 0, 1);

src/enemy/gibdo.c

@@ -166,7 +166,7 @@ void sub_08037690(GibdoEntity* this) {
 
 void sub_080376D0(GibdoEntity* this) {
     if (!sub_080379EC(this)) {
-        ResetPlayerItem();
+        ResetActiveItems();
         gPlayerState.mobility |= 0x80;
         gPlayerState.field_0xa |= 0x80;
         CopyPositionAndSpriteOffset(&gPlayerEntity, super);

src/enemy/gleerok.c

@@ -1076,7 +1076,7 @@ void sub_0802E300(GleerokEntity* this) {
             }
         }
 
-        this->unk_79 &= 0x7f;
+        this->unk_79 &= ~0x80;
         heap = this->unk_84;
         dir = sub_0806F5A4(GetFacingDirection(super, &gPlayerEntity)) << 3;
         index = 0;

src/enemy/gyorgMaleEye.c

@@ -90,7 +90,7 @@ void GyorgMaleEye_Action2(GyorgMaleEyeEntity* this) {
     sub_08048F50(this);
     if (--super->timer == 0) {
         super->action = 3;
-        super->flags &= 0x7f;
+        super->flags &= ~0x80;
         InitializeAnimation(super, super->animIndex + 4);
     }
 }

src/enemy/likeLike.c

@@ -198,7 +198,7 @@ void sub_0802805C(LikeLikeEntity* this) {
     if (super->subtimer >= 0x19 || gSave.stats.health == 0) {
         LikeLike_ReleasePlayer(this);
     } else {
-        ResetPlayerItem();
+        ResetActiveItems();
         gPlayerState.mobility |= 0x80;
         PositionRelative(super, &gPlayerEntity, 0, Q_16_16(1.0));
 

src/enemy/mazaalBracelet.c

@@ -557,7 +557,7 @@ void sub_0803A978(Entity* this) {
         this->action = 0x12;
         this->timer = 3;
         COLLISION_OFF(this);
-        *(u8*)(*(int*)&this->field_0x74 + 0x10) &= 0x7f;
+        *(u8*)(*(int*)&this->field_0x74 + 0x10) &= ~0x80;
         InitializeAnimation(this, 8);
         InitAnimationForceUpdate(this->child, 3);
     }
@@ -1244,7 +1244,7 @@ void sub_0803B804(Entity* this) {
 }
 
 void sub_0803B824(Entity* this) {
-    ResetPlayerItem();
+    ResetActiveItems();
     gPlayerState.mobility |= 0x80;
     sub_0806FA90(this, &gPlayerEntity, gUnk_080CFD1D[this->type], 1);
     gPlayerEntity.spriteOffsetY = -6;

src/enemy/miniFireballGuy.c

@@ -39,7 +39,7 @@ void MiniFireballGuy_OnCollision(Entity* this) {
 
 void MiniFireballGuy_OnDeath(Entity* this) {
     if ((this != this->parent) && (this->parent != NULL)) {
-        this->field_0x6c.HALF.LO &= 0x7f;
+        this->field_0x6c.HALF.LO &= ~0x80;
         this->parent->child = this->child;
         this->child->parent = this->parent;
     }

src/enemy/miniSlime.c

@@ -50,7 +50,7 @@ void MiniSlime_OnCollision(Entity* this) {
 void MiniSlime_OnDeath(Entity* this) {
     Entity* parent = this->parent;
     if ((this != parent) && (parent != NULL)) {
-        this->field_0x6c.HALF.LO &= 0x7f;
+        this->field_0x6c.HALF.LO &= ~0x80;
         this->parent->child = this->child;
         this->child->parent = this->parent;
         if (this->field_0x6c.HALF.HI & 0x40)

src/enemy/mulldozer.c

@@ -237,7 +237,7 @@ void sub_08033000(MulldozerEntity* this) {
         super->subtimer = 16;
         if ((this->unk_82 & 0x80) != 0) {
             super->direction = (super->direction + 0x18) & 0x1c;
-            this->unk_82 &= 0x7f;
+            this->unk_82 &= ~0x80;
         } else {
             super->direction = (super->direction + 8) & 0x1c;
             this->unk_82 |= 0x80;

src/enemy/octorokBoss.c

@@ -1226,7 +1226,7 @@ void sub_08036F60(OctorokBossEntity* this) {
 void OctorokBoss_StepSound(OctorokBossEntity* this, u32 frameMask) {
     if ((gRoomTransition.frameCount & frameMask) == 0) {
         if (IS_FROZEN(this) == FALSE) {
-            SoundReq(SFX_163);
+            SoundReq(SFX_TOGGLE_DIVING);
         } else {
             SoundReq(SFX_ICE_BLOCK_SLIDE);
         }

src/enemy/pesto.c

@@ -828,7 +828,7 @@ void sub_08024E4C(Entity* this) {
             sub_08024A14(this, 0, 8);
         } else {
             Entity* player = &gPlayerEntity;
-            ResetPlayerItem();
+            ResetActiveItems();
             gPlayerState.flags |= PL_DISABLE_ITEMS;
             gPlayerState.field_0xa |= 0x80;
             gPlayerState.queued_action = PLAYER_0807204C;

src/enemy/rupeeLike.c

@@ -167,7 +167,7 @@ void sub_0802953C(Entity* this) {
     if (((this->subtimer > 0x2d) || (gSave.stats.rupees == 0)) && (this->timer == 0)) {
         sub_080296D8(this);
     } else {
-        ResetPlayerItem();
+        ResetActiveItems();
         gPlayerState.mobility |= 0x80;
         PositionRelative(this, &gPlayerEntity, 0, Q_16_16(1.0));
         pbVar3 = GetSpriteSubEntryOffsetDataPointer((u16)this->spriteIndex, this->frameIndex);

src/enemy/vaatiProjectile.c

@@ -226,7 +226,7 @@ void VaatiProjectileFunction0Action9(Entity* this) {
 }
 
 void sub_0803E444(Entity* this) {
-    ResetPlayerItem();
+    ResetActiveItems();
     gPlayerState.mobility |= 0x80;
     gPlayerState.field_0xa |= 0x80;
     sub_0806FA90(this, this->contactedEntity, 0, -2);

src/enemy/wizzrobeFire.c

@@ -113,7 +113,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) {
                 this->timer1 = 0x28;
                 super->timer = 40;
                 super->subtimer = 0;
-                super->flags &= 0x7f;
+                super->flags &= ~0x80;
                 SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
                 EnqueueSFX(SFX_156);
                 InitializeAnimation(super, super->direction >> 3);

src/enemy/wizzrobeIce.c

@@ -120,7 +120,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) {
                 this->timer1 = 0x28;
                 super->timer = 40;
                 super->subtimer = 0;
-                super->flags &= 0x7f;
+                super->flags &= ~0x80;
                 SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
                 EnqueueSFX(SFX_156);
                 InitializeAnimation(super, super->direction >> 3);

src/enemy/wizzrobeWind.c

@@ -136,7 +136,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) {
                 this->timer1 = 0x28;
                 super->timer = 40;
                 super->subtimer = 0;
-                super->flags &= 0x7f;
+                super->flags &= ~0x80;
                 EnqueueSFX(SFX_156);
                 SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
                 InitializeAnimation(super, super->direction >> 3);
@@ -264,7 +264,7 @@ void sub_0802F9C8(WizzrobeEntity* this) {
             if (super->type2 != 0) {
                 ProcessMovement0(super);
                 if (super->collisions != COL_NONE) {
-                    super->flags &= 0x7f;
+                    super->flags &= ~0x80;
                     this->timer1 = 0x28;
                 }
             }