Update melonDS

Author: CasualPokePlayer

Assets/dll/melonDS.wbx.zst

@@ -1518,6 +1518,7 @@ ECL_EXPORT melonDS::NDS* CreateConsole(ConsoleCreationArgs* args, char* error)
 				std::move(jitArgs),
 				bitDepth,
 				interpolation,
+				44100.0f,
 				std::nullopt,
 				std::move(renderer3d),
 				// dsi specific args
@@ -1541,6 +1542,7 @@ ECL_EXPORT melonDS::NDS* CreateConsole(ConsoleCreationArgs* args, char* error)
 				std::move(jitArgs),
 				bitDepth,
 				interpolation,
+				44100.0f,
 				std::nullopt,
 				std::move(renderer3d)
 			};

waterbox/melon/BizConsoleCreator.cpp

@@ -15,11 +15,12 @@ struct FileHandle
 	virtual bool ReadLine(char* str, int count) = 0;
 	virtual bool Seek(s64 offset, FileSeekOrigin origin) = 0;
 	virtual void Rewind() = 0;
-	virtual size_t Read(void* data, u64 count) = 0;
+	virtual size_t Read(void* data, u64 size, u64 count) = 0;
 	virtual bool Flush() = 0;
-	virtual size_t Write(const void* data, u64 count) = 0;
+	virtual size_t Write(const void* data, u64 size, u64 count) = 0;
 	virtual int WriteFormatted(const char* fmt, va_list args) = 0;
 	virtual size_t Length() = 0;
+	virtual size_t Position() = 0;
 };
 
 struct MemoryFile final : FileHandle
@@ -87,25 +88,35 @@ struct MemoryFile final : FileHandle
 		pos = 0;
 	}
 
-	size_t Read(void* data_, u64 count)
+	size_t Read(void* data_, u64 size_, u64 count)
 	{
-		count = std::min(count, (u64)(size - pos));
-		memcpy(data_, &data[pos], count);
-		pos += count;
-		return count;
+		u64 len = std::min(size_ * count, (u64)(size - pos) / size_ * size_);
+		if (len == 0)
+		{
+			return 0;
+		}
+
+		memcpy(data_, &data[pos], len);
+		pos += len;
+		return len / size_;
 	}
 
 	bool Flush()
 	{
 		return true;
 	}
 
-	size_t Write(const void* data_, u64 count)
+	size_t Write(const void* data_, u64 size_, u64 count)
 	{
-		count = std::min(count, (u64)(size - pos));
-		memcpy(&data[pos], data_, count);
-		pos += count;
-		return count;
+		u64 len = std::min(size_ * count, (u64)(size - pos) / size_ * size_);
+		if (len == 0)
+		{
+			return 0;
+		}
+
+		memcpy(&data[pos], data_, len);
+		pos += len;
+		return len / size_;
 	}
 
 	int WriteFormatted(const char* fmt, va_list args)
@@ -145,6 +156,11 @@ struct MemoryFile final : FileHandle
 		return size;
 	}
 
+	size_t Position()
+	{
+		return pos;
+	}
+
 private:
 	std::unique_ptr<u8[]> data;
 	size_t pos, size;
@@ -207,19 +223,19 @@ struct CFile final : FileHandle
 		rewind(file);
 	}
 
-	size_t Read(void* data, u64 count)
+	size_t Read(void* data, u64 size, u64 count)
 	{
-		return fread(data, 1, count, file);
+		return fread(data, size, count, file);
 	}
 
 	bool Flush()
 	{
 		return fflush(file) == 0;
 	}
 
-	size_t Write(const void* data, u64 count)
+	size_t Write(const void* data, u64 size, u64 count)
 	{
-		return fwrite(data, 1, count, file);
+		return fwrite(data, size, count, file);
 	}
 
 	int WriteFormatted(const char* fmt, va_list args)
@@ -236,6 +252,11 @@ struct CFile final : FileHandle
 		return len;
 	}
 
+	size_t Position()
+	{
+		return ftell(file);
+	}
+
 private:
 	FILE* file;
 };
@@ -334,6 +355,11 @@ bool FileReadLine(char* str, int count, FileHandle* file)
 	return file->ReadLine(str, count);
 }
 
+u64 FilePosition(FileHandle* file)
+{
+	return file->Position();
+}
+
 bool FileSeek(FileHandle* file, s64 offset, FileSeekOrigin origin)
 {
 	return file->Seek(offset, origin);
@@ -346,7 +372,7 @@ void FileRewind(FileHandle* file)
 
 u64 FileRead(void* data, u64 size, u64 count, FileHandle* file)
 {
-	return file->Read(data, size * count);
+	return file->Read(data, size, count);
 }
 
 bool FileFlush(FileHandle* file)
@@ -356,7 +382,7 @@ bool FileFlush(FileHandle* file)
 
 u64 FileWrite(const void* data, u64 size, u64 count, FileHandle* file)
 {
-	return file->Write(data, size * count);
+	return file->Write(data, size, count);
 }
 
 u64 FileWriteFormatted(FileHandle* file, const char* fmt, ...)

waterbox/melon/BizPlatform/BizFile.cpp

@@ -19,6 +19,7 @@ TARGET = melonDS.wbx
 
 CORE_SRCS = \
 	ARCodeFile.cpp \
+	ARDatabaseDAT.cpp \
 	AREngine.cpp \
 	ARM.cpp \
 	ARMInterpreter.cpp \
@@ -117,7 +118,7 @@ MISC_SRCS = \
 	sha1/sha1.c \
 	tiny-AES-c/aes.c \
 	xxhash/xxhash.c \
-	blip_buf/blip_buf.c
+	blip-buf/blip_buf.c
 
 BIZPLATFORM_SRCS = \
 	BizAAC.cpp \