Merge pull request #478 from notyourav/msm

header cleanup

26 files changed, 65 insertions, 41 deletions

diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c
index 23aa475f..b36a0c00 100644
--- a/src/object/bigPushableLever.c
+++ b/src/object/bigPushableLever.c
@@ -57,7 +57,7 @@ void BigPushableLever_Idle(BigPushableLeverEntity* this) {
         SetTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer);
         EnqueueSFX(SFX_132);
         RequestPriorityDuration(super, 0x1e);
-        if (sub_08079F8C()) {
+        if (PlayerCanBeMoved()) {
             gPlayerState.pushedObject = 0x98;
             gPlayerState.queued_action = 5;
             gPlayerState.flags |= PL_BUSY;
diff --git a/src/object/bird.c b/src/object/bird.c
index 78798b49..44af688e 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -4,6 +4,7 @@
 #include "item.h"
 #include "message.h"
 #include "game.h"
+#include "collision.h"
 
 extern u16 script_EzloTalkOcarina[];
 
@@ -211,10 +212,11 @@ void Bird_Type8(Entity* this) {
                 this->speed = 0x300;
             }
 
-            if ((gPlayerEntity.flags & 0x80) != 0 && (gMessage.doTextBox & 0x7f) == 0 && gPlayerEntity.action != 28 &&
-                gPlayerEntity.action != 6 && gPlayerEntity.action != 9 && gPlayerState.framestate != 24 &&
-                gPlayerState.framestate != 11 && gPlayerState.framestate != 8 && sub_08079F8C() &&
-                (EntityInRectRadius(this, &gPlayerEntity, 0xe, 0xe))) {
+            if ((gPlayerEntity.flags & ENT_COLLIDE) && (gMessage.doTextBox & 0x7f) == 0 &&
+                gPlayerEntity.action != PLAYER_SLEEP && gPlayerEntity.action != PLAYER_BOUNCE &&
+                gPlayerEntity.action != PLAYER_MINISH && gPlayerState.framestate != PL_STATE_CLIMB &&
+                gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_PARACHUTE &&
+                PlayerCanBeMoved() && (EntityInRectRadius(this, &gPlayerEntity, 0xe, 0xe))) {
                 s32 z = gPlayerEntity.z.HALF.HI - this->z.HALF.HI - 8;
                 if ((u16)z < 0x20 && gPlayerEntity.health != 0) {
                     pEVar5 = CreateObject(0x95, 10, 0);
diff --git a/src/object/board.c b/src/object/board.c
index 7c3607c3..18e7ff97 100644
--- a/src/object/board.c
+++ b/src/object/board.c
@@ -58,7 +58,7 @@ void sub_08098BE0(BoardEntity* this) {
 }
 
 void sub_08098BE8(BoardEntity* this) {
-    if ((gPlayerState.flags & PL_MINISH) && sub_08098C30(this, &gPlayerEntity) && sub_08079F8C() &&
+    if ((gPlayerState.flags & PL_MINISH) && sub_08098C30(this, &gPlayerEntity) && PlayerCanBeMoved() &&
         gPlayerEntity.z.HALF.HI == 0) {
         gPlayerState.field_0x14 = 1;
         sub_0807AAF8(&gPlayerEntity, this->tile);
diff --git a/src/object/book.c b/src/object/book.c
index 05af98ed..01f3a15e 100644
--- a/src/object/book.c
+++ b/src/object/book.c
@@ -3,6 +3,7 @@
 #include "message.h"
 #include "item.h"
 #include "npc.h"
+#include "collision.h"
 
 extern void (*const BookActionFuncs[])(Entity*);
 extern s8 const gUnk_08123D94[];
diff --git a/src/object/button.c b/src/object/button.c
index 20a34d21..c16a1334 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -165,7 +165,7 @@ Entity* sub_08081D74(Entity* this) {
 
 u32 sub_08081E0C(Entity* this) {
     Entity* tmp = &gPlayerEntity;
-    if (tmp->z.HALF.HI != 0 || !sub_08079F8C()) {
+    if (tmp->z.HALF.HI != 0 || !PlayerCanBeMoved()) {
         return 0;
     } else {
         return EntityInRectRadius(this, tmp, 5, 6);
diff --git a/src/object/fairy.c b/src/object/fairy.c
index 76fdb2df..988d56e7 100644
--- a/src/object/fairy.c
+++ b/src/object/fairy.c
@@ -11,6 +11,7 @@
 #include "functions.h"
 #include "item.h"
 #include "hitbox.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/fan.c b/src/object/fan.c
index 51815c83..b9a98d01 100644
--- a/src/object/fan.c
+++ b/src/object/fan.c
@@ -6,6 +6,7 @@
 #include "functions.h"
 #include "sound.h"
 #include "object.h"
+#include "collision.h"
 
 typedef struct {
     Entity base;
@@ -113,7 +114,7 @@ void sub_0809EE44(FanEntity* this) {
     if (uVar4 != 0) {
         pEVar1 = &gPlayerEntity;
         if (sub_0809EF78(this, pEVar1)) {
-            if (sub_08079F8C()) {
+            if (PlayerCanBeMoved()) {
                 sub_08079E58(super->speed, super->direction);
             }
         }
diff --git a/src/object/floatingPlatform.c b/src/object/floatingPlatform.c
index 74ab1231..f762a719 100644
--- a/src/object/floatingPlatform.c
+++ b/src/object/floatingPlatform.c
@@ -29,7 +29,7 @@ void sub_080860D8(FloatingPlatformEntity* this) {
     super->frameIndex = super->type;
     super->spritePriority.b0 = 7;
     super->child = (Entity*)GetCurrentRoomProperty(super->type2);
-    sub_080A2CC0(super, (u16**)&super->child, &this->unk70);
+    UpdateRailMovement(super, (u16**)&super->child, &this->unk70);
 }
 
 void sub_0808611C(FloatingPlatformEntity* this) {
@@ -41,15 +41,15 @@ void sub_0808611C(FloatingPlatformEntity* this) {
             super->parent->timer++;
         }
 
-        sub_080A2BE4(super, iVar2);
+        SyncPlayerToPlatform(super, iVar2);
     } else if (super->timer == 0) {
-        sub_080A2BE4(super, iVar2);
+        SyncPlayerToPlatform(super, iVar2);
     } else {
-        sub_080A2BE4(super, FALSE);
+        SyncPlayerToPlatform(super, FALSE);
     }
 
     if (--this->unk70 == 0) {
-        sub_080A2CC0(super, (u16**)&super->child, &this->unk70);
+        UpdateRailMovement(super, (u16**)&super->child, &this->unk70);
     }
 }
 
@@ -58,7 +58,7 @@ bool32 sub_08086168(FloatingPlatformEntity* this) {
     const u8* ptr;
 
     ptr = gUnk_08120658 + super->type * 2;
-    if (((EntityInRectRadius(super, &gPlayerEntity, ptr[0], ptr[1])) && sub_08079F8C())) {
+    if (((EntityInRectRadius(super, &gPlayerEntity, ptr[0], ptr[1])) && PlayerCanBeMoved())) {
         gPlayerState.field_0x14 = 1;
         if (gPlayerEntity.z.HALF.HI == 0) {
             return TRUE;
diff --git a/src/object/fourElements.c b/src/object/fourElements.c
index 8fd25f49..fb26c54b 100644
--- a/src/object/fourElements.c
+++ b/src/object/fourElements.c
@@ -12,6 +12,7 @@
 #include "hitbox.h"
 #include "screen.h"
 #include "message.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index b0f0920b..047c9a40 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -225,7 +225,7 @@ void GyorgBossObject_FemalePhase4(GyorgBossObjectEntity* this) {
         }
         this->unk_6c = 0;
         gRoomTransition.field_0x39 = 0;
-        if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) {
+        if (PlayerCanBeMoved() && gPlayerEntity.z.HALF.HI == 0) {
             super->action = 9;
             super->timer = 0;
             super->subtimer = 0xF0;
@@ -479,7 +479,7 @@ u32 sub_080A20B8(GyorgBossObjectEntity* this, GyorgMaleEntity* other) {
     if (other == NULL) {
         return 1;
     }
-    if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) {
+    if (PlayerCanBeMoved() && gPlayerEntity.z.HALF.HI == 0) {
         return other->unk_7c == 0 && gPlayerState.field_0x14 != 0;
     }
     return 0;
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index 89f7cc8e..b195e6f6 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -3,6 +3,7 @@
 #include "flags.h"
 #include "functions.h"
 #include "item.h"
+#include "collision.h"
 
 static void sub_0808E6A0(Entity*);
 static void sub_0808E6E4(Entity*);
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index b356c38a..f9806ec8 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -8,6 +8,7 @@
 #include "itemMetaData.h"
 #include "functions.h"
 #include "hitbox.h"
+#include "collision.h"
 
 void sub_08081150(Entity*);
 u8 sub_0808147C(u32);
diff --git a/src/object/lavaPlatform.c b/src/object/lavaPlatform.c
index 830ba02e..4459128b 100644
--- a/src/object/lavaPlatform.c
+++ b/src/object/lavaPlatform.c
@@ -18,11 +18,11 @@ typedef struct {
     /*0x72*/ u16 wobbleTime;  /**< Time the player can stand on the platform. */
     /*0x74*/ u16 respawnTime; /**< Time until the platform respawns after it has sunk. */
     /*0x76*/ u16 unk_76;
-    /*0x78*/ Entity* unk_78; // Typed same as second argument of sub_080A2CC0
+    /*0x78*/ Entity* unk_78; // Typed same as second argument of UpdateRailMovement
 } LavaPlatformEntity;
 
 typedef struct {
-    /*0x00*/ Entity* unk_78; // Typed same as second argument of sub_080A2CC0
+    /*0x00*/ Entity* unk_78; // Typed same as second argument of UpdateRailMovement
     /*0x04*/ s16 x;
     /*0x06*/ s16 y;
     /*0x08*/ u8 collisionLayer;
@@ -246,7 +246,7 @@ void LavaPlatform_SpawnPlatforms(LavaPlatformEntity* this) {
             platform->respawnTime = entry->respawnTime;
             platform->unk_78 = entry->unk_78;
             UpdateSpriteForCollisionLayer((Entity*)platform);
-            sub_080A2CC0(&platform->base, (u16**)&platform->unk_78, &platform->unk_76);
+            UpdateRailMovement(&platform->base, (u16**)&platform->unk_78, &platform->unk_76);
         }
         entry++;
     }
@@ -282,7 +282,7 @@ void sub_0809264C(LavaPlatformEntity* this) {
 
 bool32 LavaPlatform_IsPlayerOnPlatform(LavaPlatformEntity* this) {
     if ((gPlayerState.flags & PL_MINISH) == 0 && EntityInRectRadius(super, &gPlayerEntity, 0x10, 0x10) &&
-        sub_08079F8C()) {
+        PlayerCanBeMoved()) {
         gPlayerState.field_0x14 = 1;
         if (gPlayerEntity.z.HALF.HI == 0) {
             super->subtimer = 1;
@@ -294,12 +294,12 @@ bool32 LavaPlatform_IsPlayerOnPlatform(LavaPlatformEntity* this) {
 }
 
 void sub_080926E4(LavaPlatformEntity* this) {
-    sub_080A2BE4(super, super->subtimer);
+    SyncPlayerToPlatform(super, super->subtimer);
     if (super->action == 1) {
         (super->parent)->x.HALF.HI = super->x.HALF.HI;
         (super->parent)->y.HALF.HI = super->y.HALF.HI;
     }
     if (--this->unk_76 == 0) {
-        sub_080A2CC0(super, (u16**)&this->unk_78, &this->unk_76);
+        UpdateRailMovement(super, (u16**)&this->unk_78, &this->unk_76);
     }
 }
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c
index dcf5ca1e..a3680f93 100644
--- a/src/object/lightableSwitch.c
+++ b/src/object/lightableSwitch.c
@@ -6,11 +6,16 @@
 #include "flags.h"
 #include "functions.h"
 #include "hitbox.h"
+#include "object.h"
 
 extern void (*const gUnk_081243B4[])(Entity*);
 extern void (*const gUnk_081243BC[])(Entity*);
 extern void (*const gUnk_081243C4[])(Entity*);
 
+static void sub_0809EB30(Entity* this);
+static void sub_0809EAD8(Entity* this);
+static void sub_0809EABC(Entity* this);
+
 void LightableSwitch(Entity* this) {
     gUnk_081243B4[this->type](this);
     sub_0809EB30(this);
@@ -47,7 +52,7 @@ void sub_0809EA80(Entity* this) {
     sub_0809EABC(this);
 }
 
-void sub_0809EABC(Entity* this) {
+static void sub_0809EABC(Entity* this) {
     bool32 anySet = 0;
 
     if (CheckFlags(this->field_0x86.HWORD)) {
@@ -58,21 +63,21 @@ void sub_0809EABC(Entity* this) {
     }
 }
 
-void sub_0809EAD8(Entity* this) {
+static void sub_0809EAD8(Entity* this) {
     u8 bVar1;
     Entity* pEVar2;
 
     if (this->type2 != 0) {
 
         this->child = GetCurrentRoomProperty(this->type2);
-        sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD);
+        UpdateRailMovement(this, (u16**)&this->child, &this->field_0x74.HWORD);
 
     } else {
         SetTile(0x4050, COORD_TO_TILE(this), this->collisionLayer);
     }
 }
 
-void sub_0809EB30(Entity* this) {
+static void sub_0809EB30(Entity* this) {
     u16 uVar1;
     u16* puVar2;
 
@@ -82,7 +87,7 @@ void sub_0809EB30(Entity* this) {
         }
         puVar2 = &this->field_0x74.HWORD;
         if (!--*puVar2) {
-            sub_080A2CC0(this, (u16**)&this->child, puVar2);
+            UpdateRailMovement(this, (u16**)&this->child, puVar2);
         }
     }
 }
diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c
index 3f72f3e3..6cbd40e4 100644
--- a/src/object/lilypadSmall.c
+++ b/src/object/lilypadSmall.c
@@ -4,7 +4,7 @@
 extern u16 gUnk_08123318[];
 
 static void sub_08097B24(Entity* this);
-static bool32 sub_08097ADC(Entity* this);
+static bool32 CheckMovePlayer(Entity* this);
 
 void LilypadSmall(Entity* this) {
     u32 rand;
@@ -19,22 +19,22 @@ void LilypadSmall(Entity* this) {
         this->spriteSettings.draw = TRUE;
         this->spritePriority.b0 = 7;
         this->child = GetCurrentRoomProperty(this->type2);
-        sub_080A2CC0(this, (u16**)&this->child, &this->field_0x70.HALF.LO);
+        UpdateRailMovement(this, (u16**)&this->child, &this->field_0x70.HALF.LO);
     }
-    sub_080A2BE4(this, sub_08097ADC(this));
+    SyncPlayerToPlatform(this, CheckMovePlayer(this));
     sub_08097B24(this);
     psVar4 = (u16*)&this->field_0x70;
     if (--*psVar4 == 0) {
-        sub_080A2CC0(this, (u16**)&this->child, psVar4);
+        UpdateRailMovement(this, (u16**)&this->child, psVar4);
     }
 }
 
-static bool32 sub_08097ADC(Entity* this) {
+static bool32 CheckMovePlayer(Entity* this) {
     if (!(gPlayerState.flags & PL_MINISH)) {
         return FALSE;
     } else if (EntityInRectRadius(this, &gPlayerEntity, 8, 8) == 0) {
         return FALSE;
-    } else if (!sub_08079F8C()) {
+    } else if (!PlayerCanBeMoved()) {
         return FALSE;
     } else {
         gPlayerState.field_0x14 = 1;
diff --git a/src/object/macroShoes.c b/src/object/macroShoes.c
index 36cc84e5..1de5ee00 100644
--- a/src/object/macroShoes.c
+++ b/src/object/macroShoes.c
@@ -1,7 +1,6 @@
 #include "entity.h"
 #include "asm.h"
 
-void sub_0800445C(Entity*);
 void MacroShoes_Init(Entity*);
 void MacroShoes_Idle(Entity*);
 
diff --git a/src/object/object30.c b/src/object/object30.c
index 4f6f1d33..5dc2cff7 100644
--- a/src/object/object30.c
+++ b/src/object/object30.c
@@ -10,6 +10,7 @@
 #include "object.h"
 #include "functions.h"
 #include "item.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/object96.c b/src/object/object96.c
index fde07cb0..ab630662 100644
--- a/src/object/object96.c
+++ b/src/object/object96.c
@@ -7,6 +7,7 @@
 #include "item.h"
 #include "flags.h"
 #include "effects.h"
+#include "collision.h"
 
 typedef struct _struct_gUnk_08123FB0 {
     void (*const funcEnt)(Entity*);
diff --git a/src/object/object98.c b/src/object/object98.c
index d39d7ea2..96626eeb 100644
--- a/src/object/object98.c
+++ b/src/object/object98.c
@@ -3,6 +3,7 @@
 #include "projectile.h"
 #include "room.h"
 #include "functions.h"
+#include "object.h"
 
 typedef struct {
     Entity base;
@@ -48,7 +49,7 @@ void sub_0809E360(Object98Entity* this) {
         SetDefaultPriority(super, 0);
         if (super->type != 0) {
             super->child = (Entity*)GetCurrentRoomProperty(super->type);
-            sub_080A2CC0(super, (u16**)&super->child, &this->unk74);
+            UpdateRailMovement(super, (u16**)&super->child, &this->unk74);
         }
     }
 }
@@ -62,7 +63,7 @@ void sub_0809E3E4(Object98Entity* this) {
         }
 
         if (--this->unk74 == 0) {
-            sub_080A2CC0(super, (u16**)&super->child, &this->unk74);
+            UpdateRailMovement(super, (u16**)&super->child, &this->unk74);
         }
     }
 }
diff --git a/src/object/objectA8.c b/src/object/objectA8.c
index 4f2c0c13..83f9d422 100644
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@@ -11,6 +11,7 @@
 #include "functions.h"
 #include "item.h"
 #include "hitbox.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/objectB2.c b/src/object/objectB2.c
index a791b9fb..dae02bf1 100644
--- a/src/object/objectB2.c
+++ b/src/object/objectB2.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
+#include "collision.h"
 
 extern u8 gUnk_02027EB4[];
 extern u8 gUnk_0200D654[];
diff --git a/src/object/pressurePlate.c b/src/object/pressurePlate.c
index 4536eeda..bcbe72d1 100644
--- a/src/object/pressurePlate.c
+++ b/src/object/pressurePlate.c
@@ -2,6 +2,7 @@
 #include "object.h"
 #include "functions.h"
 #include "hitbox.h"
+#include "collision.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c
index 8142a0f9..bdd17fa9 100644
--- a/src/object/pushableLever.c
+++ b/src/object/pushableLever.c
@@ -56,7 +56,7 @@ void PushableLever_Idle(PushableLeverEntity* this) {
         SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
         EnqueueSFX(SFX_16A);
         RequestPriorityDuration(super, 0x1e);
-        if (sub_08079F8C()) {
+        if (PlayerCanBeMoved()) {
             gPlayerState.pushedObject = 0x90;
             gPlayerState.queued_action = 5;
             gPlayerState.flags |= PL_BUSY;
diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c
index 696f469e..6756d82f 100644
--- a/src/object/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
@@ -6,6 +6,7 @@
 #include "room.h"
 #include "functions.h"
 #include "effects.h"
+#include "object.h"
 
 extern const s16 gUnk_080B4468[];
 
@@ -14,6 +15,10 @@ void sub_0809E86C(Entity* this);
 void sub_0809E8BC(Entity* this);
 void sub_0809E8EC(Entity* this);
 
+static void sub_0809E96C(Entity* this);
+static u32 sub_0809E9A0(void);
+static void sub_0809E918(Entity* this);
+
 void TreeHidingPortal(Entity* this) {
     static void (*const actionFuncs[])(Entity*) = {
         sub_0809E83C,
@@ -69,7 +74,7 @@ void sub_0809E8EC(Entity* this) {
     }
 }
 
-void sub_0809E918(Entity* this) {
+static void sub_0809E918(Entity* this) {
     static const s16 gUnk_08124364[] = {
         0, -4, 8,  -4,  16, -4, 22, -4,  -8, -4,  -16, -4,  -22, -4,  0,  -12, 0,   4,   8,     -12,
         8, 4,  -8, -12, -8, 4,  8,  -16, -8, -16, 12,  -16, -12, -16, 16, -14, -16, -14, -1000, 0,
@@ -88,11 +93,11 @@ void sub_0809E918(Entity* this) {
     }
 }
 
-void sub_0809E96C(Entity* this) {
+static void sub_0809E96C(Entity* this) {
     CreateMinishEntrance(COORD_TO_TILE_OFFSET(this, 0x20, 0x8));
 }
 
-u32 sub_0809E9A0(void) {
+static u32 sub_0809E9A0(void) {
     u32 rv;
     const s16* ptr;
 
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index 84949f45..c558ce37 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -205,7 +205,7 @@ void sub_0808B73C(Entity* this) {
 
 u32 sub_0808B7C8(Entity* this) {
     if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.framestate != PL_STATE_DIE && gPlayerEntity.health != 0 &&
-        sub_08079F8C() && EntityInRectRadius(this, &gPlayerEntity, 5, 5) && gPlayerEntity.z.HALF.HI == 0) {
+        PlayerCanBeMoved() && EntityInRectRadius(this, &gPlayerEntity, 5, 5) && gPlayerEntity.z.HALF.HI == 0) {
         if (this->timer == 0 && gPlayerEntity.action == PLAYER_08072C9C) {
             ResetPlayerAnimationAndAction();
         }
diff --git a/src/object/windTribeTeleporter.c b/src/object/windTribeTeleporter.c
index c76a6190..5e4cb50e 100644
--- a/src/object/windTribeTeleporter.c
+++ b/src/object/windTribeTeleporter.c
@@ -10,6 +10,7 @@
 #include "object.h"
 #include "functions.h"
 #include "hitbox.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;