6 files changed, 17 insertions, 17 deletions
diff --git a/src/object/bird.c b/src/object/bird.c
index b7774df4..9a131075 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -44,12 +44,12 @@ void sub_0809CF54(Entity* this) {
 void sub_0809CFEC(Entity* this) {
 
     sub_0806F69C(this);
-    sub_08003FC4(this, *(s16*)&this->field_0x68.HWORD);
+    GravityUpdate(this, *(s16*)&this->field_0x68.HWORD);
     if (this->actionDelay != 0) {
         if (--this->actionDelay == 0) {
             this->field_0xf = 0;
         }
-    } else if (sub_080040A8(this) == 0) {
+    } else if (CheckOnScreen(this) == 0) {
         DeleteThisEntity();
     }
     UpdateAnimationSingleFrame(this);
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 2c025c77..78d8c881 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -216,7 +216,7 @@ void sub_080811EC(Entity* this) {
         sub_0806F69C(this);
     }
 
-    sub_08003FC4(this, 0x2800);
+    GravityUpdate(this, 0x2800);
     if (this->zVelocity <= 0) {
         this->action = 2;
         COLLISION_ON(this);
@@ -302,7 +302,7 @@ void sub_0808136C(Entity* this) {
         this->y.WORD = other->y.WORD;
         this->spriteOrientation.flipY = other->spriteOrientation.flipY;
         this->spriteRendering.b3 = other->spriteRendering.b3;
-        sub_08003FC4(this, 0x2800);
+        GravityUpdate(this, 0x2800);
     } else {
         sub_08081404(this, 1);
     }
@@ -410,14 +410,14 @@ void sub_0808153C(Entity* this) {
         return;
 
     if (this->field_0x68.HALF.LO == 0) {
-        if (!sub_08003FC4(this, 0x1000) && !sub_0800442E(this)) {
+        if (!GravityUpdate(this, 0x1000) && !sub_0800442E(this)) {
             this->field_0x68.HALF.LO = 1;
             this->zVelocity = 0x1E000;
             sub_0808148C(this->type);
             UpdateSpriteForCollisionLayer(this);
         }
     } else {
-        if (!sub_08003FC4(this, 0x2800)) {
+        if (!GravityUpdate(this, 0x2800)) {
             this->field_0x68.HALF.LO = 2;
             sub_0808148C(this->type);
         }
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index d84c12b6..8adb45e7 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -57,7 +57,7 @@ void sub_0808BF14(Entity* this) {
 }
 
 void sub_0808BF58(Entity* this) {
-    sub_08003FC4(this, 0x2000);
+    GravityUpdate(this, 0x2000);
     switch (this->subAction) {
         case 0:
             if (this->zVelocity <= 98303) {
@@ -125,7 +125,7 @@ void sub_0808C01C(Entity* this, u32 r1) {
 }
 
 void sub_0808C0AC(Entity* this) {
-    sub_08003FC4(this, 0x2000);
+    GravityUpdate(this, 0x2000);
     switch (this->subAction) {
         case 0:
             if (this->zVelocity <= 98303) {
diff --git a/src/object/object49.c b/src/object/object49.c
index 125c6440..4b4be720 100644
--- a/src/object/object49.c
+++ b/src/object/object49.c
@@ -53,7 +53,7 @@ void sub_0808F0D0(Entity* this) {
 
 void sub_0808F14C(Entity* this) {
     sub_0808F2B0(this);
-    if (sub_08003FC4(this, 0x2000) == 0) {
+    if (GravityUpdate(this, 0x2000) == 0) {
         this->action++;
         SoundReq(SFX_WATER_SPLASH);
     }
diff --git a/src/object/object6A.c b/src/object/object6A.c
index baeccd92..d0063f60 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -104,7 +104,7 @@ Object6ATypeAction sub_08096290;
 
 extern void sub_08080CB4(Entity*);
 extern u32 sub_080002B8(Entity*);
-extern u32 sub_080040A8(Entity*);
+extern u32 CheckOnScreen(Entity*);
 extern void sub_08078850(Entity*, u32, u32, u8*);
 
 void sub_08095754(Object6AEntity*);
@@ -355,7 +355,7 @@ void sub_08094E30(Object6AEntity* this) {
             case 3:
                 super->z.WORD -= super->zVelocity;
                 super->zVelocity -= 0x2000;
-                if (!sub_080040A8(super)) {
+                if (!CheckOnScreen(super)) {
                     DeleteThisEntity();
                 }
                 break;
@@ -695,7 +695,7 @@ void sub_080954DC(Object6AEntity* this) {
             break;
     }
     this->off += 4;
-    if (super->subAction != 0 && !sub_080040A8(super))
+    if (super->subAction != 0 && !CheckOnScreen(super))
         DeleteThisEntity();
     if (super->direction & 0x80)
         super->spriteSettings.flipX = 0;
@@ -1090,9 +1090,9 @@ void sub_08095DBC(Object6AEntity* this) {
             super->zVelocity = 0x40000;
             super->speed = 0xC000;
         }
-        sub_08003FC4(super, super->speed);
+        GravityUpdate(super, super->speed);
         GetNextFrame(super);
-        if (!sub_080040A8(super))
+        if (!CheckOnScreen(super))
             DeleteThisEntity();
     }
 }
@@ -1241,7 +1241,7 @@ void sub_08096168(Object6AEntity* this) {
     }
     GetNextFrame(super);
     sub_0806F62C(super, super->speed, super->direction);
-    if (!sub_080040A8(super))
+    if (!CheckOnScreen(super))
         DeleteThisEntity();
 }
 
@@ -1301,7 +1301,7 @@ void sub_0809629C(Object6AEntity* this, u32 type) {
     }
     ExecuteScriptForEntity(super, 0);
     HandleEntity0x82Actions(super);
-    sub_08003FC4(super, 0x1000);
+    GravityUpdate(super, 0x1000);
     tmp = super->type;
     super->type = type;
     sub_08080CB4(super);
diff --git a/src/object/pot.c b/src/object/pot.c
index dd645021..d7a7ae96 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -256,7 +256,7 @@ void sub_08082824(Entity* this) {
         this->spriteSettings.flipY = 1;
     }
 
-    if (sub_08003FC4(this, 0x2000) == 0) {
+    if (GravityUpdate(this, 0x2000) == 0) {
         sub_08082850(this, NULL);
     }
 }