izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Preset and Yaw in Macro Factory (#130)

Browse Source 
* Fix Preset and Yaw in Macro Factory

* remove leftover macro
This commit is contained in:
inspectredc
2024-06-09 22:09:36 -06:00
committed by GitHub
parent 97b2fb2291
commit dd5d75e2b9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/factories/sm64/MacroFactory.cpp
+4 -3
View File
@@ -36,7 +36,7 @@ ExportResult SM64::MacroCodeExporter::Export(std::ostream &write, std::shared_pt
}
write << object.preset << ", ";
write << object.yaw << ", ";
write << "CONVERT_YAW(" << object.yaw << "), ";
write << object.posX << ", ";
write << object.posY << ", ";
write << object.posZ;
@@ -89,8 +89,9 @@ std::optional<std::shared_ptr<IParsedData>> SM64::MacroFactory::parse(std::vecto
break;
}
int16_t yaw = ((presetYaw >> 9) * 45) / 0x10;
int16_t preset = (presetYaw - ((yaw * 0x10 / 45) << 9)) - 0x1F;
int16_t yaw = ((presetYaw >> 9) & 0x7F) << 1;
int16_t preset = (presetYaw & 0x1FF) - 0x1F;
auto posX = reader.ReadInt16();
auto posY = reader.ReadInt16();
auto posZ = reader.ReadInt16();