Updated the Mario Motion IDs

Author: Zephiles

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

@@ -6,36 +6,47 @@ namespace ttyd::mario_motion {
 
 enum MarioMotions : uint16_t
 {
-	kNone 						= 0,
-	kWalkSlow 					= 1,
-	kRun 						= 2,
-	kJumpRising 				= 3,
-	kJumpLandOnEnemyStillInAir 	= 4,
-	kBounceOffSwitch 			= 5,
-	kBounceOffSpring 			= 6,
-	kEnterOrExitArea 			= 8,
-	kFall 						= 10,
-	kWalkOffPlatform 			= 11,
-	kClipOntoPlatform 			= 12,
-	kTalkToNpcDirect 			= 14,
-	kGetItem 					= 15,
-	kSpinJumpInAir 				= 16,
-	kSpinJumpHitGround 			= 17,
-	kHammer 					= 18,
-	kHammerSpin 				= 19,
-	kSpringJump 				= 20,
-	kPaperMode 					= 21,
-	kTubeMode 					= 22,
-	kPlaneMode 					= 24,
-	kBoatMode 					= 25,
-	kUseYoshi 					= 26,
-	kUseFlurrie 				= 27,
-	kUseVivian 					= 28,
-	kEnterPipe 					= 29,
-	kFallInWater 				= 31,
-	kTouchHazard 				= 32,
-	kRespawnInBackground 		= 33,
-	kRespawnNormal 				= 34,
+	kStay 			= 0,
+	kWalk 			= 1,
+	kDash 			= 2,
+	kJump 			= 3,
+	kJumpNPC 		= 4,
+	kJumpSw 		= 5,
+	kJumpStand 		= 6,
+	kJump2 			= 7,
+	kJump3 			= 8,
+	kJumpSmall 		= 9,
+	kFall 			= 10,
+	kFall2 			= 11,
+	kUpstairs 		= 12,
+	kLand 			= 13,
+	kTalk 			= 14,
+	kGetItem 		= 15,
+	kHip 			= 16,
+	kHip2 			= 17,
+	kHammer 		= 18,
+	kHammer2 		= 19,
+	kJabara 		= 20,
+	kSlit 			= 21,
+	kRoll 			= 22,
+	kKaze 			= 23,
+	kPlane 			= 24,
+	kShip 			= 25,
+	kYoshi 			= 26,
+	kCloud 			= 27,
+	kVivian 		= 28,
+	kDokan 			= 29,
+	kGrasp 			= 30,
+	kDamage 		= 31,
+	kDamageToge 	= 32,
+	kBottomless 	= 33,
+	kForceReset 	= 34,
+	kShadow 		= 35,
+	kPartyUse 		= 36, // Dummied out
+	kKpaSwim 		= 37,
+	kKpaPowUp 		= 38,
+	kKpaPowDown 	= 39,
+	kDummy 			= 40, // Dummied out
 };
 
 extern "C" {

ttyd-tools/rel/source/menufunctions.cpp

@@ -3868,7 +3868,7 @@ void *initStageEvents()
 	setSequencePosition(getGsw0ForEvent(StageId, EventId));
 
 	// Reset Mario's motion
-	ttyd::mario_motion::marioChgMot(ttyd::mario_motion::MarioMotions::kNone);
+	ttyd::mario_motion::marioChgMot(ttyd::mario_motion::MarioMotions::kStay);
 
 	const ttyd::event::EventStageDescription *TargetStage = ttyd::event::eventStgDtPtr(StageId);
 	const ttyd::event::EventStageEventDescription *TargetEvent = &TargetStage->pEvents[EventId];