summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiritoDev <36680385+KiritoDv@users.noreply.github.com>2022-02-26 12:46:44 -0600
committerM4xw <m4x@m4xw.net>2022-03-22 02:37:42 +0100
commit06bd295edecc281d701a4a41d6d258e90ef98e8a (patch)
tree7a372924dc3acb0d54b36856361b7fbfabc07898
parent47fc3a2e95cad22551c6a3a89b7a6aa077834c17 (diff)
Merge branch 'master' into master
-rw-r--r--OTRExporter/CutsceneExporter.cpp28
1 files changed, 2 insertions, 26 deletions
diff --git a/OTRExporter/CutsceneExporter.cpp b/OTRExporter/CutsceneExporter.cpp
index c0a5b06..c35a0a2 100644
--- a/OTRExporter/CutsceneExporter.cpp
+++ b/OTRExporter/CutsceneExporter.cpp
@@ -173,7 +173,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
writer->Write(CMD_W(e->unused11));
}
}
- break;
+ break;
case (uint32_t)CutsceneCommands::Textbox:
{
writer->Write(CS_CMD_TEXTBOX);
@@ -414,36 +414,12 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->endFrame, ((CutsceneCommandTerminator*)cs->commands[i])->endFrame));
break;
}
- //case 0x0D:
- //case 0x6D:
- //case 0x47:
- //case 0x16:
- //case 0x70:
- //case 0x71:
- //case 0x1C:
- //case 0x21:
- //case 0x3D:
- //case 0x20:
- //case 0x3B:
- //case 0x1B:
- //{
- // writer->Write((uint32_t)(CutsceneCommands)cs->commands[i]->commandID);
- // writer->Write((uint32_t)1);
- //
- // for (int i = 0; i < 12; i++)
- // writer->Write((uint32_t)0);
-
- // //writer->Write((uint32_t)0);
- // //writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->base, ((CutsceneCommandTerminator*)cs->commands[i])->startFrame));
- // //writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->endFrame, ((CutsceneCommandTerminator*)cs->commands[i])->endFrame));
- // break;
- //}
default:
{
//writer->Write((uint32_t)cs->commands[i]->commandID);
printf("Undefined CS Opcode: %04X\n", cs->commands[i]->commandID);
}
- break;
+ break;
}
}