dgxGraphics.cpp defeated me, here's what I have.

configure.py

@@ -441,7 +441,7 @@ def MatchingFor(*versions):
         "progress_category": "game",
         "objects": [
             Object(Equivalent, "sysDolphin/texture.cpp"),
-            Object(not MatchingFor("DPIJ01_PIKIDEMO"), "sysDolphin/system.cpp"),
+            Object(Matching, "sysDolphin/system.cpp"),
             Object(Matching, "sysDolphin/sysNew.cpp"),
             Object(Matching, "sysDolphin/controllerMgr.cpp"),
             Object(not MatchingFor("GPIJ01_01", "GPIJ01_02", "G98P01_PIKIDEMO", "DPIJ01_PIKIDEMO"), "sysDolphin/dgxGraphics.cpp"),
@@ -498,7 +498,7 @@ def MatchingFor(*versions):
             Object(Equivalent, "plugPikiKando/simpleAI.cpp"),
             Object(Matching, "plugPikiKando/formationMgr.cpp"),
             Object(Matching, "plugPikiKando/globalShapes.cpp"),
-            Object(not MatchingFor("GPIJ01_01", "GPIJ01_02", "DPIJ01_PIKIDEMO"), "plugPikiKando/playerState.cpp"),
+            Object(Matching, "plugPikiKando/playerState.cpp"),
             Object(Matching, "plugPikiKando/gameDemo.cpp"),
             Object(Matching, "plugPikiKando/demoInvoker.cpp"),
             Object(Matching, "plugPikiKando/demoEvent.cpp"),

include/AICreature.h

@@ -12,8 +12,40 @@ struct AState;
 template <typename T>
 struct StateMachine;
 
+struct AICreature;
 struct CollEvent;
 
+/**
+ * @brief TODO
+ *
+ * @note Size: 0x48.
+ */
+struct SAIContext {
+	SAIContext()
+	{
+		mCollidingCreature = nullptr;
+		_08.set(0.0f, 0.0f, 0.0f);
+		mCounter           = 0;
+		mCurrAnimId        = 0;
+		mCurrentState      = nullptr;
+		mCurrentItemHealth = 0.0f;
+	}
+
+	Creature* mCollidingCreature;            // _00
+	Creature* mTargetCreature;               // _04
+	Vector3f _08;                            // _08
+	int mCurrAnimId;                         // _14, to do with bombs
+	int mCounter;                            // _18, used by `SluiceAI`, `PikiHeadAI`, and `GoalAI`.
+	f32 mCurrentItemHealth;                  // _1C
+	f32 _20;                                 // _20
+	f32 mMaxItemHealth;                      // _24
+	AState<AICreature>* mCurrentState;       // _28
+	StateMachine<AICreature>* mStateMachine; // _2C
+	int mCurrentEventCount;                  // _30
+	int mMaxEventCount;                      // _34
+	bool mEventFlags[16];                    // _38
+};
+
 /**
  * @brief TODO
  *
@@ -22,24 +54,24 @@ struct CollEvent;
 struct AICreature : public Creature, public PaniAnimKeyListener {
 	AICreature(CreatureProp*);
 
-	virtual void collisionCallback(immut CollEvent&);                               // _A8
-	virtual void bounceCallback();                                                  // _AC
-	virtual void refresh(Graphics&) = 0;                                            // _EC
-	virtual void doKill()           = 0;                                            // _10C
-	virtual AState<AICreature>* getCurrState() { return mCurrentState; }            // _120 (weak)
-	virtual void setCurrState(AState<AICreature>* state) { mCurrentState = state; } // _124 (weak)
-	virtual void playSound(int) { }                                                 // _128 (weak)
-	virtual void playEffect(int) { }                                                // _12C (weak)
-	virtual void startMotion(int) { }                                               // _130 (weak)
-	virtual void finishMotion() { }                                                 // _134 (weak)
-	virtual void finishMotion(f32) { }                                              // _138 (weak)
-	virtual void startMotion(int, f32) { }                                          // _13C (weak)
-	virtual immut char* getCurrentMotionName() { return "noname"; }                 // _140 (weak)
-	virtual f32 getCurrentMotionCounter() { return -123.4f; }                       // _144 (weak)
-	virtual f32 getMotionSpeed() { return -123.4f; }                                // _148 (weak)
-	virtual void setMotionSpeed(f32) { }                                            // _14C (weak)
-	virtual void stopMotion() { }                                                   // _150 (weak)
-	virtual void animationKeyUpdated(immut PaniAnimKeyEvent&);                      // _154 (weak)
+	virtual void collisionCallback(immut CollEvent&);                                       // _A8
+	virtual void bounceCallback();                                                          // _AC
+	virtual void refresh(Graphics&) = 0;                                                    // _EC
+	virtual void doKill()           = 0;                                                    // _10C
+	virtual AState<AICreature>* getCurrState() { return mSAICtx.mCurrentState; }            // _120 (weak)
+	virtual void setCurrState(AState<AICreature>* state) { mSAICtx.mCurrentState = state; } // _124 (weak)
+	virtual void playSound(int) { }                                                         // _128 (weak)
+	virtual void playEffect(int) { }                                                        // _12C (weak)
+	virtual void startMotion(int) { }                                                       // _130 (weak)
+	virtual void finishMotion() { }                                                         // _134 (weak)
+	virtual void finishMotion(f32) { }                                                      // _138 (weak)
+	virtual void startMotion(int, f32) { }                                                  // _13C (weak)
+	virtual immut char* getCurrentMotionName() { return "noname"; }                         // _140 (weak)
+	virtual f32 getCurrentMotionCounter() { return -123.4f; }                               // _144 (weak)
+	virtual f32 getMotionSpeed() { return -123.4f; }                                        // _148 (weak)
+	virtual void setMotionSpeed(f32) { }                                                    // _14C (weak)
+	virtual void stopMotion() { }                                                           // _150 (weak)
+	virtual void animationKeyUpdated(immut PaniAnimKeyEvent&);                              // _154 (weak)
 
 	void clearEventFlags();
 	void setEventFlag(int, bool);
@@ -50,19 +82,7 @@ struct AICreature : public Creature, public PaniAnimKeyListener {
 	// _00       = VTBL
 	// _00-_2B8  = Creature
 	// _2B8-_2BC = PaniAnimKeyListener
-	Creature* mCollidingCreature;            // _2BC
-	Creature* mTargetCreature;               // _2C0, 'target'?
-	Vector3f _2C4;                           // _2C4, could just be floats
-	int mCurrAnimId;                         // _2D0, to do with bombs
-	int mCounter;                            // _2D4, used to track stages of gates
-	f32 mCurrentItemHealth;                  // _2D8
-	f32 _2DC;                                // _2DC
-	f32 mMaxItemHealth;                      // _2E0
-	AState<AICreature>* mCurrentState;       // _2E4
-	StateMachine<AICreature>* mStateMachine; // _2E8
-	int mCurrentEventCount;                  // _2EC
-	int mMaxEventCount;                      // _2F0
-	bool mEventFlags[16];                    // _2F4
+	SAIContext mSAICtx; // _2BC
 };
 
 #endif

include/Font.h

@@ -11,6 +11,8 @@ struct Texture;
 
 /**
  * @brief TODO
+ *
+ * @note Size: 0x1C.
  */
 struct FontChar {
 	FontChar()

include/SimpleAI.h

@@ -5,7 +5,7 @@
 #include "StateMachine.h"
 #include "types.h"
 
-#define C_SAI(obj) static_cast<SimpleAI*>(obj->mStateMachine)
+#define C_SAI(obj) static_cast<SimpleAI*>(obj->mSAICtx.mStateMachine)
 
 struct SAIEvent;
 
@@ -225,8 +225,6 @@ struct SimpleAI : public StateMachine<AICreature> {
 	void start(AICreature*, int);
 	void checkEvent(AICreature*);
 
-	inline SAIState* getState(int idx) { return static_cast<SAIState*>(mStates[idx]); }
-
 	// _00     = VTBL
 	// _00-_1C = StateMachine
 };

include/Texture.h

@@ -187,14 +187,18 @@ struct Texture : public GfxObject {
 	virtual void makeResident() { } // _10 (weak)
 
 	u8 getAlpha(int x, int y);
+	u8 getRed(int x, int y);
 	void read(RandomAccessStream& input);
 	void createBuffer(int width, int height, int texFmt, void* buf);
 	void grabBuffer(int width, int height, bool doClear, bool useMIPmap);
 	void decodeData(TexImg* texImg);
 
 	// unused/inlined:
 	void offsetGLtoGX(int, int);
-	u8 getRed(int, int);
+	static void offsetGXtoGL(int, int, int, int);
+	void offsetGXtoGL(int, int);
+	void write(Stream*);
+	static void decodeS3TC(int, int, u8*, u8*);
 
 	// _00 = VTBL
 	u16 mTexFormat;    // _04, see TexImgFormat enum

include/system.h

@@ -345,6 +345,15 @@ enum {
 	WrongDisc   = 5   // Non-Pikmin disc inserted
 } END_ENUM_TYPE;
 
+/**
+ * @brief FABRICATED - No other class we currently know of has a virtual table like this.
+ */
+struct System_Class_250 {
+	virtual void method(Graphics& gfx) = 0; // _00
+
+	// _00     = VTBL
+};
+
 /**
  * @brief FABRICATED - Singly-linked list of symbolic information (See `ParseMapFile`)
  */
@@ -393,7 +402,7 @@ struct System : public StdSystem {
 	RandomAccessStream* createFile(immut char*, BOOL);
 
 	// unused/inlined:
-	void findAddress(u32);
+	immut char* findAddress(u32);
 	bool hasDebugInfo();
 	static void halt(immut char* file, int line, immut char* message);
 
@@ -411,7 +420,7 @@ struct System : public StdSystem {
 	u32 mHeapStart;                                  // _244
 	u32 mHeapEnd;                                    // _248
 	Graphics* mDGXGfx;                               // _24C, cast to DGXGraphics in DOL
-	u32 _250;                                        // _250, unknown/unused - set to 0 by GameFlow::softReset.
+	System_Class_250* _250;                          // _250, a vestigial pointer related to `System::halt`
 	Delegate1<System, Graphics&>* mDvdErrorCallback; // _254
 	int mDvdErrorCode;                               // _258
 	u32 mDvdBufferSize;                              // _25C

src/card/CARDFormat.c

@@ -66,7 +66,7 @@ s32 __CARDFormatRegionAsync(s32 chan, u16 encode, CARDCallback callback)
 
 	id = (CARDID*)card->workArea;
 	memset(id, 0xff, CARD_SYSTEM_BLOCK_SIZE);
-	viDTVStatus = __VIRegs[55];
+	viDTVStatus = __VIRegs[VI_DTV_STAT];
 
 	id->encode = encode;
 
@@ -148,7 +148,7 @@ s32 CARDFormatAsync(s32 channel, CARDCallback callback)
 
 	id = &card->workArea->header.id;
 	memset(id, 0xff, CARD_SYSTEM_BLOCK_SIZE);
-	viDTVStatus = __VIRegs[55];
+	viDTVStatus = __VIRegs[VI_DTV_STAT];
 
 	id->encode = OSGetFontEncode();
 

src/jaudio/hvqm_play.c

@@ -543,7 +543,7 @@ int Jac_GetPicture(void* data, int* x, int* y)
 
 	if (playback_first_wait) {
 		*(int*)data = 0;
-		return TRUE;
+		return 1;
 	}
 
 	int frame = StreamGetCurrentFrame(0, 2);
@@ -604,7 +604,7 @@ int Jac_GetPicture(void* data, int* x, int* y)
 		StreamSyncStopAudio(0);
 	}
 	*(int*)data = 0;
-	return FALSE;
+	return 0;
 }
 
 /**

src/pad/Pad.c

@@ -1,4 +1,5 @@
 #include "Dolphin/pad.h"
+#include "Dolphin/hw_regs.h"
 #include "Dolphin/os.h"
 #include "Dolphin/vi.h"
 #include <stddef.h>
@@ -33,7 +34,6 @@ static BOOL OnReset(BOOL f);
 
 extern u16 __OSWirelessPadFixMode AT_ADDRESS(OS_BASE_CACHED | 0x30E0);
 extern u8 GameChoice AT_ADDRESS(OS_BASE_CACHED | 0x30E3);
-extern u16 DAT_CC00206C AT_ADDRESS(0xCC00206C); // Which hardware register?
 
 static BOOL Initialized = FALSE;
 
@@ -1022,7 +1022,7 @@ void PADSetSamplingRate(u32 msec)
 	}
 	}
 #if OS_BUILD_VERSION >= 20011002L
-	SISetXY(((DAT_CC00206C & 1) ? 2 : 1) * xy[msec].line, xy[msec].count);
+	SISetXY((__VIRegs[VI_CLOCK_SEL] & 1 ? 2u : 1u) * xy[msec].line, xy[msec].count);
 #else
 	SISetXY(xy[msec].line, xy[msec].count);
 #endif
@@ -1036,7 +1036,7 @@ void PADSetSamplingRate(u32 msec)
 
 #if OS_BUILD_VERSION >= 20011002L && OS_BUILD_VERSION < 20011217L
 /**
- * @TODO: Documentation
+ * This implementation was moved to SISamplingRate.c (`SIRefreshSamplingRate`)
  */
 void __PADRefreshSamplingRate(void)
 {

src/plugPikiColin/gameflow.cpp

@@ -701,7 +701,7 @@ void GameFlow::softReset()
 		PRINT("doing start load!\n");
 		gsys->startLoading(nullptr, true, 60);
 	}
-	gsys->_250     = 0;
+	gsys->_250     = nullptr;
 	mGameInterface = nullptr;
 	gsys->getHeap(SYSHEAP_Message)->inactivate();
 	mGameSection->init();

src/plugPikiKando/actor.cpp

@@ -36,7 +36,7 @@ void Actor::setType(int /*unused*/, PikiShapeObject* shape, CreatureProp* props,
 
 	mPikiAnimMgr.startMotion(PaniMotionInfo(PIKIANIM_Wait, nullptr), PaniMotionInfo(PIKIANIM_Wait));
 
-	mStateMachine = ai;
+	mSAICtx.mStateMachine = ai;
 }
 
 /**
@@ -45,7 +45,7 @@ void Actor::setType(int /*unused*/, PikiShapeObject* shape, CreatureProp* props,
  */
 void Actor::startAI(int state)
 {
-	((SimpleAI*)mStateMachine)->start(this, state);
+	C_SAI(this)->start(this, state);
 }
 
 /**
@@ -94,8 +94,8 @@ void Actor::doAnimation()
  */
 void Actor::doAI()
 {
-	if (mStateMachine) {
-		mStateMachine->exec(this);
+	if (mSAICtx.mStateMachine) {
+		mSAICtx.mStateMachine->exec(this);
 	}
 }
 

src/plugPikiKando/aiBridge.cpp

@@ -463,7 +463,7 @@ void ActBridge::newInitWork()
 	mCollisionCount = 0;
 	_2A             = 0;
 
-	if (mActionCounter) {
+	if (mActionCounter != 0) {
 		return;
 	}
 
@@ -543,16 +543,15 @@ int ActBridge::newExeWork()
 		return ACTOUT_Continue;
 	}
 
-	STACK_PAD_TERNARY(this, 3);
-
 	if (absF(xDist) > 0.3f * mBridge->getStageWidth()) {
+		STACK_PAD_STRUCT(2); // Vector3f unused(xVec); // This would be more accurate, but it makes the stack worse.
 		if (xDist < 0.0f) {
 			xVec.multiply(-1.0f);
 		}
 		zVec = zVec + xVec;
 		zVec.normalise();
 	}
-	mBridge->getStageDepth();
+	f32 unused = mBridge->getStageDepth(); // It looks like this unused result was stored in a variable in the DLL.
 	mPiki->setSpeed(0.5f, zVec);
 	return ACTOUT_Continue;
 	/*

src/plugPikiKando/aiPut.cpp

@@ -333,7 +333,7 @@ void ActPutBomb::initPut()
 	held->mVelocity.add(vel);
 	MsgUser msg(0);
 	BombItem* bomb = static_cast<BombItem*>(held);
-	static_cast<SimpleAI*>(bomb->mStateMachine)->procMsg(bomb, &msg);
+	C_SAI(bomb)->procMsg(bomb, &msg);
 	mAnimationFinished = false;
 	mState             = STATE_Put;
 }
@@ -368,10 +368,10 @@ int ActPutBomb::exeThrow()
 			InteractRelease release(mPiki, 1.0f);
 			Creature* held = mPiki->getHoldCreature();
 			held->stimulate(release);
-			held->mVelocity       = throwVel;
-			held->mTargetVelocity = throwVel;
-			BombItem* bomb        = static_cast<BombItem*>(held);
-			bomb->mCurrAnimId     = 0;
+			held->mVelocity           = throwVel;
+			held->mTargetVelocity     = throwVel;
+			BombItem* bomb            = static_cast<BombItem*>(held);
+			bomb->mSAICtx.mCurrAnimId = 0;
 			C_SAI(bomb)->start(bomb, BombAI::BOMB_Unk1);
 			bomb->disableFixPos();
 

src/plugPikiKando/bombItem.cpp

@@ -81,7 +81,7 @@ BombItem::BombItem(CreatureProp* props, ItemShapeObject* shape, SimpleAI* ai)
 {
 	mLifeGauge.mSnapToTargetHealth = true;
 	mItemShapeObject               = shape;
-	mStateMachine                  = ai;
+	mSAICtx.mStateMachine          = ai;
 	mLifeGauge.mRenderStyle        = LifeGauge::Wheel;
 }
 
@@ -142,7 +142,7 @@ void BombItem::update()
 	if (state != BombAI::BOMB_Die && state != BombAI::BOMB_Bomb && state != BombAI::BOMB_Mizu && mGroundTriangle
 	    && MapCode::getAttribute(mGroundTriangle) == ATTR_Water) {
 		PRINT("BOMB WATER START **********\n");
-		mStateMachine->transit(this, BombAI::BOMB_Mizu);
+		mSAICtx.mStateMachine->transit(this, BombAI::BOMB_Mizu);
 	}
 
 	if (state == BombAI::BOMB_Unk1 && mGroundTriangle) {
@@ -165,7 +165,7 @@ void BombItem::refresh2d(Graphics& gfx)
 	int state = getCurrState()->getID();
 
 	if (state == 2) {
-		mLifeGauge.updValue(mCurrentItemHealth, mMaxItemHealth);
+		mLifeGauge.updValue(mSAICtx.mCurrentItemHealth, mSAICtx.mMaxItemHealth);
 		mLifeGauge.mPosition = mSRT.t;
 		mLifeGauge.mScale    = 5000.0f / gfx.mCamera->mNear;
 		mLifeGauge.refresh(gfx);

src/plugPikiKando/creature.cpp

@@ -512,8 +512,8 @@ void Creature::kill(bool)
 			if (ai->getCurrState()->getID() != 1) {
 				BombItem* bomb = static_cast<BombItem*>(held);
 				MsgUser msg(1);
-				bomb->mCurrAnimId = 1;
-				static_cast<SimpleAI*>(bomb->mStateMachine)->procMsg(bomb, &msg);
+				bomb->mSAICtx.mCurrAnimId = 1;
+				C_SAI(bomb)->procMsg(bomb, &msg);
 			}
 		}
 	}