From fbc31c11709f9d2d0b1e2a500875a468f1109519 Mon Sep 17 00:00:00 2001 From: xxk-i Date: Tue, 12 Dec 2023 04:17:27 -0500 Subject: [PATCH] Fix cast stripping to match latest version of decomp --- fast64_internal/oot/oot_level_parser.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fast64_internal/oot/oot_level_parser.py b/fast64_internal/oot/oot_level_parser.py index 39a61a90f..3556ca29e 100644 --- a/fast64_internal/oot/oot_level_parser.py +++ b/fast64_internal/oot/oot_level_parser.py @@ -384,10 +384,9 @@ def parseRoomList( rf"\{{([\(\)\sA-Za-z0-9\_]*),([\(\)\sA-Za-z0-9\_]*)\}}\s*,", roomList, flags=re.DOTALL ): roomName = roomMatch.group(1).strip().replace("SegmentRomStart", "") - if "(u32)" in roomName: - roomName = roomName[5:].strip()[1:] # includes leading underscore - else: - roomName = roomName[1:] + + if "(uintptr_t)" in roomName: + roomName = roomName.replace("(uintptr_t)_", "") roomPath = os.path.join(sharedSceneData.scenePath, f"{roomName}.c") roomData = readFile(roomPath)