Updated the Player struct in mario.h to accommodate for JP

Author: Zephiles

ttyd-tools/rel/include/ttyd/mario.h

@@ -4,6 +4,8 @@
 
 namespace ttyd::mario {
 
+// The Player struct was defined using the US version, but has been adjusted to work with the JP version as well
+// The Player struct is also 100% identical between US and EU
 struct Player
 {
 	uint32_t flags1;
@@ -24,7 +26,7 @@ struct Player
 	uint32_t wMapTime;
 	uint8_t unk_38;
 	int8_t wKey;
-	uint8_t unk_3a[2];
+	uint16_t unk_3a;
 	int8_t characterId;
 	int8_t colorId;
 	uint8_t unk_3e;
@@ -66,15 +68,17 @@ struct Player
 	float unk_184;
 	float unk_188;
 	float wPlayerEffectiveSpeed;
+	#ifndef TTYD_JP
 	float unk_190;
+	#endif
 	float wControlStickSensitivity;
 	float wControlStickAngle;
 	float unk_19c;
-	float unk_1a0;
+	float wPlayerAngleCurrent;
 	float wPlayerAngle;
 	float unk_1a8;
+	float wPlayerDirectionCurrent;
 	float wPlayerDirection;
-	float unk_1b0;
 	uint32_t unk_1b4;
 	float wPlayerCollisionBox[3];
 	float wPlayerCollisionRelated[3];
@@ -96,17 +100,24 @@ struct Player
 	uint8_t prevFollowerId[2];
 	uint8_t unk_249;
 	uint16_t wPauseButtonBuffer;
-	uint32_t unk_24c;
+	uint16_t unk_24c;
+	uint16_t unk_24e;
 	uint16_t unk_250;
 	uint8_t wStickDir1;
 	uint8_t wStickDir2;
 	uint8_t wSubStickDir1;
 	uint8_t wSubStickDir2;
 	uint8_t wPauseLeftTrigger;
 	uint8_t wPauseRightTrigger;
-	uint32_t unk_258;
+	uint8_t unk_258;
+	uint8_t unk_259;
+	uint16_t unk_25a;
 	uint32_t unk_25c;
+	#ifdef TTYD_JP
+	uint8_t gap_260[68];
+	#else
 	uint8_t gap_260[88];
+	#endif
 	float wMultiVal1;
 	float wYoshiHoverHeight;
 	float wCamVal1;
@@ -117,7 +128,11 @@ struct Player
 	uint32_t unk_2f4;
 } __attribute__((__packed__));
 
+#ifdef TTYD_JP
+static_assert(sizeof(Player) == 0x2E0);
+#else
 static_assert(sizeof(Player) == 0x2F8);
+#endif
 
 extern "C" {
 

ttyd-tools/rel/source/codes.cpp

@@ -192,7 +192,7 @@ void saveMarioAndPartnerPositions()
 	MarioPartnerPositions.MarioPosition[0] = player->playerPosition[0]; // Mario Coordinate X
 	MarioPartnerPositions.MarioPosition[1] = player->playerPosition[1]; // Mario Coordinate Y
 	MarioPartnerPositions.MarioPosition[2] = player->playerPosition[2]; // Mario Coordinate Z
-	MarioPartnerPositions.MarioPosition[3] = player->unk_1a0;
+	MarioPartnerPositions.MarioPosition[3] = player->wPlayerAngleCurrent;
 
 	uint32_t PartnerPointer = reinterpret_cast<uint32_t>(getPartnerPointer());
 	if (PartnerPointer != 0)
@@ -218,10 +218,10 @@ void loadMarioAndPartnerPositions()
 
 	ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
 
-	player->playerPosition[0] 	= MarioPartnerPositions.MarioPosition[0]; // Mario Coordinate X
-	player->playerPosition[1] 	= MarioPartnerPositions.MarioPosition[1]; // Mario Coordinate Y
-	player->playerPosition[2] 	= MarioPartnerPositions.MarioPosition[2]; // Mario Coordinate Z
-	player->unk_1a0 			= MarioPartnerPositions.MarioPosition[3];
+	player->playerPosition[0] 		= MarioPartnerPositions.MarioPosition[0]; // Mario Coordinate X
+	player->playerPosition[1] 		= MarioPartnerPositions.MarioPosition[1]; // Mario Coordinate Y
+	player->playerPosition[2] 		= MarioPartnerPositions.MarioPosition[2]; // Mario Coordinate Z
+	player->wPlayerAngleCurrent 	= MarioPartnerPositions.MarioPosition[3];
 
 	uint32_t PartnerPointer = reinterpret_cast<uint32_t>(getPartnerPointer());
 	if (PartnerPointer != 0)
@@ -585,14 +585,8 @@ void bobberyEarly()
 		player->playerPosition[0] = -1;
 		player->playerPosition[1] = 59;
 		player->playerPosition[2] = RopePosZ + 10;
-		
-		#ifdef TTYD_JP
-		player->unk_19c = 180;
+		player->wPlayerAngleCurrent = 180;
 		player->wPlayerDirection = 180;
-		#else
-		player->unk_1a0 = 180;
-		player->unk_1b0 = 180;
-		#endif
 	}
 
 	if (!Cheat[BOBBERY_EARLY].Active)

ttyd-tools/rel/source/main.cpp

@@ -203,13 +203,8 @@ void *fixEvtMapBlendSetFlagCrash(void *partnerPtr)
 	// Bring out a partner if no partner is currently out
 	if (!partnerPtr)
 	{
-		#ifdef TTYD_JP
-		uint32_t tempMarioPtr = reinterpret_cast<uint32_t>(ttyd::mario::marioGetPtr());
-		uint8_t PreviousPartnerOut = *reinterpret_cast<uint8_t *>(tempMarioPtr + 0x243);
-		#else
 		ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
 		uint8_t PreviousPartnerOut = player->prevFollowerId[0];
-		#endif
 
 		// Check if a partner was previously out
 		if (PreviousPartnerOut != 0)

ttyd-tools/rel/source/menufunctions.cpp

@@ -1751,15 +1751,9 @@ uint32_t followersOptionsButtonControls()
 				// Set specific bytes
 				if (ReturnCode >= 0)
 				{
-					#ifdef TTYD_JP
-					uint32_t MarioPtr = reinterpret_cast<uint32_t>(ttyd::mario::marioGetPtr());
-					*reinterpret_cast<uint8_t *>(MarioPtr + 0x242) = ReturnCode;
-					*reinterpret_cast<uint8_t *>(MarioPtr + 0x244) = NewFollower;
-					#else
 					ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-					player->wFollowerFlags[1] = ReturnCode; // 0x246
-					player->prevFollowerId[1] = NewFollower; // 0x248
-					#endif
+					player->wFollowerFlags[1] = ReturnCode;
+					player->prevFollowerId[1] = NewFollower;
 				}
 
 				closeSecondaryMenu();