Update auto-trap-detection for latest restruct branch
Fix several issues with recent enemy memory