Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OoT anim import (reading s16s) #125

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions fast64_internal/oot/oot_anim.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,12 @@ def getFrameData(filepath, animData, frameDataName):
if matchResult is None:
raise PluginError("Cannot find animation frame data named " + frameDataName + " in " + filepath)
data = matchResult.group(1)
frameData = [int.from_bytes([int(value.strip()[2:4], 16), int(value.strip()[4:6], 16)],
'big', signed = True) for value in data.split(",") if value.strip() != ""]
def s16(v):
v %= 0x10000
if v >= 0x8000:
v -= 0x10000
return v
frameData = [s16(int(value.strip(), 0)) for value in data.split(",") if value.strip() != ""]

return frameData

Expand Down