diff --git a/mods/randomizer/src/messages.cpp b/mods/randomizer/src/messages.cpp index 2b635e3c2b..5907a026cc 100644 --- a/mods/randomizer/src/messages.cpp +++ b/mods/randomizer/src/messages.cpp @@ -14,17 +14,17 @@ static JMSMesgEntry_c defaultJMSMesgEntry{ .string_offset = 0, .message_id = 0, .event_label_id = 0, - .se_speaker = 0x24, - .fuki_kind = 0x00, - .output_type = 0x00, - .fuki_pos_type = 0x00, - .unk_0xc = 0xFF, - .unk_0xd = 0x00, - .se_mood = 0x00, - .camera_id = 0x00, - .base_anm_id = 0x02, - .face_anm_id = 0x03, - .unk_0x12 = 0x0400, + .speaker = 0x24, + .box_kind = 0x00, + .draw_type = 0x00, + .box_position = 0x00, + .item_no = 0xFF, + .line_alignment = 0x00, + .speaker_mood = 0x00, + .camera_attr = 0x00, + .talk_anim = 0x02, + .face_anim = 0x03, + .lines_per_page = 0x04, }; // Format certain messages that need to have dynamic info in them diff --git a/mods/randomizer/src/randomizer_context.cpp b/mods/randomizer/src/randomizer_context.cpp index 2b3df256be..5b236ba1c7 100644 --- a/mods/randomizer/src/randomizer_context.cpp +++ b/mods/randomizer/src/randomizer_context.cpp @@ -1569,16 +1569,16 @@ RandomizerContext WriteSeedData(randomizer::logic::world::World* world) { if (type == "branch") { auto branch = reinterpret_cast(&value); branch->type = 2; - branch->field_0x1 = flowNode["num results"].as(); + branch->result_count = flowNode["num results"].as(); branch->query_idx = flowNode["query"].as(); branch->param = flowNode["parameters"].as(); branch->next_node_idx = flowNode["next node index"].as(); // If we're using custom result indices if (flowNode["results"]) { auto& results = flowNode["results"]; - if (results.size() != branch->field_0x1) { + if (results.size() != branch->result_count) { throw std::runtime_error(fmt::format("Flow results size for {} " - "do not match num results. (expected: {}. size: {})", name, branch->field_0x1, results.size())); + "do not match num results. (expected: {}. size: {})", name, branch->result_count, results.size())); } for (const auto& resultNode : results) { auto resultIndex = handleCustomFlowID(resultNode.as());