format

6 files changed, 9 insertions, 9 deletions

diff --git a/asm/non_matching/itemTryPickupObject/sub_080762D8.inc b/asm/non_matching/itemTryPickupObject/sub_080762D8.inc
index 203b0b11..51d0ea00 100644
--- a/asm/non_matching/itemTryPickupObject/sub_080762D8.inc
+++ b/asm/non_matching/itemTryPickupObject/sub_080762D8.inc
@@ -9,7 +9,7 @@
 	strb r1, [r4, #5]
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl PlayerTryDropItem
+	bl PlayerTryDropObject
 	cmp r0, #0
 	bne _080762F6
 	b _08076486
diff --git a/asm/non_matching/itemTryPickupObject/sub_08076518.inc b/asm/non_matching/itemTryPickupObject/sub_08076518.inc
index 46aaa4e5..d05babbf 100644
--- a/asm/non_matching/itemTryPickupObject/sub_08076518.inc
+++ b/asm/non_matching/itemTryPickupObject/sub_08076518.inc
@@ -4,7 +4,7 @@
 	push {r7}
 	adds r4, r0, #0
 	mov r8, r1
-	bl PlayerTryDropItem
+	bl PlayerTryDropObject
 	cmp r0, #0
 	beq _080765D4
 	ldr r5, _0807655C @ =gPlayerState
diff --git a/include/player.h b/include/player.h
index 273932aa..d5037141 100644
--- a/include/player.h
+++ b/include/player.h
@@ -374,7 +374,7 @@ void sub_080792D8(void);
 u32 sub_08078F74(Entity*);
 void sub_0807879C(Entity*);
 void PlayerSetNormalAndCollide(void);
-bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk);
+bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk);
 
 // player.s
 extern u32 PlayerCheckNEastTile();
diff --git a/src/game.c b/src/game.c
index afd2859e..ecc81a82 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1284,8 +1284,8 @@ static void InitRoomTransition(void) {
 bool32 CanDispEzloMessage(void) {
     s32 tmp = PL_STATE_WALK;
 
-    if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gPauseMenuOptions.disabled ||
-        gUnk_0200AF00.unk_1)
+    if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED ||
+        gPauseMenuOptions.disabled || gUnk_0200AF00.unk_1)
         return 0;
 
     if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item ||
diff --git a/src/playerItem/playerItem13.c b/src/playerItem/playerItem13.c
index e4b03d8b..e76faf89 100644
--- a/src/playerItem/playerItem13.c
+++ b/src/playerItem/playerItem13.c
@@ -42,7 +42,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
     Entity* child = super->child;
     if ((this->unk_6c == child->kind) || (this->unk_6e == child->id)) {
         if (child->action != 2) {
-            sub_08079184();
+            PlayerDropHeldObject();
             DeleteThisEntity();
         } else {
             if ((gPlayerState.heldObject == 0) || ((gNewPlayerEntity.unk_79 & 0x7f) != 0)) {
@@ -54,7 +54,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
             }
         }
     } else {
-        sub_08079184();
+        PlayerDropHeldObject();
         DeleteThisEntity();
     }
 }
@@ -204,7 +204,7 @@ void sub_080AD27C(PlayerItem13Entity* this) {
         super->flags |= 0x80;
         sub_0801766C(super);
     } else {
-        sub_08079184();
+        PlayerDropHeldObject();
         DeleteThisEntity();
     }
 }
diff --git a/src/playerUtils.c b/src/playerUtils.c
index bb80c8b2..10b17c9d 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -569,7 +569,7 @@ void PlayerCancelHoldItem(ItemBehavior* beh, u32 arg1) {
  * Check if player state believes the held item is valid?
  * If it's not delete the item?
  */
-bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk) {
+bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk) {
     u32 temp;
     if (gPlayerState.heldObject == 0) {
         PlayerCancelHoldItem(arg0, unk);