Made several adjustments to the npcNameToPtr stuff

Adjusted the replacement function to simply call the original function, and then check if the returned pointer is valid.This change also fixed an issue where the function did not return the same pointer that the vanilla one would, as the vanilla one ends up going out of range when it fails to find a proper NPC.

Also changed the error text to display the number of times that the function returned an invalid pointer. Every time the number is incremented, the timer is reset to 5 seconds.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -811,8 +811,8 @@ struct ErrorHandlerStrings
 
 struct NpcNameToPtrErrorStruct
 {
-	uint32_t Timer;
-	char Buffer[32];
+	uint32_t Counter;
+	uint16_t Timer;
 };
 
 extern MenuVars MenuVar;

ttyd-tools/rel/source/draw.cpp

@@ -4494,14 +4494,12 @@ void drawNpcNameToPtrError()
 	float Scale 			= 0.6;
 
 	// Draw the text
-	char *tempBuffer = NpcNameToPtrError.Buffer;
-	drawText(tempBuffer, PosX, PosY, Alpha, TextColor, Scale);
+	char *tempDisplayBuffer = DisplayBuffer;
+	sprintf(tempDisplayBuffer,
+		"npcNameToPtr error occured x%" PRIu32,
+		NpcNameToPtrError.Counter);
 
-	// Clear the buffer if the timer is at 0
-	if (NpcNameToPtrError.Timer == 0)
-	{
-		clearMemory(tempBuffer, sizeof(NpcNameToPtrError.Buffer));
-	}
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
 }
 
 void drawTitleScreenInfo()

ttyd-tools/rel/source/main.cpp

@@ -635,32 +635,16 @@ void checkHeaps()
 
 ttyd::npcdrv::NpcEntry *Mod::npcNameToPtr_New(const char *name)
 {
-	// Get the work pointer
-	ttyd::npcdrv::NpcWork *NpcWorkPointer = ttyd::npcdrv::npcGetWorkPtr();
-	
-	// Loop through the NPCs to find the correct one
-	ttyd::npcdrv::NpcEntry *NPC = nullptr;
-	uint32_t MaxNpcCount = NpcWorkPointer->npcMaxCount;
-	
-	for (uint32_t i = 0; i < MaxNpcCount; i++)
-	{
-		NPC = &NpcWorkPointer->entries[i];
-		if (NPC->flags & (1 << 0)) // Check if 0 bit is active
-		{
-			if (compareStrings(NPC->wUnkAnimation, name))
-			{
-				return NPC;
-			}
-		}
-	}
+	// Call the original function right away
+	ttyd::npcdrv::NpcEntry *NPC = mPFN_npcNameToPtr_New_trampoline(name);
 
-	// Didn't find the correct NPC, so return the last one and print error text
-	// Only print the error text if currently not printing any previous error text
-	if (NpcNameToPtrError.Timer == 0)
+	// Check if the returned pointer is valid
+	ttyd::npcdrv::NpcWork *NpcWorkPointer = ttyd::npcdrv::npcGetWorkPtr();
+	if (NPC == &NpcWorkPointer->entries[NpcWorkPointer->npcMaxCount])
 	{
-		const char *Text = "npcNameToPtr error occured";
-		strcpy(NpcNameToPtrError.Buffer, Text);
+		// Didn't find the correct NPC, so print error text
 		NpcNameToPtrError.Timer = secondsToFrames(5);
+		NpcNameToPtrError.Counter++;
 	}
 
 	return NPC;
@@ -673,12 +657,11 @@ void displayNpcNameToPtrError()
 	{
 		Timer--;
 		NpcNameToPtrError.Timer = Timer;
+		drawFunctionOnDebugLayerWithOrder(drawNpcNameToPtrError, 100.f);
 	}
-	
-	// Call the drawing function regardless of the current time, as the drawing function is what clears the buffer
-	if (NpcNameToPtrError.Buffer[0] != '\0')
+	else
 	{
-		drawFunctionOnDebugLayerWithOrder(drawNpcNameToPtrError, 100.f);
+		NpcNameToPtrError.Counter = 0;
 	}
 }