Merge pull request #617 from octorock/projectiles

Create new entity structs for Projectiles

include/enemy.h

@@ -13,6 +13,14 @@
 #include "projectile.h"
 
 bool32 EnemyInit(Entity* this);
+/**
+ * 0: _OnTick
+ * 1: _OnCollision
+ * 2: _OnKnockback
+ * 3: _OnDeath
+ * 4: _OnConfused
+ * 5: _OnGrabbed
+ */
 u32 GetNextFunction(Entity*);
 void EnemyFunctionHandler(Entity*, EntityActionArray);
 void EnemyFunctionHandlerAfterCollision(Entity*, void (*const[])());

include/projectile.h

@@ -16,31 +16,31 @@ void DirtBallProjectile(Entity*);
 void WindProjectile(Entity*);
 void FireProjectile(Entity*);
 void IceProjectile(Entity*);
-void GleerokProjectile(Entity*);
+void GleerokProjectile();
 void KeatonDagger(Entity*);
 void GuardLineOfSight(Entity*);
 void ArrowProjectile(Entity*);
 void MazaalEnergyBeam(Entity*);
-void OctorokBossProjectile(Entity*);
+void OctorokBossProjectile();
 void StalfosProjectile(Entity*);
 void LakituCloudProjectile(Entity*);
 void LakituLightning(Entity*);
-void MandiblesProjectile(Entity*);
-void RemovableDust(Entity*);
-void SpiderWeb(Entity*);
+void MandiblesProjectile();
+void RemovableDust();
+void SpiderWeb();
 void TorchTrapProjectile(Entity*);
 void GuruguruBarProjectile(Entity*);
-void V1DarkMagicProjectile(Entity*);
-void BallAndChain(Entity*);
-void V1FireProjectile(Entity*);
+void V1DarkMagicProjectile();
+void BallAndChain();
+void V1FireProjectile();
 void CannonballProjectile(Entity*);
-void V1EyeLaser(Entity*);
+void V1EyeLaser();
 void Winder(Entity*);
 void SpikedRollers(Entity*);
-void V2Projectile(Entity*);
+void V2Projectile();
 void V3HandProjectile(Entity*);
-void V3ElectricProjectile(Entity*);
-void GyorgTail(Entity*);
+void V3ElectricProjectile();
+void GyorgTail();
 void GyorgMaleEnergyProjectile(Entity*);
 void V3TennisBallProjectile(Entity*);
 

include/projectile/winder.h

@@ -5,8 +5,8 @@
 #define WINDER_NUM_SEGMENTS 8
 
 typedef struct {
-    Entity base;
-    s16 positions[2 * WINDER_NUM_SEGMENTS];
+    /*0x00*/ Entity base;
+    /*0x68*/ s16 positions[2 * WINDER_NUM_SEGMENTS];
 } WinderEntity;
 
 #endif // WINDER_H