correctly order jump table entry blocks for games with multiple jump table-entered instructions

Author: super-continent

src/rebuilder.rs

@@ -37,7 +37,7 @@ fn assemble_script<B: ByteOrder>(
     let mut previous_jump_entries = std::collections::HashSet::new();
 
     let mut jump_entry_counts = HashMap::<u32, u32>::new();
-    let mut jump_table_buffer: Vec<u8> = Vec::new();
+    let mut jump_table_buffers: HashMap<u32, Vec<u8>> = HashMap::new();
 
     for instruction in program {
         log::debug!("finding info for {}", instruction.name);
@@ -89,8 +89,16 @@ fn assemble_script<B: ByteOrder>(
                 // this check deduplicates jump table entries
                 // TODO: make game-specific config option, seems to be needed
                 if previous_jump_entries.insert(name.0.clone()) {
-                    jump_table_buffer.write_all(&name.to_vec()).unwrap();
-                    jump_table_buffer.write_u32::<B>(offset).unwrap();
+                    jump_table_buffers
+                        .entry(instruction_info.id())
+                        .or_insert(Vec::new())
+                        .write_all(&name.to_vec())
+                        .unwrap();
+                    jump_table_buffers
+                        .entry(instruction_info.id())
+                        .or_insert(Vec::new())
+                        .write_u32::<B>(offset)
+                        .unwrap();
                     jump_entry_counts
                         .entry(instruction_info.id())
                         .or_insert(0)
@@ -169,7 +177,11 @@ fn assemble_script<B: ByteOrder>(
         result.write_u32::<B>(*count).unwrap();
     }
 
-    result.append(&mut jump_table_buffer);
+    for id in &db.jump_table_ids {
+        if let Some(buffer) = jump_table_buffers.get_mut(id) {
+            result.append(buffer);
+        }
+    }
     result.append(&mut script_buffer);
 
     let result = result;