identify some functions

11 files changed, 17 insertions, 17 deletions

diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index e47bf4e4..d8130a25 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -285,7 +285,7 @@ void sub_0802CBC4(Entity* this) {
     COLLISION_OFF(this);
     this->health = 0;
     if (this->field_0x82.HALF.HI) {
-        sub_08079184();
+        PlayerDropHeldObject();
     }
     FreeCarryEntity(this);
 
diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c
index 5d2631df..c9993651 100644
--- a/src/enemy/cuccoAggr.c
+++ b/src/enemy/cuccoAggr.c
@@ -116,7 +116,7 @@ void sub_08038DD8(CuccoAggrEntity* this) {
 void sub_08038E18(CuccoAggrEntity* this) {
     if (super->field_0xf) {
         if (--super->field_0xf == 0) {
-            sub_08079184();
+            PlayerDropHeldObject();
             sub_08039218(this);
             COLLISION_ON(super);
             super->spritePriority.b1 = 1;
diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
index ab807ba0..5ffab6bf 100644
--- a/src/enemy/ghini.c
+++ b/src/enemy/ghini.c
@@ -390,7 +390,7 @@ void sub_0803F6EC(GhiniEntity* this) {
 }
 
 void sub_0803F738(GhiniEntity* this) {
-    ResetPlayer();
+    ResetPlayerItem();
     gPlayerState.mobility |= 0x80;
     gPlayerState.field_0xa |= 0x80;
     sub_0806FA90(&gPlayerEntity, super, 0, 1);
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index 611e2fcc..dd2ec640 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -175,7 +175,7 @@ void sub_08037690(GibdoEntity* this) {
 void sub_080376D0(GibdoEntity* this) {
     u8* x;
     if (sub_080379EC(this) == 0) {
-        ResetPlayer();
+        ResetPlayerItem();
         gPlayerState.mobility = gPlayerState.mobility | 0x80;
         gPlayerState.field_0xa = gPlayerState.field_0xa | 0x80;
         CopyPositionAndSpriteOffset(&gPlayerEntity, super);
diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
index 95c2232c..d257fcea 100644
--- a/src/enemy/gleerok.c
+++ b/src/enemy/gleerok.c
@@ -125,7 +125,7 @@ void Gleerok_OnDeath(GleerokEntity* this) {
 
 void sub_0802D158(GleerokEntity* this) {
     super->action = 1;
-    gUnk_02034490.unk0 = 1;
+    gPauseMenuOptions.disabled = 1;
     SetFade(7, 8);
 }
 
@@ -373,7 +373,7 @@ void sub_0802D650(GleerokEntity* this) {
 
 void sub_0802D674(GleerokEntity* this) {
     u32 val;
-    gUnk_02034490.unk0 = 1;
+    gPauseMenuOptions.disabled = 1;
 
     if (gPlayerEntity.z.WORD != 0)
         return;
@@ -464,7 +464,7 @@ void sub_0802D7B4(GleerokEntity* this) {
 #ifndef EU
             gPlayerState.controlMode = CONTROL_1;
 #endif
-            gUnk_02034490.unk0 = 0;
+            gPauseMenuOptions.disabled = 0;
             SoundReq(BGM_BOSS_THEME);
             return;
         } else {
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 867ce963..a0c15d4b 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -191,7 +191,7 @@ void sub_0802805C(Entity* this) {
     if (this->field_0xf >= 0x19 || gSave.stats.health == 0) {
         sub_0802810C(this);
     } else {
-        ResetPlayer();
+        ResetPlayerItem();
         gPlayerState.mobility |= 0x80;
         PositionRelative(this, &gPlayerEntity, 0, Q_16_16(1.0));
 
@@ -268,7 +268,7 @@ void sub_08028224(u32 item) {
 #ifdef EU
     CreateItemEntity(item, 0, 1);
 #else
-    sub_080A7C18(item, 0, 1);
+    InitItemGetSequence(item, 0, 1);
 #endif
     MessageFromTarget(0x579);
 }
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 786039df..a6a273a1 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -1244,7 +1244,7 @@ void sub_0803B804(Entity* this) {
 }
 
 void sub_0803B824(Entity* this) {
-    ResetPlayer();
+    ResetPlayerItem();
     gPlayerState.mobility = gPlayerState.mobility | 0x80;
     sub_0806FA90(this, &gPlayerEntity, gUnk_080CFD1D[this->type], 1);
     gPlayerEntity.spriteOffsetY = -6;
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index d69fefd0..51e2b692 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -135,7 +135,7 @@ void OctorokBoss_Hit_SubAction0(OctorokBossEntity* this) {
     this->heap->fallingStonesTimer = 0;
     if (this->bossPhase == 4) {
         super->subAction = 4;
-        gUnk_02034490.unk0 = 1;
+        gPauseMenuOptions.disabled = 1;
         sub_08078B48();
         SoundReq(SFX_BOSS_DIE);
     } else {
@@ -325,7 +325,7 @@ void OctorokBoss_Intro(OctorokBossEntity* this) {
         OctorokBoss_Intro_SubAction3, OctorokBoss_Intro_SubAction4, OctorokBoss_Intro_SubAction5,
     };
     sub_08078B48();
-    gUnk_02034490.unk0 = 1;
+    gPauseMenuOptions.disabled = 1;
     sub_08036F60(this);
     OctorokBoss_Intro_SubActions[super->subAction](this);
     SetAffineInfo(super, this->unk_76, this->unk_74, this->angle.HWORD);
@@ -399,7 +399,7 @@ void OctorokBoss_Intro_SubAction5(OctorokBossEntity* this) {
             super->subAction = 0;
             gRoomControls.unk5 = gPlayerEntity.animationState;
             OctorokBoss_SetAttackTimer(this);
-            gUnk_02034490.unk0 = 0;
+            gPauseMenuOptions.disabled = 0;
             SoundReq(BGM_BOSS_THEME);
         }
     } else {
@@ -679,7 +679,7 @@ void OctorokBoss_Action1_Attack(OctorokBossEntity* this) {
         gPlayerEntity.flags &= ~ENT_COLLIDE;
         gPlayerEntity.collisionLayer = 2;
         sub_08078B48();
-        sub_08077B20();
+        PutAwayItems();
         gPlayerEntity.parent = super;
         sub_08036914(&gPlayerEntity, (u8) - (this->angle.HALF.HI + 0x80), 0x3800);
     }
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 210d8b41..a5f07588 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -806,7 +806,7 @@ void sub_08024E4C(Entity* this) {
             sub_08024A14(this, 0, 8);
         } else {
             Entity* player = &gPlayerEntity;
-            ResetPlayer();
+            ResetPlayerItem();
             gPlayerState.flags |= PL_DISABLE_ITEMS;
             gPlayerState.field_0xa |= 0x80;
             gPlayerState.queued_action = PLAYER_0807204C;
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index 720243ed..8cda5e02 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -169,7 +169,7 @@ void sub_0802953C(Entity* this) {
     if (((this->field_0xf > 0x2d) || (gSave.stats.rupees == 0)) && (this->actionDelay == 0)) {
         sub_080296D8(this);
     } else {
-        ResetPlayer();
+        ResetPlayerItem();
         gPlayerState.mobility |= 0x80;
         PositionRelative(this, &gPlayerEntity, 0, Q_16_16(1.0));
         pbVar3 = GetSpriteSubEntryOffsetDataPointer((u16)this->spriteIndex, this->frameIndex);
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index 320e4bf3..c3abb271 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -226,7 +226,7 @@ void VaatiProjectileFunction0Action9(Entity* this) {
 }
 
 void sub_0803E444(Entity* this) {
-    ResetPlayer();
+    ResetPlayerItem();
     gPlayerState.mobility = gPlayerState.mobility | 0x80;
     gPlayerState.field_0xa = gPlayerState.field_0xa | 0x80;
     sub_0806FA90(this, this->field_0x4c, 0, -2);