Renamed npcNameToPtr_New to checkForNpcNameToPtrError

Author: Zephiles

ttyd-tools/rel/include/mod.h

@@ -33,7 +33,7 @@ class Mod
 	void drawArtAttackHitboxes(ttyd::dispdrv::CameraId);
 	int32_t displayActionCommandsTimingHook(void *, ttyd::battle_unit::AttackParams *);
 	void errorHandler(uint16_t, gc::OSContext::OSContext *, uint32_t, uint32_t);
-	ttyd::npcdrv::NpcEntry *npcNameToPtr_New(const char *);
+	ttyd::npcdrv::NpcEntry *checkForNpcNameToPtrError(const char *);
 
 private:
 	void (*mPFN_marioStMain_trampoline)() = nullptr;
@@ -59,7 +59,7 @@ class Mod
 	void (*mPFN_systemErrorHandler_trampoline)(uint16_t, 
 		gc::OSContext::OSContext *, uint32_t, uint32_t) = nullptr;
 
-	ttyd::npcdrv::NpcEntry *(*mPFN_npcNameToPtr_New_trampoline)(const char *) = nullptr;
+	ttyd::npcdrv::NpcEntry *(*mPFN_npcNameToPtr_trampoline)(const char *) = nullptr;
 };
 
 }

ttyd-tools/rel/source/main.cpp

@@ -633,10 +633,10 @@ void checkHeaps()
 	}
 }
 
-ttyd::npcdrv::NpcEntry *Mod::npcNameToPtr_New(const char *name)
+ttyd::npcdrv::NpcEntry *Mod::checkForNpcNameToPtrError(const char *name)
 {
-	// Call the original function right away
-	ttyd::npcdrv::NpcEntry *NPC = mPFN_npcNameToPtr_New_trampoline(name);
+	// Call the original function immediately
+	ttyd::npcdrv::NpcEntry *NPC = mPFN_npcNameToPtr_trampoline(name);
 
 	// Check if the returned pointer is valid
 	ttyd::npcdrv::NpcWork *NpcWorkPointer = ttyd::npcdrv::npcGetWorkPtr();

ttyd-tools/rel/source/mod.cpp

@@ -140,10 +140,10 @@ void Mod::init()
 		gMod->errorHandler(error, context, dsisr, dar);
 	});
 
-	mPFN_npcNameToPtr_New_trampoline = patch::hookFunction(
+	mPFN_npcNameToPtr_trampoline = patch::hookFunction(
 		ttyd::npcdrv::npcNameToPtr, [](const char *name)
 	{
-		return gMod->npcNameToPtr_New(name);
+		return gMod->checkForNpcNameToPtrError(name);
 	});
 
 	// Initialize typesettings early