Merge pull request #474 from notyourav/fnsfns

identify some player util funds

16 files changed, 30 insertions, 30 deletions

diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c
index 323cbf0b..00e43c6b 100644
--- a/src/object/bigVortex.c
+++ b/src/object/bigVortex.c
@@ -73,7 +73,7 @@ void sub_08098DC4(Entity* this) {
         if (this->type2 == 1) {
             SetGlobalFlag(TATSUMAKI);
         }
-        sub_08077B20();
+        PutAwayItems();
     }
     UpdateAnimationSingleFrame(this);
 }
diff --git a/src/object/bird.c b/src/object/bird.c
index 3cb75c4b..c798c6f5 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -224,16 +224,16 @@ void Bird_Type8(Entity* this) {
                         this->actionDelay = 8;
                         this->speed = 0x300;
                         this->field_0x68.HWORD = 0xe000;
-                        sub_08079184();
+                        PlayerDropHeldObject();
                         sub_08078B48();
                         ResetPlayerAnimationAndAction();
-                        sub_08077B20();
+                        PutAwayItems();
                         gPlayerState.swim_state = 0;
                         gPlayerState.jump_status = 0;
                         gPlayerEntity.flags &= 0x7f;
                         gPlayerEntity.spriteSettings.draw = 0;
                         gPriorityHandler.sys_priority = 6;
-                        gUnk_02034490.unk0 = 1;
+                        gPauseMenuOptions.disabled = 1;
                     }
                 }
             }
