Changed uses of scriptContext to event

Author: Zephiles

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

@@ -31,7 +31,7 @@ extern "C" {
 // evt_bero_id_filter
 // evt_bero_read_mario_pera
 // evt_bero_get_into_info
-uint32_t evt_bero_get_info(void *scriptContext, uint32_t waitMode);
+uint32_t evt_bero_get_info(void *event, uint32_t waitMode);
 // evt_bero_get_now_number
 // evt_bero_set_now_number
 // evt_bero_get_info_nextarea

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

@@ -9,7 +9,7 @@ extern "C" {
 
 // mail_evt_gor_04_keyoff_check
 // irai_mail_check
-uint32_t evt_sub_check_intersect(void *scriptContext);
+uint32_t evt_sub_check_intersect(void *event);
 // bgm_start_wait
 // get_stop
 // set_stop

ttyd-tools/rel/source/codes.cpp

@@ -1483,22 +1483,22 @@ int32_t warpToMapByString(const char *map)
 	return SUCCESS;
 }
 
-uint32_t Mod::setIndexWarpEntrance(void *scriptContext, uint32_t waitMode)
+uint32_t Mod::setIndexWarpEntrance(void *event, uint32_t waitMode)
 {
 	// Clear the array holding the loading zone names
 	clearMemory(WarpByIndex.EntranceList, sizeof(WarpByIndex.EntranceList));
 
 	// Get the start of the loading zone addresses
-	uint32_t ScriptContextLZAddresses = *reinterpret_cast<uint32_t *>(
-		reinterpret_cast<uint32_t>(scriptContext) + 0x9C);
+	uint32_t eventLZAddresses = *reinterpret_cast<uint32_t *>(
+		reinterpret_cast<uint32_t>(event) + 0x9C);
 
 	// Loop through the loading zones and get the total amount of them
-	uint32_t tempScriptContextAddress = ScriptContextLZAddresses;
+	uint32_t tempEventAddress = eventLZAddresses;
 	uint32_t LoadingZoneTotal = 0;
 
-	while (*reinterpret_cast<uint32_t *>(tempScriptContextAddress))
+	while (*reinterpret_cast<uint32_t *>(tempEventAddress))
 	{
-		tempScriptContextAddress += 0x3C;
+		tempEventAddress += 0x3C;
 		LoadingZoneTotal++;
 	}
 
@@ -1508,7 +1508,7 @@ uint32_t Mod::setIndexWarpEntrance(void *scriptContext, uint32_t waitMode)
 	{
 		tempEntranceArray[i] = reinterpret_cast<const char *>(
 			*reinterpret_cast<uint32_t *>(
-				ScriptContextLZAddresses + (i * 0x3C)));
+				eventLZAddresses + (i * 0x3C)));
 	}
 
 	// Check to see if warping by index
@@ -1525,7 +1525,7 @@ uint32_t Mod::setIndexWarpEntrance(void *scriptContext, uint32_t waitMode)
 			// Valid entrance chosen
 			ChosenEntranceName = reinterpret_cast<const char *>(
 				*reinterpret_cast<uint32_t *>(
-					ScriptContextLZAddresses + (ChosenEntrance * 0x3C)));
+					eventLZAddresses + (ChosenEntrance * 0x3C)));
 		}
 		else
 		{
@@ -1542,7 +1542,7 @@ uint32_t Mod::setIndexWarpEntrance(void *scriptContext, uint32_t waitMode)
 	}
 
 	// Call original function
-	return mPFN_evt_bero_get_info_trampoline(scriptContext, waitMode);
+	return mPFN_evt_bero_get_info_trampoline(event, waitMode);
 }
 
 }

ttyd-tools/rel/source/global.cpp

@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.25";
+const char *VersionNumber = "v3.0.26";
 
 const char *RootLines[] = 
 {

ttyd-tools/rel/source/main.cpp

@@ -182,49 +182,32 @@ const char *replaceJumpFallAnim(char *jumpFallString)
 {
 	if (compareStringsSize(jumpFallString, "M_J_", 4))
 	{
-		if (compareStringToNextMap("gor_01"))
+		const char *MapCheck = "gor_01";
+		if (compareStringToNextMap(MapCheck))
 		{
-			// Return an arbitrary string
-			const char *newString = "gor_01";
-			
 			if (MarioFreeze)
 			{
-				return newString;
+				// Return an arbitrary string
+				return MapCheck;
 			}
 			else
 			{
 				ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-				int32_t PosX = static_cast<int32_t>(player->playerPosition[0]);
-				int32_t PosZ = static_cast<int32_t>(player->playerPosition[2]);
-				
-				int32_t args[9];
-				clearMemory(args, sizeof(args));
-				
-				args[0] = PosX;
-				args[1] = PosZ;
-				args[2] = PosX + 5;
-				args[3] = PosZ + 5;
-				args[4] = 10;
-				args[5] = 250;
-				args[6] = -10;
-				args[7] = 267;
-				
-				*reinterpret_cast<uint32_t *>(&args[8]) = 0xFE363C80;
-				
-				char fakeContext[0x1B0];
-				clearMemory(fakeContext, sizeof(fakeContext));
-				
-				*reinterpret_cast<int32_t **>(fakeContext + 0x18) = args;
-				
-				ttyd::evt_sub::evt_sub_check_intersect(fakeContext);
 
-				if (*reinterpret_cast<bool *>(
-					reinterpret_cast<uint32_t>(fakeContext) + 0x9F))
+				int32_t MarPosX = static_cast<int32_t>(player->playerPosition[0]);
+				if ((MarPosX >= -9) && (MarPosX <= 8))
 				{
-					if (player->playerPosition[1] >= 58)
+					int32_t MarPosZ = static_cast<int32_t>(player->playerPosition[2]);
+					if ((MarPosZ >= 245) && (MarPosZ <= 265))
 					{
-						MarioFreeze = true;
-						return newString;
+						int32_t MarPosY = static_cast<int32_t>(player->playerPosition[1]);
+						if (MarPosY >= 59)
+						{
+							MarioFreeze = true;
+							
+							// Return an arbitrary string
+							return MapCheck;
+						}
 					}
 				}
 			}

ttyd-tools/rel/source/mod.cpp

@@ -89,9 +89,9 @@ void Mod::init()
 	});
 
 	mPFN_evt_bero_get_info_trampoline = patch::hookFunction(
-		ttyd::evt_bero::evt_bero_get_info, [](void *scriptContext, uint32_t waitMode)
+		ttyd::evt_bero::evt_bero_get_info, [](void *event, uint32_t waitMode)
 	{
-		return gMod->setIndexWarpEntrance(scriptContext, waitMode);
+		return gMod->setIndexWarpEntrance(event, waitMode);
 	});
 
 	// Initialize typesetting early