Merge pull request #26 from PiKeyAr/master

Various fixes

Author: ItsEasyActually

SA1_Chars/SA1_Chars.cpp

@@ -22,6 +22,7 @@
 #include "MetalSonic.h"
 
 #define ReplacePVM(a)  helperFunctions.ReplaceFile("system\\" a ".PVM", "system\\" a "_DC.PVM");
+NJS_MATERIAL *TemporaryMaterialArray[] = { nullptr };
 
 //Customization Options
 enum MSHoverBehavior { Normal, Swap, Always };
@@ -54,8 +55,19 @@ DataArray(WeldInfo, BigWeldInfo, 0x03C55500, 0x11);
 DataArray(WeldInfo, MetalSonicWeldInfo, 0x03C55D68, 8);
 DataArray(WeldInfo, TikalWeldInfo, 0x038F3AB8, 14);
 DataArray(WeldInfo, EggmanWeldInfo, 0x038F3F28, 15);
+FunctionPointer(void, PlaySonicIdleVoice, (int a1), 0x442360);
 
 //Replacement Functions
+
+void PlaySonicIdleVoice_r(int a1)
+{
+	if (MetalSonicFlag)
+	{
+		PlayVoice(2044 + rand() % 5);
+	}
+	else PlaySonicIdleVoice(a1);
+}
+
 void __cdecl Sonic_MorphStretchyFeet_c(CharObj2* a1)
 {
 	float a4; // ST10_4@3
@@ -2368,9 +2380,7 @@ static void __declspec(naked) Sonic_Run1Ani_origasm()
 
 //Lantern API Fixes
 NJS_MATERIAL* Specular0[] = {
-	//Tails fixes red
-	&matlist_02F37A50[9],
-	//Gamma Material Fixes
+	//Part of Gamma's laser scope
 	materials_0020B9B8[0],
 	materials_0020B9B8[1],
 	materials_0020B9B8[2],
@@ -2417,7 +2427,7 @@ NJS_MATERIAL* Specular0[] = {
 };
 
 NJS_MATERIAL* Specular1[] = {
-	//Gamma Material Fixes
+	//Gamma's Jet Booster and Laser Scope
 	materials_0020ABF0[0],
 	materials_0020ABF0[1],
 	materials_0020ABF0[2],
@@ -2461,32 +2471,6 @@ NJS_MATERIAL* Specular1[] = {
 	//Tornado 2 Changed (Event)
 	&material_8D4714ACE7FAE0BE986[0],
 	&material_8D4714ACE7FAE0BE986[1],
-
-	//Tails' plane when Sonic sees him crash (Event)
-	((NJS_MATERIAL*)0x03176DC0),
-	((NJS_MATERIAL*)0x03176DD4),
-	((NJS_MATERIAL*)0x03176DE8),
-	((NJS_MATERIAL*)0x03176DFC),
-	((NJS_MATERIAL*)0x03176E10),
-	((NJS_MATERIAL*)0x03176E24),
-	((NJS_MATERIAL*)0x03176E38),
-	((NJS_MATERIAL*)0x03176E4C),
-	((NJS_MATERIAL*)0x03176E60),
-	((NJS_MATERIAL*)0x03176E74),
-	((NJS_MATERIAL*)0x03176E88),
-	((NJS_MATERIAL*)0x03176E9C),
-	((NJS_MATERIAL*)0x03176EB0),
-	((NJS_MATERIAL*)0x03176EC4),
-	((NJS_MATERIAL*)0x03176ED8),
-	((NJS_MATERIAL*)0x03176EEC),
-	((NJS_MATERIAL*)0x03176F00),
-	((NJS_MATERIAL*)0x03176F14),
-	((NJS_MATERIAL*)0x0317661C),
-	((NJS_MATERIAL*)0x03176630),
-	((NJS_MATERIAL*)0x03175E90),
-	((NJS_MATERIAL*)0x03175EA4),
-	((NJS_MATERIAL*)0x03175EB8),
-	((NJS_MATERIAL*)0x03175ECC),
 };
 
 NJS_MATERIAL* Specular2[] = {
@@ -2991,6 +2975,33 @@ NJS_MATERIAL* Specular3[] = {
 	//Tornado 2 Change
 	&material_8D4714ACE7FAE0BE986[0],
 	&material_8D4714ACE7FAE0BE986[1],
+
+	//EV Eggmobile 0
+	&matlist_0006D138[0],
+	&matlist_0006D138[1],
+	&matlist_0006D138[2],
+	&matlist_0006D138[3],
+	&matlist_0006D138[4],
+	&matlist_0006D138[5],
+	&matlist_0006D138[6],
+	&matlist_0006D138[7],
+	&matlist_0006D138[8],
+	&matlist_0006D138[9],
+	&matlist_0006D138[10],
+	&matlist_0006D138[11],
+	&matlist_0006D138[12],
+	&matlist_0006D138[13],
+	&matlist_0006D138[14],
+	&matlist_0006D138[15],
+	&matlist_0006D138[16],
+	&matlist_0006D138[17],
+	&matlist_0006D138[18],
+	&matlist_0006D138[19],
+	&matlist_0006D138[20],
+	&matlist_0006D138[21],
+	&matlist_0006D138[22],
+	&matlist_0006D138[23],
+	&matlist_0006D138[24],
 };
 
 NJS_MATERIAL* TailsBody[] = {
@@ -3268,18 +3279,48 @@ bool ForceDiffuse2Specular2(NJS_MATERIAL* material, Uint32 flags)
 {
 	set_diffuse(2, false);
 	set_specular(2, false);
-	use_default_diffuse(true);
 	return true;
 }
 
 bool ForceDiffuse2Specular3(NJS_MATERIAL* material, Uint32 flags)
 {
 	set_diffuse(2, false);
 	set_specular(3, false);
-	use_default_diffuse(true);
 	return true;
 }
 
+void RemoveMaterialColors(NJS_OBJECT *obj)
+{
+	if (obj->basicdxmodel)
+	{
+		for (int q = 0; q < obj->basicdxmodel->nbMat; ++q)
+		{
+			obj->basicdxmodel->mats[q].diffuse.argb.r = 0xFF;
+			obj->basicdxmodel->mats[q].diffuse.argb.g = 0xFF;
+			obj->basicdxmodel->mats[q].diffuse.argb.b = 0xFF;
+		}
+	}
+	if (obj->child) RemoveMaterialColors(obj->child);
+	if (obj->sibling) RemoveMaterialColors(obj->sibling);
+}
+
+void ForceDiffuse2Specular2_Object(NJS_OBJECT *obj)
+{
+	if (obj->basicdxmodel)
+	{
+		for (int q = 0; q < obj->basicdxmodel->nbMat; ++q)
+		{
+			if (!(obj->basicdxmodel->mats[q].attrflags & NJD_FLAG_IGNORE_LIGHT))
+			{
+				TemporaryMaterialArray[0] = &obj->basicdxmodel->mats[q];
+				material_register(TemporaryMaterialArray, 1, ForceDiffuse2Specular2);
+			}
+		}
+	}
+	if (obj->child) ForceDiffuse2Specular2_Object(obj->child);
+	if (obj->sibling) ForceDiffuse2Specular2_Object(obj->sibling);
+}
+
 //Character Init Functions
 void Init_Sonic()
 {
@@ -3469,7 +3510,7 @@ void Init_Sonic()
 	SONIC_ACTIONS[139]->object = &object_0062DE88;
 	SONIC_ACTIONS[140]->object = &object_0062DE88;
 	SONIC_ACTIONS[141]->object = &object_0062DE88;
-	SONIC_ACTIONS[142]->object = &object_0062FE6C;
+	SONIC_ACTIONS[142]->object = &object_0062FE6C; //Super Sonic jumpball
 	SONIC_ACTIONS[143]->object = &object_0062DE88;
 	SONIC_ACTIONS[144]->object = &object_0062DE88;
 	SONIC_ACTIONS[145]->object = &object_0056AF50;
@@ -3699,19 +3740,12 @@ void Init_Miles()
 	WriteJump((void*)0x007C6D80, InitTailsWeldInfo_mod);
 	WriteJump((void*)0x007C7560, InitNPCTailsWeldInfo_mod);
 	//Material fixes for the cutscene where Sonic sees Tails crash
-	((NJS_MATERIAL*)0x03171BD0)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171BE4)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171BF8)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C0C)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C20)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C34)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C48)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C5C)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171C70)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x03171A48)->diffuse.color = 0xFFB2B2B2;
-	((NJS_MATERIAL*)0x031718C4)->diffuse.color = 0xFFB2B2B2;
-	((NJS_OBJECT*)0x317178C)->basicdxmodel->mats[1].attrflags &= ~NJD_FLAG_USE_ALPHA;
-	((NJS_OBJECT*)0x31708E4)->basicdxmodel->mats[1].attrflags &= ~NJD_FLAG_USE_ALPHA;
+	RemoveMaterialColors((NJS_OBJECT*)0x3175528); //Tails' model
+	((NJS_OBJECT*)0x317178C)->basicdxmodel->mats[1].attrflags &= ~NJD_FLAG_USE_ALPHA; //Unnecessary alpha in Tails' arm
+	((NJS_OBJECT*)0x31708E4)->basicdxmodel->mats[1].attrflags &= ~NJD_FLAG_USE_ALPHA; //Unnecessary alpha in Tails' arm
+	((NJS_OBJECT*)0x31793C0)->basicdxmodel->mats[3].attrflags &= ~NJD_FLAG_IGNORE_SPECULAR; //Plane
+	((NJS_OBJECT*)0x31793C0)->basicdxmodel->mats[5].attrflags &= ~NJD_FLAG_IGNORE_SPECULAR; //Plane
+	((NJS_OBJECT*)0x31793C0)->basicdxmodel->mats[9].attrflags &= ~NJD_FLAG_IGNORE_SPECULAR; //Plane
 	//Tails Upgrades
 	WriteData((NJS_OBJECT**)0x03342074, &EV_TailsProtoPlane);
 	WriteData((NJS_OBJECT**)0x03344EAC, &EV_TailsProtoPlane);
