tons of updates. better APDebug, fixed dEn_c, mostly fixed gigoomba

1 files changed, 15 insertions, 9 deletions

diff --git a/include/game.h b/include/game.h
index f907004..55ab018 100755
--- a/include/game.h
+++ b/include/game.h
@@ -1451,7 +1451,7 @@ public:
 	ActivePhysics *listPrev, *listNext;

 	u32 _18;

 	Info info;

-	u32 _40, _44, _48, _4C;

+	float trpValue0, trpValue1, trpValue2, trpValue3;

 	float firstFloatArray[8];

 	float secondFloatArray[8];

 	Vec2 positionOfLastCollision;

@@ -1937,10 +1937,10 @@ class RideableActorCollider : public BasicCollider {
 		void update();

 

 		void init(dStageActor_c *owner, Vec2 *one, Vec2 *two); // 800DB590

-		void init(dStageActor_c *owner, float x1, float x2, float y1, float y2); // 800DB620

+		void init(dStageActor_c *owner, float x1, float y1, float x2, float y2); // 800DB620

 

 		void setPosition(Vec2 *one, Vec2 *two); // 800DB680

-		void setPosition(float x1, float x2, float y1, float y2); // 800DB6E0

+		void setPosition(float x1, float y1, float x2, float y2); // 800DB6E0

 

 		Vec2 left, right;

 };

@@ -2286,12 +2286,16 @@ public:
 };

 

 

+struct EntityDeathInfo {

+	float xSpeed, ySpeed, maxYSpeed, yAccel;

+	dStateBase_c *state;

+	u32 _14, _18;

+	u8 _1C, _1D, isDead;

+};

+

 class dEn_c : public dActorMultiState_c {

 public:

-	float _414, _418, _41C, _420;

-	void *nextState;

-	u32 _428, _42C;

-	u8 _430, _431, isDead;

+	EntityDeathInfo deathInfo;

 	u32 _434;

 	u16 _438;

 	u32 _43C;

@@ -2319,9 +2323,9 @@ public:
 	dEn_c();

 

 	int afterCreate(int);

-	int beforeExecute(int);

+	int beforeExecute();

 	int afterExecute(int);

-	int beforeDraw(int);

+	int beforeDraw();

 

 	void kill();

 

@@ -2460,6 +2464,8 @@ public:
 	void checkLiquidImmersionAndKillIfTouchingLava(Vec *pos, float effectScale);

 	void checkLiquidImmersion(Vec2 *effectivePosition, float effectScale);

 

+	void killWithSpecifiedState(dStageActor_c *killedBy, VEC2 *effectiveSpeed, dStateBase_c *state, u32 _unused=0);

+

 	// States

 	USING_STATES(dEn_c);

 	REF_NINTENDO_STATE(DieFumi);