Merge pull request #337 from octorock/push-and-pull

include/functions.h

@@ -165,4 +165,10 @@ extern void sub_0806FBB4(Entity*);
 extern u32 sub_080002D4(s32, s32, u32);
 extern void sub_08078930(Entity*);
 extern void sub_080044AE(Entity*, u32, u32);
+extern void sub_0801AF18(u8*, u32, u32);
+extern void sub_0807B9B8(s32, s32, s32);
+extern void sub_08000148(u32, u32, u32);
+extern void sub_0805457C(Entity*, s32);
+extern Entity* sub_080A2A3C(Entity*, u32, u32, u32);
+extern void sub_0806FCF4(Entity*, s32, s32, s32);
 #endif

include/object.h

@@ -233,7 +233,7 @@ void Button(Entity*);
 void MinishEmoticon(Entity*);
 void Pot(Entity*);
 void EzloCap(Entity*);
-void BlockPushed(Entity*);
+void BlockPushed();
 void LockedDoor(Entity*);
 void Object9(Entity*);
 void ObjectA(Entity*);
@@ -265,18 +265,18 @@ void EyeSwitch(Entity*);
 void PressurePlate();
 void BigBarrel(Entity*);
 void BarrelInside(Entity*);
-void PushableStatue(Entity*);
+void PushableStatue();
 void Object28(Entity*);
 void AmbientClouds(Entity*);
 void Object2A(Entity*);
 void Object2B(Entity*);
 void Beanstalk(Entity*);
 void Smoke(Entity*);
-void PushableRock(Entity*);
+void PushableRock();
 void HittableLever();
 void Object30(Entity*);
 void FrozenFlower(Entity*);
-void PullableMushroom(Entity*);
+void PullableMushroom();
 void Bollard(Entity*);
 void WarpPoint(Entity*);
 void Object35(Entity*);
@@ -302,7 +302,7 @@ void FileScreenObjects(Entity*);
 void Object49(Entity*);
 void BackgroundCloud(Entity*);
 void Object4B(Entity*);
-void PushableFurniture(Entity*);
+void PushableFurniture();
 void Furniture(Entity*);
 void MinishSizedEntrance(Entity*);
 void Archway(Entity*);
@@ -339,7 +339,7 @@ void ObjectOnPillar(Entity*);
 void MineralWaterSource(Entity*);
 void MinishSizedArchway(Entity*);
 void Object70(Entity*);
-void PushableGrave(Entity*);
+void PushableGrave();
 void StoneTablet(Entity*);
 void LilypadSmall(Entity*);
 void Object74(Entity*);
@@ -358,8 +358,8 @@ void Board(Entity*);
 void Object81(Entity*);
 void BigVortex(Entity*);
 void BigPushableLever();
-void SmallIceBlock(Entity*);
-void BigIceBlock(Entity*);
+void SmallIceBlock();
+void BigIceBlock();
 void Object86(Entity*);
 void OctorokBossObject(Entity*);
 void MacroBook(Entity*);

include/room.h

@@ -76,7 +76,8 @@ typedef struct {
     /* 0x4c */ u8 filler5[28];
     /* 0x68 */ u32 animFlags;
     /* 0x6c */ void* field_0x6c[8];
-    /* 0x8c */ void* field_0x8c[16];
+    /* 0x8c */ void* field_0x8c[8];
+    /* 0xac */ void* field_0xac[8];
 } RoomVars;
 static_assert(sizeof(RoomVars) == 0xCC);
 extern RoomVars gRoomVars;