bump lus + resolve lus conflicts (#2598)

15 files changed, 6 insertions, 6 deletions

diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp
index 4bc5cd5..4ac8586 100644
--- a/OTRExporter/DisplayListExporter.cpp
+++ b/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);
diff --git a/OTRExporter/Main.cpp b/OTRExporter/Main.cpp
index 47a1752..3bc9da0 100644
--- a/OTRExporter/Main.cpp
+++ b/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());
 		}
 	}
 }
diff --git a/assets/ship_of_harkinian/fonts/Fipps-Regular.otf b/assets/fonts/Fipps-Regular.otf
index 9334dad..9334dad 100644
--- a/assets/ship_of_harkinian/fonts/Fipps-Regular.otf
+++ b/assets/fonts/Fipps-Regular.otf
diff --git a/assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf b/assets/fonts/PressStart2P-Regular.ttf
index 2442aff..2442aff 100644
--- a/assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf
+++ b/assets/fonts/PressStart2P-Regular.ttf
diff --git a/assets/ship_of_harkinian/buttons/ABtn.png b/assets/textures/buttons/ABtn.png
index c1b0657..c1b0657 100644
--- a/assets/ship_of_harkinian/buttons/ABtn.png
+++ b/assets/textures/buttons/ABtn.png
diff --git a/assets/ship_of_harkinian/buttons/BBtn.png b/assets/textures/buttons/BBtn.png
index 99b1197..99b1197 100644
--- a/assets/ship_of_harkinian/buttons/BBtn.png
+++ b/assets/textures/buttons/BBtn.png
diff --git a/assets/ship_of_harkinian/buttons/CDown.png b/assets/textures/buttons/CDown.png
index 741188e..741188e 100644
--- a/assets/ship_of_harkinian/buttons/CDown.png
+++ b/assets/textures/buttons/CDown.png
diff --git a/assets/ship_of_harkinian/buttons/CLeft.png b/assets/textures/buttons/CLeft.png
index 5e26a20..5e26a20 100644
--- a/assets/ship_of_harkinian/buttons/CLeft.png
+++ b/assets/textures/buttons/CLeft.png
diff --git a/assets/ship_of_harkinian/buttons/CRight.png b/assets/textures/buttons/CRight.png
index 9e61806..9e61806 100644
--- a/assets/ship_of_harkinian/buttons/CRight.png
+++ b/assets/textures/buttons/CRight.png
diff --git a/assets/ship_of_harkinian/buttons/CUp.png b/assets/textures/buttons/CUp.png
index 6c0e29d..6c0e29d 100644
--- a/assets/ship_of_harkinian/buttons/CUp.png
+++ b/assets/textures/buttons/CUp.png
diff --git a/assets/ship_of_harkinian/buttons/LBtn.png b/assets/textures/buttons/LBtn.png
index 2e0a8f0..2e0a8f0 100644
--- a/assets/ship_of_harkinian/buttons/LBtn.png
+++ b/assets/textures/buttons/LBtn.png
diff --git a/assets/ship_of_harkinian/buttons/RBtn.png b/assets/textures/buttons/RBtn.png
index c255643..c255643 100644
--- a/assets/ship_of_harkinian/buttons/RBtn.png
+++ b/assets/textures/buttons/RBtn.png
diff --git a/assets/ship_of_harkinian/buttons/StartBtn.png b/assets/textures/buttons/StartBtn.png
index c3e08dc..c3e08dc 100644
--- a/assets/ship_of_harkinian/buttons/StartBtn.png
+++ b/assets/textures/buttons/StartBtn.png
diff --git a/assets/ship_of_harkinian/buttons/ZBtn.png b/assets/textures/buttons/ZBtn.png
index def8d9a..def8d9a 100644
--- a/assets/ship_of_harkinian/buttons/ZBtn.png
+++ b/assets/textures/buttons/ZBtn.png
diff --git a/assets/ship_of_harkinian/icons/gSohIcon.png b/assets/textures/icons/gSohIcon.png
index 614de2b..614de2b 100644
--- a/assets/ship_of_harkinian/icons/gSohIcon.png
+++ b/assets/textures/icons/gSohIcon.png