Skip to content

Commit

Permalink
Fix missing rfist and write float hex directly
Browse files Browse the repository at this point in the history
  • Loading branch information
cjohnson57 committed Feb 22, 2022
1 parent 6d69ba9 commit 96999a3
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions Models.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ def WriteModelData16(self, data):
self.rom.write_bytes(self.GetAddress(), data.to_bytes(2, 'big'))
self.offset += 2

def WriteModelDataFloat(self, data):
bytes = bytearray(struct.pack("f", data))
self.rom.write_bytes(self.GetAddress(), bytes)
self.offset += 4

def WriteModelDataHi(self, data):
bytes = data.to_bytes(4, 'big')
for i in range(2):
Expand All @@ -85,6 +80,7 @@ def patch_model(rom, settings, log):
writer.GoTo(0xE6718)
writer.SetAdvance(8)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_RFIST)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_RFIST)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_SHIELD_HYLIAN)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_SHIELD_HYLIAN)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_RFIST_SHIELD_HYLIAN)
Expand Down Expand Up @@ -172,8 +168,8 @@ def patch_model(rom, settings, log):
writer.GoTo(0xE6B64)
writer.SetAdvance(4)
writer.WriteModelData(Offsets.ADULT_LINK_LUT_DL_BOW_STRING)
writer.WriteModelDataFloat(0.0)
writer.WriteModelDataFloat(-360.4)
writer.WriteModelData(0x00000000)
writer.WriteModelData(0xC3B43333) # -360.4

writer.GoTo(0x69112)
writer.WriteModelDataHi(Offsets.ADULT_LINK_LUT_DL_UPGRADE_LFOREARM)
Expand Down Expand Up @@ -315,8 +311,8 @@ def patch_model(rom, settings, log):
writer.GoTo(0xE6B74)
writer.SetAdvance(4)
writer.WriteModelData(Offsets.CHILD_LINK_LUT_DL_SLINGSHOT_STRING)
writer.WriteModelData(0x44178000)
writer.WriteModelData(0x436C0000)
writer.WriteModelData(0x44178000) # 606.0
writer.WriteModelData(0x436C0000) # 236.0

writer.GoTo(0x6922E)
writer.WriteModelDataHi(Offsets.CHILD_LINK_LUT_DL_GORON_BRACELET)
Expand Down

0 comments on commit 96999a3

Please sign in to comment.