Merge pull request #264 from sauraen/f3dTypeHotfix

Hotfix for Bloxifilmz
Fast-64 · Dec 1, 2023 · 424acfd · 424acfd
2 parents 81d7a43 + bfc32e4
commit 424acfd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/fast64_internal/sm64/sm64_f3d_writer.py b/fast64_internal/sm64/sm64_f3d_writer.py
@@ -524,7 +524,7 @@ def exportF3DtoInsertableBinary(filepath, transformMatrix, obj, includeChildren)
 
     data, startRAM = getBinaryBank0F3DData(fModel, 0, [0, 0xFFFFFF])
     # must happen after getBinaryBank0F3DData
-    address_ptrs = fModel.get_ptr_addresses(f3dType)
+    address_ptrs = fModel.get_ptr_addresses(get_F3D_GBI())
 
     writeInsertableFile(filepath, insertableBinaryTypes["Display List"], address_ptrs, fMesh.draw.startAddress, data)
 

diff --git a/fast64_internal/sm64/sm64_geolayout_writer.py b/fast64_internal/sm64/sm64_geolayout_writer.py
@@ -802,22 +802,22 @@ def exportGeolayoutArmatureInsertableBinary(armatureObj, obj, convertTransformMa
         armatureObj, obj, convertTransformMatrix, camera, armatureObj.name, DLFormat.Static, True
     )
 
-    saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath, f3dType)
+    saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath)
 
 
 def exportGeolayoutObjectInsertableBinary(obj, convertTransformMatrix, filepath, camera):
     geolayoutGraph, fModel = convertObjectToGeolayout(
         obj, convertTransformMatrix, camera, obj.name, None, None, DLFormat.Static, True
     )
 
-    saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath, f3dType)
+    saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath)
 
 
-def saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath, f3d):
+def saveGeolayoutInsertableBinary(geolayoutGraph, fModel, filepath):
     data, startRAM = getBinaryBank0GeolayoutData(fModel, geolayoutGraph, 0, [0, 0xFFFFFF])
 
     address_ptrs = geolayoutGraph.get_ptr_addresses()
-    address_ptrs.extend(fModel.get_ptr_addresses(f3d))
+    address_ptrs.extend(fModel.get_ptr_addresses(get_F3D_GBI()))
 
     writeInsertableFile(
         filepath, insertableBinaryTypes["Geolayout"], address_ptrs, geolayoutGraph.startGeolayout.startAddress, data