bump lus + resolve lus conflicts (#2598)

OTRExporter/OTRExporter/DisplayListExporter.cpp

@@ -76,7 +76,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		F3DZEXOpcode opF3D = (F3DZEXOpcode)opcode;
 
 		if ((int)opF3D == G_DL)// || (int)opF3D == G_BRANCH_Z)
-			opcode = (uint8_t)G_DL_OTR;
+			opcode = (uint8_t)G_DL_OTR_HASH;
 
 		if ((int)opF3D == G_MTX)
 			opcode = (uint8_t)G_MTX_OTR;
@@ -85,10 +85,10 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			opcode = (uint8_t)G_BRANCH_Z_OTR;
 
 		if ((int)opF3D == G_VTX)
-			opcode = (uint8_t)G_VTX_OTR;
+			opcode = (uint8_t)G_VTX_OTR_HASH;
 
 		if ((int)opF3D == G_SETTIMG)
-			opcode = (uint8_t)G_SETTIMG_OTR;
+			opcode = (uint8_t)G_SETTIMG_OTR_HASH;
 
 		word0 += (opcode << 24);
 
@@ -686,7 +686,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 				Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, __)};
 				word0 = value.words.w0 & 0x00FFFFFF;
-				word0 += (G_SETTIMG_OTR << 24);
+				word0 += (G_SETTIMG_OTR_HASH << 24);
 				//word1 = value.words.w1;
 				word1 = 0;
 
@@ -754,7 +754,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 					word0 = value.words.w0;
 					word0 &= 0x00FFFFFF;
-					word0 += (G_VTX_OTR << 24);
+					word0 += (G_VTX_OTR_HASH << 24);
 					word1 = value.words.w1;
 
 					writer->Write(word0);

OTRExporter/OTRExporter/Main.cpp

@@ -154,7 +154,7 @@ static void ExporterProgramEnd()
 
 			auto fileData = File::ReadAllBytes(item);
 			printf("otrArchive->AddFile(%s)\n", StringHelper::Split(item, "Extract/")[1].c_str());
-			otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size());
+			otrArchive->AddFile(StringHelper::Split(item, item.find("Extract/assets/") != std::string::npos ? "Extract/assets/" : "Extract/")[1], (uintptr_t)fileData.data(), fileData.size());
 		}
 	}
 }