@@ -322,7 +322,7 @@ void Bird_Type9(Entity* this) {
             gPlayerEntity.spriteSettings.draw = 1;
             ResetPlayerAnimationAndAction();
             ResetPlayerEventPriority();
-            gUnk_02034490.unk0 = 0;
+            gPauseMenuOptions.disabled = 0;
             if (!CheckGlobalFlag(WARP_1ST)) {
                 pEVar1 = CreateObject(OBJECT_69, 0, 0);
                 if (pEVar1 != NULL) {
@@ -394,7 +394,7 @@ void sub_0809D738(void) {
         if (pEVar2 != NULL) {
             pEVar1->child = pEVar2;
         }
-        gUnk_02034490.unk0 = 1;
+        gPauseMenuOptions.disabled = 1;
     } else {
         ResetPlayerAnimationAndAction();
     }
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index 2e567789..af493443 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -99,7 +99,7 @@ void ChestSpawner_Type2Action1(ChestSpawnerEntity* this) {
     if (CheckFlags(this->unk_86)) {
         gScreen.controls.layerFXControl = 0xf40;
         gScreen.controls.alphaBlend = 0x1000;
-        gUnk_02034490.unk0 = 1;
+        gPauseMenuOptions.disabled = 1;
         super->action = 2;
         super->subAction = 0;
         super->field_0xf = 0x1e;
@@ -138,7 +138,7 @@ void ChestSpawner_Type2Action2(ChestSpawnerEntity* this) {
                 tmp = ++super->field_0xf;
                 gScreen.controls.alphaBlend = (((0x10 - tmp) * 0x100) & 0xff00) | tmp;
                 if (gScreen.controls.alphaBlend == 0x10) {
-                    gUnk_02034490.unk0 = 0;
+                    gPauseMenuOptions.disabled = 0;
                     gScreen.controls.layerFXControl = 0;
                     sub_08083E20(this);
                     SoundReq(SFX_SECRET_BIG);
diff --git a/src/object/cloud.c b/src/object/cloud.c
index fbd9e1b1..a8b22546 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -33,7 +33,7 @@ void sub_0809F514(Entity* this) {
     this->spriteSettings.draw = 0;
     this->field_0x68.HALF.LO = 12;
     gRoomControls.camera_target = this;
-    gUnk_02034490.unk0 = 255;
+    gPauseMenuOptions.disabled = 255;
     sub_0809F7BC(this);
 }
 
diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c
index 2e690ab7..1c3ebbeb 100644
--- a/src/object/cuccoMinigame.c
+++ b/src/object/cuccoMinigame.c
@@ -203,7 +203,7 @@ void sub_080A13E8(ObjectB9Entity* this) {
     }
 
     if (!bVar2) {
-        sub_080A7C18(ptr[0], ptr[1], 0);
+        InitItemGetSequence(ptr[0], ptr[1], 0);
     } else {
         this->unk6e = 2;
     }
diff --git a/src/object/fourElements.c b/src/object/fourElements.c
index daecece1..942cc485 100644
--- a/src/object/fourElements.c
+++ b/src/object/fourElements.c
@@ -95,7 +95,7 @@ void FourElements_Action2(FourElementsEntity* this) {
         super->actionDelay = 0x2d;
         gScreen.controls.layerFXControl = 0x640;
         gScreen.controls.alphaBlend = 0;
-        sub_080A7C18(super->type, 0, 1);
+        InitItemGetSequence(super->type, 0, 1);
         sub_0808C650(super, 1);
         SetFade(6, 2);
         SoundReq(SFX_F8);
diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c
index 85f6326d..c119010f 100644
--- a/src/object/itemForSale.c
+++ b/src/object/itemForSale.c
@@ -99,7 +99,7 @@ void ItemForSale_Action1(ItemForSaleEntity* this) {
                 super->interactType = 0;
                 super->subAction = 1;
                 sub_08078B48();
-                ResetPlayer();
+                ResetPlayerItem();
                 gPlayerState.heldObject = 4;
                 gNewPlayerEntity.unk_74 = super;
                 gUnk_0200AF00.unk_2f = 2;
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index 63681ad0..adcd258f 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -4,7 +4,7 @@
 
 extern void (*gUnk_08121488[])(Entity*);
 
-extern u32 sub_08057810(void);
+extern u32 PortalReadyForMinish(void);
 
 u32 sub_0808C128(Entity*);
 void sub_0808C13C(Entity*);
@@ -99,19 +99,19 @@ void sub_0808BFD8(Entity* this) {
 void sub_0808C01C(Entity* this, u32 r1) {
     if (CheckPlayerProximity(this->x.HALF.HI - 0x18, this->y.HALF.HI - 0x18, 0x30, 0x30)) {
         u32 type;
-        gArea.curPortalX = this->x.HALF.HI;
-        gArea.curPortalY = this->y.HALF.HI;
-        gArea.curPortalExitDirection = 2;
+        gArea.portal_x = this->x.HALF.HI;
+        gArea.portal_y = this->y.HALF.HI;
+        gArea.portal_exit_dir = 2;
         type = 4;
         if (r1 != 0)
             type = 2;
-        gArea.curPortalType = type;
+        gArea.portal_type = type;
         if (r1 == 1) {
             if ((gPlayerState.flags & PL_USE_PORTAL) && (gPlayerState.jump_status == 0)) {
-                gArea.field_0x18 = 2;
+                gArea.portal_mode = 2;
             } else {
-                if (sub_08057810() != 0) {
-                    gArea.field_0x18 = 3;
+                if (PortalReadyForMinish() != 0) {
+                    gArea.portal_mode = 3;
                 }
             }
             CreateMagicSparkles(this->x.HALF.HI, this->y.HALF.HI, this->collisionLayer);
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 0ef2bcbc..845fa697 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -323,7 +323,7 @@ void sub_08085E74(LilypadLargeEntity* this) {
     if (gPlayerState.item != NULL) {
         DeleteEntity(gPlayerState.item);
     }
-    ResetPlayer();
+    ResetPlayerItem();
 }
 
 void sub_08085EFC(LilypadLargeEntity* this) {
diff --git a/src/object/macroPlayer.c b/src/object/macroPlayer.c
index 4adcb573..f024215f 100644
--- a/src/object/macroPlayer.c
+++ b/src/object/macroPlayer.c
@@ -200,7 +200,7 @@ void MacroPlayer_Type0_Action6(MacroPlayerEntity* this) {
     u32 uVar2;
 
     if (--super->actionDelay == 0) {
-        uVar2 = gArea.curPortalExitDirection;
+        uVar2 = gArea.portal_exit_dir;
         super->action += 1;
         super->action += uVar2;
         super->animationState = gUnk_081216B4[uVar2 * 2];
diff --git a/src/object/minecart.c b/src/object/minecart.c
index 581152c2..937439fe 100644
--- a/src/object/minecart.c
+++ b/src/object/minecart.c
@@ -81,7 +81,7 @@ void sub_080917DC(MinecartEntity* this) {
                 gPlayerEntity.zVelocity = Q_16_16(2.0);
                 gPlayerEntity.speed = 0x100;
                 gPlayerEntity.flags &= ~PL_MINISH;
-                ResetPlayer();
+                ResetPlayerItem();
                 DeleteClones();
                 SoundReq(SFX_PLY_JUMP);
             }
diff --git a/src/object/object3D.c b/src/object/object3D.c
index 05514818..807285ce 100644
--- a/src/object/object3D.c
+++ b/src/object/object3D.c
@@ -35,8 +35,8 @@ void Object3D(Object3DEntity* this) {
 
 void Object3D_Init(Object3DEntity* this) {
     super->action = 1;
-    super->x.HALF.HI = gArea.curPortalX - gRoomControls.scroll_x;
-    super->y.HALF.HI = gArea.curPortalY - gRoomControls.scroll_y;
+    super->x.HALF.HI = gArea.portal_x - gRoomControls.scroll_x;
+    super->y.HALF.HI = gArea.portal_y - gRoomControls.scroll_y;
     this->unk_68 = 0x80;
     super->updatePriority = 6;
     sub_0801E1B8(0x1f17, 0);
diff --git a/src/object/object74.c b/src/object/object74.c
index e3c4111c..459880bc 100644
--- a/src/object/object74.c
+++ b/src/object/object74.c
@@ -51,7 +51,7 @@ void sub_08097B84(Object74Entity* this) {
 void sub_08097BDC(Object74Entity* this) {
     if (CheckFlags(this->unk_86)) {
         SetPlayerControl(CONTROL_1);
-        gUnk_02034490.unk0 = 1;
+        gPauseMenuOptions.disabled = 1;
         RequestPriorityDuration(super, 0x1e);
         if (sub_08097CB0(this) == FALSE) {
             sub_08097CB4(this);
@@ -76,7 +76,7 @@ void sub_08097C20(Object74Entity* this) {
         gScreen.controls.alphaBlend = (((0x10 - tmp) * 0x100)) | tmp;
         if (gScreen.controls.alphaBlend == 0x10) {
             SetPlayerControl(CONTROL_ENABLED);
-            gUnk_02034490.unk0 = 0;
+            gPauseMenuOptions.disabled = 0;
             gScreen.controls.layerFXControl = 0;
             sub_08097CFC(this);
             super->action = 4;
diff --git a/src/object/objectC1.c b/src/object/objectC1.c
index ed045a6d..454fd432 100644
--- a/src/object/objectC1.c
+++ b/src/object/objectC1.c
@@ -48,7 +48,7 @@ void ObjectC1_Init(ObjectC1Entity* this) {
 
 void ObjectC1_Action1(ObjectC1Entity* this) {
     ResetPlayerEventPriority();
-    gUnk_02034490.unk0 = 0;
+    gPauseMenuOptions.disabled = 0;
     DeleteThisEntity();
 }
 
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index 9f35a442..a5f9e0ec 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -86,7 +86,7 @@ void sub_0808B590(Entity* this) {
             return;
         this->action = 5;
         this->field_0xf = 0x60;
-        sub_08077B20();
+        PutAwayItems();
         gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
         gPlayerEntity.y.HALF.HI = this->y.HALF.HI;
         gPlayerEntity.animationState = 4;
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 2315052e..7a843ab1 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -81,7 +81,7 @@ void Whirlwind_Action1(Entity* this) {
             gPlayerState.field_0x39 = 0xff;
             this->spritePriority.b0 = gPlayerEntity.spritePriority.b0 - 1;
             this->action++;
-            sub_08077B20();
+            PutAwayItems();
             SoundReq(SFX_153);
             SoundReq(SFX_PLY_VO5);
         }