naming

include/area.h

@@ -28,7 +28,7 @@ typedef struct {
     u16 localFlagOffset;
     u8 filler[4];
     u16 lightLevel;
-    u8 unk_0b;
+    u8 lightType;
     u8 unk_0c_0 : 1;
     u8 unk_0c_1 : 3;
     u8 unk_0c_4 : 4;

include/functions.h

@@ -211,7 +211,7 @@ extern u32 sub_0807953C(void);
 extern void sub_08079BD8(Entity*);
 extern u32 sub_08079D48();
 extern void sub_08079D84(void);
-extern bool32 sub_08079F8C(void);
+extern bool32 PlayerCanBeMoved(void);
 extern u32 sub_08079FC4(u32);
 extern void sub_0807A050(void);
 extern void sub_0807A5B8(u32);
@@ -243,7 +243,7 @@ extern void sub_080A1ED0(u32, u32, u32);
 extern Entity* sub_080A2A3C(Entity*, u32, u32, u32);
 extern Entity* sub_080A2AD4(Entity*);
 extern void sub_080A2AF4(Entity*, s32, s32);
-extern void sub_080A2CC0(Entity*, u16**, u16*);
+extern void UpdateRailMovement(Entity*, u16**, u16*);
 extern void sub_080A57F4(void);
 extern void sub_080A71C4(u32, u32, u32, u32);
 extern void InitItemGetSequence(u32, u32, u32);

include/game.h

@@ -261,7 +261,7 @@ void sub_08052EA0(void);
 void sub_08053250(void);
 void sub_080533CC(void);
 
-void sub_08053494(void);
+void StartDarkNutTimer(void);
 void sub_080534AC(void);
 void InitBiggoronTimer(void);
 

include/npc.h

@@ -36,7 +36,7 @@ Entity* CreateNPC(u32 subtype, u32 form, u32 parameter);
 u32 UpdateFuseInteraction(Entity*);
 
 void NPCInit(Entity* ent);
-void sub_0806F0A4(void);
+void CollideFollowers(void);
 
 // TODO move?
 void sub_08078784(Entity* ent, u32 arg1);

include/object.h

@@ -19,7 +19,7 @@ extern void sub_080787B4(Entity*);
 extern void sub_0808C650(Entity*, u32);
 extern u32 sub_0808C67C(void);
 extern void sub_0808C688(void);
-extern void sub_080A2BE4(Entity*, bool32);
+extern void SyncPlayerToPlatform(Entity*, bool32);
 
 void CreateDust(Entity* parent);
 void CreateDustAt(s32, s32, u32);

include/player.h

@@ -20,7 +20,7 @@ enum PlayerActions {
     PLAYER_EMPTYBOTTLE,
     PLAYER_FROZEN,
     PLAYER_0807204C,
-    PLAYER_080720DC,
+    PLAYER_ROOM_EXIT,
     PLAYER_PULL,
     PLAYER_LAVA,
     PLAYER_WARP,
@@ -33,7 +33,7 @@ enum PlayerActions {
     PLAYER_080728AC,
     PLAYER_INHOLE,
     PLAYER_08072C9C,
-    PLAYER_08074C44,
+    PLAYER_SLEEP,
     PLAYER_CLIMB,
     PLAYER_USEENTRANCE,
     PLAYER_PARACHUTE,
@@ -77,7 +77,7 @@ enum PlayerSpawnType {
     PL_SPAWN_DROP,
     PL_SPAWN_WALKING,
     PL_SPAWN_STEP_IN,
-    PL_SPAWN_SPECIAL,
+    PL_SPAWN_SLEEPING,
     PL_SPAWN_DROP_MINISH,
     PL_SPAWN_STAIRS_ASCEND,
     PL_SPAWN_STAIRS_DESCEND,