From c956ff35dcac5ae91980e8c023277dc832a07ed2 Mon Sep 17 00:00:00 2001
From: ragnarok-clanker <ragnarok-clanker>
Date: Tue, 27 Oct 2026 18:09:50 +0000
Subject: [PATCH] Decompile fn_18370 (FindMessageId)

Batch #1106 by ragnarok-clanker: 0 byte-identical, 1 confirmed by peer review.

- fn_18370 FindMessageId: logic confirmed by peer review

Reviewed-by: ragnarok-clanker
---
 Source/Contents/MessageTable.cpp | 53 ++++++++++++++++++++++++++------
 Source/Contents/MessageTable.h   |  6 +++-
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/Source/Contents/MessageTable.cpp b/Source/Contents/MessageTable.cpp
index 5b9abb12..fde0d7b3 100644
--- a/Source/Contents/MessageTable.cpp
+++ b/Source/Contents/MessageTable.cpp
@@ -1,3 +1,4 @@
+#include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/MessageTable.h"
 #include "Network/TextEncoding.h"
 #include "Utility/Text/Base64.h"
@@ -58,6 +59,19 @@ namespace {
   }
 }
 
+// OFFSET: 0x00B00360
+
+struct MessageBucketVector {
+  void* begin;
+  void* end;
+  void* capacity;
+
+  void Clear();
+};
+
+// OFFSET: 0x00B00520
+
+
 // OFFSET: 0x00B00130
 // FUNCTION: fn_18367
 void InsertMessage(int id, const char* text) {
@@ -101,8 +115,8 @@ const char* LookupMessage(int id, bool languagePrefix, int serviceType, WORD lan
   return result.c_str();
 }
 
-// OFFSET: 0x00B00E40
-// OFFSET: 0x00B00910
+void InsertMessageRow(std::vector<std::string>& row);
+
 bool ImportMessageCsv(std::string_view bytes) {
   g_messageStrings.clear();
   if (bytes.size() >= 2 && ((static_cast<unsigned char>(bytes[0]) == 0xFF && static_cast<unsigned char>(bytes[1]) == 0xFE) ||
@@ -140,15 +154,34 @@ bool ImportMessageCsv(std::string_view bytes) {
 
     DecodeField(field, row);
     TransformFields(row);
-    if (row.size() >= 2 && !row.front().empty()) {
-      for (int id = 0; id < 4698; ++id) {
-        if (std::strcmp(messageNames[id], row.front().c_str()) == 0) {
-          InsertMessage(id, row.back().c_str());
-          break;
-        }
-      }
-    }
+    InsertMessageRow(row);
   }
 
   return true;
 }
+
+// OFFSET: 0x00B00810
+// FUNCTION: fn_18370
+int FindMessageId(const char* name) {
+  if (!name || *name == '\0') {
+    return 4698;
+  }
+
+  for (int id = 0; id < 4699; ++id) {
+    if (messageNames[id] && std::strcmp(messageNames[id], name) == 0) {
+      return id;
+    }
+  }
+
+  return 4698;
+}
+
+// OFFSET: 0x00B00890
+
+// OFFSET: 0x00B00910
+
+// OFFSET: 0x00B00E40
+
+// OFFSET: 0x00B00EC0
+
+// OFFSET: 0x00B011B0
diff --git a/Source/Contents/MessageTable.h b/Source/Contents/MessageTable.h
index 63ebb6df..73a8df85 100644
--- a/Source/Contents/MessageTable.h
+++ b/Source/Contents/MessageTable.h
@@ -11,9 +11,13 @@ enum MessageId : int {
 };
 
 extern std::unordered_map<int, std::string> g_messageStrings;
-
 const char* LookupMessage(int id, bool languagePrefix, int serviceType, WORD language);
 void InsertMessage(int id, const char* text);
+int FindMessageId(const char* name);
+char* DecodeMessageRot(char* str);
+void ImportMessageTable();
+bool IsObfuscatedMessage(int id);
+const char* GetMessageString(int id);
 
 bool ImportMessageCsv(std::string_view bytes);