From 0da2ed135b004aa75b0fc9863688e2de9a45fdbd Mon Sep 17 00:00:00 2001
From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Date: Mon, 17 Jan 2022 01:05:00 +0000
Subject: [PATCH] git subrepo pull (merge) --force tools/ZAPD (#618)

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0ba781304"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0ba781304"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
---
 tools/ZAPD/.gitrepo          | 4 ++--
 tools/ZAPD/ZAPD/ZTexture.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ZAPD/.gitrepo b/tools/ZAPD/.gitrepo
index 7576be8e0c..a57e9e52c6 100644
--- a/tools/ZAPD/.gitrepo
+++ b/tools/ZAPD/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/zeldaret/ZAPD.git
 	branch = master
-	commit = bf16ff7c4c409358a53793b72260b1d8e474cf0c
-	parent = a7cc87394ed4afb5ebe1f2318526545b6bbe205d
+	commit = 0ba78130478ee1272bc0e2f2fec2d162e7f7f995
+	parent = aa90d1ee2be577fb8a18c1c3c6dcafda2e732190
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/ZAPD/ZAPD/ZTexture.cpp b/tools/ZAPD/ZAPD/ZTexture.cpp
index 0d72d9c5a6..255d30886e 100644
--- a/tools/ZAPD/ZAPD/ZTexture.cpp
+++ b/tools/ZAPD/ZAPD/ZTexture.cpp
@@ -722,7 +722,7 @@ void ZTexture::Save(const fs::path& outFolder)
 	if (!Directory::Exists(outPath.string()))
 		Directory::CreateDirectory(outPath.string());
 
-	std::filesystem::__cxx11::path outFileName;
+	fs::path outFileName;
 
 	if (!dWordAligned)
 		outFileName = outPath / (outName + ".u32" + "." + GetExternalExtension() + ".png");