Fix packing/unpacking DL online and mission moby classes

Author: chaoticgd

src/assetmgr/asset_dispatch.h

@@ -45,6 +45,7 @@ class Asset;
 #define FMT_COLLECTION_PIF8 "texlist,pif,8,1,unswizzled"
 #define FMT_COLLECTION_PIF8_4MIPS "texlist,pif,8,4,unswizzled"
 #define FMT_COLLECTION_MATLIST_PIF8 "matlist,pif,8,1,unswizzled"
+#define FMT_COLLECTION_MATLIST_PIF8_4MIPS "matlist,pif,8,4,unswizzled"
 #define FMT_COLLECTION_SUBTITLES "subtitles"
 #define FMT_COLLECTION_MISSION_CLASSES "missionclasses"
 #define FMT_GLOBALWAD_NOMPEGS "nompegs"

src/wrenchbuild/common/collection_asset.cpp

@@ -83,7 +83,7 @@ static void pack_collection_asset(OutputStream& dest, const CollectionAsset& src
 static void unpack_texture_list(CollectionAsset& dest, InputStream& src, BuildConfig config, const char* hint)
 {
 	s32 count = src.read<s32>(0);
-	verify(count < 0x1000, "texlist has too many elements and is probably corrupted.");
+	verify(count < 0x1000, "matlist has too many elements and is probably corrupted.");
 	src.seek(4);
 	std::vector<s32> offsets = src.read_multiple<s32>(count);
 	for (s32 i = 0; i < count; i++) {
@@ -204,7 +204,7 @@ static void unpack_mission_classes(CollectionAsset& dest, InputStream& src, Buil
 			}
 
 			ByteRange textures_range{entry.texture_list_offset, end - entry.texture_list_offset};
-			unpack_asset(materials, src, textures_range, config, FMT_COLLECTION_PIF8_4MIPS);
+			unpack_asset(materials, src, textures_range, config, FMT_COLLECTION_MATLIST_PIF8_4MIPS);
 		}
 
 		if (entry.class_offset != 0) {
@@ -253,7 +253,7 @@ static void pack_mission_classes(OutputStream& dest, const CollectionAsset& src,
 				});
 
 				if (material_count > 0) {
-					entry.texture_list_offset = pack_asset<ByteRange>(dest, moby.get_materials(), config, 0x10, FMT_COLLECTION_PIF8_4MIPS).offset;
+					entry.texture_list_offset = pack_asset<ByteRange>(dest, moby.get_materials(), config, 0x10, FMT_COLLECTION_MATLIST_PIF8_4MIPS).offset;
 				}
 			}
 

src/wrenchbuild/globals/online_data_wad.cpp

@@ -50,7 +50,7 @@ static void unpack_online_data_wad(OnlineDataWadAsset& dest, InputStream& src, B
 	CollectionAsset& moby_classes = dest.moby_classes(SWITCH_FILES);
 	for (s32 i = 0; i < ARRAY_SIZE(header.moby_classes); i++) {
 		MobyClassAsset& moby = moby_classes.foreign_child<MobyClassAsset>(i);
-		unpack_compressed_asset(moby.materials(), src, header.moby_classes[i].textures, config, FMT_COLLECTION_PIF8);
+		unpack_compressed_asset(moby.materials(), src, header.moby_classes[i].textures, config, FMT_COLLECTION_MATLIST_PIF8);
 		unpack_compressed_asset(moby, src, header.moby_classes[i].core, config, FMT_MOBY_CLASS_PHAT);
 	}
 }
@@ -68,7 +68,7 @@ static void pack_online_data_wad(OutputStream& dest, const OnlineDataWadAsset& s
 			const MobyClassAsset& moby = moby_classes.get_child(i).as<MobyClassAsset>();
 			header.moby_classes[i].core = pack_compressed_asset<ByteRange>(dest, moby.get_core(), config, 0x10, "moby_core", FMT_MOBY_CLASS_PHAT);
 			if (moby.has_materials()) {
-				header.moby_classes[i].textures = pack_compressed_asset<ByteRange>(dest, moby.get_materials(), config, 0x10, "textures", FMT_COLLECTION_PIF8);
+				header.moby_classes[i].textures = pack_compressed_asset<ByteRange>(dest, moby.get_materials(), config, 0x10, "textures", FMT_COLLECTION_MATLIST_PIF8);
 			}
 		}
 	}