Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix alternate scene header handling #69

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Fix alternate scene header handling #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions mm/2s2h/z_scene_2SH.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ void Scene_CommandEntranceList(PlayState* play, LUS::ISceneCommand* cmd) {
}

void Scene_CommandSpecialFiles(PlayState* play, LUS::ISceneCommand* cmd) {
printf("Un-implemented command %02X\n", cmd->cmdId);
LUS::SetSpecialObjects* specialObjList = (LUS::SetSpecialObjects*)cmd;
// static RomFile naviQuestHintFiles[2] = {
// { SEGMENT_ROM_START(elf_message_field), SEGMENT_ROM_END(elf_message_field) },
Expand Down Expand Up @@ -350,6 +349,7 @@ void Scene_CommandCutsceneScriptList(PlayState* play, LUS::ISceneCommand* cmd) {

}

static bool shouldEndSceneCommands = false;
void Scene_CommandAltHeaderList(PlayState* play, LUS::ISceneCommand* cmd) {
LUS::SetAlternateHeaders* headers = (LUS::SetAlternateHeaders*)cmd;

Expand All @@ -359,7 +359,10 @@ void Scene_CommandAltHeaderList(PlayState* play, LUS::ISceneCommand* cmd) {

if (desiredHeader != nullptr) {
OTRScene_ExecuteCommands(play, desiredHeader);
// z_scene does (cmd + 1)->base.code = 0x14;
// 2S2H [Port] The original source would grab the next command after the alternate header list
// and change the command id to SCENE_CMD_ID_END. We can't modify LUS resources, so we'll just
// set a flag to end the scene commands
shouldEndSceneCommands = true;
}
}
}
Expand Down Expand Up @@ -455,27 +458,27 @@ void (*sSceneCmdHandlersOTR[SCENE_CMD_MAX])(PlayState*, LUS::ISceneCommand*) = {
};

s32 OTRScene_ExecuteCommands(PlayState* play, LUS::Scene* scene) {
LUS::SceneCommandID cmdCode;
LUS::SceneCommandID cmdId;
shouldEndSceneCommands = false;

for (int i = 0; i < scene->commands.size(); i++) {
auto sceneCmd = scene->commands[i];
cmdId = sceneCmd->cmdId;

if (sceneCmd == nullptr) // UH OH
continue;

cmdCode = sceneCmd->cmdId;
// osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1, sceneCmd->base.data2);
//SPDLOG_TRACE("CMD {:X}", cmdCode);
if ((int)cmdCode == SCENE_CMD_ID_END) {
// 2S2H [Port] This opcode is not in the original game. Its a special command for OTRs, for supporting multiple games
if (cmdId == LUS::SceneCommandID::SetCutscenesMM) {
cmdId = LUS::SceneCommandID::SetCutscenes;
}

// 2S2H [Port] shouldEndSceneCommands is set when an alternate header list is found
if (cmdId == LUS::SceneCommandID::EndMarker || shouldEndSceneCommands) {
shouldEndSceneCommands = false;
break;
} else if (cmdCode == LUS::SceneCommandID::SetCutscenesMM)
cmdCode = LUS::SceneCommandID::SetCutscenes;

//if ((int)cmdCode <= 0x19)
sSceneCmdHandlersOTR[(int)cmdCode](play, sceneCmd.get());

}

// sceneCmd++;
if (cmdId < LUS::SceneCommandID::SetCutscenesMM) {
sSceneCmdHandlersOTR[(int)cmdId](play, sceneCmd.get());
}
}
return 0;
}
Expand Down