From 3d06c6607c628eb87af9affd3d3bfc3a752ef349 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Wed, 22 Jul 2026 04:17:07 -0700
Subject: [PATCH] account for custom flow indices in getInitNodeIndex

---
 src/d/d_msg_flow.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp
index cdfa7a9e2f..bf4a7fdc4d 100644
--- a/src/d/d_msg_flow.cpp
+++ b/src/d/d_msg_flow.cpp
@@ -407,6 +407,12 @@ u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) {
 }
 
 u16 dMsgFlow_c::getInitNodeIndex(u16 param_1) {
+#if TARGET_PC
+    // If we have a custom flow index, just return it directly
+    if (param_1 >= BASE_CUSTOM_MSG_AND_FLOW_ID) {
+        return param_1;
+    }
+#endif
     u8* var_r30 = NULL;
     u16 var_r27 = -1;