@@ -4255,6 +4289,7 @@ void Init_Metal()
 	SONIC_OBJECTS[69] = &object_0059C234;
 	SONIC_OBJECTS[70] = &object_0059E254;
 	WriteJump((void*)0x007D18F0, InitMetalSonicWeldInfo);
+	WriteCall((void*)0x491701, PlaySonicIdleVoice_r);
 }
 
 extern "C"
@@ -4269,17 +4304,6 @@ extern "C"
 		HMODULE adv02dll = GetModuleHandle(L"ADV02MODELS");
 		HMODULE adv03dll = GetModuleHandle(L"ADV03MODELS");
 
-		//Lantern API Export
-		HMODULE Lantern = GetModuleHandle(L"sadx-dc-lighting");
-		if (Lantern != nullptr)
-		{
-			material_register(Specular0, LengthOfArray(Specular0), &ForceDiffuse0Specular0);
-			material_register(Specular1, LengthOfArray(Specular1), &ForceDiffuse0Specular1);
-			material_register(Specular2, LengthOfArray(Specular2), &ForceDiffuse2Specular2);
-			material_register(Specular3, LengthOfArray(Specular3), &ForceDiffuse2Specular3);
-			material_register(TailsBody, LengthOfArray(TailsBody), &ForceDiffuse0Specular0_Tails);
-			material_register(TailsShoes, LengthOfArray(TailsShoes), &ForceDiffuse0Specular1_Tails);
-		}
 
 		//Ini Configuration
 		const IniFile *config = new IniFile(std::string(path) + "\\config.ini");
