genEnemy almost complete

projectPiki · Sep 10, 2023 · f6ff234 · f6ff234
1 parent f61d49b
commit f6ff234
Show file tree

Hide file tree

Showing 5 changed files with 241 additions and 1,729 deletions.
diff --git a/include/Game/enemyInfo.h b/include/Game/enemyInfo.h
@@ -78,7 +78,7 @@ enum EEnemyTypeID {//ID      Common Name
     EnemyID_Bomb           = 36,  // Bomb-rock
     EnemyID_Egg            = 37,  // Egg
     EnemyID_PanModoki      = 38,  // Breadbug
-    EnemyID_INVALID        = 39,  // Unused ID
+    EnemyID_PanModokiNest  = 39,  // Unused ID, INVALID
     EnemyID_OoPanModoki    = 40,  // Giant Breadbug
     EnemyID_Fuefuki        = 41,  // Antenna Beetle
     EnemyID_BlueChappy     = 42,  // Orange Bulborb

diff --git a/include/Game/gameGenerator.h b/include/Game/gameGenerator.h
@@ -179,14 +179,14 @@ struct GenObject : public GenBase {
 	{
 	}
 
-	virtual void update(Game::Generator*);                 // _1C (weak)
-	virtual void render(Graphics&, Generator*);            // _20 (weak)
-	virtual u32 getLatestVersion();                        // _24
-	virtual void updateUseList(Generator*, int);           // _2C
-	virtual Creature* generate(Generator*);                // _30 (weak)
-	virtual Creature* birth(GenArg*) = 0;                  // _34
-	virtual void generatorMakeMatrix(Matrixf&, Vector3f&); // _38 (weak)
-	virtual void getDebugInfo(char*);                      // _3C (weak)
+	virtual void update(Game::Generator*);                                    // _1C (weak)
+	virtual void render(Graphics&, Generator*);                               // _20 (weak)
+	virtual u32 getLatestVersion();                                           // _24
+	virtual void updateUseList(Generator*, int);                              // _2C
+	virtual Creature* generate(Generator*);                                   // _30 (weak)
+	virtual Creature* birth(GenArg*) = 0;                                     // _34
+	virtual void generatorMakeMatrix(Matrixf& genMatrix, Vector3f& position); // _38 (weak)
+	virtual void getDebugInfo(char*);                                         // _3C (weak)
 
 	// _0C     = VTBL
 	// _00-_24 = GenBase
@@ -221,16 +221,16 @@ struct GenItem : public GenObject {
 		mParm       = nullptr;
 	}
 
-	virtual void doWrite(Stream&);                         // _08
-	virtual void ramSaveParameters(Stream&);               // _0C
-	virtual void ramLoadParameters(Stream&);               // _10
-	virtual void doEvent(u32);                             // _14
-	virtual void doRead(Stream&);                          // _18
-	virtual J3DModelData* getShape();                      // _28
-	virtual void updateUseList(Generator*, int);           // _2C
-	virtual Creature* generate(Generator*);                // _30
-	virtual Creature* birth(GenArg*);                      // _34
-	virtual void generatorMakeMatrix(Matrixf&, Vector3f&); // _38
+	virtual void doWrite(Stream&);                                            // _08
+	virtual void ramSaveParameters(Stream&);                                  // _0C
+	virtual void ramLoadParameters(Stream&);                                  // _10
+	virtual void doEvent(u32);                                                // _14
+	virtual void doRead(Stream&);                                             // _18
+	virtual J3DModelData* getShape();                                         // _28
+	virtual void updateUseList(Generator*, int);                              // _2C
+	virtual Creature* generate(Generator*);                                   // _30
+	virtual Creature* birth(GenArg*);                                         // _34
+	virtual void generatorMakeMatrix(Matrixf& genMatrix, Vector3f& position); // _38
 
 	static void initialise();
 
@@ -254,17 +254,17 @@ struct GenPellet : public GenObject {
 		mGenParm    = nullptr;
 	}
 
-	virtual void doWrite(Stream&);                         // _08
-	virtual void ramSaveParameters(Stream&);               // _0C
-	virtual void ramLoadParameters(Stream&);               // _10
-	virtual void doEvent(unsigned long);                   // _14
-	virtual void doRead(Stream&);                          // _18
-	virtual J3DModelData* getShape();                      // _28
-	virtual void updateUseList(Generator*, int);           // _2C
-	virtual Creature* generate(Generator*);                // _30 (weak)
-	virtual Creature* birth(GenArg*);                      // _34
-	virtual void generatorMakeMatrix(Matrixf&, Vector3f&); // _38
-	virtual void getDebugInfo(char*);                      // _3C
+	virtual void doWrite(Stream&);                                            // _08
+	virtual void ramSaveParameters(Stream&);                                  // _0C
+	virtual void ramLoadParameters(Stream&);                                  // _10
+	virtual void doEvent(unsigned long);                                      // _14
+	virtual void doRead(Stream&);                                             // _18
+	virtual J3DModelData* getShape();                                         // _28
+	virtual void updateUseList(Generator*, int);                              // _2C
+	virtual Creature* generate(Generator*);                                   // _30 (weak)
+	virtual Creature* birth(GenArg*);                                         // _34
+	virtual void generatorMakeMatrix(Matrixf& genMatrix, Vector3f& position); // _38
+	virtual void getDebugInfo(char*);                                         // _3C
 
 	static void initialise();
 

diff --git a/include/Graphics.h b/include/Graphics.h
@@ -25,12 +25,12 @@ struct Sphere;
 }
 
 struct PerspPrintfInfo {
-	inline PerspPrintfInfo()
+	inline PerspPrintfInfo(f32 x = 1.0f)
 	    : mFont(JFWSystem::systemFont)
 	    , _04(0)
 	    , _08(0)
 	    , _0C(0)
-	    , _10(1.0f)
+	    , _10(x)
 	    , _14(Color4(0x66, 0x99, 0xFF, 0xFF))
 	    , _18(Color4(0, 0x66, 0xFF, 0xFF))
 	{

diff --git a/src/plugProjectYamashitaU/enemyInfo.cpp b/src/plugProjectYamashitaU/enemyInfo.cpp
@@ -163,7 +163,7 @@ char* getEnemyResName(int enemyID, int enemyFlags)
 		break;
 	}
 
-	if (enemyID == EnemyTypeID::EnemyID_INVALID || enemyID == EnemyTypeID::EnemyID_INVALID2) {
+	if (enemyID == EnemyTypeID::EnemyID_PanModokiNest || enemyID == EnemyTypeID::EnemyID_INVALID2) {
 		enemyID = EnemyTypeID::EnemyID_PanHouse;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,7 +163,7 @@ char* getEnemyResName(int enemyID, int enemyFlags) @@
     		break;
     	}
-    	if (enemyID == EnemyTypeID::EnemyID_INVALID || enemyID == EnemyTypeID::EnemyID_INVALID2) {
+    	if (enemyID == EnemyTypeID::EnemyID_PanModokiNest || enemyID == EnemyTypeID::EnemyID_INVALID2) {
     		enemyID = EnemyTypeID::EnemyID_PanHouse;
     	}
@@ Expand Down @@