From c7762a8a2eeb39aa766ddd43fd0a26b5daef0e88 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 26 Jan 2024 23:19:46 -0500 Subject: [PATCH] Use lc_lz2::CompressV3 for CompressOverworld --- src/app/gfx/compression.cc | 7 ++++++- src/app/gfx/compression.h | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/gfx/compression.cc b/src/app/gfx/compression.cc index 2481aa2d..3cd4ee8d 100644 --- a/src/app/gfx/compression.cc +++ b/src/app/gfx/compression.cc @@ -598,6 +598,11 @@ absl::StatusOr CompressOverworld(const uchar* data, const int pos, return CompressV2(data, pos, length, kNintendoMode1); } +absl::StatusOr CompressOverworld(const std::vector data, + const int pos, const int length) { + return CompressV3(data, pos, length, kNintendoMode1); +} + // ============================================================================ // Compression V3 @@ -1019,7 +1024,7 @@ void FinalizeCompression(CompressionContext& context) { << context.compressed_data.size()); } -absl::StatusOr CompressV3(const std::vector data, +absl::StatusOr CompressV3(const std::vector& data, const int start, const int length, int mode, bool check) { if (length == 0) { diff --git a/src/app/gfx/compression.h b/src/app/gfx/compression.h index f532cc39..eedad7ef 100644 --- a/src/app/gfx/compression.h +++ b/src/app/gfx/compression.h @@ -128,6 +128,8 @@ absl::StatusOr CompressGraphics(const uchar* data, const int pos, const int length); absl::StatusOr CompressOverworld(const uchar* data, const int pos, const int length); +absl::StatusOr CompressOverworld(const std::vector data, + const int pos, const int length); absl::StatusOr SplitCompressionPiece( CompressionPiecePointer& piece, int mode); @@ -185,7 +187,7 @@ absl::StatusOr SplitCompressionPieceV3( CompressionPiece& piece, int mode); void FinalizeCompression(CompressionContext& context); -absl::StatusOr CompressV3(const std::vector data, +absl::StatusOr CompressV3(const std::vector& data, const int start, const int length, int mode = 1, bool check = false);