@@ -4488,6 +4512,31 @@ extern "C"
 			ReplacePVM("EV_TR1_WITH_SONIC", "EV_TR1_WITH_SONIC_DC");
 			ReplacePVM("EV_TR2BEFORE_WITH_SONIC", "EV_TR2BEFORE_WITH_SONIC_DC");
 			ReplacePVM("EV_TR2CHANGE_WITH_SONIC", "EV_TR2CHANGE_WITH_SONIC_DC");
+
+			//Lantern API Export
+			HMODULE Lantern = GetModuleHandle(L"sadx-dc-lighting");
+			if (Lantern != nullptr)
+			{
+				material_register(Specular0, LengthOfArray(Specular0), &ForceDiffuse0Specular0);
+				material_register(Specular1, LengthOfArray(Specular1), &ForceDiffuse0Specular1);
+				material_register(Specular2, LengthOfArray(Specular2), &ForceDiffuse2Specular2);
+				material_register(Specular3, LengthOfArray(Specular3), &ForceDiffuse2Specular3);
+				material_register(TailsBody, LengthOfArray(TailsBody), &ForceDiffuse0Specular0_Tails);
+				material_register(TailsShoes, LengthOfArray(TailsShoes), &ForceDiffuse0Specular1_Tails);
+				if (EnableSonic)
+				{
+					ForceDiffuse2Specular2_Object(&object_0062FE6C); //Super Sonic jumpball
+					if (EnableExtras)
+					{
+						ForceDiffuse2Specular2_Object(&object_LShoeSpin); //Sonic jumpball with LS shoes
+						ForceDiffuse2Specular2_Object(&object_SShoeHeelL); //Super Sonic Left Heel
+						ForceDiffuse2Specular2_Object(&object_SShoeToeL); //Super Sonic Left Toe
+						ForceDiffuse2Specular2_Object(&object_SShoeHeelR); //Super Sonic Right Heel
+						ForceDiffuse2Specular2_Object(&object_SShoeToeR); //Super Sonic Right Toe
+						ForceDiffuse2Specular2_Object(&object_SSCrystalRing); //Super Sonic arm with Crystal Ring
+					}
+				}
+			}
 		}
 	}