name asm funcs

6 files changed, 9 insertions, 9 deletions

diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c
index 11aab009..10a51b9f 100644
--- a/src/npc/cuccoChick.c
+++ b/src/npc/cuccoChick.c
@@ -74,7 +74,7 @@ void CuccoChick_Fusion(Entity* this) {
         this->spriteSettings.draw = 1;
         this->frameIndex = 1;
     } else {
-        if (sub_08003FC4(this, 0x3000) == 0) {
+        if (GravityUpdate(this, 0x3000) == 0) {
             this->zVelocity = 0x10000;
         }
     }
diff --git a/src/npc/melari.c b/src/npc/melari.c
index 757bc43e..f2d408b2 100644
--- a/src/npc/melari.c
+++ b/src/npc/melari.c
@@ -79,7 +79,7 @@ void sub_08068780(Entity* this) {
 
     if (this->frame & 0x40) {
         this->frame &= 0xbf;
-        if (sub_080040A8(this) == 0) {
+        if (CheckOnScreen(this) == 0) {
             SoundReq(gUnk_0811153E[(s32)Random() % 3]);
         } else {
             EnqueueSFX(gUnk_08111538[(s32)Random() % 3]);
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index a86189ef..97d3c819 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -265,7 +265,7 @@ void sub_08060DFC(Entity* this) {
 
     sub_0806F69C(this);
     sub_08060E94(this);
-    uVar1 = sub_08003FC4(this, 0x2000);
+    uVar1 = GravityUpdate(this, 0x2000);
     if (uVar1 == 0) {
         this->action = 7;
         this->collisionLayer = 1;
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 3014e4b8..9e643e8e 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -96,7 +96,7 @@ void sub_080604DC(Entity* this) {
     int iVar2;
     Entity* ent;
 
-    if (this->spriteSettings.draw == 1 && sub_080040A8(this)) {
+    if (this->spriteSettings.draw == 1 && CheckOnScreen(this)) {
         if ((this->frame & 1) != 0) {
             this->frame &= 0xfe;
             ent = CreateFx(this, 17, 0x40);
@@ -163,7 +163,7 @@ void sub_08060528(Entity* this) {
             this->field_0x6a.HWORD -= 1;
         }
     }
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     if (((this->field_0x6c.HALF.HI != 0) && (this->zVelocity == 0)) && this->z.WORD == 0) {
         this->field_0x6c.HALF.HI = 0;
         sub_080606C0(this);
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index dc8e0531..3d89d6f4 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -174,7 +174,7 @@ void sub_0806AEA8(Entity* this) {
     int old = this->field_0x82.HWORD;
     this->field_0x82.HWORD &= ~0x20;
     if (old & 0x20) {
-        sub_08003FC4(this, 0x4000);
+        GravityUpdate(this, 0x4000);
     }
     HandleEntity0x82Actions(this);
     this->field_0x82.HWORD = old;
@@ -226,7 +226,7 @@ void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
 }
 
 void sub_0806AF78(Entity* this, ScriptExecutionContext* context) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     if (0 <= this->z.WORD && this->zVelocity < 1) {
         this->z.WORD = 0;
         sub_0806AF70(this, context);
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 781c2c80..4cb5a1ae 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -137,7 +137,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
             break;
         case 2:
             sub_0806F62C(this, 0x100, 0x80);
-            sub_08003FC4(this, 0x2000);
+            GravityUpdate(this, 0x2000);
             if (!(this->frame & 1)) {
                 UpdateAnimationSingleFrame(this);
             }
@@ -148,7 +148,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
         case 3:
             sub_0806F62C(this, 0x100, 0x80);
             UpdateAnimationSingleFrame(this);
-            if (sub_08003FC4(this, 0x2000) == 0) {
+            if (GravityUpdate(this, 0x2000) == 0) {
                 context->unk_18++;
                 InitAnimationForceUpdate(this, 0x1E);
             }