Match most of Ujib.cpp and Tobi.cpp

projectPiki · Sep 8, 2023 · 1411d83 · 1411d83
1 parent d4fde81
commit 1411d83
Show file tree

Hide file tree

Showing 6 changed files with 668 additions and 3,189 deletions.
diff --git a/docs/recommended_todo.md b/docs/recommended_todo.md
@@ -147,12 +147,12 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ImomushiState.cpp">ImomushiState.cpp</a> | 19863 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/UjiaState.cpp">UjiaState.cpp</a> | 20924 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/RumbleMgr.cpp">RumbleMgr.cpp</a> | 21534 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Rock.cpp">Rock.cpp</a> | 21671 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecHiba.cpp">ElecHiba.cpp</a> | 21823 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Frog.cpp">Frog.cpp</a> | 22143 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/QueenState.cpp">QueenState.cpp</a> | 22549 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujia.cpp">Ujia.cpp</a> | 22950 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecBug.cpp">ElecBug.cpp</a> | 24345 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ArmorState.cpp">ArmorState.cpp</a> | 24714 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/SaraiState.cpp">SaraiState.cpp</a> | 24923 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TobiState.cpp">TobiState.cpp</a> | 24962 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/UjibState.cpp">UjibState.cpp</a> | 25505 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Armor.cpp">Armor.cpp</a> | 25769 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TankState.cpp">TankState.cpp</a> | 29293 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/RandItemUnit.cpp">RandItemUnit.cpp</a> | 29622 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/IKSystemBase.cpp">IKSystemBase.cpp</a> | 30077 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/QueenState.cpp">QueenState.cpp</a> | 22549 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujia.cpp">Ujia.cpp</a> | 22940 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Ujib.cpp">Ujib.cpp</a> | 23626 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ElecBug.cpp">ElecBug.cpp</a> | 24345 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/ArmorState.cpp">ArmorState.cpp</a> | 24714 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/SaraiState.cpp">SaraiState.cpp</a> | 24923 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TobiState.cpp">TobiState.cpp</a> | 24962 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/UjibState.cpp">UjibState.cpp</a> | 25505 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Armor.cpp">Armor.cpp</a> | 25767 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/Tobi.cpp">Tobi.cpp</a> | 25912 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectNishimuraU/TankState.cpp">TankState.cpp</a> | 29293 |
 
 ### <section id="plugProjectOgawaU">plugProjectOgawaU</section>
 | File | Size (bytes) | File | Size (bytes) |

diff --git a/include/Game/Entities/Tobi.h b/include/Game/Entities/Tobi.h
@@ -8,6 +8,10 @@
 #include "Game/EnemyBase.h"
 #include "Collinfo.h"
 
+#define GET_APPCHECK_VAL(check)      ((u8)check)
+#define GET_APPCHECK_MAX(check)      (check >> 8)
+#define SET_APPCHECK_MAX(check, val) (check = (val) << 8)
+
 /**
  * --Header for Shearwigs (Tobi)--
  */
@@ -91,15 +95,15 @@ struct Obj : public EnemyBase {
 	// _00 		= VTBL
 	// _00-_2BC	= EnemyBase
 	FSM* mFsm;                 // _2BC
-	u8 _2C0;                   // _2C0, guess based on Ujia/b
-	bool mIsUnderground;       // _2C1, guess based on Ujia/b
-	u16 _2C2;                  // _2C2, guess based on Ujia/b
+	u8 _2C0;                   // _2C0
+	bool mIsUnderground;       // _2C1
+	u16 mAppearCheck;          // _2C2
 	StateID mNextState;        // _2C4
 	MouthSlots mMouthSlots;    // _2C8
 	Vector3f mTargetPosition;  // _2D0
-	ItemBridge::Item* mBridge; // _2DC, guess based on Ujia/b
-	f32 _2E0;                  // _2E0, guess based on Ujia/b
-	f32 _2E4;                  // _2E4, guess based on Ujia/b
+	ItemBridge::Item* mBridge; // _2DC
+	f32 _2E0;                  // _2E0
+	f32 _2E4;                  // _2E4
 	                           // _2E8 = PelletView
 };
 
@@ -124,19 +128,19 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFp01(this, 'fp01', "離陸ライフ", 0.5f, 0.0f, 1.0f)               // 'takeoff life'
-		    , mFp02(this, 'fp02', "着陸ライフ", 0.7f, 0.0f, 1.0f)               // 'landing life'
-		    , mFp03(this, 'fp03', "飛行オフセット", 60.0f, 0.0f, 300.0f)        // 'flight offset'
-		    , mPoisonDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
-		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 75.0f, 0.0f, 100.0f)  // 'bridge eating power'
+		    , mTakeOffHealthRatio(this, 'fp01', "離陸ライフ", 0.5f, 0.0f, 1.0f)  // 'takeoff life'
+		    , mLandHealthRatio(this, 'fp02', "着陸ライフ", 0.7f, 0.0f, 1.0f)     // 'landing life'
+		    , mFlightHeight(this, 'fp03', "飛行オフセット", 60.0f, 0.0f, 300.0f) // 'flight offset'
+		    , mPoisonDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 10000.0f)  // 'white pikmin'
+		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 75.0f, 0.0f, 100.0f)   // 'bridge eating power'
 		{
 		}
 
-		Parm<f32> mFp01;         // _804
-		Parm<f32> mFp02;         // _82C
-		Parm<f32> mFp03;         // _854
-		Parm<f32> mPoisonDamage; // _87C, fp11
-		Parm<f32> mBridgeDamage; // _8A4, fp12
+		Parm<f32> mTakeOffHealthRatio; // _804
+		Parm<f32> mLandHealthRatio;    // _82C
+		Parm<f32> mFlightHeight;       // _854
+		Parm<f32> mPoisonDamage;       // _87C, fp11
+		Parm<f32> mBridgeDamage;       // _8A4, fp12
 	};
 
 	Parms() { }

diff --git a/include/Game/Entities/Ujib.h b/include/Game/Entities/Ujib.h
@@ -8,6 +8,10 @@
 #include "Game/EnemyBase.h"
 #include "Collinfo.h"
 
+#define GET_APPCHECK_VAL(check)      ((u8)check)
+#define GET_APPCHECK_MAX(check)      (check >> 8)
+#define SET_APPCHECK_MAX(check, val) (check = (val) << 8)
+
 /**
  * --Header for Male Sheargrub (Ujib)--
  */
@@ -84,8 +88,8 @@ struct Obj : public EnemyBase {
 	FSM* mFsm;                 // _2BC
 	u8 _2C0;                   // _2C0
 	bool mIsUnderground;       // _2C1
-	u16 _2C2;                  // _2C2
-	int mNextState;            // _2C4
+	u16 mAppearCheck;          // _2C2
+	StateID mNextState;        // _2C4
 	MouthSlots mMouthSlots;    // _2C8
 	ItemBridge::Item* mBridge; // _2D0
 	f32 _2CC;                  // _2D4