Rename movement functions

7 files changed, 7 insertions, 12 deletions

diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c
index cdc65c3a..fd2b80aa 100644
--- a/src/object/bakerOven.c
+++ b/src/object/bakerOven.c
@@ -65,7 +65,7 @@ void sub_0809CD0C(Entity* this) {
             gPlayerEntity.iframes = 16;
             gPlayerEntity.knockbackDirection = 16;
             gPlayerEntity.knockbackDuration = 12;
-            gPlayerEntity.field_0x46 = 16;
+            gPlayerEntity.knockbackSpeed = 16;
         }
     }
 }
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 054f7411..49503916 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -203,7 +203,7 @@ void sub_080811D8(Entity* this) {
 
 void sub_080811EC(Entity* this) {
     if (this->field_0x68.HALF.HI != 6) {
-        sub_080AEFE0(this);
+        ProcessMovement2(this);
     } else {
         LinearMoveUpdate(this);
     }
@@ -389,7 +389,7 @@ void sub_08081500(Entity* this) {
                 UpdateSpriteForCollisionLayer(this);
             }
 
-            sub_080AEFE0(this);
+            ProcessMovement2(this);
         }
     }
 }
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c
index 13dae7bc..aac89cb2 100644
--- a/src/object/lightableSwitch.c
+++ b/src/object/lightableSwitch.c
@@ -6,11 +6,6 @@
 #include "flags.h"
 #include "functions.h"
 
-extern void sub_0809EB30(Entity*);
-extern void sub_0809EAD8(Entity*);
-extern void sub_0809EABC(Entity*);
-extern void sub_080A2CC0(Entity*, Entity**, u16*);
-
 extern void (*const gUnk_081243B4[])(Entity*);
 extern void (*const gUnk_081243BC[])(Entity*);
 extern void (*const gUnk_081243C4[])(Entity*);
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 5f5a426c..6d326946 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -114,7 +114,7 @@ void sub_08085A44(LilypadLargeEntity* this) {
         }
     }
     sub_08085EFC(this);
-    sub_080AF134(super);
+    ProcessMovement4(super);
     sub_08085F1C(this);
 }
 
diff --git a/src/object/objectB2.c b/src/object/objectB2.c
index fc5b4a85..bd2c58b5 100644
--- a/src/object/objectB2.c
+++ b/src/object/objectB2.c
@@ -22,7 +22,7 @@ void ObjectB2(Entity* this) {
     }
     this->speed = this->parent->speed;
     LinearMoveUpdate(this);
-    if (sub_080AE4CC((u8*)this->child, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
+    if (IsTileCollision((u8*)this->child, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
         DeleteThisEntity();
     }
     if (this->speed < 0x41) {
diff --git a/src/object/rupee.c b/src/object/rupee.c
index f4119600..583cf0f0 100644
--- a/src/object/rupee.c
+++ b/src/object/rupee.c
@@ -37,7 +37,7 @@ void sub_08086A28(Entity* ent) {
         if (iVar1 == 0) {
             ent->action = 2;
         }
-        ProcessMovement(ent);
+        ProcessMovement0(ent);
         CopyPosition(ent, ent->child);
     }
 }
diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c
index 63542a02..c491a16b 100644
--- a/src/object/smallIceBlock.c
+++ b/src/object/smallIceBlock.c
@@ -205,7 +205,7 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
     if (uVar3 != 0) {
         return 0;
     }
-    sub_080AEFE0(super);
+    ProcessMovement2(super);
     sub_0800445C(super);
     if (super->actionDelay != 0) {
         super->speed += 0x10;