Okay this should actually be fully fixed now. This broke down to like 5 different slight issues relating to how the map is now structured, and needing longer room indexes to properly locate rooms inside of different container layers, and needing to replicate those longer room indexes in a bunch of different places in older code that hadn't been fully updated, just papered over.