Merge pull request #619 from octorock/objects

include/asm.h

@@ -19,7 +19,7 @@ extern void sub_08001290(struct Entity_*, u32);
 extern void GenericKnockback(struct Entity_*);
 extern u32 GetFuserId(struct Entity_*);
 extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
-extern u32 GravityUpdate(struct Entity_*, u32);
+extern u32 GravityUpdate(struct Entity_* entity, u32 gravity);
 extern u32 CheckOnScreen(struct Entity_*);
 extern bool32 EntityInRectRadius(struct Entity_*, struct Entity_*, u32, u32);
 extern void UpdateAnimationVariableFrames(struct Entity_*, u32);

include/item.h

@@ -6,7 +6,6 @@
 #include "player.h"
 
 void CreateItemEntity(u32, u32, u32);
-void sub_08081404(Entity*, u32);
 extern void ExecuteItemFunction(ItemBehavior* this, u32 index);
 
 extern void ItemDebug(ItemBehavior*, u32);

include/object.h

@@ -134,7 +134,7 @@ typedef enum {
     EZLO_CAP_FLYING,
     GIANT_TWIG,
     OBJECT_63,
-    THUNDERBOLD,
+    THUNDERBOLT,
     LADDER_HOLE,
     WATER_DROP_OBJECT,
     GLEEROK_PARTICLE,
@@ -330,7 +330,7 @@ void SwordsmanNewsletter();
 void EzloCapFlying();
 void GiantTwig();
 void Object63();
-void Thunderbold();
+void Thunderbolt();
 void LadderHoleInBookshelf();
 void WaterDropObject();
 void GleerokParticle();

include/object/cutsceneOrchestrator.h

@@ -0,0 +1,12 @@
+#ifndef CUTSCENEORCHESTRATOR_H
+#define CUTSCENEORCHESTRATOR_H
+
+#include "script.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unused1[28];
+    /*0x84*/ ScriptExecutionContext* context;
+} CutsceneOrchestratorEntity;
+
+#endif // CUTSCENEORCHESTRATOR_H

include/object/itemOnGround.h

@@ -0,0 +1,18 @@
+#ifndef ITEMONGROUND_H
+#define ITEMONGROUND_H
+
+#include "entity.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unk_68;
+    /*0x69*/ u8 unk_69;
+    /*0x6a*/ u8 unk_6a;
+    /*0x6b*/ u8 unused1[1];
+    /*0x6c*/ u16 unk_6c;
+    /*0x6e*/ u16 unk_6e;
+    /*0x70*/ u8 unused2[22];
+    /*0x86*/ u16 unk_86;
+} ItemOnGroundEntity;
+
+#endif // ITEMONGROUND_H

include/object/lilypadLarge.h

@@ -0,0 +1,21 @@
+#ifndef LILYPADLARGE_H
+#define LILYPADLARGE_H
+
+#include "entity.h"
+
+typedef struct {
+    Entity base;
+    u8 unk_68[4];
+    s32 unk_6c;
+    s32 unk_70;
+    s16 unk_74;
+    s16 unk_76;
+    union SplitWord unk_78;
+    union SplitWord unk_7c;
+    u8 unk_80[2];
+    u16 unk_82;
+    u8 unk_84;
+    u8 unk_85;
+} LilypadLargeEntity;
+
+#endif // LILYPADLARGE_H