name asm funcs

23 files changed, 46 insertions, 46 deletions

diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index e43a8f39..865791d5 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -108,7 +108,7 @@ void sub_080318DC(Entity* this) {
 
 void sub_08031A60(Entity* this) {
     if (this->iframes > 0)
-        sub_08003FC4(this, 0x1800);
+        GravityUpdate(this, 0x1800);
 
     sub_08001324(this);
 }
@@ -351,7 +351,7 @@ void sub_08031EE8(Entity* this) {
 }
 
 void sub_08031F54(Entity* this) {
-    sub_08003FC4(this, gUnk_080CE5F0[this->type2]);
+    GravityUpdate(this, gUnk_080CE5F0[this->type2]);
     if (this->type2 * -0xe <= this->z.HALF.HI) {
         this->action = 3;
         this->actionDelay = 20;
@@ -426,7 +426,7 @@ void sub_08032008(Entity* this) {
 }
 
 void sub_08032148(Entity* this) {
-    if (sub_08003FC4(this, 0x2000))
+    if (GravityUpdate(this, 0x2000))
         return;
 
     sub_08032290(this);
@@ -481,7 +481,7 @@ void sub_08032204(Entity* this) {
 }
 
 void sub_08032248(Entity* this) {
-    if (sub_08003FC4(this, 0x1800) == 0) {
+    if (GravityUpdate(this, 0x1800) == 0) {
         if (this->frame & 0x80) {
             ((Entity*)this->field_0x7c.WORD)->actionDelay--;
 
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 205e149e..b6988f6c 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -133,7 +133,7 @@ void sub_08021984(Entity* this) {
         EnqueueSFX(0x12d);
     }
 
-    if (sub_08003FC4(this, 0x1800) == 0) {
+    if (GravityUpdate(this, 0x1800) == 0) {
         this->action = 2;
         this->actionDelay = 16;
         this->field_0xf = 1;
@@ -200,7 +200,7 @@ void sub_08021AD8(Entity* this) {
             EnqueueSFX(0x7c);
         }
         sub_080AEFE0(this);
-        if (!sub_08003FC4(this, 0x1800))
+        if (!GravityUpdate(this, 0x1800))
             this->frameDuration = 1;
     }
 
@@ -259,7 +259,7 @@ void sub_08021C58(Entity* this) {
     GetNextFrame(this);
     if (this->frame & 1) {
         sub_080AEFE0(this);
-        if (sub_08003FC4(this, 0x1800) == 0)
+        if (GravityUpdate(this, 0x1800) == 0)
             this->frameDuration = 1;
     }
 
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index f14b400c..eb77023e 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -134,7 +134,7 @@ void sub_0801EFD8(Entity* this) {
             sub_0801FB68(this);
             InitializeAnimation(this, 8);
         }
-        sub_08003FC4(this, 0x1800);
+        GravityUpdate(this, 0x1800);
         GetNextFrame(this);
     }
 }
@@ -146,7 +146,7 @@ void sub_0801F02C(Entity* this) {
 }
 
 void sub_0801F048(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     GetNextFrame(this);
     if (this->type == 0) {
         sub_0804A7D4(this);
@@ -218,7 +218,7 @@ void sub_0801F1B0(Entity* this) {
             EnqueueSFX(299);
         }
         sub_080AEFE0(this);
-        if (sub_08003FC4(this, 0x4000) == 0)
+        if (GravityUpdate(this, 0x4000) == 0)
             GetNextFrame(this);
     } else {
         GetNextFrame(this);
@@ -278,7 +278,7 @@ void sub_0801F2CC(Entity* this) {
 }
 
 void sub_0801F2F8(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     GetNextFrame(this);
     if (this->frame & 0x80) {
         sub_0801F340(this);
@@ -409,7 +409,7 @@ void sub_0801F584(Entity* this) {
             EnqueueSFX(299);
         }
         sub_080AEFE0(this);
-        if (sub_08003FC4(this, 0x4000) == 0)
+        if (GravityUpdate(this, 0x4000) == 0)
             GetNextFrame(this);
 
     } else {
@@ -471,7 +471,7 @@ void sub_0801F6CC(Entity* this) {
 }
 
 void sub_0801F6F8(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     GetNextFrame(this);
     if (this->frame & 0x80) {
         this->action = 4;
@@ -586,7 +586,7 @@ void sub_0801F940(Entity* this) {
             EnqueueSFX(299);
         }
         sub_080AEFE0(this);
-        if (sub_08003FC4(this, 0x4000) == 0)
+        if (GravityUpdate(this, 0x4000) == 0)
             GetNextFrame(this);
     } else {
         GetNextFrame(this);
@@ -646,7 +646,7 @@ void sub_0801FA78(Entity* this) {
 }
 
 void sub_0801FAAC(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     GetNextFrame(this);
     if (this->frame & 0x80) {
         sub_0801FB14(this);
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index abb416f2..46b7c58b 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -52,7 +52,7 @@ void sub_08022988(Entity* this) {
         }
 
         ProcessMovement(this);
-        if (sub_08003FC4(this, 0x2000) == 0) {
+        if (GravityUpdate(this, 0x2000) == 0) {
             if (--this->actionDelay == 0) {
                 sub_08022A88(this);
             } else {
@@ -64,7 +64,7 @@ void sub_08022988(Entity* this) {
 }
 
 void sub_080229F8(Entity* this) {
-    if (sub_08003FC4(this, 0x2800) == 0) {
+    if (GravityUpdate(this, 0x2800) == 0) {
         if (--this->actionDelay == 0) {
             this->action = 4;
             this->actionDelay = 6;
@@ -88,7 +88,7 @@ void sub_08022A40(Entity* this) {
     }
 
     ProcessMovement(this);
-    if (sub_08003FC4(this, 0x2000) == 0) {
+    if (GravityUpdate(this, 0x2000) == 0) {
         if (--this->actionDelay == 0) {
             sub_08022A88(this);
         } else {
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index afcc4ac7..ebeaaf1f 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -49,7 +49,7 @@ void sub_080453E8(Entity* this) {
 void sub_08045430(Entity* this) {
     sub_080AEFE0(this);
     GetNextFrame(this);
-    if (sub_08003FC4(this, 0x1800) == 0)
+    if (GravityUpdate(this, 0x1800) == 0)
         sub_08045524(this);
 }
 
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index 594c8800..494b577b 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -227,7 +227,7 @@ void sub_0802BEEC(Entity* this) {
             this->direction = this->animationState << 3;
             InitializeAnimation(this, this->animationState + 4);
         }
-    } else if (!sub_08003FC4(this, 0x1c00)) {
+    } else if (!GravityUpdate(this, 0x1c00)) {
         this->action = 8;
         this->actionDelay = 30;
         this->speed = 0x120;
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index 85d80ee3..9179a7a5 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -224,7 +224,7 @@ void Lakitu_LightningDelay(Entity* this) {
 }
 
 void Lakitu_Cloudless(Entity* this) {
-    if (sub_08003FC4(this, 0x1800) == 0 && this->animIndex <= 19) {
+    if (GravityUpdate(this, 0x1800) == 0 && this->animIndex <= 19) {
         InitAnimationForceUpdate(this, this->animationState + 20);
 
         this->spritePriority.b1 = 0;
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index d0db11ed..2adfed33 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -927,7 +927,7 @@ void sub_0803B100(Entity* this) {
 
 void sub_0803B144(Entity* this) {
     UpdateAnimationSingleFrame(this->child);
-    if (sub_08003FC4(this, 0x2000) == 0) {
+    if (GravityUpdate(this, 0x2000) == 0) {
         this->action = 0x2a;
         InitializeAnimation(this, 0x16);
         sub_0803B8E8(this, 0x14);
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index a96e4f84..553d5053 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -315,7 +315,7 @@ void sub_080342C8(Entity* this) {
         this->spriteOffsetX = gUnk_080CECEC[this->actionDelay >> 1 & 7];
     } else {
         this->spriteOffsetX = 0;
-        if (sub_08003FC4(this, 0x2000) == 0) {
+        if (GravityUpdate(this, 0x2000) == 0) {
             this->action = 0xc;
             this->field_0x7c.HALF.HI = 0x708;
             this->field_0x7c.BYTES.byte1 = 0;
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index cca05ed4..0cde6285 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -43,7 +43,7 @@ void sub_08045618(Entity* this) {
 void sub_08045654(Entity* this) {
     sub_080AEFE0(this);
     GetNextFrame(this);
-    if (sub_08003FC4(this, 0x1800) == 0) {
+    if (GravityUpdate(this, 0x1800) == 0) {
         sub_08045678(this);
     }
 }
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index 5d8ba2d5..804ccba6 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -238,7 +238,7 @@ void Peahat_Stunned(Entity* this) {
             GetNextFrame(this);
             break;
         case PeahatAnimation_SlicedPropeller:
-            sub_08003FC4(this, 0x1c00);
+            GravityUpdate(this, 0x1c00);
             if (this->z.HALF.HI == 0) {
                 this->action = 7;
                 this->actionDelay = 150;
@@ -316,7 +316,7 @@ void Peahat_Takeoff(Entity* this) {
     } else if (this->frame & 1) {
         sub_0800442E(this);
     } else {
-        sub_08003FC4(this, 0x1c00);
+        GravityUpdate(this, 0x1c00);
         ProcessMovement(this);
     }
 }
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 6240bcd2..2641033f 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -104,7 +104,7 @@ void sub_0802511C(Entity* this) {
 }
 
 void sub_0802514C(Entity* this) {
-    sub_08003FC4(this, 0x2000);
+    GravityUpdate(this, 0x2000);
     if (sub_0806F520(this)) {
         gUnk_080CBFEC[this->subAction](this);
     } else {
@@ -209,7 +209,7 @@ void sub_0802538C(Entity* this) {
         if (this->frame == 0) {
             GetNextFrame(this);
         } else {
-            sub_08003FC4(this, 0x2000);
+            GravityUpdate(this, 0x2000);
             if (this->zVelocity < 0x2000) {
                 this->action = 4;
                 InitializeAnimation(this, 2);
@@ -220,7 +220,7 @@ void sub_0802538C(Entity* this) {
 
 void sub_080253D4(Entity* this) {
     GetNextFrame(this);
-    if (!sub_08003FC4(this, 0x2000)) {
+    if (!GravityUpdate(this, 0x2000)) {
         if (this->field_0xf == 0) {
             this->action = 5;
             InitializeAnimation(this, 3);
@@ -256,7 +256,7 @@ void sub_0802544C(Entity* this) {
 }
 
 void sub_0802547C(Entity* this) {
-    sub_08003FC4(this, 0x2000);
+    GravityUpdate(this, 0x2000);
     GetNextFrame(this);
     if ((this->actionDelay & 7) == 0) {
         sub_08025BD4(this);
@@ -268,7 +268,7 @@ void sub_0802547C(Entity* this) {
 }
 
 void sub_080254B4(Entity* this) {
-    sub_08003FC4(this, 0x2000);
+    GravityUpdate(this, 0x2000);
     if (this->frame & 0x80) {
         if (this->z.HALF.HI == 0) {
             if (this->cutsceneBeh.HWORD == 0) {
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index 5fb77dab..0a7dc34c 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -206,7 +206,7 @@ void Rollobite_Unroll(Entity* this) {
 }
 
 void Rollobite_LinedUp(Entity* this) {
-    if (sub_08003FC4(this, 0x1c00) == 0) {
+    if (GravityUpdate(this, 0x1c00) == 0) {
         this->action = 7;
         this->spritePriority.b0 = 7;
     }
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index d001888d..e555d60b 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -83,7 +83,7 @@ void sub_08031480(Entity* this) {
             SoundReq(SFX_12D);
         }
     } else {
-        if (sub_08003FC4(this, 0x1800) == 0) {
+        if (GravityUpdate(this, 0x1800) == 0) {
             this->action = 2;
             this->field_0xf = 0xf;
             this->spriteSettings.draw = 1;
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index 5d307fc4..57a6b416 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -117,7 +117,7 @@ void sub_08023CE0(Entity* this) {
                     EnqueueSFX(0x12d);
                     InitializeAnimation(this, 4);
                 }
-            } else if (!sub_08003FC4(this, 0x1800)) {
+            } else if (!GravityUpdate(this, 0x1800)) {
                 this->action = 3;
                 this->spriteSettings.draw = 1;
                 EnqueueSFX(0x84);
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index 903908c4..ec281989 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -173,7 +173,7 @@ void sub_0802B8E0(Entity* this) {
 }
 
 void sub_0802B948(Entity* this) {
-    if (!sub_08003FC4(this, 0x1800)) {
+    if (!GravityUpdate(this, 0x1800)) {
         this->action = 1;
         this->actionDelay = 1;
     }
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 69664d39..7d5ea60b 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -86,7 +86,7 @@ void sub_080225A0(Entity* this) {
 }
 
 void sub_080225BC(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     if (this->frame & 1) {
         sub_0804A7D4(this);
     } else {
@@ -125,7 +125,7 @@ void sub_08022654(Entity* this) {
             InitializeAnimation(this, 0);
             /* fallthrough */
         case 1:
-            if (sub_08003FC4(this, 0x1800))
+            if (GravityUpdate(this, 0x1800))
                 return;
 
             this->subAction = 2;
@@ -204,7 +204,7 @@ void sub_080227AC(Entity* this) {
 }
 
 void sub_0802281C(Entity* this) {
-    sub_08003FC4(this, 0x1800);
+    GravityUpdate(this, 0x1800);
     GetNextFrame(this);
     if (this->frame & 0x80) {
         this->action = 2;
@@ -218,7 +218,7 @@ void sub_08022854(Entity* this) {
     GetNextFrame(this);
     if (this->frame & 1) {
         sub_080AEFE0(this);
-        if (sub_08003FC4(this, 0x1800) == 0) {
+        if (GravityUpdate(this, 0x1800) == 0) {
             this->action = 7;
             this->hitType = 0x5c;
             InitializeAnimation(this, 5);
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index ac123367..07709ae9 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -56,7 +56,7 @@ void nullsub_16(Entity* this) {
 void sub_0802F1F0(Entity* this) {
     sub_08001242(this);
     if (this->z.HALF.HI != 0) {
-        sub_08003FC4(this, this->field_0x80.HWORD);
+        GravityUpdate(this, this->field_0x80.HWORD);
     }
 }
 
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index ba3b5d58..2fc3bfb0 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -55,7 +55,7 @@ void sub_08037F58(Entity* this) {
 void sub_08037F84(Entity* this) {
     sub_08001242(this);
     if (this->z.HALF.HI != 0) {
-        sub_08003FC4(this, 0x3000);
+        GravityUpdate(this, 0x3000);
     }
 }
 
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index 8a5dd737..7882441e 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -972,7 +972,7 @@ void sub_08043520(Entity* this) {
     Entity* entity;
 
     entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[4];
-    sub_08003FC4(entity, 0x1a00);
+    GravityUpdate(entity, 0x1a00);
     if ((entity->zVelocity < 0) && (-6 < entity->z.HALF.HI)) {
         entity->z.HALF.HI = -6;
         this->subAction = 3;
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index 232d95a5..c9198d08 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -313,7 +313,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
                 }
                 break;
             }
-            if (sub_08003FC4(this, 0x2800) == 0) {
+            if (GravityUpdate(this, 0x2800) == 0) {
                 this->field_0x80.HALF.LO = 5;
                 this->actionDelay = 0x10;
                 COLLISION_ON(this);
@@ -379,7 +379,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
             }
             break;
         case 1:
-            if (sub_08003FC4(this, 0x2800) != 0)
+            if (GravityUpdate(this, 0x2800) != 0)
                 break;
             this->field_0x80.HALF.LO += 1;
             switch (this->cutsceneBeh.HALF.LO) {
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 25fb3dba..d216ba7f 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -470,7 +470,7 @@ void VaatiWrathType0ActionB(Entity* this) {
             UpdateAnimationSingleFrame(this);
             GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type1);
             GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2);
-            if (sub_08003FC4(this, 0x2000) == 0) {
+            if (GravityUpdate(this, 0x2000) == 0) {
                 this->subAction = 1;
                 this->actionDelay = 0xf0;
                 this->health = 8;
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index 32390db3..fc63d632 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -34,7 +34,7 @@ void sub_0802A250(Entity* this) {
 }
 
 void sub_0802A2B4(Entity* this) {
-    if (!sub_08003FC4(this, 0x2800)) {
+    if (!GravityUpdate(this, 0x2800)) {
         this->action = 2;
         this->spritePriority.b0 = 7;
         EnqueueSFX(0x84);