From 62f3d09076c117685b73c2f0bec18f6b7aa5b9ad Mon Sep 17 00:00:00 2001
From: madeline <qwertytrogi@gmail.com>
Date: Mon, 20 Apr 2026 20:22:06 -0700
Subject: [PATCH] fix incorrect eldin field name on map

---
 include/d/d_menu_fmap.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h
index 026e98e056..48db37fef3 100644
--- a/include/d/d_menu_fmap.h
+++ b/include/d/d_menu_fmap.h
@@ -75,7 +75,9 @@ public:
         /* 0x8 */ BE(u16) mAreaName;
         /* 0xA */ u8 mCount;
 #ifdef _MSVC_LANG
-        u8* __get_mRoomNos() const { return (u8*)(this + 1); }
+        // Room numbers start at offset 0xB (right after mCount), NOT at sizeof(data)=12.
+        // (u8*)(this+1) would give offset 12 because MSVC sizeof=12; use &mCount+1 instead.
+        u8* __get_mRoomNos() const { return (u8*)&mCount + 1; }
         __declspec(property(get = __get_mRoomNos)) u8* mRoomNos;
 #else
         /* 0xB */ u8 mRoomNos[0];