From 05572a0921b13d8f554113463d47815da66be937 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 24 Dec 2023 01:53:49 +0100
Subject: [PATCH 001/222] FreeType: Calculate font size correctly depending on
 whether it is a pixel or a true type font.

Fix small rendering issues.

Fix #2953
---
 src/font.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/font.cpp b/src/font.cpp
index 415e53ad5..e52c43366 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -535,7 +535,7 @@ void FTFont::SetSize(int height, bool create) {
 	hb_ft_font_set_funcs(hb_font);
 #endif
 
-	baseline_offset = FT_MulFix(face->ascender, face->size->metrics.y_scale) / 64;
+	baseline_offset = static_cast<int>(FT_MulFix(face->ascender, face->size->metrics.y_scale) / 64);
 	if (baseline_offset == 0) {
 		// FIXME: Becomes 0 for FON files. How is the baseline calculated for them?
 		baseline_offset = static_cast<int>(height * (10.0 / 12.0));

From 8f3d3c3c172b995e095b98ec9a08bcf4ab49a09c Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 1 Dec 2023 16:24:22 +0100
Subject: [PATCH 002/222] MIDI: Report the device status

---
 src/audio_generic.cpp                         |  3 ++-
 src/audio_generic_midiout.cpp                 | 22 ++++++++++++----
 src/audio_generic_midiout.h                   |  4 +--
 src/audio_midi.cpp                            | 26 ++++++++++++++-----
 src/audio_midi.h                              | 16 ++++++++++++
 src/decoder_fluidsynth.cpp                    | 12 ++++-----
 src/decoder_fluidsynth.h                      |  2 +-
 src/decoder_wildmidi.cpp                      |  9 ++++---
 src/decoder_wildmidi.h                        |  2 +-
 src/platform/libretro/midiout_device.cpp      |  6 ++---
 src/platform/libretro/midiout_device.h        |  2 +-
 src/platform/linux/midiout_device_alsa.cpp    | 14 +++++-----
 src/platform/linux/midiout_device_alsa.h      |  2 +-
 .../macos/midiout_device_coreaudio.cpp        |  6 ++---
 src/platform/macos/midiout_device_coreaudio.h |  2 +-
 src/platform/windows/midiout_device_win32.cpp |  4 +--
 src/platform/windows/midiout_device_win32.h   |  2 +-
 17 files changed, 89 insertions(+), 45 deletions(-)

diff --git a/src/audio_generic.cpp b/src/audio_generic.cpp
index 1135064b9..48511672a 100644
--- a/src/audio_generic.cpp
+++ b/src/audio_generic.cpp
@@ -223,7 +223,8 @@ bool GenericAudio::PlayOnChannel(BgmChannel& chan, Filesystem_Stream::InputStrea
 		if (!MidiDecoder::CreateFluidsynth(true) && !MidiDecoder::CreateWildMidi(true)) {
 			if (!midi_thread) {
 				midi_thread = std::make_unique<GenericAudioMidiOut>();
-				if (midi_thread->IsInitialized()) {
+				std::string status_message;
+				if (midi_thread->IsInitialized(status_message)) {
 					midi_thread->StartThread();
 				} else {
 					midi_thread.reset();
diff --git a/src/audio_generic_midiout.cpp b/src/audio_generic_midiout.cpp
index 31911e414..7f75e22c2 100644
--- a/src/audio_generic_midiout.cpp
+++ b/src/audio_generic_midiout.cpp
@@ -23,6 +23,7 @@
 #include <chrono>
 #include "filesystem_stream.h"
 #include "game_clock.h"
+#include "output.h"
 
 #ifdef USE_LIBRETRO
 #include "platform/libretro/midiout_device.h"
@@ -43,18 +44,21 @@ static struct {
 	bool alsa = true;
 	bool win32 = true;
 	bool coreaudio = true;
+	std::string status;
 } works;
 
 GenericAudioMidiOut::GenericAudioMidiOut() {
 	stop_thread.store(false);
 
 #ifdef USE_LIBRETRO
+	std::string libretro_status;
 	if (works.libretro) {
-		auto dec = std::make_unique<LibretroMidiOutDevice>();
+		auto dec = std::make_unique<LibretroMidiOutDevice>(libretro_status);
 		if (dec->IsInitialized()) {
 			midi_out = std::make_unique<AudioDecoderMidi>(std::move(dec));
 		} else {
 			works.libretro = false;
+			Output::Debug(libretro_status);
 		}
 	}
 
@@ -65,32 +69,39 @@ GenericAudioMidiOut::GenericAudioMidiOut() {
 
 #ifdef HAVE_ALSA
 	if (works.alsa) {
-		auto dec = std::make_unique<AlsaMidiOutDevice>();
+		auto dec = std::make_unique<AlsaMidiOutDevice>(works.status);
 		if (dec->IsInitialized()) {
 			midi_out = std::make_unique<AudioDecoderMidi>(std::move(dec));
 		} else {
 			works.alsa = false;
+			Output::Debug(works.status);
 		}
 	}
 #elif _WIN32
 	if (works.win32) {
-		auto dec = std::make_unique<Win32MidiOutDevice>();
+		auto dec = std::make_unique<Win32MidiOutDevice>(works.status);
 		if (dec->IsInitialized()) {
 			midi_out = std::make_unique<AudioDecoderMidi>(std::move(dec));
 		} else {
 			works.win32 = false;
+			Output::Debug(works.status);
 		}
 	}
 #elif __APPLE__
 	if (works.coreaudio) {
-		auto dec = std::make_unique<CoreAudioMidiOutDevice>();
+		auto dec = std::make_unique<CoreAudioMidiOutDevice>(works.status);
 		if (dec->IsInitialized()) {
 			midi_out = std::make_unique<AudioDecoderMidi>(std::move(dec));
 		} else {
 			works.coreaudio = false;
+			Output::Debug(works.status);
 		}
 	}
 #endif
+
+#ifdef USE_LIBRETRO
+	works.status = libretro_status + ". " + works.status;
+#endif
 }
 
 GenericAudioMidiOut::~GenericAudioMidiOut() {
@@ -145,7 +156,8 @@ void GenericAudioMidiOut::ThreadFunction() {
 	}
 }
 
-bool GenericAudioMidiOut::IsInitialized() const {
+bool GenericAudioMidiOut::IsInitialized(std::string& status_message) const {
+	status_message = works.status;
 	return midi_out != nullptr;
 }
 
diff --git a/src/audio_generic_midiout.h b/src/audio_generic_midiout.h
index f9538a3bf..1f252bde5 100644
--- a/src/audio_generic_midiout.h
+++ b/src/audio_generic_midiout.h
@@ -52,7 +52,7 @@ class GenericAudioMidiOut final {
 	void StartThread();
 	void StopThread();
 	void ThreadFunction();
-	bool IsInitialized() const;
+	bool IsInitialized(std::string& status_message) const;
 
 	static bool IsSupported(Filesystem_Stream::InputStream& stream);
 private:
@@ -79,7 +79,7 @@ class GenericAudioMidiOut final {
 
 	void StartThread() {};
 	void StopThread() {};
-	bool IsInitialized() const {
+	bool IsInitialized(std::string&) const {
 		return false;
 	}
 
diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index 011fb480b..c03dd2948 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -43,6 +43,8 @@ bool MidiDecoder::SetFormat(int frequency, AudioDecoderBase::Format format, int
 static struct {
 	bool fluidsynth = true;
 	bool wildmidi = true;
+	std::string fluidsynth_status;
+	std::string wildmidi_status;
 } works;
 
 std::unique_ptr<AudioDecoderBase> MidiDecoder::Create(bool resample) {
@@ -63,13 +65,12 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateFluidsynth(bool resample) {
 	std::unique_ptr<AudioDecoderBase> mididec;
 
 #if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
-	std::string error_message;
-	if (works.fluidsynth && FluidSynthDecoder::Initialize(error_message)) {
+	if (works.fluidsynth && FluidSynthDecoder::Initialize(works.fluidsynth_status)) {
 		auto dec = std::make_unique<FluidSynthDecoder>();
 		mididec = std::make_unique<AudioDecoderMidi>(std::move(dec));
 	}
 	else if (!mididec && works.fluidsynth) {
-		Output::Debug("{}", error_message);
+		Output::Debug("Fluidsynth: {}", works.fluidsynth_status);
 		works.fluidsynth = false;
 	}
 #endif
@@ -87,13 +88,12 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateWildMidi(bool resample) {
 	std::unique_ptr<AudioDecoderBase> mididec;
 
 #ifdef HAVE_LIBWILDMIDI
-	std::string error_message;
-	if (!mididec && works.wildmidi && WildMidiDecoder::Initialize(error_message)) {
+	if (!mididec && works.wildmidi && WildMidiDecoder::Initialize(works.wildmidi_status)) {
 		auto dec = std::make_unique<WildMidiDecoder>();
 		mididec = std::make_unique<AudioDecoderMidi>(std::move(dec));
 	}
 	else if (!mididec && works.wildmidi) {
-		Output::Debug("{}", error_message);
+		Output::Debug("WildMidi: {}", works.wildmidi_status);
 		works.wildmidi = false;
 	}
 #endif
@@ -126,6 +126,20 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateFmMidi(bool resample) {
 	return mididec;
 }
 
+bool MidiDecoder::CheckFluidsynth(std::string& status_message) {
+	CreateFluidsynth(true);
+
+	status_message = works.fluidsynth_status;
+	return works.fluidsynth;
+}
+
+bool MidiDecoder::CheckWildMidi(std::string &status_message) {
+	CreateWildMidi(true);
+
+	status_message = works.wildmidi_status;
+	return works.wildmidi;
+}
+
 void MidiDecoder::Reset() {
 	works.fluidsynth = true;
 	works.wildmidi = true;
diff --git a/src/audio_midi.h b/src/audio_midi.h
index 82a70635e..39ca9fa2c 100644
--- a/src/audio_midi.h
+++ b/src/audio_midi.h
@@ -204,6 +204,22 @@ class MidiDecoder {
 
 	static std::unique_ptr<AudioDecoderBase> CreateFmMidi(bool resample);
 
+	/**
+	 * Checks if Fluidsynth works.
+	 *
+	 * @param status_message Current Fluidsynth status
+	 * @return true: Works, false: Not working
+	 */
+	static bool CheckFluidsynth(std::string& status_message);
+
+	/**
+	 * Checks if WildMidi works.
+	 *
+	 * @param status_message Current Fluidsynth status
+	 * @return true: Works, false: Not working
+	 */
+	static bool CheckWildMidi(std::string& status_message);
+
 	/**
 	 * Resets the global state of the midi libraries.
 	 */
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index 2c6506d02..3f363d110 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -119,10 +119,10 @@ namespace {
 	int instances = 0;
 }
 
-static fluid_synth_t* create_synth(std::string& error_message) {
+static fluid_synth_t* create_synth(std::string& status_message) {
 	fluid_synth_t* syn = new_fluid_synth(global_settings.get());
 	if (!syn) {
-		error_message = "new_fluid_synth failed";
+		status_message = "new_fluid_synth failed";
 		return nullptr;
 	}
 
@@ -168,13 +168,13 @@ static fluid_synth_t* create_synth(std::string& error_message) {
 	for (const auto& sf_name: sf_paths) {
 		if (fluid_synth_sfload(syn, sf_name.c_str(), 1) != FLUID_FAILED) {
 			sf_load_success = true;
-			Output::Debug("Fluidsynth: Using soundfont {}", sf_name);
+			status_message = fmt::format("Using soundfont {}", sf_name);
 			break;
 		}
 	}
 
 	if (!sf_load_success) {
-		error_message = "Fluidsynth: Could not load soundfont.";
+		status_message = "Could not load soundfont.";
 		return nullptr;
 	}
 
@@ -210,7 +210,7 @@ FluidSynthDecoder::~FluidSynthDecoder() {
 	}
 }
 
-bool FluidSynthDecoder::Initialize(std::string& error_message) {
+bool FluidSynthDecoder::Initialize(std::string& status_message) {
 	// only initialize once until a new game starts
 	if (once)
 		return init;
@@ -247,7 +247,7 @@ bool FluidSynthDecoder::Initialize(std::string& error_message) {
 			vio_open, vio_read, vio_seek, vio_tell, vio_close);
 #endif
 
-	global_synth.reset(create_synth(error_message));
+	global_synth.reset(create_synth(status_message));
 	if (!global_synth) {
 		return false;
 	}
diff --git a/src/decoder_fluidsynth.h b/src/decoder_fluidsynth.h
index f0799413e..1eb6fe27b 100644
--- a/src/decoder_fluidsynth.h
+++ b/src/decoder_fluidsynth.h
@@ -44,7 +44,7 @@ class FluidSynthDecoder : public MidiDecoder {
 	FluidSynthDecoder();
 	~FluidSynthDecoder() override;
 
-	static bool Initialize(std::string& error_message);
+	static bool Initialize(std::string& status_message);
 	static void ResetState();
 
 	/**
diff --git a/src/decoder_wildmidi.cpp b/src/decoder_wildmidi.cpp
index d4738e961..a4d00cd7c 100644
--- a/src/decoder_wildmidi.cpp
+++ b/src/decoder_wildmidi.cpp
@@ -84,7 +84,7 @@ WildMidiDecoder::~WildMidiDecoder() {
 		WildMidi_Close(handle);
 }
 
-bool WildMidiDecoder::Initialize(std::string& error_message) {
+bool WildMidiDecoder::Initialize(std::string& status_message) {
 	std::string config_file;
 	bool found = false;
 
@@ -282,10 +282,11 @@ bool WildMidiDecoder::Initialize(std::string& error_message) {
 
 	// bail, if nothing found
 	if (!found) {
-		error_message = "WildMidi: Could not find configuration file.";
+		status_message = "Could not find configuration file.";
 		return false;
 	}
-	Output::Debug("WildMidi: Using {} as configuration file...", config_file);
+
+	status_message = fmt::format("Using {} as configuration file...", config_file);
 
 #if LIBWILDMIDI_VERSION >= 1027 // at least 0.4.3
 	init = (WildMidi_InitVIO(&vio, config_file.c_str(), EP_MIDI_FREQ, WILDMIDI_OPTS) == 0);
@@ -294,7 +295,7 @@ bool WildMidiDecoder::Initialize(std::string& error_message) {
 #endif
 
 	if (!init) {
-		error_message = std::string("WildMidi_Init() failed : ") + WildMidi_GetError();
+		status_message = std::string("WildMidi_Init() failed: ") + WildMidi_GetError();
 		return false;
 	}
 
diff --git a/src/decoder_wildmidi.h b/src/decoder_wildmidi.h
index 4142b3e09..8c32e60f5 100644
--- a/src/decoder_wildmidi.h
+++ b/src/decoder_wildmidi.h
@@ -33,7 +33,7 @@ class WildMidiDecoder : public MidiDecoder {
 public:
 	~WildMidiDecoder();
 
-	static bool Initialize(std::string& error_message);
+	static bool Initialize(std::string& status_message);
 	static void ResetState();
 
 	// Audio Decoder interface
diff --git a/src/platform/libretro/midiout_device.cpp b/src/platform/libretro/midiout_device.cpp
index 13960a360..48a800696 100644
--- a/src/platform/libretro/midiout_device.cpp
+++ b/src/platform/libretro/midiout_device.cpp
@@ -19,14 +19,14 @@
 #include "ui.h"
 #include "output.h"
 
-LibretroMidiOutDevice::LibretroMidiOutDevice() {
+LibretroMidiOutDevice::LibretroMidiOutDevice(std::string& status_message) {
 	if (!LibretroUi::environ_cb(RETRO_ENVIRONMENT_GET_MIDI_INTERFACE, &midi_out)) {
-		Output::Debug("libretro: GET_MIDI_INTERFACE unsupported");
+		status_message = "libretro: GET_MIDI_INTERFACE unsupported";
 		return;
 	}
 
 	if (!midi_out.output_enabled()) {
-		Output::Debug("libretro: MIDI output not enabled");
+		status_message = "libretro: MIDI output not enabled";
 		return;
 	}
 
diff --git a/src/platform/libretro/midiout_device.h b/src/platform/libretro/midiout_device.h
index fa3c7fae4..62a87b9f1 100644
--- a/src/platform/libretro/midiout_device.h
+++ b/src/platform/libretro/midiout_device.h
@@ -27,7 +27,7 @@
  */
 class LibretroMidiOutDevice : public MidiDecoder {
 public:
-	LibretroMidiOutDevice();
+	LibretroMidiOutDevice(std::string& status_message);
 
 	void SendMidiMessage(uint32_t message) override;
 	void SendSysExMessage(const uint8_t* data, size_t size) override;
diff --git a/src/platform/linux/midiout_device_alsa.cpp b/src/platform/linux/midiout_device_alsa.cpp
index e444a0825..9ed75b590 100644
--- a/src/platform/linux/midiout_device_alsa.cpp
+++ b/src/platform/linux/midiout_device_alsa.cpp
@@ -19,10 +19,10 @@
 #include "output.h"
 #include "system.h"
 
-AlsaMidiOutDevice::AlsaMidiOutDevice() {
+AlsaMidiOutDevice::AlsaMidiOutDevice(std::string& status_message) {
 	int status = snd_seq_open(&midi_out, "default", SND_SEQ_OPEN_DUPLEX, 0);
 	if (status < 0) {
-		Output::Debug("ALSA MIDI: snd_seq_open failed: {}", snd_strerror(status));
+		status_message = fmt::format("ALSA MIDI: snd_seq_open failed: {}", snd_strerror(status));
 		return;
 	}
 
@@ -75,7 +75,7 @@ AlsaMidiOutDevice::AlsaMidiOutDevice() {
 	done:;
 
 	if (!candidate_found) {
-		Output::Debug("ALSA MIDI: No suitable client found");
+		status_message = "ALSA MIDI: No suitable client found";
 		return;
 	}
 
@@ -84,7 +84,7 @@ AlsaMidiOutDevice::AlsaMidiOutDevice() {
 	status = snd_seq_create_simple_port(midi_out, "Harmony",
 		SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_APPLICATION);
 	if (status < 0) {
-		Output::Debug("ALSA MIDI: snd_seq_create_simple_port failed: {}", snd_strerror(status));
+		status_message = fmt::format("ALSA MIDI: snd_seq_create_simple_port failed: {}", snd_strerror(status));
 		return;
 	}
 
@@ -92,19 +92,19 @@ AlsaMidiOutDevice::AlsaMidiOutDevice() {
 
 	status = snd_seq_connect_to(midi_out, 0, dst_client, dst_port);
 	if (status < 0) {
-		Output::Debug("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(status));
+		status_message = fmt::format("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(status));
 		return;
 	}
 
 	queue = snd_seq_alloc_named_queue(midi_out, GAME_TITLE);
 	if (queue < 0) {
-		Output::Debug("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(queue));
+		status_message = fmt::format("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(queue));
 		return;
 	}
 
 	status = snd_seq_start_queue(midi_out, queue, nullptr);
 	if (status < 0) {
-		Output::Debug("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(status));
+		status_message = fmt::format("ALSA MIDI: snd_seq_connect_to failed: {}", snd_strerror(status));
 		return;
 	}
 
diff --git a/src/platform/linux/midiout_device_alsa.h b/src/platform/linux/midiout_device_alsa.h
index 7a6dffbc2..6a88d32c6 100644
--- a/src/platform/linux/midiout_device_alsa.h
+++ b/src/platform/linux/midiout_device_alsa.h
@@ -27,7 +27,7 @@
  */
 class AlsaMidiOutDevice : public MidiDecoder {
 public:
-	AlsaMidiOutDevice();
+	AlsaMidiOutDevice(std::string& status_message);
 	~AlsaMidiOutDevice();
 
 	void SendMidiMessage(uint32_t message) override;
diff --git a/src/platform/macos/midiout_device_coreaudio.cpp b/src/platform/macos/midiout_device_coreaudio.cpp
index 98ee57b8d..4bb86fc98 100644
--- a/src/platform/macos/midiout_device_coreaudio.cpp
+++ b/src/platform/macos/midiout_device_coreaudio.cpp
@@ -19,10 +19,10 @@
 #include "midiout_device_coreaudio.h"
 #include "output.h"
 
-CoreAudioMidiOutDevice::CoreAudioMidiOutDevice() {
+CoreAudioMidiOutDevice::CoreAudioMidiOutDevice(std::string& status_message) {
 	OSStatus status = NewAUGraph(&graph);
 	if (status != noErr) {
-		Output::Debug("macOS Midi: NewAUGraph failed: {}", status);
+		status_message = fmt::format("macOS Midi: NewAUGraph failed: {}", status);
 		return;
 	}
 	AudioComponentDescription synthDesc = {
@@ -70,7 +70,7 @@ CoreAudioMidiOutDevice::CoreAudioMidiOutDevice() {
 	status = AUGraphStart(graph);
 
 	if (status != noErr) {
-		Output::Debug("macOS Midi: AUGraphStart failed: {}", status);
+		status_message = fmt::format("macOS Midi: AUGraphStart failed: {}", status);
 		return;
 	}
 
diff --git a/src/platform/macos/midiout_device_coreaudio.h b/src/platform/macos/midiout_device_coreaudio.h
index dbcf40f5d..6880cfba0 100644
--- a/src/platform/macos/midiout_device_coreaudio.h
+++ b/src/platform/macos/midiout_device_coreaudio.h
@@ -26,7 +26,7 @@
  */
 class CoreAudioMidiOutDevice : public MidiDecoder {
 public:
-	CoreAudioMidiOutDevice();
+	CoreAudioMidiOutDevice(std::string& status_message);
 	~CoreAudioMidiOutDevice();
 
 	void SendMidiMessage(uint32_t message) override;
diff --git a/src/platform/windows/midiout_device_win32.cpp b/src/platform/windows/midiout_device_win32.cpp
index 9a231b16e..ec005c239 100644
--- a/src/platform/windows/midiout_device_win32.cpp
+++ b/src/platform/windows/midiout_device_win32.cpp
@@ -25,7 +25,7 @@ static std::string get_error_str(MMRESULT res) {
 	return std::string(errMsg);
 }
 
-Win32MidiOutDevice::Win32MidiOutDevice() {
+Win32MidiOutDevice::Win32MidiOutDevice(std::string& status_message) {
 	// TODO: Windows MIDI Mapper was removed in Windows 8.
 	// This means it's impossible to change the default ("0") MIDI device
 	// without third party software. We should allow specifying the MIDI device
@@ -34,7 +34,7 @@ Win32MidiOutDevice::Win32MidiOutDevice() {
 
 	MMRESULT err = midiOutOpen(&midi_out, device_id, 0, 0, CALLBACK_NULL);
 	if (err != MMSYSERR_NOERROR) {
-		Output::Debug("Win32 midiOutOpen {} failed: ({}) {}", 0, err, get_error_str(err));
+		status_message = fmt::format("Win32 midiOutOpen {} failed: ({}) {}", 0, err, get_error_str(err));
 		midi_out = nullptr;
 		return;
 	}
diff --git a/src/platform/windows/midiout_device_win32.h b/src/platform/windows/midiout_device_win32.h
index 2b96fd265..d581c481a 100644
--- a/src/platform/windows/midiout_device_win32.h
+++ b/src/platform/windows/midiout_device_win32.h
@@ -31,7 +31,7 @@
  */
 class Win32MidiOutDevice : public MidiDecoder {
 public:
-	Win32MidiOutDevice();
+	Win32MidiOutDevice(std::string& status_message);
 	~Win32MidiOutDevice();
 
 	void SendMidiMessage(uint32_t message) override;

From bddc3c5cfa9bf767912e49baf9aba545ecf9345d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 2 Dec 2023 00:53:40 +0100
Subject: [PATCH 003/222] Settings: Add configuring MIDI devices

---
 src/audio.cpp              | 40 ++++++++++++++++++++
 src/audio.h                | 15 ++++++++
 src/audio_generic.cpp      |  9 +++--
 src/audio_midi.cpp         | 24 ++++++++----
 src/config_param.h         |  3 +-
 src/decoder_fluidsynth.cpp |  8 +---
 src/decoder_fluidsynth.h   |  8 ----
 src/game_config.cpp        | 17 +++++++++
 src/game_config.h          |  5 +++
 src/player.cpp             | 16 ++------
 src/scene_settings.cpp     |  7 +++-
 src/scene_settings.h       |  1 +
 src/window_settings.cpp    | 75 ++++++++++++++++++++++++++++++++++----
 src/window_settings.h      |  5 +++
 14 files changed, 186 insertions(+), 47 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index 0ce51b1f0..1448736ce 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -89,3 +89,43 @@ int AudioInterface::SE_GetGlobalVolume() const {
 void AudioInterface::SE_SetGlobalVolume(int volume) {
 	cfg.sound_volume.Set(volume);
 }
+
+bool AudioInterface::GetFluidsynthEnabled() const {
+	return cfg.fluidsynth_midi.Get();
+}
+
+void AudioInterface::SetFluidsynthEnabled(bool enable) {
+	cfg.fluidsynth_midi.Set(enable);
+}
+
+bool AudioInterface::GetWildMidiEnabled() const {
+	return cfg.wildmidi_midi.Get();
+}
+
+void AudioInterface::SetWildMidiEnabled(bool enable) {
+	cfg.wildmidi_midi.Set(enable);
+}
+
+bool AudioInterface::GetNativeMidiEnabled() const {
+	return cfg.native_midi.Get();
+}
+
+void AudioInterface::SetNativeMidiEnabled(bool enable) {
+	cfg.native_midi.Set(enable);
+}
+
+bool AudioInterface::GetFmMidiEnabled() const {
+	return cfg.fmmidi_midi.Get();
+}
+
+void AudioInterface::SetFmMidiEnabled(bool enable) {
+	cfg.fmmidi_midi.Set(enable);
+}
+
+std::string AudioInterface::GetFluidsynthSoundfont() const {
+	return cfg.soundfont.Get();
+}
+
+void AudioInterface::SetFluidsynthSoundfont(StringView sf) {
+	cfg.soundfont.Set(ToString(sf));
+}
diff --git a/src/audio.h b/src/audio.h
index bb0e6b7ab..43ca569d4 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -133,6 +133,21 @@ struct AudioInterface {
 	int SE_GetGlobalVolume() const;
 	void SE_SetGlobalVolume(int volume);
 
+	bool GetFluidsynthEnabled() const;
+	void SetFluidsynthEnabled(bool enable);
+
+	bool GetWildMidiEnabled() const;
+	void SetWildMidiEnabled(bool enable);
+
+	bool GetNativeMidiEnabled() const;
+	void SetNativeMidiEnabled(bool enable);
+
+	bool GetFmMidiEnabled() const;
+	void SetFmMidiEnabled(bool enable);
+
+	std::string GetFluidsynthSoundfont() const;
+	void SetFluidsynthSoundfont(StringView sf);
+
 protected:
 	Game_ConfigAudio cfg;
 };
diff --git a/src/audio_generic.cpp b/src/audio_generic.cpp
index 48511672a..cd45e13db 100644
--- a/src/audio_generic.cpp
+++ b/src/audio_generic.cpp
@@ -217,10 +217,11 @@ bool GenericAudio::PlayOnChannel(BgmChannel& chan, Filesystem_Stream::InputStrea
 	if (chan.id == 0 && GenericAudioMidiOut::IsSupported(filestream)) {
 		chan.decoder.reset();
 
-		// FIXME: Try Fluidsynth and WildMidi first
-		// If they work fallback to the normal AudioDecoder handler below
-		// There should be a way to configure the order
-		if (!MidiDecoder::CreateFluidsynth(true) && !MidiDecoder::CreateWildMidi(true)) {
+		// Order is Fluidsynth, WildMidi, Native, FmMidi
+		bool fluidsynth = Audio().GetFluidsynthEnabled() && MidiDecoder::CreateFluidsynth(true);
+		bool wildmidi = Audio().GetWildMidiEnabled() && MidiDecoder::CreateWildMidi(true);
+
+		if (!fluidsynth && !wildmidi && Audio().GetNativeMidiEnabled()) {
 			if (!midi_thread) {
 				midi_thread = std::make_unique<GenericAudioMidiOut>();
 				std::string status_message;
diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index c03dd2948..a21b4603a 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -25,6 +25,8 @@
 
 #ifdef USE_AUDIO_RESAMPLER
 #include "audio_resampler.h"
+#include "audio.h"
+
 #endif
 
 void MidiDecoder::GetFormat(int& freq, AudioDecoderBase::Format& format, int& channels) const {
@@ -50,12 +52,16 @@ static struct {
 std::unique_ptr<AudioDecoderBase> MidiDecoder::Create(bool resample) {
 	std::unique_ptr<AudioDecoderBase> mididec;
 
-	mididec = CreateFluidsynth(resample);
-	if (!mididec) {
+	if (Audio().GetFluidsynthEnabled()) {
+		mididec = CreateFluidsynth(resample);
+	}
+
+	if (!mididec && Audio().GetWildMidiEnabled()) {
 		mididec = CreateWildMidi(resample);
-		if (!mididec) {
-			mididec = CreateFmMidi(resample);
-		}
+	}
+
+	if (!mididec && Audio().GetFmMidiEnabled()) {
+		mididec = CreateFmMidi(resample);
 	}
 
 	return mididec;
@@ -127,14 +133,18 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateFmMidi(bool resample) {
 }
 
 bool MidiDecoder::CheckFluidsynth(std::string& status_message) {
-	CreateFluidsynth(true);
+	if (works.fluidsynth && works.fluidsynth_status.empty()) {
+		CreateFluidsynth(true);
+	}
 
 	status_message = works.fluidsynth_status;
 	return works.fluidsynth;
 }
 
 bool MidiDecoder::CheckWildMidi(std::string &status_message) {
-	CreateWildMidi(true);
+	if (works.wildmidi && works.wildmidi_status.empty()) {
+		CreateWildMidi(true);
+	}
 
 	status_message = works.wildmidi_status;
 	return works.wildmidi;
diff --git a/src/config_param.h b/src/config_param.h
index 036503eb1..777b2144c 100644
--- a/src/config_param.h
+++ b/src/config_param.h
@@ -337,12 +337,13 @@ class BoolConfigParam : public ConfigParamBase<bool> {
 		return true;
 	}
 
-	void Toggle() {
+	bool Toggle() {
 		if (Get()) {
 			Set(false);
 		} else {
 			Set(true);
 		}
+		return Get();
 	}
 
 	std::string ValueToString() const override {
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index 3f363d110..9fb8444a4 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "system.h"
+#include "audio.h"
 #include "decoder_fluidsynth.h"
 
 #if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
@@ -94,8 +95,6 @@ static fluid_fileapi_t fluidlite_vio = {
 #endif
 
 namespace {
-	std::string preferred_soundfont;
-
 	bool once = false;
 	bool init = false;
 }
@@ -132,6 +131,7 @@ static fluid_synth_t* create_synth(std::string& status_message) {
 
 	// Attempt loading a soundfont
 	std::vector<std::string> sf_paths;
+	std::string preferred_soundfont = Audio().GetFluidsynthSoundfont();
 	if (!preferred_soundfont.empty()) {
 		sf_paths.emplace_back(preferred_soundfont);
 	}
@@ -265,10 +265,6 @@ void FluidSynthDecoder::ResetState() {
 	global_settings.reset();
 }
 
-void FluidSynthDecoder::SetSoundfont(StringView sf) {
-	preferred_soundfont = ToString(sf);
-}
-
 int FluidSynthDecoder::FillBuffer(uint8_t* buffer, int length) {
 	auto* instance_synth = GetSynthInstance();
 
diff --git a/src/decoder_fluidsynth.h b/src/decoder_fluidsynth.h
index 1eb6fe27b..3c90276cc 100644
--- a/src/decoder_fluidsynth.h
+++ b/src/decoder_fluidsynth.h
@@ -47,14 +47,6 @@ class FluidSynthDecoder : public MidiDecoder {
 	static bool Initialize(std::string& status_message);
 	static void ResetState();
 
-	/**
-	 * Sets the name of the preferred soundfont.
-	 * Must be called before the first MIDI is played.
-	 *
-	 * @param sf soundfont to check for first
-	 */
-	static void SetSoundfont(StringView sf);
-
 	int FillBuffer(uint8_t* buffer, int length) override;
 
 	void SendMidiMessage(uint32_t message) override;
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 48ba6a3be..bcaa72b4d 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -321,6 +321,12 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			}
 			continue;
 		}
+		if (cp.ParseNext(arg, 1, "--soundfont")) {
+			if (arg.NumValues() > 0) {
+				audio.soundfont.Set(arg.Value(0));
+			}
+			continue;
+		}
 
 		cp.SkipNext();
 	}
@@ -356,6 +362,11 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	/** AUDIO SECTION */
 	audio.music_volume.FromIni(ini);
 	audio.sound_volume.FromIni(ini);
+	audio.fluidsynth_midi.FromIni(ini);
+	audio.wildmidi_midi.FromIni(ini);
+	audio.native_midi.FromIni(ini);
+	audio.fmmidi_midi.FromIni(ini);
+	audio.soundfont.FromIni(ini);
 
 	/** INPUT SECTION */
 	input.buttons = Input::GetDefaultButtonMappings();
@@ -442,6 +453,12 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
 
 	audio.music_volume.ToIni(os);
 	audio.sound_volume.ToIni(os);
+	audio.fluidsynth_midi.ToIni(os);
+	audio.wildmidi_midi.ToIni(os);
+	audio.native_midi.ToIni(os);
+	audio.fmmidi_midi.ToIni(os);
+	audio.soundfont.ToIni(os);
+
 	os << "\n";
 
 	/** INPUT SECTION */
diff --git a/src/game_config.h b/src/game_config.h
index 95905c981..0462a1a45 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -103,6 +103,11 @@ struct Game_ConfigVideo {
 struct Game_ConfigAudio {
 	RangeConfigParam<int> music_volume{ "BGM Volume", "Volume of the background music", "Audio", "MusicVolume", 100, 0, 100 };
 	RangeConfigParam<int> sound_volume{ "SFX Volume", "Volume of the sound effects", "Audio", "SoundVolume", 100, 0, 100 };
+	BoolConfigParam fluidsynth_midi { "Fluidsynth (SF2)", "Play MIDI using SF2 soundfonts", "Audio", "Fluidsynth", true };
+	BoolConfigParam wildmidi_midi { "WildMidi (GUS)", "Play MIDI using GUS patches", "Audio", "WildMidi", true };
+	BoolConfigParam native_midi { "Native MIDI", "Play MIDI through the operating system ", "Audio", "NativeMidi", true };
+	BoolConfigParam fmmidi_midi { "FmMidi", "Play MIDI using the built-in MIDI synthesizer", "Audio", "FmMidi", true };
+	StringConfigParam soundfont { "Soundfont", "Soundfont to use for Fluidsynth", "Audio", "Soundfont", "" };
 
 	void Hide();
 };
diff --git a/src/player.cpp b/src/player.cpp
index 46e20d9de..88c2c9b56 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -83,15 +83,12 @@
 #include "baseui.h"
 #include "game_clock.h"
 #include "message_overlay.h"
+#include "audio_midi.h"
 
 #ifdef __ANDROID__
 #include "platform/android/android.h"
 #endif
 
-#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
-#include "decoder_fluidsynth.h"
-#endif
-
 #ifndef EMSCRIPTEN
 // This is not used on Emscripten.
 #include "exe_reader.h"
@@ -639,14 +636,6 @@ Game_Config Player::ParseCommandLine() {
 			}
 			continue;
 		}
-#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
-		if (cp.ParseNext(arg, 1, "--soundfont")) {
-			if (arg.NumValues() > 0) {
-				FluidSynthDecoder::SetSoundfont(arg.Value(0));
-			}
-			continue;
-		}
-#endif
 		if (cp.ParseNext(arg, 0, "--version", 'v')) {
 			std::cout << GetFullVersionString() << std::endl;
 			exit(0);
@@ -676,6 +665,9 @@ void Player::CreateGameObjects() {
 	CmdlineParser cp(arguments);
 	game_config = Game_ConfigGame::Create(cp);
 
+	// Reinit MIDI
+	MidiDecoder::Reset();
+
 	// Load the meta information file.
 	// Note: This should eventually be split across multiple folders as described in Issue #1210
 	std::string meta_file = FileFinder::Game().FindFile(META_NAME);
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index bf564d071..4b7bc7cc3 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -87,10 +87,13 @@ void Scene_Settings::CreateMainWindow() {
 }
 
 void Scene_Settings::CreateOptionsWindow() {
-	help_window.reset(new Window_Help(Player::menu_offset_x, 0, MENU_WIDTH, 32));
+	help_window = std::make_unique<Window_Help>(Player::menu_offset_x, 0, MENU_WIDTH, 32);
 	options_window = std::make_unique<Window_Settings>(Player::menu_offset_x + 32, 32, MENU_WIDTH - 64, Player::screen_height - 32 * 2);
 	options_window->SetHelpWindow(help_window.get());
 
+	help_window2 = std::make_unique<Window_Help>(Player::menu_offset_x, Player::screen_height - 32, MENU_WIDTH, 32);
+	options_window->help_window2 = help_window2.get();
+
 	input_window = std::make_unique<Window_InputSettings>(Player::menu_offset_x, 32, MENU_WIDTH, Player::screen_height - 32 * 3);
 	input_window->SetHelpWindow(help_window.get());
 
@@ -140,6 +143,7 @@ void Scene_Settings::SetMode(Window_Settings::UiMode new_mode) {
 	input_mode_window->SetVisible(false);
 	input_help_window->SetVisible(false);
 	help_window->SetVisible(false);
+	help_window2->SetVisible(false);
 	about_window->SetVisible(false);
 
 	picker_window.reset();
@@ -244,6 +248,7 @@ void Scene_Settings::vUpdate() {
 		case Window_Settings::eInput:
 		case Window_Settings::eVideo:
 		case Window_Settings::eAudio:
+		case Window_Settings::eAudioMidi:
 		case Window_Settings::eLicense:
 		case Window_Settings::eEngine:
 		case Window_Settings::eInputButtonCategory:
diff --git a/src/scene_settings.h b/src/scene_settings.h
index cf21a8b91..0bd902ec0 100644
--- a/src/scene_settings.h
+++ b/src/scene_settings.h
@@ -72,6 +72,7 @@ class Scene_Settings : public Scene {
 
 	std::unique_ptr<Window_Command> main_window;
 	std::unique_ptr<Window_Help> help_window;
+	std::unique_ptr<Window_Help> help_window2;
 	std::unique_ptr<Window_About> about_window;
 	std::unique_ptr<Window_Settings> options_window;
 	std::unique_ptr<Window_InputSettings> input_window;
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index cba597ced..0cb1003d4 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -31,6 +31,8 @@
 #include "player.h"
 #include "system.h"
 #include "audio.h"
+#include "audio_midi.h"
+#include "audio_generic_midiout.h"
 
 class MenuItem final : public ConfigParam<StringView> {
 public:
@@ -51,7 +53,7 @@ void Window_Settings::DrawOption(int index) {
 	auto& option = options[index];
 
 	bool enabled = bool(option.action);
-	Font::SystemColor color = enabled ? Font::ColorDefault : Font::ColorDisabled;
+	Font::SystemColor color = enabled ? option.color : Font::ColorDisabled;
 
 	contents->TextDraw(rect, color, option.text);
 	contents->TextDraw(rect, color, option.value_text, Text::AlignRight);
@@ -127,6 +129,9 @@ void Window_Settings::Refresh() {
 		case eAudio:
 			RefreshAudio();
 			break;
+		case eAudioMidi:
+			RefreshAudioMidi();
+			break;
 		case eEngine:
 			RefreshEngine();
 			break;
@@ -163,8 +168,15 @@ void Window_Settings::Refresh() {
 void Window_Settings::UpdateHelp() {
 	if (index >= 0 && index < static_cast<int>(options.size())) {
 		help_window->SetText(options[index].help);
+		if (help_window2) {
+			help_window2->SetText(options[index].help2);
+			help_window2->SetVisible(!options[index].help2.empty());
+		}
 	} else {
 		help_window->SetText("");
+		if (help_window2) {
+			help_window2->SetVisible(false);
+		}
 	}
 }
 
@@ -265,12 +277,59 @@ void Window_Settings::RefreshAudio() {
 
 	AddOption(cfg.music_volume, [this](){ Audio().BGM_SetGlobalVolume(GetCurrentOption().current_value); });
 	AddOption(cfg.sound_volume, [this](){ Audio().SE_SetGlobalVolume(GetCurrentOption().current_value); });
-	/*AddOption("Midi Backend", LockedConfigParam<std::string>("Unknown"), "",
-			[](){},
-			"Which MIDI backend to use");
-	AddOption("Midi Soundfont", LockedConfigParam<std::string>("Default"), "",
-			[](){},
-			"Which MIDI soundfont to use");*/
+	AddOption(MenuItem("MIDI drivers", "Configure MIDI playback", ""), [this](){ Push(eAudioMidi); });
+	AddOption(cfg.soundfont, [this](){ });
+}
+
+void Window_Settings::RefreshAudioMidi() {
+	auto cfg = Audio().GetConfig();
+
+	bool used = false;
+
+	AddOption(MenuItem("> Information <", "The first active and working option is used for MIDI", ""), [](){});
+	options.back().help2 = "Changes take effect when a new MIDI file is played";
+
+#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
+	AddOption(cfg.fluidsynth_midi, []() { Audio().SetFluidsynthEnabled(Audio().GetConfig().fluidsynth_midi.Toggle()); });
+	if (!MidiDecoder::CheckFluidsynth(options.back().help2)) {
+		options.back().text += " [Not working]";
+		options.back().color = Font::ColorKnockout;
+	} else if (cfg.fluidsynth_midi.Get()) {
+		options.back().text += " [In use]";
+		used = true;
+	}
+#endif
+#ifdef HAVE_LIBWILDMIDI
+	AddOption(cfg.wildmidi_midi, [](){ Audio().SetWildMidiEnabled(Audio().GetConfig().wildmidi_midi.Toggle()); });
+	if (!MidiDecoder::CheckWildMidi(options.back().help2)) {
+		options.back().text += " [Not working]";
+		options.back().color = Font::ColorKnockout;
+	} else if (cfg.wildmidi_midi.Get() && !used) {
+		options.back().text += " [In use]";
+		used = true;
+	}
+#endif
+#ifdef HAVE_NATIVE_MIDI
+	AddOption(cfg.native_midi, [](){ Audio().SetNativeMidiEnabled(Audio().GetConfig().native_midi.Toggle()); });
+	if (!GenericAudioMidiOut().IsInitialized(options.back().help2)) {
+		options.back().text += " [Not working]";
+		options.back().color = Font::ColorKnockout;
+	} else if (cfg.native_midi.Get() && !used) {
+		options.back().text += " [In use]";
+		used = true;
+	}
+#endif
+#ifdef WANT_FMMIDI
+	AddOption(cfg.fmmidi_midi, [](){ Audio().SetFmMidiEnabled(Audio().GetConfig().fmmidi_midi.Toggle()); });
+	if (cfg.fmmidi_midi.Get() && !used) {
+		options.back().text += " [In use]";
+	}
+#endif
+
+	if (options.size() == 1) {
+		options.pop_back();
+		AddOption(MenuItem("MIDI is unavailable", "EasyRPG Player was not compiled with MIDI support", ""), [](){});
+	}
 }
 
 void Window_Settings::RefreshEngine() {
@@ -333,7 +392,7 @@ void Window_Settings::RefreshLicense() {
 #ifdef HAVE_OPUS
 	AddOption(MenuItem("opus", "Decodes the free OPUS audio codec", "BSD"), [](){});
 #endif
-#ifdef HAVE_WILDMIDI
+#ifdef HAVE_LIBWILDMIDI
 	AddOption(MenuItem("WildMidi", "MIDI synthesizer", "LGPLv3+"), [](){});
 #endif
 #ifdef HAVE_FLUIDSYNTH
diff --git a/src/window_settings.h b/src/window_settings.h
index 9effde03c..80d1d34ef 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -42,6 +42,7 @@ class Window_Settings : public Window_Selectable {
 		eInputButtonRemove,
 		eVideo,
 		eAudio,
+		eAudioMidi,
 		eLicense,
 		eEngine,
 		eSave,
@@ -60,8 +61,10 @@ class Window_Settings : public Window_Selectable {
 		std::string text;
 		std::string value_text;
 		std::string help;
+		std::string help2;
 		std::function<void(void)> action;
 		OptionMode mode;
+		Font::SystemColor color = Font::ColorDefault;
 		int current_value;
 		int original_value;
 		int min_value;
@@ -106,6 +109,7 @@ class Window_Settings : public Window_Selectable {
 	 */
 	void Refresh();
 
+	Window_Help* help_window2 = nullptr;
 private:
 
 	/**
@@ -134,6 +138,7 @@ class Window_Settings : public Window_Selectable {
 	void RefreshButtonList();
 	void RefreshVideo();
 	void RefreshAudio();
+	void RefreshAudioMidi();
 	void RefreshEngine();
 	void RefreshLicense();
 

From 8a00b7cc4353a8d9d0db4a9301c058cc0a5fd4fa Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 2 Dec 2023 00:55:28 +0100
Subject: [PATCH 004/222] Config Param: Simplify code via constexpr if

---
 src/config_param.h | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/config_param.h b/src/config_param.h
index 777b2144c..5cc7158eb 100644
--- a/src/config_param.h
+++ b/src/config_param.h
@@ -76,7 +76,7 @@ class ConfigParamBase {
 		}
 
 		if (IsValid(value)) {
-			_value = std::move(value);
+			_value = value;
 			return true;
 		}
 		return false;
@@ -181,30 +181,19 @@ class ConfigParamBase {
 	/** @return human readable representation of the value for the settings scene */
 	virtual std::string ValueToString() const = 0;
 
-	template <typename U = T, typename std::enable_if<std::is_same<U, std::string>::value, int>::type = 0>
-	bool FromIni(const lcf::INIReader& ini) {
+	virtual bool FromIni(const lcf::INIReader& ini) {
 		// FIXME: Migrate IniReader to StringView (or std::string_view with C++17)
 		if (ini.HasValue(ToString(_config_section), ToString(_config_key))) {
-			Set(ini.GetString(ToString(_config_section), ToString(_config_key), T()));
-			return true;
-		}
-		return false;
-	}
-
-	template <typename U = T, typename std::enable_if<std::is_same<U, int>::value, int>::type = 0>
-	bool FromIni(const lcf::INIReader& ini) {
-		if (ini.HasValue(ToString(_config_section), ToString(_config_key))) {
-			Set(ini.GetInteger(ToString(_config_section), ToString(_config_key), T()));
-			return true;
-		}
-		return false;
-	}
-
-	template <typename U = T, typename std::enable_if<std::is_same<U, bool>::value, int>::type = 0>
-	bool FromIni(const lcf::INIReader& ini) {
-		if (ini.HasValue(ToString(_config_section), ToString(_config_key))) {
-			Set(ini.GetBoolean(ToString(_config_section), ToString(_config_key), T()));
-			return true;
+			if constexpr (std::is_same_v<T, std::string>) {
+				Set(ini.GetString(ToString(_config_section), ToString(_config_key), T()));
+				return true;
+			} else if constexpr (std::is_same_v<T, int>) {
+				Set(ini.GetInteger(ToString(_config_section), ToString(_config_key), T()));
+				return true;
+			} else if constexpr (std::is_same_v<T, bool>) {
+				Set(ini.GetBoolean(ToString(_config_section), ToString(_config_key), T()));
+				return true;
+			}
 		}
 		return false;
 	}
@@ -405,8 +394,7 @@ class EnumConfigParam : public ConfigParamBase<E> {
 		return false;
 	}
 
-	template <typename U = E, typename std::enable_if<std::is_same<U, E>::value, int>::type = 0>
-	bool FromIni(const lcf::INIReader& ini) {
+	bool FromIni(const lcf::INIReader& ini) override {
 		if (ini.HasValue(ToString(this->_config_section), ToString(this->_config_key))) {
 			std::string s = ini.GetString(ToString(this->_config_section), ToString(this->_config_key), std::string());
 			for (size_t i = 0; i < _tags.size(); ++i) {

From d3577f56f95e3f1a76609855fc99817e8eb1640c Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 4 Dec 2023 01:53:00 +0100
Subject: [PATCH 005/222] Ui: Add OpenURL to SDL2

This function can open folders and websites, useful for the settings
---
 src/baseui.h                 |  9 +++++++++
 src/platform/sdl/sdl2_ui.cpp | 19 ++++++++++++++++++-
 src/platform/sdl/sdl2_ui.h   |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/baseui.h b/src/baseui.h
index 266c3ee4a..05cb71f10 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -220,6 +220,15 @@ class BaseUi {
 	 */
 	void SetGameResolution(GameResolution resolution);
 
+	/**
+	 * Opens the specified URL through the operating system.
+	 * Opens a file browser when file:// is provided.
+	 *
+	 * @param url URL to open
+	 * @return true when successful
+	 */
+	virtual bool OpenURL(StringView path) { (void)path; return false; }
+
 	/** Toggles "stretch to screen width" on or off */
 	virtual void ToggleStretch() {};
 
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 6e5255166..3d4311caa 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -749,7 +749,6 @@ void Sdl2Ui::ProcessWindowEvent(SDL_Event &evnt) {
 				break;
 			}
 		}
-#endif
 
 		ShowCursor(last);
 
@@ -1262,3 +1261,21 @@ Rect Sdl2Ui::GetWindowMetrics() const {
 		return window_mode_metrics;
 	}
 }
+
+bool Sdl2Ui::OpenURL(StringView url) {
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+	if (IsFullscreen()) {
+		ToggleFullscreen();
+	}
+
+	if (SDL_OpenURL(ToString(url).c_str()) < 0) {
+		Output::Warning("Open URL {} failed: {}", url, SDL_GetError());
+		return false;
+	}
+
+	return true;
+#else
+	Output::Warning("Cannot Open URL: SDL2 version too old (must be 2.0.14)");
+	return false;
+#endif
+}
diff --git a/src/platform/sdl/sdl2_ui.h b/src/platform/sdl/sdl2_ui.h
index c9543f2aa..cfa28769c 100644
--- a/src/platform/sdl/sdl2_ui.h
+++ b/src/platform/sdl/sdl2_ui.h
@@ -70,6 +70,7 @@ class Sdl2Ui final : public BaseUi {
 	void ToggleStretch() override;
 	void ToggleVsync() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
+	bool OpenURL(StringView url) override;
 	Rect GetWindowMetrics() const override;
 
 #ifdef SUPPORT_AUDIO

From 1cbf5e77c320b4d014e0eecd8f558fda9e1fb531 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 4 Dec 2023 01:55:45 +0100
Subject: [PATCH 006/222] Settings: Make "Pause when focus lost" a setting
 instead of a compile time flag

Fix #2925
---
 src/baseui.h                 | 12 +++++++++++-
 src/game_config.cpp          |  2 ++
 src/game_config.h            |  1 +
 src/options.h                | 12 ------------
 src/platform/sdl/sdl2_ui.cpp | 12 ++++++++----
 src/platform/sdl/sdl_ui.cpp  |  8 ++++++--
 src/window_settings.cpp      |  1 +
 7 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/baseui.h b/src/baseui.h
index 05cb71f10..3ebc01be9 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -191,9 +191,15 @@ class BaseUi {
 	/** Toggle whether we should show fps */
 	void ToggleShowFps();
 
-	/** Toggle wheter we should show fps on the titlebar */
+	/** Toggle whether we should show fps on the titlebar */
 	void ToggleShowFpsOnTitle();
 
+	/**
+	 * Set whether the program pauses the execution when the program focus is lost.
+	 * @param value
+	 */
+	void SetPauseWhenFocusLost(bool value);
+
 	/**
 	 * @return the minimum amount of time each physical frame should take.
 	 * If the UI manages time (i.e.) vsync, will return a 0 duration.
@@ -386,6 +392,10 @@ inline void BaseUi::ToggleShowFpsOnTitle() {
 	vcfg.fps_render_window.Toggle();
 }
 
+inline void BaseUi::SetPauseWhenFocusLost(bool value) {
+	vcfg.pause_when_focus_lost.Set(value);
+}
+
 inline Game_Clock::duration BaseUi::GetFrameLimit() const {
 	return IsFrameRateSynchronized() ? Game_Clock::duration(0) : frame_limit;
 }
diff --git a/src/game_config.cpp b/src/game_config.cpp
index bcaa72b4d..24f1d9c4c 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -350,6 +350,7 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	video.scaling_mode.FromIni(ini);
 	video.stretch.FromIni(ini);
 	video.touch_ui.FromIni(ini);
+	video.pause_when_focus_lost.FromIni(ini);
 	video.game_resolution.FromIni(ini);
 
 	if (ini.HasValue("Video", "WindowX") && ini.HasValue("Video", "WindowY") && ini.HasValue("Video", "WindowWidth") && ini.HasValue("Video", "WindowHeight")) {
@@ -437,6 +438,7 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
 	video.scaling_mode.ToIni(os);
 	video.stretch.ToIni(os);
 	video.touch_ui.ToIni(os);
+	video.pause_when_focus_lost.ToIni(os);
 	video.game_resolution.ToIni(os);
 
 	// only preserve when toggling between window and fullscreen is supported
diff --git a/src/game_config.h b/src/game_config.h
index 0462a1a45..b0bb22aef 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -85,6 +85,7 @@ struct Game_ConfigVideo {
 		Utils::MakeSvArray("nearest", "integer", "bilinear"),
 		Utils::MakeSvArray("Scale to screen size (Causes scaling artifacts)", "Scale to multiple of the game resolution", "Like Nearest, but output is blurred to avoid artifacts")};
 	BoolConfigParam stretch{ "Stretch", "Stretch to the width of the window/screen", "Video", "Stretch", false };
+	BoolConfigParam pause_when_focus_lost{ "Pause when focus lost", "Pause the execution when the program is in the background", "Video", "PauseWhenFocusLost", true };
 	BoolConfigParam touch_ui{ "Touch Ui", "Display the touch ui", "Video", "TouchUi", true };
 	EnumConfigParam<GameResolution, 3> game_resolution{ "Resolution", "Game resolution. Changes require a restart.", "Video", "GameResolution", GameResolution::Original,
 		Utils::MakeSvArray("Original (Recommended)", "Widescreen (Experimental)", "Ultrawide (Experimental)"),
diff --git a/src/options.h b/src/options.h
index 5f673d83a..fc05038da 100644
--- a/src/options.h
+++ b/src/options.h
@@ -52,18 +52,6 @@
 /** Targeted screen bits per pixel. */
 #define SCREEN_TARGET_BPP 32
 
-/**
- * Pause the game process when the player window
- * looses its focus.
- */
-#define PAUSE_GAME_WHEN_FOCUS_LOST 1
-
-/**
- * Pause the audio process when the player window
- * looses its focus.
- */
-#define PAUSE_AUDIO_WHEN_FOCUS_LOST 1
-
 /** INI configuration filename. */
 #define INI_NAME "RPG_RT.ini"
 #define EASYRPG_INI_NAME "EasyRPG.ini"
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 3d4311caa..1b062505e 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -732,16 +732,17 @@ void Sdl2Ui::ProcessEvent(SDL_Event &evnt) {
 
 void Sdl2Ui::ProcessWindowEvent(SDL_Event &evnt) {
 	int state = evnt.window.event;
-#if PAUSE_GAME_WHEN_FOCUS_LOST
+
 	if (state == SDL_WINDOWEVENT_FOCUS_LOST) {
+		if (!vcfg.pause_when_focus_lost.Get()) {
+			return;
+		}
 
 		Player::Pause();
 
 		bool last = ShowCursor(true);
 
-#ifndef EMSCRIPTEN
 		// Filter SDL events until focus is regained
-
 		SDL_Event wait_event;
 
 		while (SDL_WaitEvent(&wait_event)) {
@@ -757,7 +758,7 @@ void Sdl2Ui::ProcessWindowEvent(SDL_Event &evnt) {
 
 		return;
 	}
-#endif
+
 #if defined(USE_MOUSE_OR_TOUCH) && defined(SUPPORT_MOUSE_OR_TOUCH)
 	if (state == SDL_WINDOWEVENT_ENTER) {
 		mouse_focus = true;
@@ -1230,6 +1231,7 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.scaling_mode.SetOptionVisible(true);
 	cfg.stretch.SetOptionVisible(true);
 	cfg.game_resolution.SetOptionVisible(true);
+	cfg.pause_when_focus_lost.SetOptionVisible(true);
 
 	cfg.vsync.Set(current_display_mode.vsync);
 	cfg.window_zoom.Set(current_display_mode.zoom);
@@ -1243,6 +1245,8 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.window_zoom.SetOptionVisible(false);
 	// Toggling this freezes the web player
 	cfg.vsync.SetOptionVisible(false);
+	cfg.pause_when_focus_lost.Lock(false);
+	cfg.pause_when_focus_lost.SetOptionVisible(false);
 #elif defined(__WIIU__)
 	// FIXME: Some options below may crash, better disable for now
 	cfg.fullscreen.SetOptionVisible(false);
diff --git a/src/platform/sdl/sdl_ui.cpp b/src/platform/sdl/sdl_ui.cpp
index 63ed428c2..04961a612 100644
--- a/src/platform/sdl/sdl_ui.cpp
+++ b/src/platform/sdl/sdl_ui.cpp
@@ -478,8 +478,11 @@ void SdlUi::ProcessActiveEvent(SDL_Event &evnt) {
 	int state;
 	state = evnt.active.state;
 
-#if PAUSE_GAME_WHEN_FOCUS_LOST
 	if (state == SDL_APPINPUTFOCUS && !evnt.active.gain) {
+		if (!vcfg.pause_when_focus_lost.Get()) {
+			return;
+		}
+
 		Player::Pause();
 
 		bool last = ShowCursor(true);
@@ -500,7 +503,6 @@ void SdlUi::ProcessActiveEvent(SDL_Event &evnt) {
 
 		return;
 	}
-#endif
 }
 
 void SdlUi::ProcessKeyDownEvent(SDL_Event &evnt) {
@@ -747,6 +749,8 @@ void SdlUi::vGetConfig(Game_ConfigVideo& cfg) const {
 #endif
 
 	cfg.fullscreen.SetOptionVisible(toggle_fs_available);
+	cfg.pause_when_focus_lost.SetOptionVisible(toggle_fs_available);
+
 #ifdef SUPPORT_ZOOM
 	cfg.window_zoom.SetOptionVisible(true);
 	cfg.window_zoom.Set(current_display_mode.zoom);
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 0cb1003d4..3a901b58e 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -268,6 +268,7 @@ void Window_Settings::RefreshVideo() {
 	AddOption(cfg.fps_render_window, [](){ DisplayUi->ToggleShowFpsOnTitle(); });
 	AddOption(cfg.stretch, []() { DisplayUi->ToggleStretch(); });
 	AddOption(cfg.scaling_mode, [this](){ DisplayUi->SetScalingMode(static_cast<ScalingMode>(GetCurrentOption().current_value)); });
+	AddOption(cfg.pause_when_focus_lost, [cfg]() mutable { DisplayUi->SetPauseWhenFocusLost(cfg.pause_when_focus_lost.Toggle()); });
 	AddOption(cfg.touch_ui, [](){ DisplayUi->ToggleTouchUi(); });
 	AddOption(cfg.game_resolution, [this]() { DisplayUi->SetGameResolution(static_cast<GameResolution>(GetCurrentOption().current_value)); });
 }

From ff6d8cd284e0fbf932a84f4406d8dc35cc4d0127 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 4 Dec 2023 01:58:02 +0100
Subject: [PATCH 007/222] Settings: Code improvements for MIDI

This already contains a few lines of font I couldn't properly split.
Wrote both at the same time...
---
 src/audio.cpp           |  15 ++++++
 src/config_param.h      |  11 ++++
 src/game_config.cpp     |  52 +++++++++++++++++++
 src/game_config.h       |  19 ++++++-
 src/scene_settings.cpp  |   3 +-
 src/window_settings.cpp | 109 ++++++++++++++++++++++++++--------------
 src/window_settings.h   |   6 +++
 7 files changed, 176 insertions(+), 39 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index 1448736ce..fd6e720ec 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -70,6 +70,21 @@ AudioInterface::AudioInterface(const Game_ConfigAudio& cfg) : cfg(cfg) {
 Game_ConfigAudio AudioInterface::GetConfig() const {
 	auto acfg = cfg;
 	acfg.Hide();
+
+#if !defined(HAVE_FLUIDSYNTH) && !defined(HAVE_FLUIDLITE)
+	acfg.fluidsynth_midi.SetOptionVisible(false);
+	acfg.soundfont.SetOptionVisible(false);
+#endif
+#ifndef HAVE_LIBWILDMIDI
+	acfg.wildmidi_midi.SetOptionVisible(false);
+#endif
+#ifndef HAVE_NATIVE_MIDI
+	acfg.native_midi.SetOptionVisible(false);
+#endif
+#ifndef WANT_FMMIDI
+	acfg.fmmidi_midi.SetOptionVisible(false);
+#endif
+
 	vGetConfig(acfg);
 	return acfg;
 }
diff --git a/src/config_param.h b/src/config_param.h
index 5cc7158eb..cdbe2ecd5 100644
--- a/src/config_param.h
+++ b/src/config_param.h
@@ -19,6 +19,7 @@
 #define EP_CONFIG_PARAM_H
 
 #include "string_view.h"
+#include "filefinder.h"
 #include <array>
 #include <cstdint>
 #include <lcf/inireader.h>
@@ -431,4 +432,14 @@ class EnumConfigParam : public ConfigParamBase<E> {
 	}
 };
 
+class PathConfigParam : public StringConfigParam {
+public:
+	PathConfigParam(StringView name, StringView description, StringView config_section, StringView config_key, std::string value) :
+			StringConfigParam(name, description, config_section, config_key, value) {}
+
+	std::string ValueToString() const override {
+		return std::get<1>(FileFinder::GetPathAndFilename(Get()));
+	}
+};
+
 #endif
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 24f1d9c4c..883c82591 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -35,6 +35,8 @@
 
 namespace {
 	std::string config_path;
+	std::string soundfont_path;
+	std::string font_path;
 	StringView config_name = "config.ini";
 }
 
@@ -58,6 +60,7 @@ void Game_ConfigVideo::Hide() {
 	scaling_mode.SetOptionVisible(false);
 	stretch.SetOptionVisible(false);
 	touch_ui.SetOptionVisible(false);
+	pause_when_focus_lost.SetOptionVisible(false);
 	game_resolution.SetOptionVisible(false);
 }
 
@@ -201,6 +204,35 @@ Filesystem_Stream::InputStream Game_Config::GetGlobalConfigFileInput() {
 	return Filesystem_Stream::InputStream();
 }
 
+FilesystemView Game_Config::GetSoundfontFilesystem() {
+	std::string path = soundfont_path;
+	if (path.empty()) {
+		path = FileFinder::MakePath(GetGlobalConfigFilesystem().GetFullPath(), "Soundfont");
+	}
+
+	if (!FileFinder::Root().MakeDirectory(path, true)) {
+		Output::Warning("Could not create soundfont path {}", path);
+		return {};
+	}
+
+	return FileFinder::Root().Create(path);
+}
+
+
+FilesystemView Game_Config::GetFontFilesystem() {
+	std::string path = font_path;
+	if (path.empty()) {
+		path = FileFinder::MakePath(GetGlobalConfigFilesystem().GetFullPath(), "Font");
+	}
+
+	if (!FileFinder::Root().MakeDirectory(path, true)) {
+		Output::Warning("Could not create fount path {}", path);
+		return {};
+	}
+
+	return FileFinder::Root().Create(path);
+}
+
 Filesystem_Stream::OutputStream Game_Config::GetGlobalConfigFileOutput() {
 	auto fs = GetGlobalConfigFilesystem();
 
@@ -327,6 +359,18 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			}
 			continue;
 		}
+		if (cp.ParseNext(arg, 1, "--soundfont-path")) {
+			if (arg.NumValues() > 0) {
+				soundfont_path = FileFinder::MakeCanonical(arg.Value(0), 0);
+			}
+			continue;
+		}
+		if (cp.ParseNext(arg, 1, "--font-path")) {
+			if (arg.NumValues() > 0) {
+				font_path = FileFinder::MakeCanonical(arg.Value(0), 0);
+			}
+			continue;
+		}
 
 		cp.SkipNext();
 	}
@@ -423,6 +467,10 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	player.settings_in_title.FromIni(ini);
 	player.settings_in_menu.FromIni(ini);
 	player.show_startup_logos.FromIni(ini);
+	player.font1.FromIni(ini);
+	player.font1_size.FromIni(ini);
+	player.font2.FromIni(ini);
+	player.font2_size.FromIni(ini);
 }
 
 void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
@@ -506,6 +554,10 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
 	player.settings_in_title.ToIni(os);
 	player.settings_in_menu.ToIni(os);
 	player.show_startup_logos.ToIni(os);
+	player.font1.ToIni(os);
+	player.font1_size.ToIni(os);
+	player.font2.ToIni(os);
+	player.font2_size.ToIni(os);
 
 	os << "\n";
 }
diff --git a/src/game_config.h b/src/game_config.h
index b0bb22aef..c22151448 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -68,6 +68,10 @@ struct Game_ConfigPlayer {
 		Utils::MakeSvArray("None", "Custom", "All"),
 		Utils::MakeSvArray("none", "custom", "all"),
 		Utils::MakeSvArray("Do not show any additional logos", "Show custom logos bundled with the game", "Show all logos, including the original from RPG Maker")};
+	PathConfigParam font1 { "Font 1", "The game chooses whether it wants font 1 or 2", "Player", "Font1", "" };
+	RangeConfigParam<int> font1_size { "Font 1 Size", "", "Player", "Font1Size", 12, 6, 16};
+	PathConfigParam font2 { "Font 2", "The game chooses whether it wants font 1 or 2", "Player", "Font2", "" };
+	RangeConfigParam<int> font2_size { "Font 2 Size", "", "Player", "Font2Size", 12, 6, 16};
 
 	void Hide();
 };
@@ -108,7 +112,7 @@ struct Game_ConfigAudio {
 	BoolConfigParam wildmidi_midi { "WildMidi (GUS)", "Play MIDI using GUS patches", "Audio", "WildMidi", true };
 	BoolConfigParam native_midi { "Native MIDI", "Play MIDI through the operating system ", "Audio", "NativeMidi", true };
 	BoolConfigParam fmmidi_midi { "FmMidi", "Play MIDI using the built-in MIDI synthesizer", "Audio", "FmMidi", true };
-	StringConfigParam soundfont { "Soundfont", "Soundfont to use for Fluidsynth", "Audio", "Soundfont", "" };
+	PathConfigParam soundfont { "Soundfont", "Soundfont to use for Fluidsynth", "Audio", "Soundfont", "" };
 
 	void Hide();
 };
@@ -151,6 +155,19 @@ struct Game_Config {
 	 */
 	static FilesystemView GetGlobalConfigFilesystem();
 
+	/**
+	 * Returns the filesystem view to the soundfont directory
+	 * By default this is config/Soundfont
+	 */
+	static FilesystemView GetSoundfontFilesystem();
+
+	/**
+	 * Returns the filesystem view to the font directory
+	 * By default this is config/Font
+	 */
+	static FilesystemView GetFontFilesystem();
+
+
 	/**
 	 * Returns a handle to the global config file for reading.
 	 * The file is created if it does not exist.
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index 4b7bc7cc3..afbcd91f0 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -91,7 +91,7 @@ void Scene_Settings::CreateOptionsWindow() {
 	options_window = std::make_unique<Window_Settings>(Player::menu_offset_x + 32, 32, MENU_WIDTH - 64, Player::screen_height - 32 * 2);
 	options_window->SetHelpWindow(help_window.get());
 
-	help_window2 = std::make_unique<Window_Help>(Player::menu_offset_x, Player::screen_height - 32, MENU_WIDTH, 32);
+	help_window2 = std::make_unique<Window_Help>(Player::menu_offset_x, options_window->GetBottomY(), MENU_WIDTH, 32);
 	options_window->help_window2 = help_window2.get();
 
 	input_window = std::make_unique<Window_InputSettings>(Player::menu_offset_x, 32, MENU_WIDTH, Player::screen_height - 32 * 3);
@@ -249,6 +249,7 @@ void Scene_Settings::vUpdate() {
 		case Window_Settings::eVideo:
 		case Window_Settings::eAudio:
 		case Window_Settings::eAudioMidi:
+		case Window_Settings::eAudioSoundfont:
 		case Window_Settings::eLicense:
 		case Window_Settings::eEngine:
 		case Window_Settings::eInputButtonCategory:
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 3a901b58e..4b748ea40 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -23,6 +23,7 @@
 #include "text.h"
 #include "window_settings.h"
 #include "game_config.h"
+#include "game_system.h"
 #include "input_buttons.h"
 #include "keys.h"
 #include "output.h"
@@ -132,6 +133,9 @@ void Window_Settings::Refresh() {
 		case eAudioMidi:
 			RefreshAudioMidi();
 			break;
+		case eAudioSoundfont:
+			RefreshAudioSoundfont();
+			break;
 		case eEngine:
 			RefreshEngine();
 			break;
@@ -278,8 +282,10 @@ void Window_Settings::RefreshAudio() {
 
 	AddOption(cfg.music_volume, [this](){ Audio().BGM_SetGlobalVolume(GetCurrentOption().current_value); });
 	AddOption(cfg.sound_volume, [this](){ Audio().SE_SetGlobalVolume(GetCurrentOption().current_value); });
-	AddOption(MenuItem("MIDI drivers", "Configure MIDI playback", ""), [this](){ Push(eAudioMidi); });
-	AddOption(cfg.soundfont, [this](){ });
+	if (cfg.fluidsynth_midi.IsOptionVisible() || cfg.wildmidi_midi.IsOptionVisible() || cfg.native_midi.IsOptionVisible() || cfg.fmmidi_midi.IsOptionVisible()) {
+		AddOption(MenuItem("MIDI drivers", "Configure MIDI playback", ""), [this]() { Push(eAudioMidi); });
+	}
+	AddOption(cfg.soundfont, [this](){ Push(eAudioSoundfont); });
 }
 
 void Window_Settings::RefreshAudioMidi() {
@@ -290,47 +296,76 @@ void Window_Settings::RefreshAudioMidi() {
 	AddOption(MenuItem("> Information <", "The first active and working option is used for MIDI", ""), [](){});
 	options.back().help2 = "Changes take effect when a new MIDI file is played";
 
-#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
-	AddOption(cfg.fluidsynth_midi, []() { Audio().SetFluidsynthEnabled(Audio().GetConfig().fluidsynth_midi.Toggle()); });
-	if (!MidiDecoder::CheckFluidsynth(options.back().help2)) {
-		options.back().text += " [Not working]";
-		options.back().color = Font::ColorKnockout;
-	} else if (cfg.fluidsynth_midi.Get()) {
-		options.back().text += " [In use]";
-		used = true;
+	if (cfg.fluidsynth_midi.IsOptionVisible()) {
+		AddOption(cfg.fluidsynth_midi, []() { Audio().SetFluidsynthEnabled(Audio().GetConfig().fluidsynth_midi.Toggle()); });
+		if (!MidiDecoder::CheckFluidsynth(options.back().help2)) {
+			options.back().text += " [Not working]";
+			options.back().color = Font::ColorKnockout;
+		} else if (cfg.fluidsynth_midi.Get()) {
+			options.back().text += " [In use]";
+			used = true;
+		}
 	}
-#endif
-#ifdef HAVE_LIBWILDMIDI
-	AddOption(cfg.wildmidi_midi, [](){ Audio().SetWildMidiEnabled(Audio().GetConfig().wildmidi_midi.Toggle()); });
-	if (!MidiDecoder::CheckWildMidi(options.back().help2)) {
-		options.back().text += " [Not working]";
-		options.back().color = Font::ColorKnockout;
-	} else if (cfg.wildmidi_midi.Get() && !used) {
-		options.back().text += " [In use]";
-		used = true;
+
+	if (cfg.wildmidi_midi.IsOptionVisible()) {
+		AddOption(cfg.wildmidi_midi, []() { Audio().SetWildMidiEnabled(Audio().GetConfig().wildmidi_midi.Toggle()); });
+		if (!MidiDecoder::CheckWildMidi(options.back().help2)) {
+			options.back().text += " [Not working]";
+			options.back().color = Font::ColorKnockout;
+		} else if (cfg.wildmidi_midi.Get() && !used) {
+			options.back().text += " [In use]";
+			used = true;
+		}
 	}
-#endif
-#ifdef HAVE_NATIVE_MIDI
-	AddOption(cfg.native_midi, [](){ Audio().SetNativeMidiEnabled(Audio().GetConfig().native_midi.Toggle()); });
-	if (!GenericAudioMidiOut().IsInitialized(options.back().help2)) {
-		options.back().text += " [Not working]";
-		options.back().color = Font::ColorKnockout;
-	} else if (cfg.native_midi.Get() && !used) {
-		options.back().text += " [In use]";
-		used = true;
+
+	if (cfg.native_midi.IsOptionVisible()) {
+		AddOption(cfg.native_midi, []() { Audio().SetNativeMidiEnabled(Audio().GetConfig().native_midi.Toggle()); });
+		if (!GenericAudioMidiOut().IsInitialized(options.back().help2)) {
+			options.back().text += " [Not working]";
+			options.back().color = Font::ColorKnockout;
+		} else if (cfg.native_midi.Get() && !used) {
+			options.back().text += " [In use]";
+			used = true;
+		}
 	}
-#endif
-#ifdef WANT_FMMIDI
-	AddOption(cfg.fmmidi_midi, [](){ Audio().SetFmMidiEnabled(Audio().GetConfig().fmmidi_midi.Toggle()); });
-	if (cfg.fmmidi_midi.Get() && !used) {
-		options.back().text += " [In use]";
+
+	if (cfg.fmmidi_midi.IsOptionVisible()) {
+		AddOption(cfg.fmmidi_midi, []() { Audio().SetFmMidiEnabled(Audio().GetConfig().fmmidi_midi.Toggle()); });
+		if (cfg.fmmidi_midi.Get() && !used) {
+			options.back().text += " [In use]";
+		}
 	}
-#endif
+}
+
+void Window_Settings::RefreshAudioSoundfont() {
+	auto fs = Game_Config::GetSoundfontFilesystem();
+
+	if (!fs) {
+		Pop();
+	}
+
+	fs.ClearCache();
 
-	if (options.size() == 1) {
-		options.pop_back();
-		AddOption(MenuItem("MIDI is unavailable", "EasyRPG Player was not compiled with MIDI support", ""), [](){});
+	auto acfg = Audio().GetConfig();
+	AddOption(MenuItem("<Autodetect>", "Attempt to find a suitable soundfont automatically", acfg.soundfont.Get().empty() ? "[x]" : ""), [this]() {
+		Audio().SetFluidsynthSoundfont({});
+		Pop();
+	});
+
+	auto list = fs.ListDirectory();
+	assert(list);
+
+	std::string sf_lower = Utils::LowerCase(Audio().GetFluidsynthSoundfont());
+	for (const auto& item: *list) {
+		if (item.second.type == DirectoryTree::FileType::Regular && StringView(item.first).ends_with(".sf2")) {
+			AddOption(MenuItem(item.second.name, "Use this custom soundfont", StringView(sf_lower).ends_with(item.first) ? "[x]" : ""), [this, fs, item]() {
+				Audio().SetFluidsynthSoundfont(FileFinder::MakePath(fs.GetFullPath(), item.second.name));
+				Pop();
+			});
+		}
 	}
+
+	AddOption(MenuItem("<Open Soundfont directory>", "Open the soundfont directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
 }
 
 void Window_Settings::RefreshEngine() {
diff --git a/src/window_settings.h b/src/window_settings.h
index 80d1d34ef..7270ea2fe 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -43,8 +43,11 @@ class Window_Settings : public Window_Selectable {
 		eVideo,
 		eAudio,
 		eAudioMidi,
+		eAudioSoundfont,
 		eLicense,
 		eEngine,
+		eEngineFont1,
+		eEngineFont2,
 		eSave,
 		eEnd,
 		eAbout,
@@ -110,6 +113,7 @@ class Window_Settings : public Window_Selectable {
 	void Refresh();
 
 	Window_Help* help_window2 = nullptr;
+	RangeConfigParam<int> font_size { "<Font Size>", "Font size to use. Not supported for the built-in font.", "", "", 12, 6, 16};
 private:
 
 	/**
@@ -139,7 +143,9 @@ class Window_Settings : public Window_Selectable {
 	void RefreshVideo();
 	void RefreshAudio();
 	void RefreshAudioMidi();
+	void RefreshAudioSoundfont();
 	void RefreshEngine();
+	void RefreshEngineFont(bool mincho);
 	void RefreshLicense();
 
 	void UpdateHelp() override;

From 3e5d648a5532ed741f7c44ed5ac58aab2eae46d4 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 4 Dec 2023 01:58:16 +0100
Subject: [PATCH 008/222] Settings: Allow configuring the default fonts

The Window class was extended to allow setting a font.
---
 src/bitmap.cpp          | 28 ++++++-------
 src/bitmap.h            | 20 ++++++++--
 src/filefinder.cpp      |  9 -----
 src/filefinder.h        |  8 ++++
 src/font.cpp            | 16 +++++++-
 src/game_config.cpp     |  7 +++-
 src/scene_logo.cpp      |  2 +
 src/scene_settings.cpp  | 31 +++++++++++++++
 src/scene_settings.h    |  1 +
 src/window.h            | 27 +++++++++++++
 src/window_help.cpp     |  2 +-
 src/window_settings.cpp | 87 +++++++++++++++++++++++++++++++++++++----
 12 files changed, 200 insertions(+), 38 deletions(-)

diff --git a/src/bitmap.cpp b/src/bitmap.cpp
index d74a358e9..c7785efbd 100644
--- a/src/bitmap.cpp
+++ b/src/bitmap.cpp
@@ -333,20 +333,20 @@ void Bitmap::HueChangeBlit(int x, int y, Bitmap const& src, Rect const& src_rect
 }
 
 Point Bitmap::TextDraw(Rect const& rect, int color, StringView text, Text::Alignment align) {
-	FontRef font = Font::Default();
-
 	switch (align) {
 	case Text::AlignLeft:
 		return TextDraw(rect.x, rect.y, color, text);
 		break;
 	case Text::AlignCenter: {
-		Rect text_rect = Text::GetSize(*font, text);
+		auto f = font ? font : Font::Default();
+		Rect text_rect = Text::GetSize(*f, text);
 		int dx = rect.x + (rect.width - text_rect.width) / 2;
 		return TextDraw(dx, rect.y, color, text);
 		break;
 	}
 	case Text::AlignRight: {
-		Rect text_rect = Text::GetSize(*font, text);
+		auto f = font ? font : Font::Default();
+		Rect text_rect = Text::GetSize(*f, text);
 		int dx = rect.x + rect.width - text_rect.width;
 		return TextDraw(dx, rect.y, color, text);
 		break;
@@ -354,30 +354,30 @@ Point Bitmap::TextDraw(Rect const& rect, int color, StringView text, Text::Align
 	default: assert(false);
 	}
 
-	return Point();
+	return {};
 }
 
 Point Bitmap::TextDraw(int x, int y, int color, StringView text, Text::Alignment align) {
-	auto font = Font::Default();
+	auto f = font ? font : Font::Default();
 	auto system = Cache::SystemOrBlack();
-	return Text::Draw(*this, x, y, *font, *system, color, text, align);
+	return Text::Draw(*this, x, y, *f, *system, color, text, align);
 }
 
 Point Bitmap::TextDraw(Rect const& rect, Color color, StringView text, Text::Alignment align) {
-	FontRef font = Font::Default();
-
 	switch (align) {
 	case Text::AlignLeft:
 		return TextDraw(rect.x, rect.y, color, text);
 		break;
 	case Text::AlignCenter: {
-		Rect text_rect = Text::GetSize(*font, text);
+		auto f = font ? font : Font::Default();
+		Rect text_rect = Text::GetSize(*f, text);
 		int dx = rect.x + (rect.width - text_rect.width) / 2;
 		return TextDraw(dx, rect.y, color, text);
 		break;
 	}
 	case Text::AlignRight: {
-		Rect text_rect = Text::GetSize(*font, text);
+		auto f = font ? font : Font::Default();
+		Rect text_rect = Text::GetSize(*f, text);
 		int dx = rect.x + rect.width - text_rect.width;
 		return TextDraw(dx, rect.y, color, text);
 		break;
@@ -385,12 +385,12 @@ Point Bitmap::TextDraw(Rect const& rect, Color color, StringView text, Text::Ali
 	default: assert(false);
 	}
 
-	return Point();
+	return {};
 }
 
 Point Bitmap::TextDraw(int x, int y, Color color, StringView text) {
-	auto font = Font::Default();
-	return Text::Draw(*this, x, y, *font, color, text);
+	auto f = font ? font : Font::Default();
+	return Text::Draw(*this, x, y, *f, color, text);
 }
 
 Rect Bitmap::TransformRectangle(const Transform& xform, const Rect& rect) {
diff --git a/src/bitmap.h b/src/bitmap.h
index b7be3f1db..e10fb1426 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -241,7 +241,7 @@ class Bitmap {
 	Color GetColorAt(int x, int y) const;
 
 	/**
-	 * Draws text to bitmap using the Font::Default() font.
+	 * Draws text to bitmap using the configured Font or the Font::Default() font.
 	 *
 	 * @param x x coordinate where text rendering starts.
 	 * @param y y coordinate where text rendering starts.
@@ -253,7 +253,7 @@ class Bitmap {
 	Point TextDraw(int x, int y, int color, StringView text, Text::Alignment align = Text::AlignLeft);
 
 	/**
-	 * Draws text to bitmap using the Font::Default() font.
+	 * Draws text to bitmap using the configured Font or the Font::Default() font.
 	 *
 	 * @param rect bounding rectangle.
 	 * @param color system color index.
@@ -264,7 +264,7 @@ class Bitmap {
 	Point TextDraw(Rect const& rect, int color, StringView text, Text::Alignment align = Text::AlignLeft);
 
 	/**
-	 * Draws text to bitmap using the Font::Default() font.
+	 * Draws text to bitmap using the configured Font or the Font::Default() font.
 	 *
 	 * @param x x coordinate where text rendering starts.
 	 * @param y y coordinate where text rendering starts.
@@ -275,7 +275,7 @@ class Bitmap {
 	Point TextDraw(int x, int y, Color color, StringView text);
 
 	/**
-	 * Draws text to bitmap using the Font::Default() font.
+	 * Draws text to bitmap using the configured Font or the Font::Default() font.
 	 *
 	 * @param rect bounding rectangle.
 	 * @param color text color.
@@ -594,6 +594,9 @@ class Bitmap {
 	int bpp() const;
 	int pitch() const;
 
+	FontRef GetFont() const;
+	void SetFont(FontRef font);
+
 	ImageOpacity ComputeImageOpacity() const;
 	ImageOpacity ComputeImageOpacity(Rect rect) const;
 
@@ -603,6 +606,7 @@ class Bitmap {
 	ImageOpacity image_opacity = ImageOpacity::Alpha_8Bit;
 	TileOpacity tile_opacity;
 	Color bg_color, sh_color;
+	FontRef font;
 
 	std::string filename;
 
@@ -689,6 +693,14 @@ inline StringView Bitmap::GetFilename() const {
 	return filename;
 }
 
+inline FontRef Bitmap::GetFont() const {
+	return font;
+}
+
+inline void Bitmap::SetFont(FontRef font) {
+	this->font = font;
+}
+
 inline int Bitmap::GetOriginalBpp() const {
 	return original_bpp;
 }
diff --git a/src/filefinder.cpp b/src/filefinder.cpp
index cc6b9004c..e78ae5805 100644
--- a/src/filefinder.cpp
+++ b/src/filefinder.cpp
@@ -57,18 +57,9 @@ namespace {
 	auto MOVIE_TYPES = { ".avi", ".mpg" };
 #endif
 
-	std::string fonts_path;
 	std::shared_ptr<Filesystem> root_fs;
 	FilesystemView game_fs;
 	FilesystemView save_fs;
-
-	constexpr const auto IMG_TYPES = Utils::MakeSvArray(".bmp",  ".png", ".xyz");
-	constexpr const auto MUSIC_TYPES = Utils::MakeSvArray(
-			".opus", ".oga", ".ogg", ".wav", ".mid", ".midi", ".mp3", ".wma");
-	constexpr const auto SOUND_TYPES = Utils::MakeSvArray(
-			".opus", ".oga", ".ogg", ".wav", ".mp3", ".wma");
-	constexpr const auto FONTS_TYPES = Utils::MakeSvArray(".fon", ".fnt", ".bdf", ".ttf", ".ttc", ".otf", ".woff2", ".woff");
-	constexpr const auto TEXT_TYPES = Utils::MakeSvArray(".txt", ".csv", ""); // "" = Complete Filename (incl. extension) provided by the user
 }
 
 FilesystemView FileFinder::Game() {
diff --git a/src/filefinder.h b/src/filefinder.h
index f7cfe6229..7c181808a 100644
--- a/src/filefinder.h
+++ b/src/filefinder.h
@@ -37,6 +37,14 @@
  * insensitive files paths.
  */
 namespace FileFinder {
+	constexpr const auto IMG_TYPES = Utils::MakeSvArray(".bmp",  ".png", ".xyz");
+	constexpr const auto MUSIC_TYPES = Utils::MakeSvArray(
+			".opus", ".oga", ".ogg", ".wav", ".mid", ".midi", ".mp3", ".wma");
+	constexpr const auto SOUND_TYPES = Utils::MakeSvArray(
+			".opus", ".oga", ".ogg", ".wav", ".mp3", ".wma");
+	constexpr const auto FONTS_TYPES = Utils::MakeSvArray(".fon", ".fnt", ".bdf", ".ttf", ".ttc", ".otf", ".woff2", ".woff");
+	constexpr const auto TEXT_TYPES = Utils::MakeSvArray(".txt", ".csv", ""); // "" = Complete Filename (incl. extension) provided by the user
+
 	/**
 	 * Quits FileFinder.
 	 */
diff --git a/src/font.cpp b/src/font.cpp
index e52c43366..f893116d5 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -619,10 +619,24 @@ FontRef Font::CreateFtFont(Filesystem_Stream::InputStream is, int size, bool bol
 void Font::ResetDefault() {
 	SetDefault(nullptr, true);
 	SetDefault(nullptr, false);
+
+#ifdef HAVE_FREETYPE
+	const auto& cfg = Player::player_config;
+	if (!cfg.font1.Get().empty()) {
+		auto is = FileFinder::Root().OpenInputStream(cfg.font1.Get());
+		SetDefault(CreateFtFont(std::move(is), cfg.font1_size.Get(), false, false), false);
+	}
+
+	if (!cfg.font2.Get().empty()) {
+		auto is = FileFinder::Root().OpenInputStream(cfg.font2.Get());
+		SetDefault(CreateFtFont(std::move(is), cfg.font2_size.Get(), false, false), true);
+	}
+#endif
 }
 
 void Font::Dispose() {
-	ResetDefault();
+	SetDefault(nullptr, true);
+	SetDefault(nullptr, false);
 
 #ifdef HAVE_FREETYPE
 	if (library) {
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 883c82591..94df55604 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -41,7 +41,12 @@ namespace {
 }
 
 void Game_ConfigPlayer::Hide() {
-	// Game specific settings unsupported
+#ifndef HAVE_FREETYPE
+	font1.SetOptionVisible(false);
+	font1_size.SetOptionVisible(false);
+	font2.SetOptionVisible(false);
+	font2_size.SetOptionVisible(false);
+#endif
 }
 
 void Game_ConfigVideo::Hide() {
diff --git a/src/scene_logo.cpp b/src/scene_logo.cpp
index e81f1ce4e..dc6188ccf 100644
--- a/src/scene_logo.cpp
+++ b/src/scene_logo.cpp
@@ -63,6 +63,8 @@ void Scene_Logo::Start() {
 
 void Scene_Logo::vUpdate() {
 	if (current_logo_index == 0 && frame_counter == 0) {
+		Font::ResetDefault();
+
 		if (!DetectGame()) {
 			// async delay for emscripten
 			return;
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index afbcd91f0..ea8aa9415 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -258,6 +258,12 @@ void Scene_Settings::vUpdate() {
 		case Window_Settings::eInputListButtonsDeveloper:
 			UpdateOptions();
 			break;
+		case Window_Settings::eEngineFont1:
+			UpdateFont(false);
+			break;
+		case Window_Settings::eEngineFont2:
+			UpdateFont(true);
+			break;
 		case Window_Settings::eInputButtonOption:
 			UpdateButtonOption();
 			break;
@@ -442,6 +448,31 @@ void Scene_Settings::UpdateOptions() {
 	}
 }
 
+void Scene_Settings::UpdateFont(bool mincho) {
+	auto fs = Game_Config::GetFontFilesystem();
+
+	help_window2->SetText("The quick brown fox jumps over the lazy dog 1234567890.");
+
+	int index = options_window->GetIndex();
+	if (index == 0) {
+		help_window2->SetFont(Font::DefaultBitmapFont(mincho));
+		help_window2->SetVisible(true);
+	} else if (index >= options_window->GetRowMax() - 2) {
+		// Size or browse
+	} else {
+		auto is = fs.OpenInputStream(options_window->GetCurrentOption().text);
+		if (is) {
+			auto font = Font::CreateFtFont(std::move(is), options_window->font_size.Get(), false, false);
+			if (font) {
+				help_window2->SetFont(font);
+				help_window2->SetVisible(true);
+			}
+		}
+	}
+
+	UpdateOptions();
+}
+
 void Scene_Settings::UpdateButtonOption() {
 	if (Input::IsTriggered(Input::DECISION)) {
 		switch (input_mode_window->GetIndex()) {
diff --git a/src/scene_settings.h b/src/scene_settings.h
index 0bd902ec0..f62704ea1 100644
--- a/src/scene_settings.h
+++ b/src/scene_settings.h
@@ -63,6 +63,7 @@ class Scene_Settings : public Scene {
 
 	void UpdateMain();
 	void UpdateOptions();
+	void UpdateFont(bool mincho);
 	void UpdateButtonOption();
 	void UpdateButtonAdd();
 	void UpdateButtonRemove();
diff --git a/src/window.h b/src/window.h
index 0968b4931..abefad8f5 100644
--- a/src/window.h
+++ b/src/window.h
@@ -20,6 +20,7 @@
 
 // Headers
 #include "system.h"
+#include "bitmap.h"
 #include "drawable.h"
 #include "rect.h"
 
@@ -61,6 +62,8 @@ class Window : public Drawable {
 	void SetWidth(int nwidth);
 	int GetHeight() const;
 	void SetHeight(int nheight);
+	int GetRightX() const;
+	int GetBottomY() const;
 	int GetOx() const;
 	void SetOx(int nox);
 	int GetOy() const;
@@ -80,6 +83,9 @@ class Window : public Drawable {
 	void SetOpenAnimation(int frames);
 	void SetCloseAnimation(int frames);
 
+	FontRef GetFont() const;
+	void SetFont(FontRef font);
+
 	bool IsOpening() const;
 	bool IsClosing() const;
 	bool IsOpeningOrClosing() const;
@@ -88,6 +94,7 @@ class Window : public Drawable {
 	virtual bool IsSystemGraphicUpdateAllowed() const;
 
 	unsigned long ID;
+	FontRef font;
 	BitmapRef windowskin, contents;
 	bool stretch = true;
 	Rect cursor_rect;
@@ -153,6 +160,7 @@ inline BitmapRef Window::GetContents() const {
 
 inline void Window::SetContents(BitmapRef const& ncontents) {
 	contents = ncontents;
+	contents->SetFont(font);
 }
 
 inline bool Window::GetStretch() const {
@@ -236,6 +244,14 @@ inline int Window::GetHeight() const {
 	return height;
 }
 
+inline int Window::GetRightX() const {
+	return x + width;
+}
+
+inline int Window::GetBottomY() const {
+	return y + height;
+}
+
 inline int Window::GetOx() const {
 	return ox;
 }
@@ -304,4 +320,15 @@ inline bool Window::IsSystemGraphicUpdateAllowed() const {
 	return !IsClosing();
 }
 
+inline FontRef Window::GetFont() const {
+	return font;
+}
+
+inline void Window::SetFont(FontRef font) {
+	this->font = font;
+	if (contents) {
+		contents->SetFont(font);
+	}
+}
+
 #endif
diff --git a/src/window_help.cpp b/src/window_help.cpp
index 3641a7476..1417a6bc7 100644
--- a/src/window_help.cpp
+++ b/src/window_help.cpp
@@ -61,7 +61,7 @@ void Window_Help::AddText(std::string text, int color, Text::Alignment align, bo
 
 		// Special handling for proportional fonts: If the "normal" space is already small do not half it again
 		if (nextpos != decltype(text)::npos) {
-			int space_width = Text::GetSize(*Font::Default(), " ").width;
+			int space_width = Text::GetSize(*(font ? font : Font::Default()), " ").width;
 
 			if (halfwidthspace && space_width >= 6) {
 				text_x_offset += space_width / 2;
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 4b748ea40..7313c8f6b 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -139,6 +139,12 @@ void Window_Settings::Refresh() {
 		case eEngine:
 			RefreshEngine();
 			break;
+		case eEngineFont1:
+			RefreshEngineFont(false);
+			break;
+		case eEngineFont2:
+			RefreshEngineFont(true);
+			break;
 		case eLicense:
 			RefreshLicense();
 			break;
@@ -372,17 +378,82 @@ void Window_Settings::RefreshEngine() {
 	auto& cfg = Player::player_config;
 
 	// FIXME: Binding &cfg is not needed and generates a warning but MSVC requires it
-#ifdef _MSC_VER
+	AddOption(cfg.font1, [this, &cfg]() {
+		font_size.Set(cfg.font1_size.Get());
+		Push(eEngineFont1);
+	});
+	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_gothic) {
+		options.back().text += " [In use]";
+	}
+
+	AddOption(cfg.font2, [this, &cfg]() {
+		font_size.Set(cfg.font2_size.Get());
+		Push(eEngineFont2);
+	});
+	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_mincho) {
+		options.back().text += " [In use]";
+	}
+
+	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<StartupLogos>(GetCurrentOption().current_value)); });
 	AddOption(cfg.settings_autosave, [&cfg](){ cfg.settings_autosave.Toggle(); });
 	AddOption(cfg.settings_in_title, [&cfg](){ cfg.settings_in_title.Toggle(); });
 	AddOption(cfg.settings_in_menu, [&cfg](){ cfg.settings_in_menu.Toggle(); });
-	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<StartupLogos>(GetCurrentOption().current_value)); });
-#else
-	AddOption(cfg.settings_autosave, [](){ cfg.settings_autosave.Toggle(); });
-	AddOption(cfg.settings_in_title, [](){ cfg.settings_in_title.Toggle(); });
-	AddOption(cfg.settings_in_menu, [](){ cfg.settings_in_menu.Toggle(); });
-	AddOption(cfg.show_startup_logos, [this](){ cfg.show_startup_logos.Set(static_cast<StartupLogos>(GetCurrentOption().current_value)); });
-#endif
+}
+
+void Window_Settings::RefreshEngineFont(bool mincho) {
+	auto fs = Game_Config::GetFontFilesystem();
+
+	if (!fs) {
+		Pop();
+	}
+
+	fs.ClearCache();
+
+	auto& cfg = Player::player_config;
+
+	auto& setting = mincho ? cfg.font2 : cfg.font1;
+
+	AddOption(MenuItem("<Built-in Font>", "Use the built-in pixel font", setting.Get().empty() ? "[x]" : ""), [this, &setting, mincho]() {
+		Font::SetDefault(nullptr, mincho);
+		setting.Set("");
+		Pop();
+	});
+
+	//std::string font_lower = Utils::LowerCase(Audio().GetFluidsynthSoundfont());
+
+	auto list = fs.ListDirectory();
+	assert(list);
+	for (const auto& item: *list) {
+		bool is_font = std::any_of(FileFinder::FONTS_TYPES.begin(), FileFinder::FONTS_TYPES.end(), [&item](const auto& ext) {
+			return StringView(item.first).ends_with(ext);
+		});
+
+		if (item.second.type == DirectoryTree::FileType::Regular && is_font) {
+			/*AddOption(MenuItem(item.second.name, "Use this custom soundfont", StringView(sf_lower).ends_with(item.first) ? "[x]" : ""), [fs, item]() {
+				Audio().SetFluidsynthSoundfont(FileFinder::MakePath(fs.GetFullPath(), item.second.name));
+			});*/
+			AddOption(MenuItem(item.second.name, "Use this font", ""), [=, &cfg, &setting]() mutable {
+				auto is = fs.OpenInputStream(item.second.name);
+				if (is) {
+					auto font = Font::CreateFtFont(std::move(is), font_size.Get(), false, false);
+					if (font) {
+						setting.Set(FileFinder::MakePath(fs.GetFullPath(), item.second.name));
+						auto& setting_size = mincho ? cfg.font2_size : cfg.font1_size;
+						setting_size.Set(font->GetCurrentStyle().size);
+						Font::SetDefault(font, mincho);
+						Pop();
+					}
+				}
+			});
+		}
+	}
+
+	AddOption(font_size, [this]() mutable {
+		font_size.Set(GetCurrentOption().current_value);
+	});
+
+	AddOption(MenuItem("<Open Font directory>", "Open the font directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
+
 }
 
 void Window_Settings::RefreshLicense() {

From 988719eebc7b896c78be689873dc84247ff67030 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 6 Dec 2023 21:27:20 +0100
Subject: [PATCH 009/222] Add live reload of Fluidsynth soundfont

Does a program reset, won't work for all MIDI files.
Playing a new file will fix it.
---
 src/audio.cpp              |  2 ++
 src/audio_midi.cpp         | 12 +++++++
 src/audio_midi.h           |  4 ++-
 src/decoder_fluidsynth.cpp | 66 ++++++++++++++++++++++++++++++--------
 src/decoder_fluidsynth.h   |  1 +
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index fd6e720ec..e177a3dbe 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -17,6 +17,7 @@
 
 // Headers
 #include "audio.h"
+#include "audio_midi.h"
 #include "system.h"
 #include "baseui.h"
 #include "player.h"
@@ -143,4 +144,5 @@ std::string AudioInterface::GetFluidsynthSoundfont() const {
 
 void AudioInterface::SetFluidsynthSoundfont(StringView sf) {
 	cfg.soundfont.Set(ToString(sf));
+	MidiDecoder::ChangeFluidsynthSoundfont(sf);
 }
diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index a21b4603a..8ba50c593 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -141,6 +141,18 @@ bool MidiDecoder::CheckFluidsynth(std::string& status_message) {
 	return works.fluidsynth;
 }
 
+void MidiDecoder::ChangeFluidsynthSoundfont(StringView sf_path) {
+	if (!works.fluidsynth || works.fluidsynth_status.empty()) {
+		// Fluidsynth was not initialized yet or failed, will use the path from the config automatically
+		works.fluidsynth = true;
+		CreateFluidsynth(true);
+		return;
+	}
+
+	// Was initialized before
+	works.fluidsynth = FluidSynthDecoder::ChangeGlobalSoundfont(sf_path, works.fluidsynth_status);
+}
+
 bool MidiDecoder::CheckWildMidi(std::string &status_message) {
 	if (works.wildmidi && works.wildmidi_status.empty()) {
 		CreateWildMidi(true);
diff --git a/src/audio_midi.h b/src/audio_midi.h
index 39ca9fa2c..8882cc35f 100644
--- a/src/audio_midi.h
+++ b/src/audio_midi.h
@@ -212,10 +212,12 @@ class MidiDecoder {
 	 */
 	static bool CheckFluidsynth(std::string& status_message);
 
+	static void ChangeFluidsynthSoundfont(StringView sf_path);
+
 	/**
 	 * Checks if WildMidi works.
 	 *
-	 * @param status_message Current Fluidsynth status
+	 * @param status_message Current WildMidi status
 	 * @return true: Works, false: Not working
 	 */
 	static bool CheckWildMidi(std::string& status_message);
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index 9fb8444a4..e4584d310 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -115,20 +115,11 @@ namespace {
 #if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
 	fluid_sfloader_t* global_loader; // owned by global_settings
 #endif
+	int global_synth_id = -1;
 	int instances = 0;
 }
 
-static fluid_synth_t* create_synth(std::string& status_message) {
-	fluid_synth_t* syn = new_fluid_synth(global_settings.get());
-	if (!syn) {
-		status_message = "new_fluid_synth failed";
-		return nullptr;
-	}
-
-#if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
-	fluid_synth_add_sfloader(syn, global_loader);
-#endif
-
+static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int& synth_id) {
 	// Attempt loading a soundfont
 	std::vector<std::string> sf_paths;
 	std::string preferred_soundfont = Audio().GetFluidsynthSoundfont();
@@ -165,8 +156,14 @@ static fluid_synth_t* create_synth(std::string& status_message) {
 	}
 
 	bool sf_load_success = false;
+	int old_synth_id = synth_id;
 	for (const auto& sf_name: sf_paths) {
-		if (fluid_synth_sfload(syn, sf_name.c_str(), 1) != FLUID_FAILED) {
+		int new_synth_id = fluid_synth_sfload(syn, sf_name.c_str(), 1);
+		if (new_synth_id != FLUID_FAILED) {
+			synth_id = new_synth_id;
+			if (old_synth_id > 0) {
+				fluid_synth_sfunload(syn, old_synth_id, 1);
+			}
 			sf_load_success = true;
 			status_message = fmt::format("Using soundfont {}", sf_name);
 			break;
@@ -175,6 +172,24 @@ static fluid_synth_t* create_synth(std::string& status_message) {
 
 	if (!sf_load_success) {
 		status_message = "Could not load soundfont.";
+		return false;
+	}
+
+	return true;
+}
+
+static fluid_synth_t* create_synth(std::string& status_message, int& synth_id) {
+	fluid_synth_t* syn = new_fluid_synth(global_settings.get());
+	if (!syn) {
+		status_message = "new_fluid_synth failed";
+		return nullptr;
+	}
+
+#if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
+	fluid_synth_add_sfloader(syn, global_loader);
+#endif
+
+	if (!load_default_sf(status_message, syn, synth_id)) {
 		return nullptr;
 	}
 
@@ -190,7 +205,8 @@ FluidSynthDecoder::FluidSynthDecoder() {
 	// Sharing is only not possible when a Midi is played as a SE (unlikely)
 	if (instances > 1) {
 		std::string error_message;
-		local_synth = create_synth(error_message);
+		int unused = -1;
+		local_synth = create_synth(error_message, unused);
 		if (!local_synth) {
 			// unlikely, the SF was already allocated once
 			Output::Debug("FluidSynth failed: {}", error_message);
@@ -247,7 +263,8 @@ bool FluidSynthDecoder::Initialize(std::string& status_message) {
 			vio_open, vio_read, vio_seek, vio_tell, vio_close);
 #endif
 
-	global_synth.reset(create_synth(status_message));
+	global_synth_id = -1;
+	global_synth.reset(create_synth(status_message, global_synth_id));
 	if (!global_synth) {
 		return false;
 	}
@@ -265,6 +282,27 @@ void FluidSynthDecoder::ResetState() {
 	global_settings.reset();
 }
 
+bool FluidSynthDecoder::ChangeGlobalSoundfont(StringView sf_path, std::string& status_message) {
+	if (!global_synth) {
+		return false;
+	}
+
+	if (sf_path.empty()) {
+		return load_default_sf(status_message, global_synth.get(), global_synth_id);
+	}
+
+	int new_global_id = fluid_synth_sfload(global_synth.get(), ToString(sf_path).c_str(), 1);
+	if (new_global_id != FLUID_FAILED) {
+		assert(fluid_synth_sfunload(global_synth.get(), global_synth_id, 1) == FLUID_OK);
+		global_synth_id = new_global_id;
+		status_message = fmt::format("Using soundfont {}", sf_path);
+		return true;
+	}
+
+	status_message = "Could not load soundfont.";
+	return false;
+}
+
 int FluidSynthDecoder::FillBuffer(uint8_t* buffer, int length) {
 	auto* instance_synth = GetSynthInstance();
 
diff --git a/src/decoder_fluidsynth.h b/src/decoder_fluidsynth.h
index 3c90276cc..486b7550f 100644
--- a/src/decoder_fluidsynth.h
+++ b/src/decoder_fluidsynth.h
@@ -46,6 +46,7 @@ class FluidSynthDecoder : public MidiDecoder {
 
 	static bool Initialize(std::string& status_message);
 	static void ResetState();
+	static bool ChangeGlobalSoundfont(StringView sf_path, std::string& status_message);
 
 	int FillBuffer(uint8_t* buffer, int length) override;
 

From 62533fcb92456014a6561c3eb1d97ee73029e8ca Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 6 Dec 2023 22:12:47 +0100
Subject: [PATCH 010/222] Message Window: Only change the font when a new page
 starts

Prevents glitches when switching the font in the settings while rendering
---
 src/window_message.cpp | 20 ++++++++++++--------
 src/window_message.h   |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/window_message.cpp b/src/window_message.cpp
index 4c00c6e91..9c46aff0b 100644
--- a/src/window_message.cpp
+++ b/src/window_message.cpp
@@ -265,6 +265,12 @@ void Window_Message::InsertNewPage() {
 	prev_char_printable = false;
 	prev_char_waited = true;
 
+	if (GetFont()) {
+		page_font = GetFont();
+	} else {
+		page_font = Font::Default();
+	}
+
 	// Position the message box vertically
 	// Game_Message::GetRealPosition() specify top/middle/bottom
 	if (Game_Message::GetRealPosition() == 0) {
@@ -318,7 +324,6 @@ void Window_Message::InsertNewPage() {
 			ShowGoldWindow();
 		}
 	}
-
 }
 
 void Window_Message::InsertNewLine() {
@@ -459,7 +464,6 @@ void Window_Message::UpdateMessage() {
 	}
 
 	auto system = Cache::SystemOrBlack();
-	auto font = Font::Default();
 
 	while (true) {
 		const auto* end = text.data() + text.size();
@@ -471,7 +475,7 @@ void Window_Message::UpdateMessage() {
 		}
 
 		if (!shape_ret.empty()) {
-			if (!DrawGlyph(*font, *system, shape_ret[0])) {
+			if (!DrawGlyph(*page_font, *system, shape_ret[0])) {
 				continue;
 			}
 
@@ -498,7 +502,7 @@ void Window_Message::UpdateMessage() {
 
 		const auto ch = tret.ch;
 		if (tret.is_exfont) {
-			if (!DrawGlyph(*font, *system, ch, true)) {
+			if (!DrawGlyph(*page_font, *system, ch, true)) {
 				text_index = text_prev;
 			}
 			continue;
@@ -573,7 +577,7 @@ void Window_Message::UpdateMessage() {
 				break;
 			case '_':
 				// Insert half size space
-				contents_x += Text::GetSize(*Font::Default(), " ").width / 2;
+				contents_x += Text::GetSize(*page_font, " ").width / 2;
 				DebugLogText("{}: MSG HalfWait \\_");
 				SetWaitForCharacter(1);
 				break;
@@ -631,7 +635,7 @@ void Window_Message::UpdateMessage() {
 			continue;
 		}
 
-		if (font->CanShape()) {
+		if (page_font->CanShape()) {
 			assert(shape_ret.empty());
 
 			auto text_index_shape = text_index;
@@ -657,10 +661,10 @@ void Window_Message::UpdateMessage() {
 				text32 += tret.ch;
 			}
 
-			shape_ret = font->Shape(text32);
+			shape_ret = page_font->Shape(text32);
 			continue;
 		} else {
-			if (!DrawGlyph(*font, *system, ch, false)) {
+			if (!DrawGlyph(*page_font, *system, ch, false)) {
 				text_index = text_prev;
 				continue;
 			}
diff --git a/src/window_message.h b/src/window_message.h
index 2bfb2b65a..8d9054696 100644
--- a/src/window_message.h
+++ b/src/window_message.h
@@ -179,6 +179,8 @@ class Window_Message: public Window_Selectable {
 	bool prev_char_waited = true;
 	/** Was the previous character printable? */
 	bool prev_char_printable = false;
+	/** Active font for the current page */
+	FontRef page_font;
 
 	/** Used by the number input event. */
 	std::unique_ptr<Window_NumberInput> number_input_window;

From 59cbcb0a11e3d1f295992b9f4b22a5642cfc6474 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 6 Dec 2023 22:20:08 +0100
Subject: [PATCH 011/222] Window Help: Support optional scrolling when the text
 does not fit in the window

---
 src/filefinder.h       |  2 +-
 src/game_config.h      |  2 +-
 src/scene_settings.cpp |  3 +++
 src/text.cpp           |  1 -
 src/window_help.cpp    | 51 ++++++++++++++++++++++++++++++++++++++++++
 src/window_help.h      | 30 +++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/filefinder.h b/src/filefinder.h
index 7c181808a..3bd774afc 100644
--- a/src/filefinder.h
+++ b/src/filefinder.h
@@ -37,7 +37,7 @@
  * insensitive files paths.
  */
 namespace FileFinder {
-	constexpr const auto IMG_TYPES = Utils::MakeSvArray(".bmp",  ".png", ".xyz");
+	constexpr const auto IMG_TYPES = Utils::MakeSvArray(".bmp", ".png", ".xyz");
 	constexpr const auto MUSIC_TYPES = Utils::MakeSvArray(
 			".opus", ".oga", ".ogg", ".wav", ".mid", ".midi", ".mp3", ".wma");
 	constexpr const auto SOUND_TYPES = Utils::MakeSvArray(
diff --git a/src/game_config.h b/src/game_config.h
index c22151448..0118960c0 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -89,7 +89,7 @@ struct Game_ConfigVideo {
 		Utils::MakeSvArray("nearest", "integer", "bilinear"),
 		Utils::MakeSvArray("Scale to screen size (Causes scaling artifacts)", "Scale to multiple of the game resolution", "Like Nearest, but output is blurred to avoid artifacts")};
 	BoolConfigParam stretch{ "Stretch", "Stretch to the width of the window/screen", "Video", "Stretch", false };
-	BoolConfigParam pause_when_focus_lost{ "Pause when focus lost", "Pause the execution when the program is in the background", "Video", "PauseWhenFocusLost", true };
+	BoolConfigParam pause_when_focus_lost{ "Pause when focus lost", "Pause the program when it is in the background", "Video", "PauseWhenFocusLost", true };
 	BoolConfigParam touch_ui{ "Touch Ui", "Display the touch ui", "Video", "TouchUi", true };
 	EnumConfigParam<GameResolution, 3> game_resolution{ "Resolution", "Game resolution. Changes require a restart.", "Video", "GameResolution", GameResolution::Original,
 		Utils::MakeSvArray("Original (Recommended)", "Widescreen (Experimental)", "Ultrawide (Experimental)"),
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index ea8aa9415..f74c8472f 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -88,10 +88,12 @@ void Scene_Settings::CreateMainWindow() {
 
 void Scene_Settings::CreateOptionsWindow() {
 	help_window = std::make_unique<Window_Help>(Player::menu_offset_x, 0, MENU_WIDTH, 32);
+	help_window->SetAnimation(Window_Help::Animation::Loop);
 	options_window = std::make_unique<Window_Settings>(Player::menu_offset_x + 32, 32, MENU_WIDTH - 64, Player::screen_height - 32 * 2);
 	options_window->SetHelpWindow(help_window.get());
 
 	help_window2 = std::make_unique<Window_Help>(Player::menu_offset_x, options_window->GetBottomY(), MENU_WIDTH, 32);
+	help_window2->SetAnimation(Window_Help::Animation::Loop);
 	options_window->help_window2 = help_window2.get();
 
 	input_window = std::make_unique<Window_InputSettings>(Player::menu_offset_x, 32, MENU_WIDTH, Player::screen_height - 32 * 3);
@@ -200,6 +202,7 @@ void Scene_Settings::vUpdate() {
 
 	main_window->Update();
 	help_window->Update();
+	help_window2->Update();
 	options_window->Update();
 	input_window->Update();
 	input_mode_window->Update();
diff --git a/src/text.cpp b/src/text.cpp
index 3154b20e3..e8050f6de 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -75,7 +75,6 @@ Point Text::Draw(Bitmap& dest, const int x, const int y, const Font& font, const
 
 	dst_rect.y = y;
 	dst_rect.width += 1; dst_rect.height += 1; // Need place for shadow
-	if (dst_rect.IsOutOfBounds(dest.GetWidth(), dest.GetHeight())) return { 0, 0 };
 
 	const int iy = dst_rect.y;
 	const int ix = dst_rect.x;
diff --git a/src/window_help.cpp b/src/window_help.cpp
index 1417a6bc7..b080537c1 100644
--- a/src/window_help.cpp
+++ b/src/window_help.cpp
@@ -39,6 +39,9 @@ void Window_Help::SetText(std::string text, int color, Text::Alignment align, bo
 		this->text = std::move(text);
 		this->align = align;
 		this->color = color;
+		this->text_x_scroll = 0;
+		this->text_x_scroll_dir = false;
+		this->text_x_width = text_x_offset;
 	}
 }
 
@@ -72,3 +75,51 @@ void Window_Help::AddText(std::string text, int color, Text::Alignment align, bo
 		}
 	}
 }
+
+void Window_Help::SetAnimation(Window_Help::Animation animation) {
+	text_x_scroll = 0;
+	this->animation = animation;
+}
+
+void Window_Help::UpdateScroll() {
+	if (animation == Animation::None) {
+		return;
+	}
+
+	if (text_x_width <= contents->GetWidth()) {
+		// no need to scroll
+		return;
+	}
+
+	if (animation == Animation::BackAndForth) {
+		text_x_scroll += text_x_scroll_dir ? 1 : -1;
+
+		if ((!text_x_scroll_dir && (text_x_width + text_x_scroll) == contents->GetWidth()) ||
+				(text_x_scroll_dir && text_x_scroll == 0)) {
+			text_x_scroll_dir = !text_x_scroll_dir;
+		}
+
+		contents->Clear();
+		text_x_offset = text_x_scroll;
+		AddText(text, color, align, true);
+	} else if (animation == Animation::Loop) {
+		--text_x_scroll;
+
+		const int gap_size = 18;
+
+		if (text_x_scroll == -text_x_width - gap_size) {
+			text_x_scroll = 0;
+		}
+
+		contents->Clear();
+		text_x_offset = text_x_scroll;
+		AddText(text, color, align, true);
+		text_x_offset += gap_size;
+		AddText(text, color, align, true);
+	}
+}
+
+void Window_Help::Update() {
+	Window_Base::Update();
+	UpdateScroll();
+}
diff --git a/src/window_help.h b/src/window_help.h
index 5965e3a38..4e290c439 100644
--- a/src/window_help.h
+++ b/src/window_help.h
@@ -30,6 +30,15 @@
 class Window_Help : public Window_Base {
 
 public:
+	enum class Animation {
+		/** Never scroll */
+		None,
+		/** Scroll left and when the end of the text is reached scroll right, then repeat */
+		BackAndForth,
+		/** Scroll left and repeat the text in an endless loop (also known as marquee) */
+		Loop
+	};
+
 	/**
 	 * Constructor.
 	 */
@@ -44,6 +53,18 @@ class Window_Help : public Window_Base {
 	 */
 	void SetText(std::string text, int color = Font::ColorDefault, Text::Alignment align = Text::AlignLeft, bool halfwidthspace = true);
 
+	/**
+	 * Sets the scrolling animation when the text is larger than the help window.
+	 *
+	 * @param animation
+	 */
+	void SetAnimation(Animation animation);
+
+	/**
+	 * Updates the scrolling animation if set.
+	 */
+	void Update() override;
+
 	/**
 	 * Clears the window
 	 */
@@ -60,6 +81,8 @@ class Window_Help : public Window_Base {
 	void AddText(std::string text, int color = Font::ColorDefault, Text::Alignment align = Text::AlignLeft, bool halfwidthspace = true);
 
 private:
+	void UpdateScroll();
+
 	/** Text to draw. */
 	std::string text;
 	/** Color of Text to draw. */
@@ -68,6 +91,13 @@ class Window_Help : public Window_Base {
 	Text::Alignment align;
 	/** Current text position */
 	int text_x_offset = 0;
+	/** Width of the text */
+	int text_x_width = 0;
+	/** Current scroll position of the animation */
+	int text_x_scroll = 0;
+	bool text_x_scroll_dir = false;
+
+	Animation animation = Animation::None;
 };
 
 #endif

From c43c5af728371df9dde14c8d12d881f10649fe42 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 6 Dec 2023 23:40:02 +0100
Subject: [PATCH 012/222] Settings: Add a font preview and mark the active font

---
 src/font.cpp            |  4 ++++
 src/font.h              |  5 +++++
 src/scene_settings.cpp  | 17 ++++++++++++++---
 src/window_settings.cpp | 21 +++++++++++++++------
 src/window_settings.h   | 28 ++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index f893116d5..d3c9dba1a 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -656,6 +656,10 @@ Font::Font(StringView name, int size, bool bold, bool italic)
 	current_style = original_style;
 }
 
+StringView Font::GetName() const {
+	return name;
+}
+
 Rect Font::GetSize(char32_t glyph) const {
 	if (EP_UNLIKELY(Utils::IsControlCharacter(glyph))) {
 		if (glyph == '\n') {
diff --git a/src/font.h b/src/font.h
index 8bdb2d89e..e563d62ef 100644
--- a/src/font.h
+++ b/src/font.h
@@ -98,6 +98,11 @@ class Font {
 
 	virtual ~Font() = default;
 
+	/**
+	 * @return Name of the font
+	 */
+	 StringView GetName() const;
+
 	/**
 	 * Determines the size of a bitmap required to render a single character.
 	 * The dimensions of the Rect describe a bounding box to fit the text.
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index f74c8472f..d12c305ea 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -454,19 +454,30 @@ void Scene_Settings::UpdateOptions() {
 void Scene_Settings::UpdateFont(bool mincho) {
 	auto fs = Game_Config::GetFontFilesystem();
 
-	help_window2->SetText("The quick brown fox jumps over the lazy dog 1234567890.");
+	auto& last_index = options_window->GetFrame().scratch;
 
 	int index = options_window->GetIndex();
+	if (last_index == index) {
+		UpdateOptions();
+		return;
+	}
+	last_index = index;
+
 	if (index == 0) {
+		help_window2->Clear();
 		help_window2->SetFont(Font::DefaultBitmapFont(mincho));
 		help_window2->SetVisible(true);
-	} else if (index >= options_window->GetRowMax() - 2) {
-		// Size or browse
+	} else if (index >= options_window->GetRowMax() - 3) {
+		// Size, sample or browse
+		help_window2->Clear();
+		help_window2->SetFont(nullptr);
+		help_window2->SetVisible(true);
 	} else {
 		auto is = fs.OpenInputStream(options_window->GetCurrentOption().text);
 		if (is) {
 			auto font = Font::CreateFtFont(std::move(is), options_window->font_size.Get(), false, false);
 			if (font) {
+				help_window2->Clear();
 				help_window2->SetFont(font);
 				help_window2->SetVisible(true);
 			}
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 7313c8f6b..02a024487 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -381,6 +381,7 @@ void Window_Settings::RefreshEngine() {
 	AddOption(cfg.font1, [this, &cfg]() {
 		font_size.Set(cfg.font1_size.Get());
 		Push(eEngineFont1);
+		GetFrame().scratch = -1;
 	});
 	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_gothic) {
 		options.back().text += " [In use]";
@@ -389,6 +390,7 @@ void Window_Settings::RefreshEngine() {
 	AddOption(cfg.font2, [this, &cfg]() {
 		font_size.Set(cfg.font2_size.Get());
 		Push(eEngineFont2);
+		GetFrame().scratch = -1;
 	});
 	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_mincho) {
 		options.back().text += " [In use]";
@@ -413,13 +415,18 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 
 	auto& setting = mincho ? cfg.font2 : cfg.font1;
 
+	auto set_help2 = [this]() {
+		options.back().help2 = ToString(sample_text.GetDescriptions()[static_cast<int>(sample_text.Get())]);
+	};
+
 	AddOption(MenuItem("<Built-in Font>", "Use the built-in pixel font", setting.Get().empty() ? "[x]" : ""), [this, &setting, mincho]() {
 		Font::SetDefault(nullptr, mincho);
 		setting.Set("");
 		Pop();
 	});
+	set_help2();
 
-	//std::string font_lower = Utils::LowerCase(Audio().GetFluidsynthSoundfont());
+	std::string font_lower = Utils::LowerCase(Font::Default(mincho)->GetName());
 
 	auto list = fs.ListDirectory();
 	assert(list);
@@ -429,10 +436,7 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 		});
 
 		if (item.second.type == DirectoryTree::FileType::Regular && is_font) {
-			/*AddOption(MenuItem(item.second.name, "Use this custom soundfont", StringView(sf_lower).ends_with(item.first) ? "[x]" : ""), [fs, item]() {
-				Audio().SetFluidsynthSoundfont(FileFinder::MakePath(fs.GetFullPath(), item.second.name));
-			});*/
-			AddOption(MenuItem(item.second.name, "Use this font", ""), [=, &cfg, &setting]() mutable {
+			AddOption(MenuItem(item.second.name, "Use this font", StringView(font_lower).ends_with(item.first) ? "[x]" : ""), [=, &cfg, &setting]() mutable {
 				auto is = fs.OpenInputStream(item.second.name);
 				if (is) {
 					auto font = Font::CreateFtFont(std::move(is), font_size.Get(), false, false);
@@ -445,6 +449,7 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 					}
 				}
 			});
+			set_help2();
 		}
 	}
 
@@ -452,8 +457,12 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 		font_size.Set(GetCurrentOption().current_value);
 	});
 
-	AddOption(MenuItem("<Open Font directory>", "Open the font directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
+	AddOption(sample_text, [this]() {
+		sample_text.Set(static_cast<SampleText>(GetCurrentOption().current_value));
+	});
+	set_help2();
 
+	AddOption(MenuItem("<Open Font directory>", "Open the font directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
 }
 
 void Window_Settings::RefreshLicense() {
diff --git a/src/window_settings.h b/src/window_settings.h
index 7270ea2fe..4a2d03460 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -164,6 +164,34 @@ class Window_Settings : public Window_Selectable {
 
 	void SavePosition();
 	void RestorePosition();
+
+	// The sample text for the font preview. This option is not saved.
+	enum class SampleText {
+		English,
+		French,
+		German,
+		Chinese,
+		Japanese_Hiragana,
+		Japanese_Kanji,
+		Korean,
+		Diacritics
+	};
+
+	EnumConfigParam<SampleText, 8> sample_text{
+		"<Sample Text>", "Text to show in the preview", "", "", SampleText::English,
+		Utils::MakeSvArray("English", "French", "German", "Chinese", "Japanese (Hiragana)", "Japanese (Kanji)", "Korean", "Various Diacritics"),
+		Utils::MakeSvArray("", "", "", "", "", "", "", ""),
+		Utils::MakeSvArray(
+			"The quick brown fox jumps over the lazy dog 1234567890.?!",
+			"Voix ambiguë d’un cœur qui au zéphyr préfère les jattes de kiwis",
+			"Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
+			"天地玄黃宇宙洪荒。日月盈昃辰宿列張。寒來暑往秋收冬藏。閏餘成歲律呂調陽。雲騰致雨露結為霜。金生麗水玉出崑岡。劍號巨闕珠稱夜光。果珍李柰菜重芥薑。海鹹河淡鱗潛羽翔。",
+			"いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす",
+			"色は匂えど散りぬるを我が世誰ぞ常ならん有為の奥山今日越えて浅き夢見じ酔いもせず",
+			"키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다",
+			"ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
+		)
+	};
 };
 
 #endif

From 1069008a9a886ffe7a0d8f6923a988f15cd20b44 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 20 Dec 2023 20:16:23 +0100
Subject: [PATCH 013/222] Emscripten: Add Soundfont and Font upload

Currently lacking sanity checks
---
 resources/emscripten/emscripten-post.js | 74 ++++++++++++++++++-------
 src/decoder_fluidsynth.cpp              |  8 ++-
 src/platform/emscripten/interface.cpp   | 74 +++++++++++++++++++++++++
 src/platform/emscripten/interface.h     |  8 ++-
 src/platform/sdl/sdl2_ui.cpp            |  4 +-
 src/scene_settings.cpp                  |  4 ++
 src/scene_settings.h                    |  1 +
 src/window_settings.cpp                 | 12 ++++
 8 files changed, 162 insertions(+), 23 deletions(-)

diff --git a/resources/emscripten/emscripten-post.js b/resources/emscripten/emscripten-post.js
index 7277533b8..1344420f7 100644
--- a/resources/emscripten/emscripten-post.js
+++ b/resources/emscripten/emscripten-post.js
@@ -14,7 +14,7 @@ if (Module.saveFs === undefined) {
 }
 
 Module.initApi = function() {
-  Module.api_private.download_js = function(buffer, size, filename) {
+  Module.api_private.download_js = function (buffer, size, filename) {
     const blob = new Blob([Module.HEAPU8.slice(buffer, buffer + size)]);
     const link = document.createElement('a');
     link.href = window.URL.createObjectURL(blob);
@@ -23,28 +23,62 @@ Module.initApi = function() {
     link.remove();
   }
 
-  Module.api_private.uploadSavegame_js = function(slot) {
-    let saveFile = document.getElementById('easyrpg_saveFile');
-    if (saveFile == null) {
-      saveFile = document.createElement('input');
-      saveFile.type = 'file';
-      saveFile.id = 'easyrpg_saveFile';
-      saveFile.style.display = 'none';
-      saveFile.addEventListener('change', function(evt) {
-        const save = evt.target.files[0];
+  Module.api_private.createInputElement_js = function (id, event) {
+    let file = document.getElementById(id);
+    if (file == null) {
+      file = document.createElement('input');
+      file.type = 'file';
+      file.id = id;
+      file.style.display = 'none';
+      file.addEventListener('change', function (evt) {
+        const selected_file = evt.target.files[0];
         const reader = new FileReader();
-        reader.onload = function (file) {
-          const result = new Uint8Array(file.currentTarget.result);
-          var buf = Module._malloc(result.length);
-          Module.HEAPU8.set(result, buf);
-          Module.api_private.uploadSavegameStep2(slot, buf, result.length);
-          Module._free(buf);
-          Module.api.refreshScene();
-        };
-        reader.readAsArrayBuffer(save);
+        reader.onload = function(file) {
+          event(file, selected_file.name);
+        }
+        reader.readAsArrayBuffer(selected_file);
       });
     }
-    saveFile.click();
+    file.click();
+  }
+
+  Module.api_private.uploadSavegame_js = function (slot) {
+    Module.api_private.createInputElement_js('easyrpg_saveFile', function (file) {
+      const result = new Uint8Array(file.currentTarget.result);
+      var buf = Module._malloc(result.length);
+      Module.HEAPU8.set(result, buf);
+      Module.api_private.uploadSavegameStep2(slot, buf, result.length);
+      Module._free(buf);
+      Module.api.refreshScene();
+    });
+  }
+
+  Module.api_private.uploadSoundfont_js = function () {
+    Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
+      const result = new Uint8Array(file.currentTarget.result);
+      //const name_buf = Module._malloc(name.length + 1);
+      //stringToUTF8(name, name_buf, name.length + 1);
+      const content_buf = Module._malloc(result.length);
+      Module.HEAPU8.set(result, content_buf);
+      Module.api_private.uploadSoundfontStep2(name, content_buf, result.length);
+      //Module._free(name_buf);
+      Module._free(content_buf);
+      Module.api.refreshScene();
+    });
+  }
+
+  Module.api_private.uploadFont_js = function () {
+    Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
+      const result = new Uint8Array(file.currentTarget.result);
+      //const name_buf = Module._malloc(name.length + 1);
+      //stringToUTF8(name, name_buf, name.length + 1);
+      const content_buf = Module._malloc(result.length);
+      Module.HEAPU8.set(result, content_buf);
+      Module.api_private.uploadFontStep2(name, content_buf, result.length);
+      //Module._free(name_buf);
+      Module._free(content_buf);
+      Module.api.refreshScene();
+    });
   }
 }
 
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index e4584d310..48cebea3e 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -228,8 +228,14 @@ FluidSynthDecoder::~FluidSynthDecoder() {
 
 bool FluidSynthDecoder::Initialize(std::string& status_message) {
 	// only initialize once until a new game starts
-	if (once)
+	if (once) {
+		if (!init && global_settings && !global_synth) {
+			global_synth.reset(create_synth(status_message, global_synth_id));
+			init = (global_synth != nullptr);
+		}
 		return init;
+	}
+
 	once = true;
 
 #ifdef HAVE_FLUIDLITE
diff --git a/src/platform/emscripten/interface.cpp b/src/platform/emscripten/interface.cpp
index 10524d6d5..0e88efbf2 100644
--- a/src/platform/emscripten/interface.cpp
+++ b/src/platform/emscripten/interface.cpp
@@ -53,6 +53,18 @@ void Emscripten_Interface::UploadSavegame(int slot) {
 	}, slot);
 }
 
+void Emscripten_Interface::UploadSoundfont() {
+	EM_ASM_INT({
+		Module.api_private.uploadSoundfont_js($0);
+	});
+}
+
+void Emscripten_Interface::UploadFont() {
+	EM_ASM_INT({
+	   Module.api_private.uploadFont_js($0);
+   });
+}
+
 void Emscripten_Interface::RefreshScene() {
 	Scene::instance->Refresh();
 }
@@ -91,17 +103,79 @@ bool Emscripten_Interface_Private::UploadSavegameStep2(int slot, int buffer_addr
 	return true;
 }
 
+bool Emscripten_Interface_Private::UploadSoundfontStep2(std::string filename, int buffer_addr, int size) {
+	auto fs = Game_Config::GetSoundfontFilesystem();
+	if (!fs) {
+		Output::Warning("Cannot access Soundfont directory");
+		return false;
+	}
+
+	std::string name = std::get<1>(FileFinder::GetPathAndFilename(filename));
+
+	// TODO: Sanitize
+	/*std::istream is(new Filesystem_Stream::InputMemoryStreamBufView(lcf::Span<uint8_t>(reinterpret_cast<uint8_t*>(buffer_addr), size)));
+
+	if (!lcf::LSD_Reader::Load(is)) {
+		Output::Warning("Selected file is not a valid savegame");
+		return false;
+	}*/
+
+	{
+		auto os = fs.OpenOutputStream(name);
+		if (!os)
+			return false;
+		os.write(reinterpret_cast<char*>(buffer_addr), size);
+	}
+
+	AsyncHandler::SaveFilesystem();
+
+	return true;
+}
+
+bool Emscripten_Interface_Private::UploadFontStep2(std::string filename, int buffer_addr, int size) {
+	auto fs = Game_Config::GetFontFilesystem();
+	if (!fs) {
+		Output::Warning("Cannot access Font directory");
+		return false;
+	}
+
+	std::string name = std::get<1>(FileFinder::GetPathAndFilename(filename));
+
+	// TODO: Sanitize
+	/*std::istream is(new Filesystem_Stream::InputMemoryStreamBufView(lcf::Span<uint8_t>(reinterpret_cast<uint8_t*>(buffer_addr), size)));
+
+	if (!lcf::LSD_Reader::Load(is)) {
+		Output::Warning("Selected file is not a valid savegame");
+		return false;
+	}*/
+
+	{
+		auto os = fs.OpenOutputStream(name);
+		if (!os)
+			return false;
+		os.write(reinterpret_cast<char*>(buffer_addr), size);
+	}
+
+	AsyncHandler::SaveFilesystem();
+
+	return true;
+}
+
 // Binding code
 EMSCRIPTEN_BINDINGS(player_interface) {
 	emscripten::class_<Emscripten_Interface>("api")
 		.class_function("requestReset", &Emscripten_Interface::Reset)
 		.class_function("downloadSavegame", &Emscripten_Interface::DownloadSavegame)
 		.class_function("uploadSavegame", &Emscripten_Interface::UploadSavegame)
+		.class_function("uploadSoundfont", &Emscripten_Interface::UploadSoundfont)
+		.class_function("uploadFont", &Emscripten_Interface::UploadFont)
 		.class_function("refreshScene", &Emscripten_Interface::RefreshScene)
 		.class_function("takeScreenshot", &Emscripten_Interface::TakeScreenshot)
 	;
 
 	emscripten::class_<Emscripten_Interface_Private>("api_private")
 		.class_function("uploadSavegameStep2", &Emscripten_Interface_Private::UploadSavegameStep2)
+		.class_function("uploadSoundfontStep2", &Emscripten_Interface_Private::UploadSoundfontStep2)
+		.class_function("uploadFontStep2", &Emscripten_Interface_Private::UploadFontStep2)
 	;
 }
diff --git a/src/platform/emscripten/interface.h b/src/platform/emscripten/interface.h
index b84c9b14f..795587cc8 100644
--- a/src/platform/emscripten/interface.h
+++ b/src/platform/emscripten/interface.h
@@ -18,11 +18,15 @@
 #ifndef EP_EMSCRIPTEN_INTERFACE_H
 #define EP_EMSCRIPTEN_INTERFACE_H
 
+#include <string>
+
 class Emscripten_Interface {
 public:
 	static bool DownloadSavegame(int slot);
 	static void UploadSavegame(int slot);
-	static void RefreshScene();
+    static void UploadSoundfont();
+    static void UploadFont();
+    static void RefreshScene();
 	static void TakeScreenshot();
 	static void Reset();
 };
@@ -30,6 +34,8 @@ class Emscripten_Interface {
 class Emscripten_Interface_Private {
 public:
 	static bool UploadSavegameStep2(int slot, int buffer_addr, int size);
+    static bool UploadFontStep2(std::string name, int buffer_addr, int size);
+    static bool UploadSoundfontStep2(std::string name, int buffer_addr, int size);
 };
 
 #endif
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 1b062505e..fd529bb47 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -734,7 +734,9 @@ void Sdl2Ui::ProcessWindowEvent(SDL_Event &evnt) {
 	int state = evnt.window.event;
 
 	if (state == SDL_WINDOWEVENT_FOCUS_LOST) {
-		if (!vcfg.pause_when_focus_lost.Get()) {
+		auto cfg = vcfg;
+		vGetConfig(cfg);
+		if (!cfg.pause_when_focus_lost.Get()) {
 			return;
 		}
 
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index d12c305ea..14fb5fc4b 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -195,6 +195,10 @@ void Scene_Settings::SetMode(Window_Settings::UiMode new_mode) {
 	}
 }
 
+void Scene_Settings::Refresh() {
+	options_window->Refresh();
+}
+
 void Scene_Settings::vUpdate() {
 	if (RefreshInputEmergencyReset()) {
 		return;
diff --git a/src/scene_settings.h b/src/scene_settings.h
index f62704ea1..ce2143bc2 100644
--- a/src/scene_settings.h
+++ b/src/scene_settings.h
@@ -43,6 +43,7 @@ class Scene_Settings : public Scene {
 	Scene_Settings();
 
 	void Start() override;
+	void Refresh() override;
 	void vUpdate() override;
 
 	/**
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 02a024487..39de34c7d 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -35,6 +35,10 @@
 #include "audio_midi.h"
 #include "audio_generic_midiout.h"
 
+#ifdef EMSCRIPTEN
+#  include "platform/emscripten/interface.h"
+#endif
+
 class MenuItem final : public ConfigParam<StringView> {
 public:
 	explicit MenuItem(StringView name, StringView description, StringView value) :
@@ -371,7 +375,11 @@ void Window_Settings::RefreshAudioSoundfont() {
 		}
 	}
 
+#ifdef EMSCRIPTEN
+	AddOption(MenuItem("<Upload Soundfont>", "Provide a soundfont from your system", ""), [fs]() { Emscripten_Interface::UploadSoundfont(); });
+#else
 	AddOption(MenuItem("<Open Soundfont directory>", "Open the soundfont directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
+#endif
 }
 
 void Window_Settings::RefreshEngine() {
@@ -462,7 +470,11 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 	});
 	set_help2();
 
+#ifdef EMSCRIPTEN
+	AddOption(MenuItem("<Upload Font>", "Provide a font from your system", ""), [fs]() { Emscripten_Interface::UploadFont(); });
+#else
 	AddOption(MenuItem("<Open Font directory>", "Open the font directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
+#endif
 }
 
 void Window_Settings::RefreshLicense() {

From 62d7f35c851cac8455907d169a4f0ef913d025ef Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 20 Dec 2023 20:24:12 +0100
Subject: [PATCH 014/222] Settings: Do not allow disabling of FmMidi

Is the last option, disabling it breaks MIDI entirely
---
 src/audio.cpp           |  8 --------
 src/audio.h             |  3 ---
 src/audio_midi.cpp      |  2 +-
 src/config_param.h      | 10 +++++-----
 src/game_config.cpp     |  2 --
 src/game_config.h       |  2 +-
 src/window_settings.cpp |  4 ++--
 7 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index e177a3dbe..a892540a8 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -130,14 +130,6 @@ void AudioInterface::SetNativeMidiEnabled(bool enable) {
 	cfg.native_midi.Set(enable);
 }
 
-bool AudioInterface::GetFmMidiEnabled() const {
-	return cfg.fmmidi_midi.Get();
-}
-
-void AudioInterface::SetFmMidiEnabled(bool enable) {
-	cfg.fmmidi_midi.Set(enable);
-}
-
 std::string AudioInterface::GetFluidsynthSoundfont() const {
 	return cfg.soundfont.Get();
 }
diff --git a/src/audio.h b/src/audio.h
index 43ca569d4..7449034ab 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -142,9 +142,6 @@ struct AudioInterface {
 	bool GetNativeMidiEnabled() const;
 	void SetNativeMidiEnabled(bool enable);
 
-	bool GetFmMidiEnabled() const;
-	void SetFmMidiEnabled(bool enable);
-
 	std::string GetFluidsynthSoundfont() const;
 	void SetFluidsynthSoundfont(StringView sf);
 
diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index 8ba50c593..aee12a405 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -60,7 +60,7 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::Create(bool resample) {
 		mididec = CreateWildMidi(resample);
 	}
 
-	if (!mididec && Audio().GetFmMidiEnabled()) {
+	if (!mididec) {
 		mididec = CreateFmMidi(resample);
 	}
 
diff --git a/src/config_param.h b/src/config_param.h
index cdbe2ecd5..4ed9ea3cf 100644
--- a/src/config_param.h
+++ b/src/config_param.h
@@ -31,10 +31,6 @@
 #include <lcf/flag_set.h>
 
 namespace {
-	inline const std::string& ParamValueToString(const std::string& s) {
-		return s;
-	}
-
 	inline std::string ParamValueToString(StringView s) {
 		return ToString(s);
 	}
@@ -42,6 +38,10 @@ namespace {
 	inline std::string ParamValueToString(int i) {
 		return std::to_string(i);
 	}
+
+	inline std::string ParamValueToString(bool b) {
+		return b ? "[ON]" : "[OFF]";
+	}
 }
 
 /**
@@ -337,7 +337,7 @@ class BoolConfigParam : public ConfigParamBase<bool> {
 	}
 
 	std::string ValueToString() const override {
-		return Get() ? "[ON]" : "[OFF]";
+		return ParamValueToString(Get());
 	}
 };
 
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 94df55604..fa786b37b 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -415,7 +415,6 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	audio.fluidsynth_midi.FromIni(ini);
 	audio.wildmidi_midi.FromIni(ini);
 	audio.native_midi.FromIni(ini);
-	audio.fmmidi_midi.FromIni(ini);
 	audio.soundfont.FromIni(ini);
 
 	/** INPUT SECTION */
@@ -511,7 +510,6 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
 	audio.fluidsynth_midi.ToIni(os);
 	audio.wildmidi_midi.ToIni(os);
 	audio.native_midi.ToIni(os);
-	audio.fmmidi_midi.ToIni(os);
 	audio.soundfont.ToIni(os);
 
 	os << "\n";
diff --git a/src/game_config.h b/src/game_config.h
index 0118960c0..092116bca 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -111,7 +111,7 @@ struct Game_ConfigAudio {
 	BoolConfigParam fluidsynth_midi { "Fluidsynth (SF2)", "Play MIDI using SF2 soundfonts", "Audio", "Fluidsynth", true };
 	BoolConfigParam wildmidi_midi { "WildMidi (GUS)", "Play MIDI using GUS patches", "Audio", "WildMidi", true };
 	BoolConfigParam native_midi { "Native MIDI", "Play MIDI through the operating system ", "Audio", "NativeMidi", true };
-	BoolConfigParam fmmidi_midi { "FmMidi", "Play MIDI using the built-in MIDI synthesizer", "Audio", "FmMidi", true };
+	LockedConfigParam<std::string> fmmidi_midi { "FmMidi", "Play MIDI using the built-in MIDI synthesizer", "[Always ON]" };
 	PathConfigParam soundfont { "Soundfont", "Soundfont to use for Fluidsynth", "Audio", "Soundfont", "" };
 
 	void Hide();
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 39de34c7d..7250893e0 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -340,8 +340,8 @@ void Window_Settings::RefreshAudioMidi() {
 	}
 
 	if (cfg.fmmidi_midi.IsOptionVisible()) {
-		AddOption(cfg.fmmidi_midi, []() { Audio().SetFmMidiEnabled(Audio().GetConfig().fmmidi_midi.Toggle()); });
-		if (cfg.fmmidi_midi.Get() && !used) {
+		AddOption(cfg.fmmidi_midi, []() {});
+		if (!used) {
 			options.back().text += " [In use]";
 		}
 	}

From 9ffb9b43806130215374470e072d9214f6499731 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 20 Dec 2023 20:48:10 +0100
Subject: [PATCH 015/222] Fix build when Fluidsynth is missing or Fluidlite is
 used

---
 src/audio_midi.cpp         | 2 ++
 src/config_param.h         | 4 ++++
 src/decoder_fluidsynth.cpp | 4 ++--
 src/scene_title.cpp        | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index aee12a405..9827be97a 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -149,8 +149,10 @@ void MidiDecoder::ChangeFluidsynthSoundfont(StringView sf_path) {
 		return;
 	}
 
+#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
 	// Was initialized before
 	works.fluidsynth = FluidSynthDecoder::ChangeGlobalSoundfont(sf_path, works.fluidsynth_status);
+#endif
 }
 
 bool MidiDecoder::CheckWildMidi(std::string &status_message) {
diff --git a/src/config_param.h b/src/config_param.h
index 4ed9ea3cf..6b5e5e701 100644
--- a/src/config_param.h
+++ b/src/config_param.h
@@ -39,6 +39,10 @@ namespace {
 		return std::to_string(i);
 	}
 
+	inline std::string ParamValueToString(double d) {
+		return std::to_string(d);
+	}
+
 	inline std::string ParamValueToString(bool b) {
 		return b ? "[ON]" : "[OFF]";
 	}
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index 48cebea3e..b2c541e2d 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -130,7 +130,7 @@ static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int
 
 #if FLUIDSYNTH_VERSION_MAJOR >= 2
 	char* default_sf = nullptr;
-	if (fluid_settings_dupstr(global_settings.get(), "synth.default-soundfont", &default_sf) == FLUID_OK) {
+	if (fluid_settings_dupstr(global_settings.get(), "synth.default-soundfont", &default_sf) == 0) {
 		if (default_sf != nullptr && default_sf[0] != '\0') {
 			sf_paths.emplace_back(default_sf);
 		}
@@ -299,7 +299,7 @@ bool FluidSynthDecoder::ChangeGlobalSoundfont(StringView sf_path, std::string& s
 
 	int new_global_id = fluid_synth_sfload(global_synth.get(), ToString(sf_path).c_str(), 1);
 	if (new_global_id != FLUID_FAILED) {
-		assert(fluid_synth_sfunload(global_synth.get(), global_synth_id, 1) == FLUID_OK);
+		assert(fluid_synth_sfunload(global_synth.get(), global_synth_id, 1) == 0);
 		global_synth_id = new_global_id;
 		status_message = fmt::format("Using soundfont {}", sf_path);
 		return true;
diff --git a/src/scene_title.cpp b/src/scene_title.cpp
index 3d4c38b07..bd23305a0 100644
--- a/src/scene_title.cpp
+++ b/src/scene_title.cpp
@@ -92,7 +92,6 @@ void Scene_Title::CreateHelpWindow() {
 	translate_window->SetHelpWindow(help_window.get());
 }
 
-
 void Scene_Title::Continue(SceneType prev_scene) {
 	Main_Data::game_system->ResetSystemGraphic();
 

From e63b72b61eb88d542908c6d30f60027ecd4871b7 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 21 Dec 2023 01:35:51 +0100
Subject: [PATCH 016/222] Update help/manual

---
 resources/unix/easyrpg-player.6.adoc | 27 +++++++++++++++++++++
 src/game_config.cpp                  | 35 ++++++++++++++++++++++++++++
 src/player.cpp                       | 11 +++++++++
 3 files changed, 73 insertions(+)

diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index 0a4081d08..a7166d61c 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -62,6 +62,25 @@ NOTE: For games that only use ASCII (English games) use '1252'.
    - 'rpg2k3v105'  - RPG Maker 2003 (v1.05 - v1.09a)
    - 'rpg2k3e'     - RPG Maker 2003 RPG Maker 2003 (English release, v1.12)
 
+*--font1* _FILE_::
+  Path to a font to use for the first font. The system graphic of the game
+  determines whether font 1 or 2 is used. When no font is selected or the
+  selected font lacks certain glyphs the built-in pixel font is used.
+
+*--font1-size* _PX_::
+  Size of font 1 in pixel. The default value is 12.
+
+*--font2* _FILE_::
+  Path to a font to use for the second font. See font 1 for further information.
+
+*--font2-size* _PX_::
+  Size of font 2 in pixel. The default value is 12.
+
+*--font-path* _PATH_::
+  Configures the path where the settings scene looks for fonts. The user can
+  choose from any font in the directory. This is more flexible than using
+  *--font1* or *--font2* directly. The default path is 'config-path/Font'.
+
 *--language* _LANG_::
   Loads the game translation in language/'LANG' folder.
 
@@ -166,6 +185,10 @@ NOTE: When using the game browser all games will share the same save directory!
    - 'widescreen'  - 416x240 (16:9)
    - 'ultrawide'   - 560x240 (21:9)
 
+*--pause-focus-lost*::
+  Pause the game when the window has no focus. Can be disabled with
+  *--no-pause-focus-lost*.
+
 *--scaling* _MODE_::
   How the video output is scaled. Possible options:
    - 'nearest'    - Scale to screen size using nearest neighbour algorithm.
@@ -206,6 +229,10 @@ NOTE: When using the game browser all games will share the same save directory!
   Adds 'FILE' to the list of soundfonts used for playing MIDI files and use
   this one with highest precedence. The soundfont must be in SF2 format.
 
+*--soundfont-path* _P_::
+  Configures the path where the settings scene looks for soundfonts. The user
+  can choose from any soundfont in the directory. This is more flexible than
+  using *--soundfont* directly. The default path is 'config-path/Soundfont'.
 
 === Debug options
 
diff --git a/src/game_config.cpp b/src/game_config.cpp
index fa786b37b..043cc70d1 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -275,6 +275,9 @@ std::string Game_Config::GetConfigPath(CmdlineParser& cp) {
 }
 
 void Game_Config::LoadFromArgs(CmdlineParser& cp) {
+	font_path.clear();
+	soundfont_path.clear();
+
 	while (!cp.Done()) {
 		CmdlineArg arg;
 		long li_value = 0;
@@ -302,6 +305,14 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			video.fps_render_window.Set(arg.ArgIsOn());
 			continue;
 		}
+		if (cp.ParseNext(arg, 0, "--pause-focus-lost")) {
+			video.pause_when_focus_lost.Set(true);
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, "--no-pause-focus-lost")) {
+			video.pause_when_focus_lost.Set(false);
+			continue;
+		}
 		if (cp.ParseNext(arg, 0, "--window")) {
 			video.fullscreen.Set(false);
 			continue;
@@ -364,6 +375,30 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			}
 			continue;
 		}
+		if (cp.ParseNext(arg, 1, "--font1")) {
+			if (arg.NumValues() > 0) {
+				player.font1.Set(FileFinder::MakeCanonical(arg.Value(0), 0));
+			}
+			continue;
+		}
+		if (cp.ParseNext(arg, 1, "--font1-size")) {
+			if (arg.ParseValue(0, li_value)) {
+				player.font1_size.Set(li_value);
+			}
+			continue;
+		}
+		if (cp.ParseNext(arg, 1, "--font2")) {
+			if (arg.NumValues() > 0) {
+				player.font2.Set(FileFinder::MakeCanonical(arg.Value(0), 0));
+			}
+			continue;
+		}
+		if (cp.ParseNext(arg, 1, "--font2-size")) {
+			if (arg.ParseValue(0, li_value)) {
+				player.font2_size.Set(li_value);
+			}
+			continue;
+		}
 		if (cp.ParseNext(arg, 1, "--soundfont-path")) {
 			if (arg.NumValues() > 0) {
 				soundfont_path = FileFinder::MakeCanonical(arg.Value(0), 0);
diff --git a/src/player.cpp b/src/player.cpp
index 88c2c9b56..ff3be5789 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1380,6 +1380,13 @@ Engine options:
                        rpg2k3     - RPG Maker 2003 (v1.00 - v1.04)
                        rpg2k3v105 - RPG Maker 2003 (v1.05 - v1.09a)
                        rpg2k3e    - RPG Maker 2003 (English release, v1.12)
+ --font1 FILE         Font to use for the first font. The system graphic of the
+                      game determines whether font 1 or 2 is used.
+ --font1-size PX      Size of font 1 in pixel. The default is 12.
+ --font2 FILE         Font to use for the second font.
+ --font2-size PX      Size of font 2 in pixel. The default is 12.
+ --font-path PATH     The path in which the settings scene looks for fonts.
+                      The default is config-path/Font.
  --language LANG      Load the game translation in language/LANG folder.
  --load-game-id N     Skip the title scene and load SaveN.lsd (N is padded to
                       two digits).
@@ -1432,6 +1439,8 @@ Video options:
                        original   - 320x240 (4:3). Recommended
                        widescreen - 416x240 (16:9)
                        ultrawide  - 560x240 (21:9)
+ --pause-focus-lost   Pause the game when the window has no focus.
+                      Disable with --no-pause-focus-lost.
  --scaling S          How the video output is scaled.
                       Options:
                        nearest  - Scale to screen size. Fast, but causes scaling
@@ -1453,6 +1462,8 @@ Audio options:
  --music-volume V     Set volume of background music to V (0-100).
  --sound-volume V     Set volume of sound effects to V (0-100).
  --soundfont FILE     Soundfont in sf2 format to use when playing MIDI files.
+ --soundfont-path P   The path in which the settings scene looks for soundfonts.
+                      The default is config-path/Soundfont.
 
 Debug options:
  --battle-test N...   Start a battle test.

From b6e397b6a6b8c1fbc2f51020f98dd881719dae1a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 21 Dec 2023 15:14:49 +0100
Subject: [PATCH 017/222] Fluidsynth: Only try /usr/share on desktop
 Linux/BSD/macOS systems

---
 src/decoder_fluidsynth.cpp | 2 ++
 src/system.h               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index b2c541e2d..dd2d383ea 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -149,11 +149,13 @@ static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int
 		sf_paths.insert(sf_paths.end(), sdl_sfs.begin(), sdl_sfs.end());
 	}
 
+#ifdef SYSTEM_DESKTOP_LINUX_BSD_MACOS
 	auto sf_files = {"FluidR3_GM.sf2"};
 	for (const auto& sf_file: sf_files) {
 		sf_paths.emplace_back(FileFinder::MakePath("/usr/share/soundfonts", sf_file));
 		sf_paths.emplace_back(FileFinder::MakePath("/usr/share/sounds/sf2", sf_file));
 	}
+#endif
 
 	bool sf_load_success = false;
 	int old_synth_id = synth_id;
diff --git a/src/system.h b/src/system.h
index 74b8d0b12..8e6b14970 100644
--- a/src/system.h
+++ b/src/system.h
@@ -93,6 +93,7 @@
 #  define SUPPORT_TOUCH
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define SYSTEM_DESKTOP_LINUX_BSD_MACOS
 #endif
 
 #ifdef USE_SDL

From fb71fe492cee89f34ca870eeb8787b299868c144 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 21 Dec 2023 16:28:46 +0100
Subject: [PATCH 018/222] Settings: Prevent changing the font when the game has
 a custom font

---
 src/player.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/player.cpp b/src/player.cpp
index ff3be5789..f64122b78 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1054,12 +1054,20 @@ void Player::LoadFonts() {
 	// Look for bundled fonts
 	auto gothic = FileFinder::OpenFont("Font");
 	if (gothic) {
-		Font::SetDefault(Font::CreateFtFont(std::move(gothic), 12, false, false), false);
+		auto ft = Font::CreateFtFont(std::move(gothic), 12, false, false);
+		player_config.font1.SetLocked(ft != nullptr);
+		if (ft) {
+			Font::SetDefault(ft, false);
+		}
 	}
 
 	auto mincho = FileFinder::OpenFont("Font2");
 	if (mincho) {
-		Font::SetDefault(Font::CreateFtFont(std::move(mincho), 12, false, false), true);
+		auto ft = Font::CreateFtFont(std::move(mincho), 12, false, false);
+		player_config.font2.SetLocked(ft != nullptr);
+		if (ft) {
+			Font::SetDefault(ft, true);
+		}
 	}
 #endif
 }

From 5a91e4239cd2a913393b24d9bfd2a183e8243b92 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 21 Dec 2023 16:29:15 +0100
Subject: [PATCH 019/222] Settings: Fix memory corruption after Push

The option was deleted. This randomly crashed when opening the font list.
---
 src/window_settings.cpp | 62 ++++++++++++++++++++++-------------------
 src/window_settings.h   |  9 +++---
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 7250893e0..5a02ddb06 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -55,7 +55,7 @@ void Window_Settings::DrawOption(int index) {
 	Rect rect = GetItemRect(index);
 	contents->ClearRect(rect);
 
-	auto& option = options[index];
+	auto& option = GetFrame().options[index];
 
 	bool enabled = bool(option.action);
 	Font::SystemColor color = enabled ? option.color : Font::ColorDisabled;
@@ -119,7 +119,7 @@ Window_Settings::UiMode Window_Settings::GetMode() const {
 }
 
 void Window_Settings::Refresh() {
-	options.clear();
+	GetFrame().options.clear();
 
 	switch (GetFrame().uimode) {
 		case eNone:
@@ -164,9 +164,9 @@ void Window_Settings::Refresh() {
 			break;
 	}
 
-	SetItemMax(options.size());
+	SetItemMax(GetFrame().options.size());
 
-	if (GetFrame().uimode == eNone || options.empty()) {
+	if (GetFrame().uimode == eNone || GetFrame().options.empty()) {
 		SetIndex(-1);
 	}
 
@@ -180,11 +180,11 @@ void Window_Settings::Refresh() {
 }
 
 void Window_Settings::UpdateHelp() {
-	if (index >= 0 && index < static_cast<int>(options.size())) {
-		help_window->SetText(options[index].help);
+	if (index >= 0 && index < static_cast<int>(GetFrame().options.size())) {
+		help_window->SetText(GetFrame().options[index].help);
 		if (help_window2) {
-			help_window2->SetText(options[index].help2);
-			help_window2->SetVisible(!options[index].help2.empty());
+			help_window2->SetText(GetFrame().options[index].help2);
+			help_window2->SetVisible(!GetFrame().options[index].help2.empty());
 		}
 	} else {
 		help_window->SetText("");
@@ -209,7 +209,7 @@ void Window_Settings::AddOption(const Param& param,
 	if (!param.IsLocked()) {
 		opt.action = std::forward<Action>(action);
 	}
-	options.push_back(std::move(opt));
+	GetFrame().options.push_back(std::move(opt));
 }
 
 template <typename T, typename Action>
@@ -231,7 +231,7 @@ void Window_Settings::AddOption(const RangeConfigParam<T>& param,
 	if (!param.IsLocked()) {
 		opt.action = std::forward<Action>(action);
 	}
-	options.push_back(std::move(opt));
+	GetFrame().options.push_back(std::move(opt));
 }
 
 template <typename T, typename Action, size_t S>
@@ -267,7 +267,7 @@ void Window_Settings::AddOption(const EnumConfigParam<T, S>& param,
 	if (!param.IsLocked()) {
 		opt.action = std::forward<Action>(action);
 	}
-	options.push_back(std::move(opt));
+	GetFrame().options.push_back(std::move(opt));
 }
 
 void Window_Settings::RefreshVideo() {
@@ -304,37 +304,37 @@ void Window_Settings::RefreshAudioMidi() {
 	bool used = false;
 
 	AddOption(MenuItem("> Information <", "The first active and working option is used for MIDI", ""), [](){});
-	options.back().help2 = "Changes take effect when a new MIDI file is played";
+	GetFrame().options.back().help2 = "Changes take effect when a new MIDI file is played";
 
 	if (cfg.fluidsynth_midi.IsOptionVisible()) {
 		AddOption(cfg.fluidsynth_midi, []() { Audio().SetFluidsynthEnabled(Audio().GetConfig().fluidsynth_midi.Toggle()); });
-		if (!MidiDecoder::CheckFluidsynth(options.back().help2)) {
-			options.back().text += " [Not working]";
-			options.back().color = Font::ColorKnockout;
+		if (!MidiDecoder::CheckFluidsynth(GetFrame().options.back().help2)) {
+			GetFrame().options.back().text += " [Not working]";
+			GetFrame().options.back().color = Font::ColorKnockout;
 		} else if (cfg.fluidsynth_midi.Get()) {
-			options.back().text += " [In use]";
+			GetFrame().options.back().text += " [In use]";
 			used = true;
 		}
 	}
 
 	if (cfg.wildmidi_midi.IsOptionVisible()) {
 		AddOption(cfg.wildmidi_midi, []() { Audio().SetWildMidiEnabled(Audio().GetConfig().wildmidi_midi.Toggle()); });
-		if (!MidiDecoder::CheckWildMidi(options.back().help2)) {
-			options.back().text += " [Not working]";
-			options.back().color = Font::ColorKnockout;
+		if (!MidiDecoder::CheckWildMidi(GetFrame().options.back().help2)) {
+			GetFrame().options.back().text += " [Not working]";
+			GetFrame().options.back().color = Font::ColorKnockout;
 		} else if (cfg.wildmidi_midi.Get() && !used) {
-			options.back().text += " [In use]";
+			GetFrame().options.back().text += " [In use]";
 			used = true;
 		}
 	}
 
 	if (cfg.native_midi.IsOptionVisible()) {
 		AddOption(cfg.native_midi, []() { Audio().SetNativeMidiEnabled(Audio().GetConfig().native_midi.Toggle()); });
-		if (!GenericAudioMidiOut().IsInitialized(options.back().help2)) {
-			options.back().text += " [Not working]";
-			options.back().color = Font::ColorKnockout;
+		if (!GenericAudioMidiOut().IsInitialized(GetFrame().options.back().help2)) {
+			GetFrame().options.back().text += " [Not working]";
+			GetFrame().options.back().color = Font::ColorKnockout;
 		} else if (cfg.native_midi.Get() && !used) {
-			options.back().text += " [In use]";
+			GetFrame().options.back().text += " [In use]";
 			used = true;
 		}
 	}
@@ -342,7 +342,7 @@ void Window_Settings::RefreshAudioMidi() {
 	if (cfg.fmmidi_midi.IsOptionVisible()) {
 		AddOption(cfg.fmmidi_midi, []() {});
 		if (!used) {
-			options.back().text += " [In use]";
+			GetFrame().options.back().text += " [In use]";
 		}
 	}
 }
@@ -391,8 +391,11 @@ void Window_Settings::RefreshEngine() {
 		Push(eEngineFont1);
 		GetFrame().scratch = -1;
 	});
+	if (cfg.font1.IsLocked()) {
+		GetFrame().options.back().help = "This game uses a custom font";
+	}
 	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_gothic) {
-		options.back().text += " [In use]";
+		GetFrame().options.back().text += " [In use]";
 	}
 
 	AddOption(cfg.font2, [this, &cfg]() {
@@ -400,8 +403,11 @@ void Window_Settings::RefreshEngine() {
 		Push(eEngineFont2);
 		GetFrame().scratch = -1;
 	});
+	if (cfg.font2.IsLocked()) {
+		GetFrame().options.back().help = "This game uses a custom font";
+	}
 	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_mincho) {
-		options.back().text += " [In use]";
+		GetFrame().options.back().text += " [In use]";
 	}
 
 	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<StartupLogos>(GetCurrentOption().current_value)); });
@@ -424,7 +430,7 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 	auto& setting = mincho ? cfg.font2 : cfg.font1;
 
 	auto set_help2 = [this]() {
-		options.back().help2 = ToString(sample_text.GetDescriptions()[static_cast<int>(sample_text.Get())]);
+		GetFrame().options.back().help2 = ToString(sample_text.GetDescriptions()[static_cast<int>(sample_text.Get())]);
 	};
 
 	AddOption(MenuItem("<Built-in Font>", "Use the built-in pixel font", setting.Get().empty() ? "[x]" : ""), [this, &setting, mincho]() {
diff --git a/src/window_settings.h b/src/window_settings.h
index 4a2d03460..73f72b9bc 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -82,6 +82,7 @@ class Window_Settings : public Window_Selectable {
 		int arg = -1;
 		int scratch = 0;
 		int scratch2 = 0;
+		std::vector<Option> options;
 	};
 
 	/** Constructor  */
@@ -90,13 +91,13 @@ class Window_Settings : public Window_Selectable {
 	/** @return true if the index points to an enabled action */
 	bool IsCurrentActionEnabled() const {
 		return (index >= 0
-				&& index < static_cast<int>(options.size())
-				&& static_cast<bool>(options[index].action));
+				&& index < static_cast<int>(GetFrame().options.size())
+				&& static_cast<bool>(GetFrame().options[index].action));
 	}
 
 	/** Execute the action pointed to by index */
 	Option& GetCurrentOption() {
-		return options[index];
+		return GetFrame().options[index];
 	}
 
 	UiMode GetMode() const;
@@ -150,8 +151,6 @@ class Window_Settings : public Window_Selectable {
 
 	void UpdateHelp() override;
 
-	std::vector<Option> options;
-
 	struct Memory {
 		int index = 0;
 		int top_row = 0;

From 833abeff1e9d522e73d847b60d526b4bf04a0fb9 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 21 Dec 2023 17:09:40 +0100
Subject: [PATCH 020/222] Emscripten: Sanitize (Sound)fonts

Disable feature when not available.
---
 src/platform/emscripten/interface.cpp | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/platform/emscripten/interface.cpp b/src/platform/emscripten/interface.cpp
index 0e88efbf2..a57e9c9ff 100644
--- a/src/platform/emscripten/interface.cpp
+++ b/src/platform/emscripten/interface.cpp
@@ -22,8 +22,10 @@
 #include <lcf/lsd/reader.h>
 #include <sstream>
 
+#include "system.h"
 #include "async_handler.h"
 #include "filefinder.h"
+#include "filesystem_stream.h"
 #include "player.h"
 #include "scene_save.h"
 #include "output.h"
@@ -112,13 +114,11 @@ bool Emscripten_Interface_Private::UploadSoundfontStep2(std::string filename, in
 
 	std::string name = std::get<1>(FileFinder::GetPathAndFilename(filename));
 
-	// TODO: Sanitize
-	/*std::istream is(new Filesystem_Stream::InputMemoryStreamBufView(lcf::Span<uint8_t>(reinterpret_cast<uint8_t*>(buffer_addr), size)));
-
-	if (!lcf::LSD_Reader::Load(is)) {
-		Output::Warning("Selected file is not a valid savegame");
+	// TODO: No good way to sanitize this, would require launching an entire, second fluidsynth session
+	if (!StringView(name).ends_with(".sf2")) {
+		Output::Warning("Selected file is not a valid soundfont");
 		return false;
-	}*/
+	}
 
 	{
 		auto os = fs.OpenOutputStream(name);
@@ -141,13 +141,11 @@ bool Emscripten_Interface_Private::UploadFontStep2(std::string filename, int buf
 
 	std::string name = std::get<1>(FileFinder::GetPathAndFilename(filename));
 
-	// TODO: Sanitize
-	/*std::istream is(new Filesystem_Stream::InputMemoryStreamBufView(lcf::Span<uint8_t>(reinterpret_cast<uint8_t*>(buffer_addr), size)));
-
-	if (!lcf::LSD_Reader::Load(is)) {
-		Output::Warning("Selected file is not a valid savegame");
+	Filesystem_Stream::InputStream is(new Filesystem_Stream::InputMemoryStreamBufView(lcf::Span<uint8_t>(reinterpret_cast<uint8_t*>(buffer_addr), size)), filename);
+	if (!Font::CreateFtFont(std::move(is), 12, false, false)) {
+		Output::Warning("Selected file is not a valid font");
 		return false;
-	}*/
+	}
 
 	{
 		auto os = fs.OpenOutputStream(name);
@@ -167,15 +165,23 @@ EMSCRIPTEN_BINDINGS(player_interface) {
 		.class_function("requestReset", &Emscripten_Interface::Reset)
 		.class_function("downloadSavegame", &Emscripten_Interface::DownloadSavegame)
 		.class_function("uploadSavegame", &Emscripten_Interface::UploadSavegame)
+#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
 		.class_function("uploadSoundfont", &Emscripten_Interface::UploadSoundfont)
+#endif
+#if defined(HAVE_FREETYPE)
 		.class_function("uploadFont", &Emscripten_Interface::UploadFont)
+#endif
 		.class_function("refreshScene", &Emscripten_Interface::RefreshScene)
 		.class_function("takeScreenshot", &Emscripten_Interface::TakeScreenshot)
 	;
 
 	emscripten::class_<Emscripten_Interface_Private>("api_private")
 		.class_function("uploadSavegameStep2", &Emscripten_Interface_Private::UploadSavegameStep2)
+#if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
 		.class_function("uploadSoundfontStep2", &Emscripten_Interface_Private::UploadSoundfontStep2)
+#endif
+#if defined(HAVE_FREETYPE)
 		.class_function("uploadFontStep2", &Emscripten_Interface_Private::UploadFontStep2)
+#endif
 	;
 }

From 349b7e2481fa25e7f9ae01687f319e0d7de1a874 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 22 Dec 2023 22:03:32 +0100
Subject: [PATCH 021/222] FluidSynth: Change SF when the MIDI changes

Live SF change is too much complexity, not working properly.
---
 src/audio_decoder_midi.cpp |  3 ++
 src/audio_midi.cpp         |  1 +
 src/audio_midi.h           |  5 +++
 src/decoder_fluidsynth.cpp | 84 ++++++++++++++++++++------------------
 src/decoder_fluidsynth.h   |  2 +
 src/window_settings.cpp    | 10 +++--
 6 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/src/audio_decoder_midi.cpp b/src/audio_decoder_midi.cpp
index 31b773ede..2ba0cff6f 100644
--- a/src/audio_decoder_midi.cpp
+++ b/src/audio_decoder_midi.cpp
@@ -308,6 +308,9 @@ int AudioDecoderMidi::GetTicks() const {
 }
 
 void AudioDecoderMidi::Reset() {
+	// Placed here to avoid reloading of a soundfont on shutdown
+	mididec->OnNewMidi();
+
 	// Generate a MIDI reset event so the device doesn't
 	// leave notes playing or keeps any state
 	reset();
diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index 9827be97a..e4b027a3a 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -152,6 +152,7 @@ void MidiDecoder::ChangeFluidsynthSoundfont(StringView sf_path) {
 #if defined(HAVE_FLUIDSYNTH) || defined(HAVE_FLUIDLITE)
 	// Was initialized before
 	works.fluidsynth = FluidSynthDecoder::ChangeGlobalSoundfont(sf_path, works.fluidsynth_status);
+	Output::Debug("Fluidsynth: {}", works.fluidsynth_status);
 #endif
 }
 
diff --git a/src/audio_midi.h b/src/audio_midi.h
index 8882cc35f..88a58a0c3 100644
--- a/src/audio_midi.h
+++ b/src/audio_midi.h
@@ -180,6 +180,11 @@ class MidiDecoder {
 		return true;
 	}
 
+	/**
+	 * Notifies the sequencer that a new MIDI is about to start.
+	 */
+	virtual void OnNewMidi() {};
+
 	/*
 	 * Does the sequencer need "sound off" messages sent to every channel between
 	 * tracks? NOTE: enabling this can break smooth fade outs between tracks.
diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index dd2d383ea..f171ff7d2 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -94,11 +94,6 @@ static fluid_fileapi_t fluidlite_vio = {
 };
 #endif
 
-namespace {
-	bool once = false;
-	bool init = false;
-}
-
 struct FluidSynthDeleter {
 	void operator()(fluid_settings_t* s) const {
 		delete_fluid_settings(s);
@@ -110,16 +105,17 @@ struct FluidSynthDeleter {
 };
 
 namespace {
+	bool once = false;
+	bool init = false;
+
 	std::unique_ptr<fluid_settings_t, FluidSynthDeleter> global_settings;
 	std::unique_ptr<fluid_synth_t, FluidSynthDeleter> global_synth;
-#if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
-	fluid_sfloader_t* global_loader; // owned by global_settings
-#endif
-	int global_synth_id = -1;
+	std::unique_ptr<fluid_synth_t, FluidSynthDeleter> pending_global_synth;
+
 	int instances = 0;
 }
 
-static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int& synth_id) {
+static bool load_default_sf(std::string& status_message, fluid_synth_t* syn) {
 	// Attempt loading a soundfont
 	std::vector<std::string> sf_paths;
 	std::string preferred_soundfont = Audio().GetFluidsynthSoundfont();
@@ -158,14 +154,8 @@ static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int
 #endif
 
 	bool sf_load_success = false;
-	int old_synth_id = synth_id;
 	for (const auto& sf_name: sf_paths) {
-		int new_synth_id = fluid_synth_sfload(syn, sf_name.c_str(), 1);
-		if (new_synth_id != FLUID_FAILED) {
-			synth_id = new_synth_id;
-			if (old_synth_id > 0) {
-				fluid_synth_sfunload(syn, old_synth_id, 1);
-			}
+		if (fluid_synth_sfload(syn, sf_name.c_str(), 1) != FLUID_FAILED) {
 			sf_load_success = true;
 			status_message = fmt::format("Using soundfont {}", sf_name);
 			break;
@@ -180,7 +170,7 @@ static bool load_default_sf(std::string& status_message, fluid_synth_t* syn, int
 	return true;
 }
 
-static fluid_synth_t* create_synth(std::string& status_message, int& synth_id) {
+static fluid_synth_t* create_synth(std::string& status_message) {
 	fluid_synth_t* syn = new_fluid_synth(global_settings.get());
 	if (!syn) {
 		status_message = "new_fluid_synth failed";
@@ -188,13 +178,14 @@ static fluid_synth_t* create_synth(std::string& status_message, int& synth_id) {
 	}
 
 #if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
-	fluid_synth_add_sfloader(syn, global_loader);
+	// Fluidsynth 1.x does not support VIO API for soundfonts
+	// owned by fluid_synth
+	auto* loader = new_fluid_defsfloader(global_settings.get());
+	fluid_sfloader_set_callbacks(loader,
+			vio_open, vio_read, vio_seek, vio_tell, vio_close);
+	fluid_synth_add_sfloader(syn, loader);
 #endif
 
-	if (!load_default_sf(status_message, syn, synth_id)) {
-		return nullptr;
-	}
-
 	fluid_synth_set_interp_method(syn, -1, FLUID_INTERP_LINEAR);
 
 	return syn;
@@ -208,7 +199,7 @@ FluidSynthDecoder::FluidSynthDecoder() {
 	if (instances > 1) {
 		std::string error_message;
 		int unused = -1;
-		local_synth = create_synth(error_message, unused);
+		local_synth = create_synth(error_message);
 		if (!local_synth) {
 			// unlikely, the SF was already allocated once
 			Output::Debug("FluidSynth failed: {}", error_message);
@@ -232,7 +223,13 @@ bool FluidSynthDecoder::Initialize(std::string& status_message) {
 	// only initialize once until a new game starts
 	if (once) {
 		if (!init && global_settings && !global_synth) {
-			global_synth.reset(create_synth(status_message, global_synth_id));
+			global_synth.reset(create_synth(status_message));
+			if (global_synth) {
+				if (!load_default_sf(status_message, global_synth.get())) {
+					global_synth.reset();
+				}
+			}
+
 			init = (global_synth != nullptr);
 		}
 		return init;
@@ -263,20 +260,16 @@ bool FluidSynthDecoder::Initialize(std::string& status_message) {
 	fluid_settings_setstr(global_settings.get(), "synth.chorus.active", "no");
 #endif
 
-	// Fluidsynth 1.x does not support VIO API for soundfonts
-#if defined(HAVE_FLUIDSYNTH) && FLUIDSYNTH_VERSION_MAJOR > 1
-	// owned by fluid_settings
-	global_loader = new_fluid_defsfloader(global_settings.get());
-	fluid_sfloader_set_callbacks(global_loader,
-			vio_open, vio_read, vio_seek, vio_tell, vio_close);
-#endif
-
-	global_synth_id = -1;
-	global_synth.reset(create_synth(status_message, global_synth_id));
+	global_synth.reset(create_synth(status_message));
 	if (!global_synth) {
 		return false;
 	}
 
+	if (!load_default_sf(status_message, global_synth.get())) {
+		global_synth.reset();
+		return false;
+	}
+
 	init = true;
 
 	return init;
@@ -288,6 +281,7 @@ void FluidSynthDecoder::ResetState() {
 
 	global_synth.reset();
 	global_settings.reset();
+	pending_global_synth.reset();
 }
 
 bool FluidSynthDecoder::ChangeGlobalSoundfont(StringView sf_path, std::string& status_message) {
@@ -295,18 +289,22 @@ bool FluidSynthDecoder::ChangeGlobalSoundfont(StringView sf_path, std::string& s
 		return false;
 	}
 
+	pending_global_synth.reset(create_synth(status_message));
+
+	if (!pending_global_synth) {
+		return false;
+	}
+
 	if (sf_path.empty()) {
-		return load_default_sf(status_message, global_synth.get(), global_synth_id);
+		return load_default_sf(status_message, pending_global_synth.get());
 	}
 
-	int new_global_id = fluid_synth_sfload(global_synth.get(), ToString(sf_path).c_str(), 1);
-	if (new_global_id != FLUID_FAILED) {
-		assert(fluid_synth_sfunload(global_synth.get(), global_synth_id, 1) == 0);
-		global_synth_id = new_global_id;
+	if (fluid_synth_sfload(pending_global_synth.get(), ToString(sf_path).c_str(), 1) != FLUID_FAILED) {
 		status_message = fmt::format("Using soundfont {}", sf_path);
 		return true;
 	}
 
+	pending_global_synth.reset();
 	status_message = "Could not load soundfont.";
 	return false;
 }
@@ -389,6 +387,12 @@ fluid_synth_t *FluidSynthDecoder::GetSynthInstance() {
 	}
 }
 
+void FluidSynthDecoder::OnNewMidi() {
+	if (pending_global_synth) {
+		global_synth = std::move(pending_global_synth);
+	}
+}
+
 bool FluidSynthDecoder::NeedsSoftReset() {
 	return true;
 }
diff --git a/src/decoder_fluidsynth.h b/src/decoder_fluidsynth.h
index 486b7550f..42c28a914 100644
--- a/src/decoder_fluidsynth.h
+++ b/src/decoder_fluidsynth.h
@@ -62,6 +62,8 @@ class FluidSynthDecoder : public MidiDecoder {
 #endif
 	};
 
+	void OnNewMidi() override;
+
 	bool NeedsSoftReset() override;
 
 private:
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 5a02ddb06..8a1a7d3d4 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -303,9 +303,6 @@ void Window_Settings::RefreshAudioMidi() {
 
 	bool used = false;
 
-	AddOption(MenuItem("> Information <", "The first active and working option is used for MIDI", ""), [](){});
-	GetFrame().options.back().help2 = "Changes take effect when a new MIDI file is played";
-
 	if (cfg.fluidsynth_midi.IsOptionVisible()) {
 		AddOption(cfg.fluidsynth_midi, []() { Audio().SetFluidsynthEnabled(Audio().GetConfig().fluidsynth_midi.Toggle()); });
 		if (!MidiDecoder::CheckFluidsynth(GetFrame().options.back().help2)) {
@@ -345,6 +342,9 @@ void Window_Settings::RefreshAudioMidi() {
 			GetFrame().options.back().text += " [In use]";
 		}
 	}
+
+	AddOption(MenuItem("> Information <", "The first active and working option is used for MIDI", ""), [](){});
+	GetFrame().options.back().help2 = "Changes take effect when a new MIDI file is played";
 }
 
 void Window_Settings::RefreshAudioSoundfont() {
@@ -375,6 +375,10 @@ void Window_Settings::RefreshAudioSoundfont() {
 		}
 	}
 
+	for (auto& opt: GetFrame().options) {
+		opt.help2 = "Changes take effect when a new MIDI file is played";
+	}
+
 #ifdef EMSCRIPTEN
 	AddOption(MenuItem("<Upload Soundfont>", "Provide a soundfont from your system", ""), [fs]() { Emscripten_Interface::UploadSoundfont(); });
 #else

From 645881edefae491bb98ee1701157dd1cf9448ed1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 24 Dec 2023 21:16:58 +0100
Subject: [PATCH 022/222] FtFont: Improve error handling

- Game will not terminate anymore when a glyph fails to render
- Fix crash when a font fails to load
---
 src/font.cpp           | 82 +++++++++++++++++++++++++++++++++---------
 src/scene_settings.cpp |  6 ++++
 src/window_settings.h  | 10 +++---
 3 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index d3c9dba1a..8495bc4c8 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -136,6 +136,7 @@ namespace {
 		FTFont(Filesystem_Stream::InputStream is, int size, bool bold, bool italic);
 		~FTFont() override;
 
+		bool IsOk() const;
 		Rect vGetSize(char32_t glyph) const override;
 		GlyphRet vRender(char32_t glyph) const override;
 		GlyphRet vRenderShaped(char32_t glyph) const override;
@@ -282,6 +283,10 @@ FTFont::FTFont(Filesystem_Stream::InputStream is, int size, bool bold, bool ital
 
 	FT_New_Memory_Face(library, ft_buffer.data(), ft_buffer.size(), 0, &face);
 
+	if (face == nullptr) {
+		return;
+	}
+
 	if (face->num_charmaps > 0) {
 		// Force unicode charmap
 		if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) {
@@ -319,21 +324,33 @@ FTFont::~FTFont() {
 	}
 }
 
+bool FTFont::IsOk() const {
+	return face;
+}
+
 Rect FTFont::vGetSize(char32_t glyph) const {
 	auto glyph_index = FT_Get_Char_Index(face, glyph);
 
-	if (glyph_index == 0 && fallback_font) {
-		return fallback_font->vGetSize(glyph);
+	if (glyph_index == 0) {
+		if (fallback_font) {
+			return fallback_font->vGetSize(glyph);
+		} else {
+			return {0, 0, 0, current_style.size};
+		}
 	}
 
 	auto load_glyph = [&](auto flags) {
 		if (FT_Load_Glyph(face, glyph_index, flags) != FT_Err_Ok) {
-			Output::Error("Couldn't load FreeType character {:#x}", uint32_t(glyph));
+			Output::Debug("Couldn't load FreeType character {:#x}", uint32_t(glyph));
+			return false;
 		}
+		return true;
 	};
 
 	if (FT_HAS_COLOR(face)) {
-		load_glyph(FT_LOAD_COLOR);
+		if (!load_glyph(FT_LOAD_COLOR)) {
+			Output::Error("Broken color font for glyph {:#x}", uint32_t(glyph));
+		}
 
 		// When it is a color font check if the glyph is a color glyph
 		// If it is not then reload the glyph monochrome
@@ -341,7 +358,13 @@ Rect FTFont::vGetSize(char32_t glyph) const {
 			load_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO);
 		}
 	} else {
-		load_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO);
+		if (!load_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO)) {
+			if (fallback_font) {
+				return fallback_font->vGetSize(glyph);
+			} else {
+				return {0, 0, 0, current_style.size};
+			}
+		}
 	}
 
 	FT_GlyphSlot slot = face->glyph;
@@ -360,30 +383,44 @@ Rect FTFont::vGetSize(char32_t glyph) const {
 Font::GlyphRet FTFont::vRender(char32_t glyph) const {
 	auto glyph_index = FT_Get_Char_Index(face, glyph);
 
-	if (glyph_index == 0 && fallback_font) {
-		return fallback_font->vRender(glyph);
+	if (glyph_index == 0) {
+		if (fallback_font) {
+			return fallback_font->vRender(glyph);
+		} else {
+			return { {}, {0, current_style.size}, {0, 0}, false };
+		}
 	}
 
 	return vRenderShaped(glyph_index);
 }
 
 Font::GlyphRet FTFont::vRenderShaped(char32_t glyph) const {
-	if (glyph == 0 && fallback_font) {
-		return fallback_font->vRender(glyph);
+	if (glyph == 0) {
+		if (fallback_font) {
+			return fallback_font->vRender(glyph);
+		} else {
+			return { {}, {0, current_style.size}, {0, 0}, false };
+		}
 	}
 
 	auto render_glyph = [&](auto flags, auto mode) {
 		if (FT_Load_Glyph(face, glyph, flags) != FT_Err_Ok) {
-			Output::Error("Couldn't load FreeType character {:#x}", uint32_t(glyph));
+			Output::Debug("Couldn't load FreeType character {:#x}", uint32_t(glyph));
+			return false;
 		}
 
 		if (FT_Render_Glyph(face->glyph, mode) != FT_Err_Ok) {
-			Output::Error("Couldn't render FreeType character {:#x}", uint32_t(glyph));
+			Output::Debug("Couldn't render FreeType character {:#x}", uint32_t(glyph));
+			return false;
 		}
+
+		return true;
 	};
 
 	if (FT_HAS_COLOR(face)) {
-		render_glyph(FT_LOAD_COLOR, FT_RENDER_MODE_NORMAL);
+		if (!render_glyph(FT_LOAD_COLOR, FT_RENDER_MODE_NORMAL)) {
+			Output::Error("Broken color font for glyph {:#x}", uint32_t(glyph));
+		}
 
 		// When it is a color font check if the glyph is a color glyph
 		// If it is not then rerender the glyph monochrome
@@ -392,7 +429,13 @@ Font::GlyphRet FTFont::vRenderShaped(char32_t glyph) const {
 			render_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO, FT_RENDER_MODE_MONO);
 		}
 	} else {
-		render_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO, FT_RENDER_MODE_MONO);
+		if (!render_glyph(FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO, FT_RENDER_MODE_MONO)) {
+			if (fallback_font) {
+				return fallback_font->vRender(glyph);
+			} else {
+				return { {}, {0, current_style.size}, {0, 0}, false };
+			}
+		}
 	}
 
 	FT_GlyphSlot slot = face->glyph;
@@ -598,7 +641,7 @@ FontRef Font::CreateFtFont(Filesystem_Stream::InputStream is, int size, bool bol
 
 	if (it == ft_cache.end()) {
 		auto ft_font = std::make_shared<FTFont>(std::move(is), size, bold, italic);
-		if (!ft_font) {
+		if (!ft_font || !ft_font->IsOk()) {
 			return nullptr;
 		}
 
@@ -609,8 +652,6 @@ FontRef Font::CreateFtFont(Filesystem_Stream::InputStream is, int size, bool bol
 		it->second.last_access = Game_Clock::GetFrameTime();
 		return it->second.font;
 	}
-
-	return std::make_shared<FTFont>(std::move(is), size, bold, italic);
 #else
 	return nullptr;
 #endif
@@ -688,6 +729,9 @@ Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, in
 	}
 
 	auto gret = vRender(glyph);
+	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
+		return {};
+	}
 
 	auto rect = Rect(x, y, gret.bitmap->width(), gret.bitmap->height());
 	if (EP_UNLIKELY(rect.width == 0)) {
@@ -743,6 +787,9 @@ Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, in
 	}
 
 	auto gret = vRenderShaped(shape.code);
+	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
+		return {};
+	}
 
 	auto rect = Rect(x, y, gret.bitmap->width(), gret.bitmap->height());
 	if (EP_UNLIKELY(rect.width == 0)) {
@@ -791,6 +838,9 @@ Point Font::Render(Bitmap& dest, int x, int y, Color const& color, char32_t glyp
 	}
 
 	auto gret = vRender(glyph);
+	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
+		return {};
+	}
 
 	auto rect = Rect(x, y, gret.bitmap->width(), gret.bitmap->height());
 	dest.MaskedBlit(rect, *gret.bitmap, 0, 0, color);
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index 14fb5fc4b..4f58dd7af 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -484,6 +484,12 @@ void Scene_Settings::UpdateFont(bool mincho) {
 				help_window2->Clear();
 				help_window2->SetFont(font);
 				help_window2->SetVisible(true);
+			} else {
+				auto& opt = options_window->GetCurrentOption();
+				opt.action = nullptr;
+				opt.value_text = "[Broken]";
+				opt.help2.clear();
+				options_window->DrawOption(options_window->GetIndex());
 			}
 		}
 	}
diff --git a/src/window_settings.h b/src/window_settings.h
index 73f72b9bc..cb774d2bc 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -113,17 +113,17 @@ class Window_Settings : public Window_Selectable {
 	 */
 	void Refresh();
 
-	Window_Help* help_window2 = nullptr;
-	RangeConfigParam<int> font_size { "<Font Size>", "Font size to use. Not supported for the built-in font.", "", "", 12, 6, 16};
-private:
-
 	/**
-	 * Draws an item together with the quantity.
+	 * Draws an item.
 	 *
 	 * @param index index of item to draw.
 	 */
 	void DrawOption(int index);
 
+	Window_Help* help_window2 = nullptr;
+	RangeConfigParam<int> font_size { "<Font Size>", "Font size to use. Not supported for the built-in font.", "", "", 12, 6, 16};
+private:
+
 	template <typename Param, typename Action>
 	void AddOption(const Param& p,
 			Action&& action);

From 7d55c281a5a5ce8ceab4e24f51712574182d80a9 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 24 Dec 2023 21:37:03 +0100
Subject: [PATCH 023/222] Settings: Add Spanish pangram

---
 src/window_settings.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/window_settings.h b/src/window_settings.h
index cb774d2bc..26fb1988e 100644
--- a/src/window_settings.h
+++ b/src/window_settings.h
@@ -169,6 +169,7 @@ class Window_Settings : public Window_Selectable {
 		English,
 		French,
 		German,
+		Spanish,
 		Chinese,
 		Japanese_Hiragana,
 		Japanese_Kanji,
@@ -176,14 +177,15 @@ class Window_Settings : public Window_Selectable {
 		Diacritics
 	};
 
-	EnumConfigParam<SampleText, 8> sample_text{
+	EnumConfigParam<SampleText, 9> sample_text{
 		"<Sample Text>", "Text to show in the preview", "", "", SampleText::English,
-		Utils::MakeSvArray("English", "French", "German", "Chinese", "Japanese (Hiragana)", "Japanese (Kanji)", "Korean", "Various Diacritics"),
-		Utils::MakeSvArray("", "", "", "", "", "", "", ""),
+		Utils::MakeSvArray("English", "French", "German", "Spanish", "Chinese", "Japanese (Hiragana)", "Japanese (Kanji)", "Korean", "Various Diacritics"),
+		Utils::MakeSvArray("", "", "", "", "", "", "", "", ""),
 		Utils::MakeSvArray(
 			"The quick brown fox jumps over the lazy dog 1234567890.?!",
-			"Voix ambiguë d’un cœur qui au zéphyr préfère les jattes de kiwis",
+			"Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis",
 			"Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
+			"Jovencillo emponzoñado de whisky, ¡qué figurota exhibe!",
 			"天地玄黃宇宙洪荒。日月盈昃辰宿列張。寒來暑往秋收冬藏。閏餘成歲律呂調陽。雲騰致雨露結為霜。金生麗水玉出崑岡。劍號巨闕珠稱夜光。果珍李柰菜重芥薑。海鹹河淡鱗潛羽翔。",
 			"いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす",
 			"色は匂えど散りぬるを我が世誰ぞ常ならん有為の奥山今日越えて浅き夢見じ酔いもせず",

From 6056464a24ae3fce571416b6ce1ccf34dce0a062 Mon Sep 17 00:00:00 2001
From: Tool Man <gchristin2000@bell.net>
Date: Thu, 28 Dec 2023 04:33:01 +0000
Subject: [PATCH 024/222] Maniac Patch: Added separate Width/Height Values for
 pictures

Added:
- Separate Width and Height value as per .scale2 parameter in ManiacPatch 211010
- Set Height to Width when using picture effects (as per ManiacPatch)
- Set both Width and Height to Magnify when using .scale parameter

Bugfix:
- Fix ManiacPatch picture rotation not fully working
---
 src/game_interpreter.cpp | 61 ++++++++++++++++++++++++++++++----------
 src/game_pictures.cpp    | 13 +++++++--
 src/game_pictures.h      |  3 +-
 src/sprite_picture.cpp   |  4 +++
 4 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 199bd7a55..9853a682f 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2707,10 +2707,11 @@ namespace PicPointerPatch {
 	}
 
 	static void AdjustParams(Game_Pictures::Params& params) {
-		if (params.magnify > 10000) {
-			int new_magnify = Main_Data::game_variables->Get(params.magnify - 10000);
-			Output::Debug("PicPointer: Zoom {} replaced with {}", params.magnify, new_magnify);
-			params.magnify = new_magnify;
+		if (params.magnify_width > 10000) {
+			int new_magnify = Main_Data::game_variables->Get(params.magnify_width - 10000);
+			Output::Debug("PicPointer: Zoom {} replaced with {}", params.magnify_width, new_magnify);
+			params.magnify_width = new_magnify;
+			params.magnify_height = new_magnify;
 		}
 
 		if (params.top_trans > 10000) {
@@ -2795,7 +2796,8 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 	params.position_x = ValueOrVariable(pos_mode, com.parameters[2]);
 	params.position_y = ValueOrVariable(pos_mode, com.parameters[3]);
 	params.fixed_to_map = com.parameters[4] > 0;
-	params.magnify = com.parameters[5];
+	params.magnify_width = com.parameters[5];
+	params.magnify_height = params.magnify_width;
 	params.use_transparent_color = com.parameters[7] > 0;
 	params.top_trans = com.parameters[6];
 	params.red = com.parameters[8];
@@ -2828,7 +2830,16 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 			}
 			params.name = PicPointerPatch::ReplaceName(params.name, var, com.parameters[18]);
 		}
-		params.magnify = ValueOrVariable(com.parameters[20], params.magnify);
+
+		params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
+		if (Player::IsPatchManiac() && com.parameters.size() > 31 && com.parameters[20] >= 16 && params.effect_mode == 0) {
+			// The >= 16 check is needed because this bit is set when independent width/height scaling is used
+			// When using special effects on Maniacs, Height is set to Width
+			params.magnify_height = ValueOrVariableBitfield((com.parameters[20] >> 1), 1, com.parameters[31]);
+		} else {
+			params.magnify_height = params.magnify_width;
+		}
+
 		params.top_trans = ValueOrVariable(com.parameters[21], params.top_trans);
 		if (com.parameters[22] > 0) {
 			// If spritesheet is enabled
@@ -2877,7 +2888,8 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 	PicPointerPatch::AdjustShowParams(pic_id, params);
 
 	// Sanitize input
-	params.magnify = std::max(0, std::min(params.magnify, 2000));
+	params.magnify_width = std::max(0, std::min(params.magnify_width, 2000));
+	params.magnify_height = std::max(0, std::min(params.magnify_height, 2000));
 	params.top_trans = std::max(0, std::min(params.top_trans, 100));
 	params.bottom_trans = std::max(0, std::min(params.bottom_trans, 100));
 
@@ -2914,7 +2926,8 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 	int pos_mode = ManiacBitmask(com.parameters[1], 0xFF);
 	params.position_x = ValueOrVariable(pos_mode, com.parameters[2]);
 	params.position_y = ValueOrVariable(pos_mode, com.parameters[3]);
-	params.magnify = com.parameters[5];
+	params.magnify_width = com.parameters[5];
+	params.magnify_height = params.magnify_width;
 	params.top_trans = com.parameters[6];
 	params.red = com.parameters[8];
 	params.green = com.parameters[9];
@@ -2936,7 +2949,15 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 			// Currently unused by RPG Maker
 			//int chars_to_replace = com.parameters[18];
 			//int replace_with = com.parameters[19];
-			params.magnify = ValueOrVariable(com.parameters[20], params.magnify);
+
+			params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
+			if (Player::IsPatchManiac() && com.parameters.size() > 18 && com.parameters[20] >= 16 && params.effect_mode == 0) {
+				// The >= 16 check is needed because this bit is set when independent width/height scaling is used
+				// When using special effects on Maniacs, Height is set to Width
+				params.magnify_height = ValueOrVariableBitfield((com.parameters[20] >> 1), 1, com.parameters[18]);
+			} else {
+				params.magnify_height = params.magnify_width;
+			}
 			params.top_trans = ValueOrVariable(com.parameters[21], params.top_trans);
 		}
 
@@ -2962,8 +2983,8 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 			params.origin = com.parameters[1] >> 8;
 
 			if (params.effect_mode == lcf::rpg::SavePicture::Effect_maniac_fixed_angle) {
-				params.effect_power = ValueOrVariableBitfield(com.parameters[16], 0, params.effect_power);
-				int divisor = ValueOrVariableBitfield(com.parameters[16], 1, com.parameters[15]);
+				params.effect_power = ValueOrVariableBitfield(com.parameters[4], 0, params.effect_power);
+				int divisor = ValueOrVariableBitfield(com.parameters[4], 1, com.parameters[7]);
 				if (divisor == 0) {
 					divisor = 1;
 				}
@@ -2978,7 +2999,8 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 	PicPointerPatch::AdjustMoveParams(pic_id, params);
 
 	// Sanitize input
-	params.magnify = std::max(0, std::min(params.magnify, 2000));
+	params.magnify_width = std::max(0, std::min(params.magnify_width, 2000));
+	params.magnify_height = std::max(0, std::min(params.magnify_height, 2000));
 	params.top_trans = std::max(0, std::min(params.top_trans, 100));
 	params.bottom_trans = std::max(0, std::min(params.bottom_trans, 100));
 	params.duration = std::max(Player::IsPatchManiac() ? -10000 : 0, std::min(params.duration, 10000));
@@ -4258,7 +4280,7 @@ bool Game_Interpreter::CommandManiacShowStringPicture(lcf::rpg::EventCommand con
 
 	params.position_x = ValueOrVariableBitfield(com.parameters[0], 1, com.parameters[2]);
 	params.position_y = ValueOrVariableBitfield(com.parameters[0], 1, com.parameters[3]);
-	params.magnify = ValueOrVariableBitfield(com.parameters[0], 2, com.parameters[4]);
+	params.magnify_width = ValueOrVariableBitfield(com.parameters[0], 2, com.parameters[4]);
 	params.top_trans = ValueOrVariableBitfield(com.parameters[0], 3, com.parameters[5]);
 	params.red = com.parameters[6];
 	params.green = com.parameters[7];
@@ -4271,6 +4293,15 @@ bool Game_Interpreter::CommandManiacShowStringPicture(lcf::rpg::EventCommand con
 	params.battle_layer = com.parameters[16];
 	params.flags = com.parameters[17];
 
+	params.magnify_width = ValueOrVariableBitfield(com.parameters[0], 2, com.parameters[4]);
+	if (com.parameters.size() > 23 && com.parameters[0] >= 0x10000000 && params.effect_mode == 0) {
+		// The >= 0x10000000 check is needed because this bit is set when independent width/height scaling is used
+		// When using special effects on Maniacs, Height is set to Width
+		params.magnify_height = ValueOrVariableBitfield((com.parameters[0] >> 1), 7, com.parameters[23]);
+	} else {
+		params.magnify_height = params.magnify_width;
+	}
+
 	int flags = com.parameters[12];
 	int blend_mode = flags & 0xF;
 	if (blend_mode == 1) {
@@ -4403,13 +4434,13 @@ bool Game_Interpreter::CommandManiacGetPictureInfo(lcf::rpg::EventCommand const&
 			x = Utils::RoundTo<int>(data.current_x);
 			y = Utils::RoundTo<int>(data.current_y);
 			width = Utils::RoundTo<int>(width * data.current_magnify / 100.0);
-			height = Utils::RoundTo<int>(height * data.current_magnify / 100.0);
+			height = Utils::RoundTo<int>(height * data.maniac_current_magnify_height / 100.0);
 			break;
 		case 2:
 			x = Utils::RoundTo<int>(data.finish_x);
 			y = Utils::RoundTo<int>(data.finish_y);
 			width = Utils::RoundTo<int>(width * data.finish_magnify / 100.0);
-			height = Utils::RoundTo<int>(height * data.finish_magnify / 100.0);
+			height = Utils::RoundTo<int>(height * data.maniac_finish_magnify_height / 100.0);
 			break;
 	}
 
diff --git a/src/game_pictures.cpp b/src/game_pictures.cpp
index 7bcbb4121..3fc5f2601 100644
--- a/src/game_pictures.cpp
+++ b/src/game_pictures.cpp
@@ -51,6 +51,7 @@ void SyncCurrentToFinish(lcf::rpg::SavePicture& data) {
 	data.current_blue = data.finish_blue;
 	data.current_sat = data.finish_sat;
 	data.current_magnify = data.finish_magnify;
+	data.maniac_current_magnify_height = data.maniac_finish_magnify_height;
 	data.current_top_trans = data.finish_top_trans;
 	data.current_bot_trans = data.finish_bot_trans;
 	if (do_effect) {
@@ -113,6 +114,11 @@ std::vector<lcf::rpg::SavePicture> Game_Pictures::GetSaveData() const {
 		if (Player::IsRPG2k3E()) {
 			data.frames = frame_counter;
 		}
+		if (!Player::IsPatchManiac()) {
+			// Default the values so they are not stored in the savegame
+			data.maniac_current_magnify_height = 100;
+			data.maniac_finish_magnify_height = 100;
+		}
 		save.push_back(std::move(data));
 	}
 
@@ -534,6 +540,7 @@ void Game_Pictures::Picture::Update(bool is_battle) {
 		data.current_blue = interpolate(data.current_blue, data.finish_blue);
 		data.current_sat = interpolate(data.current_sat, data.finish_sat);
 		data.current_magnify = interpolate(data.current_magnify, data.finish_magnify);
+		data.maniac_current_magnify_height = interpolate(data.maniac_current_magnify_height, data.maniac_finish_magnify_height);
 		data.current_top_trans = interpolate(data.current_top_trans, data.finish_top_trans);
 		data.current_bot_trans = interpolate(data.current_bot_trans, data.finish_bot_trans);
 	}
@@ -601,7 +608,8 @@ Game_Pictures::ShowParams Game_Pictures::Picture::GetShowParams() const {
 	Game_Pictures::ShowParams params;
 	params.position_x = static_cast<int>(data.finish_x);
 	params.position_y = static_cast<int>(data.finish_y);
-	params.magnify = data.finish_magnify;
+	params.magnify_width = data.finish_magnify;
+	params.magnify_height = data.maniac_finish_magnify_height;
 	params.top_trans = data.finish_top_trans;
 	params.bottom_trans = data.finish_bot_trans;
 	params.red = data.finish_red;
@@ -631,7 +639,8 @@ void Game_Pictures::Picture::SetNonEffectParams(const Params& params, bool set_p
 		data.finish_x = params.position_x;
 		data.finish_y = params.position_y;
 	}
-	data.finish_magnify = params.magnify;
+	data.finish_magnify = params.magnify_width;
+	data.maniac_finish_magnify_height = params.magnify_height;
 	data.finish_top_trans = params.top_trans;
 	data.finish_bot_trans = params.bottom_trans;
 	data.finish_red = params.red;
diff --git a/src/game_pictures.h b/src/game_pictures.h
index cb4ab567d..30d0a0251 100644
--- a/src/game_pictures.h
+++ b/src/game_pictures.h
@@ -46,7 +46,6 @@ class Game_Pictures {
 	struct Params {
 		int position_x = 0;
 		int position_y = 0;
-		int magnify = 100;
 		int top_trans = 0;
 		int bottom_trans = 0;
 		int red = 100;
@@ -60,6 +59,8 @@ class Game_Pictures {
 		bool flip_y = false;
 		int blend_mode = 0;
 		int origin = 0;
+		int magnify_width = 100; // RPG_RT supports magnify, but not independent for w/h
+		int magnify_height = 100;
 	};
 	struct ShowParams : Params {
 		std::string name;
diff --git a/src/sprite_picture.cpp b/src/sprite_picture.cpp
index 47de160f8..2932d6025 100644
--- a/src/sprite_picture.cpp
+++ b/src/sprite_picture.cpp
@@ -112,8 +112,12 @@ void Sprite_Picture::Draw(Bitmap& dst) {
 		SetX(x);
 		SetY(y);
 	}
+
 	SetZoomX(data.current_magnify / 100.0);
 	SetZoomY(data.current_magnify / 100.0);
+	if (Player::IsPatchManiac()) {
+		SetZoomY(data.maniac_current_magnify_height / 100.0);
+	}
 
 	auto sr = GetSrcRect();
 	SetOx(sr.width / 2);

From 7341f3d7d262262b0e5f1f57d8e59a28e2afc8e4 Mon Sep 17 00:00:00 2001
From: Tool Man <gchristin2000@bell.net>
Date: Sun, 7 Jan 2024 02:17:30 +0000
Subject: [PATCH 025/222] Maniac Patch: Fix String Vars with ShowPicture

Added the following:
- Check if we're using a string variable with com.parameters[17]
- Set the name parameter to the String Variable

Fixed the following:
- When using a String Var with ShowPicture, it no longers crash the game with picture ID -1
---
 src/game_interpreter.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 9853a682f..133b7ae40 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2822,7 +2822,12 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 
 	if (param_size > 16 && (Player::IsRPG2k3ECommands() || Player::IsPatchManiac())) {
 		// Handling of RPG2k3 1.12 chunks
-		pic_id = ValueOrVariable(com.parameters[17], pic_id);
+		if (Player::IsPatchManiac()) {
+			pic_id = ValueOrVariableBitfield(com.parameters[17], 0, pic_id);
+			params.name = ToString(CommandStringOrVariableBitfield(com, 17, 2, 30));
+		} else {
+			pic_id = ValueOrVariable(com.parameters[17], pic_id);
+		}
 		if (com.parameters[19] != 0) {
 			int var = 0;
 			if (Main_Data::game_variables->IsValid(com.parameters[19])) {

From 1a310f477d94e0dfd073dfb7fe92606445e6cb71 Mon Sep 17 00:00:00 2001
From: Tool Man <gchristin2000@bell.net>
Date: Sun, 7 Jan 2024 05:45:35 +0000
Subject: [PATCH 026/222] Maniac Patch: Added Var and Var Index support for
 Picture Tint

While testing, I found out the following things:
- You cannot mix multiple Variable types for each parameters
- When using Variables for Picture Tint, parameter 17 is set to 4096 (0x100),
- When using Var Indexes for Picture Tint, parameter 17 is set to 8192 (0x200),
- Before, parameters for red, green, blue and saturation were always constants.
- Surprisingly this feature doesn't work with ShowStringPicture

Added:
- Variable and VarIndex support for Tinting using ShowPicture and MovePicture using bitfields
---
 src/game_interpreter.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 133b7ae40..ab2ab8628 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2836,6 +2836,14 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 			params.name = PicPointerPatch::ReplaceName(params.name, var, com.parameters[18]);
 		}
 
+		if (Player::IsPatchManiac()) {
+			// Color tint using variables
+			params.red = ValueOrVariableBitfield(com.parameters[17], 3, params.red);
+			params.green = ValueOrVariableBitfield(com.parameters[17], 3,  params.green);
+			params.blue = ValueOrVariableBitfield(com.parameters[17], 3, params.blue);
+			params.saturation = ValueOrVariableBitfield(com.parameters[17], 3,  params.saturation);
+		}
+
 		params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
 		if (Player::IsPatchManiac() && com.parameters.size() > 31 && com.parameters[20] >= 16 && params.effect_mode == 0) {
 			// The >= 16 check is needed because this bit is set when independent width/height scaling is used
@@ -2955,6 +2963,14 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 			//int chars_to_replace = com.parameters[18];
 			//int replace_with = com.parameters[19];
 
+			if (com.parameters[17] >= 4096 && Player::IsPatchManiac()) {
+				// Color tint using variables
+				params.red = ValueOrVariableBitfield(com.parameters[17], 3, params.red);
+				params.green = ValueOrVariableBitfield(com.parameters[17], 3,  params.green);
+				params.blue = ValueOrVariableBitfield(com.parameters[17], 3, params.blue);
+				params.saturation = ValueOrVariableBitfield(com.parameters[17], 3,  params.saturation);
+			}
+
 			params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
 			if (Player::IsPatchManiac() && com.parameters.size() > 18 && com.parameters[20] >= 16 && params.effect_mode == 0) {
 				// The >= 16 check is needed because this bit is set when independent width/height scaling is used

From 006066caf5b05270ecd4f0acb0cbf93b0bd87f15 Mon Sep 17 00:00:00 2001
From: MackValentine <mackvalentine@gmail.com>
Date: Sat, 17 Jun 2023 15:46:26 +0200
Subject: [PATCH 027/222] New Command: 2002 - Activate Event At [x,y]

`@raw 2002, "", UseVarX,x UseVarY,y`

Activate an event in map remotely, based on its x and y coordinates.

Command made by @MackValentine,
I only refactored it to fit the player specifications.
---
 src/game_interpreter_map.cpp | 10 ++++++++++
 src/game_interpreter_map.h   |  1 +
 src/game_player.cpp          |  3 +++
 src/game_player.h            |  2 ++
 4 files changed, 16 insertions(+)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 8d6a26537..9298969dd 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -142,6 +142,8 @@ bool Game_Interpreter_Map::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandOpenLoadMenu(com);
 		case Cmd::ToggleAtbMode:
 			return CommandToggleAtbMode(com);
+		case static_cast <Game_Interpreter::Cmd>(2002): //Cmd::easyrpg_ActivateEvent
+			return CommandActivateEventAt(com);
 		default:
 			return Game_Interpreter::ExecuteCommand(com);
 	}
@@ -674,3 +676,11 @@ bool Game_Interpreter_Map::CommandToggleAtbMode(lcf::rpg::EventCommand const& /*
 	Main_Data::game_system->ToggleAtbMode();
 	return true;
 }
+
+bool Game_Interpreter_Map::CommandActivateEventAt(lcf::rpg::EventCommand const& com) {
+	int x = ValueOrVariable(com.parameters[0], com.parameters[1]);
+	int y = ValueOrVariable(com.parameters[2], com.parameters[3]);
+
+	bool b = Main_Data::game_player->ActivateEventAt(x, y);
+	return true;
+}
diff --git a/src/game_interpreter_map.h b/src/game_interpreter_map.h
index 5dd41139e..0a43343fd 100644
--- a/src/game_interpreter_map.h
+++ b/src/game_interpreter_map.h
@@ -81,6 +81,7 @@ class Game_Interpreter_Map : public Game_Interpreter
 	bool CommandOpenMainMenu(lcf::rpg::EventCommand const& com);
 	bool CommandOpenLoadMenu(lcf::rpg::EventCommand const& com);
 	bool CommandToggleAtbMode(lcf::rpg::EventCommand const& com);
+	bool CommandActivateEventAt(lcf::rpg::EventCommand const& com);
 
 	AsyncOp ContinuationShowInnStart(int indent, int choice_result, int price);
 
diff --git a/src/game_player.cpp b/src/game_player.cpp
index 33085d61d..d4bbcb134 100644
--- a/src/game_player.cpp
+++ b/src/game_player.cpp
@@ -835,3 +835,6 @@ void Game_Player::UpdatePan() {
 	data()->pan_current_y -= dy;
 }
 
+bool Game_Player::ActivateEventAt(int x, int y) {
+	return CheckEventTriggerThere({ lcf::rpg::EventPage::Trigger_action }, x, y, true);
+}
diff --git a/src/game_player.h b/src/game_player.h
index f107866b0..97c4f8b51 100644
--- a/src/game_player.h
+++ b/src/game_player.h
@@ -60,6 +60,8 @@ class Game_Player : public Game_PlayerBase {
 	TeleportTarget GetTeleportTarget() const;
 	void ResetTeleportTarget(TeleportTarget tt = {});
 
+	bool ActivateEventAt(int x, int y);
+
 	/**
 	 * Sets the map, position and direction that the game player must have after the teleport is over
 	 *

From 7e9ed719d71cb8894a3fdc19da04244a4465baa9 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Tue, 9 Jan 2024 01:17:21 +0100
Subject: [PATCH 028/222] 3DS: properly support 3dslink

---
 src/platform/3ds/main.cpp | 80 +++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 16 deletions(-)

diff --git a/src/platform/3ds/main.cpp b/src/platform/3ds/main.cpp
index 2c321fc83..34ec27132 100644
--- a/src/platform/3ds/main.cpp
+++ b/src/platform/3ds/main.cpp
@@ -16,15 +16,16 @@
  */
 
 #include <3ds.h>
-#include <3dslink.h>
 #include <cstdio>
 
 #include "player.h"
 #include <string>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <malloc.h>
 #include <string>
 #include <vector>
+#include "lcf/scope_guard.h"
 #include "output.h"
 
 /* 8 MB required for booting and need extra linear memory for the sound
@@ -35,7 +36,52 @@ u32 __ctru_linear_heap_size = 12*1024*1024;
 namespace {
 	u32 old_time_limit;
 	int n3dslinkSocket = -1;
+	u32* n3dsSocBuf = nullptr;
 	bool is_emu = false;
+
+	constexpr int SOC_BUFFERSIZE = 0x100000;
+}
+
+static void start3DSLink() {
+	// only do socket stuff, if sent by 3dslink
+	if (!__3dslink_host.s_addr) return;
+
+	n3dsSocBuf = (u32*)memalign(0x1000, SOC_BUFFERSIZE);
+	if(n3dsSocBuf == nullptr) {
+		printf("failed to allocate SOC buffer\n");
+		return;
+	}
+	auto buff_sg = lcf::makeScopeGuard([&]() {
+		free(n3dsSocBuf);
+		n3dsSocBuf = nullptr;
+	});
+
+	int ret = socInit(n3dsSocBuf, SOC_BUFFERSIZE);
+	if (ret != 0) {
+		printf("socInit failed: 0x%08X\n", (unsigned int)ret);
+		return;
+	}
+	auto serv_sg = lcf::makeScopeGuard([&]() {
+		socExit();
+	});
+
+	n3dslinkSocket = link3dsStdio();
+	if(n3dslinkSocket < 0) {
+		printf("failed to link stdio\n");
+		return;
+	}
+
+	serv_sg.Dismiss();
+	buff_sg.Dismiss();
+}
+
+static void stop3DSLink() {
+	if (n3dslinkSocket < 0) return;
+
+	close(n3dslinkSocket);
+	n3dslinkSocket = -1;
+	socExit();
+	free(n3dsSocBuf);
 }
 
 static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserData /* userdata */) {
@@ -54,13 +100,20 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 	want_log = true;
 #endif
 	if (want_log) {
-		printf("%s: %s\n", prefix.c_str(), message.c_str());
+		printf("%s: %s\n", prefix.c_str(), msg.c_str());
 	}
 }
 
 int main(int argc, char* argv[]) {
 	std::vector<std::string> args(argv, argv + argc);
 
+	gfxInitDefault();
+#ifdef _DEBUG
+	consoleInit(GFX_BOTTOM, nullptr);
+#endif
+	start3DSLink();
+	Output::SetLogCallback(LogCallback);
+
 	APT_GetAppCpuTimeLimit(&old_time_limit);
 	APT_SetAppCpuTimeLimit(30);
 
@@ -71,13 +124,6 @@ int main(int argc, char* argv[]) {
 		osSetSpeedupEnable(true);
 	}
 
-	gfxInitDefault();
-	n3dslinkSocket = link3dsStdio();
-#ifdef _DEBUG
-	consoleInit(GFX_BOTTOM, nullptr);
-#endif
-	Output::SetCustomMsgOut(LogMessage);
-
 	// cia/citra
 	is_emu = !envIsHomebrew();
 	bool is_cia = argc == 0;
@@ -113,6 +159,14 @@ int main(int argc, char* argv[]) {
 	} else if(is_cia) {
 		// No RomFS -> load games from hardcoded path
 		ctr_dir = tmp_path;
+		Output::Debug("CIA: Using hard-coded path.");
+	} else if(args[0].rfind("3dslink:/", 0) == 0) {
+		// Check if a game directory was provided, otherwise use default
+		if (std::none_of(args.cbegin(), args.cend(),
+			[](const std::string& a) { return a == "--project-path"; })) {
+			ctr_dir = tmp_path;
+			Output::Debug("3dslink: Using hard-coded path.");
+		}
 	}
 	// otherwise uses cwd by default or 3dslink argument
 	if (!ctr_dir.empty()) {
@@ -125,13 +179,7 @@ int main(int argc, char* argv[]) {
 	Player::Run();
 
 	romfsExit();
-
-	// Close debug log
-	if (n3dslinkSocket >= 0) {
-		close(n3dslinkSocket);
-		n3dslinkSocket = -1;
-	}
-
+	stop3DSLink();
 	gfxExit();
 
 	if (old_time_limit != UINT32_MAX) {

From d4b7e8e3654cf88eef323667b10ed239fb039733 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Tue, 9 Jan 2024 01:18:13 +0100
Subject: [PATCH 029/222] NX: fix copy/paste error in custom logging func

---
 src/platform/switch/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/platform/switch/main.cpp b/src/platform/switch/main.cpp
index e4d32c0c7..d3685cb8b 100644
--- a/src/platform/switch/main.cpp
+++ b/src/platform/switch/main.cpp
@@ -28,9 +28,10 @@ namespace {
 }
 
 static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserData /* userdata */) {
+	std::string prefix = Output::LogLevelToString(lvl);
+
 	if (!is_nro) {
-		std::string m = std::string("[" GAME_TITLE "] ") +
-			Output::LogLevelToString(lvl) + ": " + msg;
+		std::string m = std::string("[" GAME_TITLE "] ") + prefix + ": " + msg;
 
 		// HLE in yuzu emulator
 		svcOutputDebugString(m.c_str(), m.length());
@@ -38,7 +39,7 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 
 	// additional to nxlink server
 	if(nxlinkSocket >= 0) {
-		printf("%s: %s\n", prefix.c_str(), message.c_str());
+		printf("%s: %s\n", prefix.c_str(), msg.c_str());
 	}
 }
 

From ab232d15699d6bc87dfef3e9ff4985bc502d346c Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Sun, 3 Mar 2024 16:25:54 +0100
Subject: [PATCH 030/222] Simple implementation for AntiLagSwitch

---
 src/game_config_game.cpp | 10 ++++++++++
 src/game_config_game.h   |  1 +
 src/game_map.cpp         |  4 ++++
 src/player.cpp           |  6 ++++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index 359158a33..6ce8f9382 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -87,6 +87,7 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_common_this_event.Lock(false);
 			patch_key_patch.Lock(false);
 			patch_rpg2k3_commands.Lock(false);
+			patch_anti_lag_switch.Lock(false);
 			patch_override = true;
 			continue;
 		}
@@ -105,6 +106,11 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 					patch_key_patch.Set(true);
 				} else if (v == "rpg2k3-cmds" || v == "rpg2k3-commands") {
 					patch_rpg2k3_commands.Set(true);
+				} else if (v.rfind("anti-lag-switch=") == 0) {
+					int num = static_cast<int>(std::strtol(v.substr(16).c_str(), nullptr, 0));
+					if (num > 0) {
+						patch_anti_lag_switch.Set(num);
+					}
 				}
 			}
 			patch_override = true;
@@ -151,4 +157,8 @@ void Game_ConfigGame::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	if (patch_rpg2k3_commands.FromIni(ini)) {
 		patch_override = true;
 	}
+
+	if (patch_anti_lag_switch.FromIni(ini)) {
+		patch_override = true;
+	}
 }
diff --git a/src/game_config_game.h b/src/game_config_game.h
index 3064a2d3c..c91d5d1e2 100644
--- a/src/game_config_game.h
+++ b/src/game_config_game.h
@@ -44,6 +44,7 @@ struct Game_ConfigGame {
 	BoolConfigParam patch_unlock_pics{ "Unlock Pictures", "Allow picture commands while a message is shown", "Patch", "PicUnlock", false };
 	BoolConfigParam patch_key_patch{ "Ineluki Key Patch", "Support \"Ineluki Key Patch\"", "Patch", "KeyPatch", false };
 	BoolConfigParam patch_rpg2k3_commands{ "RPG2k3 Event Commands", "Enable support for RPG2k3 event commands", "Patch", "RPG2k3Commands", false };
+	ConfigParam<int> patch_anti_lag_switch{ "Anti-Lag Switch", "Disable event page refreshes when switch is set", "Patch", "AntiLagSwitch", 0 };
 
 	// Command line only
 	BoolConfigParam patch_support{ "Support patches", "When OFF all patch support is disabled", "", "", true };
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 29858b313..486273f08 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -1512,6 +1512,10 @@ void Game_Map::SetPositionY(int y, bool reset_panorama) {
 }
 
 bool Game_Map::GetNeedRefresh() {
+	if (Player::game_config.patch_anti_lag_switch.Get() && Main_Data::game_switches->Get(Player::game_config.patch_anti_lag_switch.Get())) {
+		return false;
+	}
+
 	return need_refresh;
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index 2279b02d4..72a87d3c9 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -825,8 +825,8 @@ void Player::CreateGameObjects() {
 		}
 	}
 
-	Output::Debug("Patch configuration: dynrpg={} maniac={} key-patch={} common-this={} pic-unlock={} 2k3-commands={}",
-		Player::IsPatchDynRpg(), Player::IsPatchManiac(), Player::IsPatchKeyPatch(), game_config.patch_common_this_event.Get(), game_config.patch_unlock_pics.Get(), game_config.patch_rpg2k3_commands.Get());
+	Output::Debug("Patch configuration: dynrpg={} maniac={} key-patch={} common-this={} pic-unlock={} 2k3-commands={} anti-lag-switch={}",
+		Player::IsPatchDynRpg(), Player::IsPatchManiac(), Player::IsPatchKeyPatch(), game_config.patch_common_this_event.Get(), game_config.patch_unlock_pics.Get(), game_config.patch_rpg2k3_commands.Get(), game_config.patch_anti_lag_switch.Get());
 
 	ResetGameObjects();
 
@@ -1403,6 +1403,8 @@ Engine options:
                        pic-unlock  - Pictures are not blocked by messages
                        rpg2k3-cmds - Support all RPG Maker 2003 event commands
                                      in any version of the engine
+                       anti-lag-switch=[switch-id]
+                                   - Disable event page refreshes via switch
  --no-patch           Disable all engine patches.
  --project-path PATH  Instead of using the working directory, the game in PATH
                       is used.

From 74bb6600f60ebe7b8a45aedc61a47dbfc3595f4f Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Sun, 3 Mar 2024 16:26:47 +0100
Subject: [PATCH 031/222] Implemented experimental "map event caches" to
 drastically increase performance when doing a lot of operations with
 game_switches & game_variables

---
 src/game_interpreter.cpp | 29 +++++++++++---------
 src/game_map.cpp         | 57 +++++++++++++++++++++++++++++++++++++++-
 src/game_map.h           | 14 ++++++++++
 3 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index acb522744..12fe1c7b5 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -441,7 +441,7 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 
 			const int key = _keyinput.CheckInput();
 			Main_Data::game_variables->Set(_keyinput.variable, key);
-			Game_Map::SetNeedRefresh(true);
+			Game_Map::SetNeedRefreshForVarChange(_keyinput.variable);
 			if (key == 0) {
 				++_keyinput.wait_frames;
 				break;
@@ -1066,15 +1066,15 @@ bool Game_Interpreter::CommandControlSwitches(lcf::rpg::EventCommand const& com)
 			} else {
 				Main_Data::game_switches->Flip(start);
 			}
+			Game_Map::SetNeedRefreshForSwitchChange(start);
 		} else {
 			if (val < 2) {
 				Main_Data::game_switches->SetRange(start, end, val == 0);
 			} else {
 				Main_Data::game_switches->FlipRange(start, end);
 			}
+			Game_Map::SetNeedRefresh(true);
 		}
-
-		Game_Map::SetNeedRefresh(true);
 	}
 
 	return true;
@@ -1338,6 +1338,7 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 					Main_Data::game_variables->BitShiftRight(start, value);
 					break;
 			}
+			Game_Map::SetNeedRefreshForVarChange(start);
 		} else if (com.parameters[4] == 1) {
 			// Multiple variables - Direct variable lookup
 			int var_id = com.parameters[5];
@@ -1376,6 +1377,7 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 					Main_Data::game_variables->BitShiftRightRangeVariable(start, end, var_id);
 					break;
 			}
+			Game_Map::SetNeedRefresh(true);
 		} else if (com.parameters[4] == 2) {
 			// Multiple variables - Indirect variable lookup
 			int var_id = com.parameters[5];
@@ -1414,6 +1416,7 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 					Main_Data::game_variables->BitShiftRightRangeVariableIndirect(start, end, var_id);
 					break;
 			}
+			Game_Map::SetNeedRefresh(true);
 		} else if (com.parameters[4] == 3) {
 			// Multiple variables - random
 			int rmax = max(com.parameters[5], com.parameters[6]);
@@ -1453,6 +1456,7 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 					Main_Data::game_variables->BitShiftRightRangeRandom(start, end, rmin, rmax);
 					break;
 			}
+			Game_Map::SetNeedRefresh(true);
 		} else {
 			// Multiple variables - constant
 			switch (operation) {
@@ -1490,9 +1494,8 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 					Main_Data::game_variables->BitShiftRightRange(start, end, value);
 					break;
 			}
+			Game_Map::SetNeedRefresh(true);
 		}
-
-		Game_Map::SetNeedRefresh(true);
 	}
 
 	return true;
@@ -2284,7 +2287,9 @@ bool Game_Interpreter::CommandMemorizeLocation(lcf::rpg::EventCommand const& com
 	Main_Data::game_variables->Set(var_map_id, Game_Map::GetMapId());
 	Main_Data::game_variables->Set(var_x, player->GetX());
 	Main_Data::game_variables->Set(var_y, player->GetY());
-	Game_Map::SetNeedRefresh(true);
+	Game_Map::SetNeedRefreshForVarChange(var_map_id);
+	Game_Map::SetNeedRefreshForVarChange(var_x);
+	Game_Map::SetNeedRefreshForVarChange(var_y);
 	return true;
 }
 
@@ -2394,7 +2399,7 @@ bool Game_Interpreter::CommandStoreTerrainID(lcf::rpg::EventCommand const& com)
 	int y = ValueOrVariable(com.parameters[0], com.parameters[2]);
 	int var_id = com.parameters[3];
 	Main_Data::game_variables->Set(var_id, Game_Map::GetTerrainTag(x, y));
-	Game_Map::SetNeedRefresh(true);
+	Game_Map::SetNeedRefreshForVarChange(var_id);
 	return true;
 }
 
@@ -2404,7 +2409,7 @@ bool Game_Interpreter::CommandStoreEventID(lcf::rpg::EventCommand const& com) {
 	int var_id = com.parameters[3];
 	auto* ev = Game_Map::GetEventAt(x, y, false);
 	Main_Data::game_variables->Set(var_id, ev ? ev->GetId() : 0);
-	Game_Map::SetNeedRefresh(true);
+	Game_Map::SetNeedRefreshForVarChange(var_id);
 	return true;
 }
 
@@ -3200,7 +3205,7 @@ bool Game_Interpreter::CommandKeyInputProc(lcf::rpg::EventCommand const& com) {
 	if (wait) {
 		// While waiting the variable is reset to 0 each frame.
 		Main_Data::game_variables->Set(var_id, 0);
-		Game_Map::SetNeedRefresh(true);
+		Game_Map::SetNeedRefreshForVarChange(var_id);
 	}
 
 	if (wait && Game_Message::IsMessageActive()) {
@@ -3315,7 +3320,7 @@ bool Game_Interpreter::CommandKeyInputProc(lcf::rpg::EventCommand const& com) {
 
 	int key = _keyinput.CheckInput();
 	Main_Data::game_variables->Set(_keyinput.variable, key);
-	Game_Map::SetNeedRefresh(true);
+	Game_Map::SetNeedRefreshForVarChange(_keyinput.variable);
 
 	return true;
 }
@@ -3757,7 +3762,7 @@ bool Game_Interpreter::CommandLoop(lcf::rpg::EventCommand const& com) { // code
 	int loop_count_var = com.parameters[4];
 	if (loop_count_var > 0) {
 		Main_Data::game_variables->Set(loop_count_var, begin_loop_val);
-		Game_Map::SetNeedRefresh(true);
+		Game_Map::SetNeedRefreshForVarChange(loop_count_var);
 	}
 
 	return true;
@@ -3844,7 +3849,7 @@ bool Game_Interpreter::CommandEndLoop(lcf::rpg::EventCommand const& com) { // co
 		int loop_count_var = com.parameters[4];
 		if (loop_count_var > 0) {
 			Main_Data::game_variables->Set(loop_count_var, cur_loop_val);
-			Game_Map::SetNeedRefresh(true);
+			Game_Map::SetNeedRefreshForVarChange(loop_count_var);
 		}
 	}
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 486273f08..26c9c4f23 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -72,6 +72,8 @@ namespace {
 	std::vector<unsigned char> passages_up;
 	std::vector<Game_Event> events;
 	std::vector<Game_CommonEvent> common_events;
+	std::unordered_map<int, std::unique_ptr<MapEventCache>> events_cache_by_switch;
+	std::unordered_map<int, std::unique_ptr<MapEventCache>> events_cache_by_variable;
 
 	std::unique_ptr<lcf::rpg::Map> map;
 
@@ -132,6 +134,8 @@ void Game_Map::InitCommonEvents() {
 
 void Game_Map::Dispose() {
 	events.clear();
+	events_cache_by_switch.clear();
+	events_cache_by_variable.clear();
 	map.reset();
 	map_info = {};
 	panorama = {};
@@ -356,9 +360,37 @@ void Game_Map::SetupCommon() {
 
 	// Create the map events
 	events.reserve(map->events.size());
-	for (const auto& ev : map->events) {
+	for (auto& ev : map->events) {
 		events.emplace_back(GetMapId(), &ev);
+
+		for (const auto& pg : ev.pages) {
+			if (pg.condition.flags.switch_a) {
+				AddEventToSwitchCache(ev, pg.condition.switch_a_id);
+			}
+			if (pg.condition.flags.switch_b) {
+				AddEventToSwitchCache(ev, pg.condition.switch_b_id);
+			}
+			if (pg.condition.flags.variable) {
+				AddEventToVariableCache(ev, pg.condition.variable_id);
+			}
+		}
+	}
+}
+
+void Game_Map::AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id) {
+	if (events_cache_by_switch.find(switch_id) == events_cache_by_switch.end()) {
+		std::unique_ptr<MapEventCache> cache = std::make_unique<MapEventCache>();
+		events_cache_by_switch[switch_id] = std::move(cache);
+	}
+	events_cache_by_switch[switch_id]->AddEvent(ev);
+}
+
+void Game_Map::AddEventToVariableCache(lcf::rpg::Event& ev, int var_id) {
+	if (events_cache_by_variable.find(var_id) == events_cache_by_variable.end()) {
+		std::unique_ptr<MapEventCache> cache = std::make_unique<MapEventCache>();
+		events_cache_by_variable[var_id] = std::move(cache);
 	}
+	events_cache_by_variable[var_id]->AddEvent(ev);
 }
 
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
@@ -1523,6 +1555,29 @@ void Game_Map::SetNeedRefresh(bool refresh) {
 	need_refresh = refresh;
 }
 
+
+void MapEventCache::AddEvent(lcf::rpg::Event& ev) {
+	for (const auto& ev2 : events) {
+		if (ev.ID == ev2.ID)
+			return;
+	}
+	events.emplace_back(ev);
+}
+
+void Game_Map::SetNeedRefreshForSwitchChange(int switch_id) {
+	if (need_refresh)
+		return;
+	if (events_cache_by_switch.find(switch_id) != events_cache_by_switch.end())
+		SetNeedRefresh(true);
+}
+
+void Game_Map::SetNeedRefreshForVarChange(int var_id) {
+	if (need_refresh)
+		return;
+	if (events_cache_by_variable.find(var_id) != events_cache_by_variable.end())
+		SetNeedRefresh(true);
+}
+
 std::vector<unsigned char>& Game_Map::GetPassagesDown() {
 	return passages_down;
 }
diff --git a/src/game_map.h b/src/game_map.h
index 2533347d3..4a6b41f23 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -73,6 +73,14 @@ class MapUpdateAsyncContext {
 		bool message = false;
 };
 
+class MapEventCache {
+	public:
+		void AddEvent(lcf::rpg::Event& ev);
+
+	private:
+		std::vector<lcf::rpg::Event> events;
+};
+
 /**
  * Game_Map namespace
  */
@@ -679,6 +687,12 @@ namespace Game_Map {
 
 	FileRequestAsync* RequestMap(int map_id);
 
+	void SetNeedRefreshForSwitchChange(int switch_id);
+	void SetNeedRefreshForVarChange(int var_id);
+
+	void AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id);
+	void AddEventToVariableCache(lcf::rpg::Event& ev, int var_id);
+
 	namespace Parallax {
 		struct Params {
 			std::string name;

From ed7f74962666aeac7650866482f198fe2dac881e Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 20:24:46 +0100
Subject: [PATCH 032/222] Fix crash when MovePicture is used on an erased
 picture with a non-default origin.

Fix #3189
---
 src/game_pictures.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game_pictures.cpp b/src/game_pictures.cpp
index 3c2fba50b..bd154364a 100644
--- a/src/game_pictures.cpp
+++ b/src/game_pictures.cpp
@@ -395,7 +395,7 @@ void Game_Pictures::OnPictureSpriteReady(FileRequestResult*, int id) {
 }
 
 void Game_Pictures::Picture::ApplyOrigin(bool is_move) {
-	if (origin == 0 || !sprite) {
+	if (origin == 0 || !sprite || !sprite->GetBitmap()) {
 		return;
 	}
 

From 40387f0a57827afe14681682ac7bd83d4ca2a44f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 21:25:49 +0100
Subject: [PATCH 033/222] Settings: Only show "Open folder" on Windows, Linux,
 macOS

---
 src/system.h            | 2 ++
 src/window_settings.cpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/system.h b/src/system.h
index 8e6b14970..c2f627d2c 100644
--- a/src/system.h
+++ b/src/system.h
@@ -77,6 +77,7 @@
 #  define SUPPORT_TOUCH
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define SUPPORT_FILE_BROWSER
 #elif defined(__SWITCH__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
@@ -93,6 +94,7 @@
 #  define SUPPORT_TOUCH
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define SUPPORT_FILE_BROWSER
 #  define SYSTEM_DESKTOP_LINUX_BSD_MACOS
 #endif
 
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 8a1a7d3d4..23a4a7bb4 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -381,7 +381,7 @@ void Window_Settings::RefreshAudioSoundfont() {
 
 #ifdef EMSCRIPTEN
 	AddOption(MenuItem("<Upload Soundfont>", "Provide a soundfont from your system", ""), [fs]() { Emscripten_Interface::UploadSoundfont(); });
-#else
+#elif defined(SUPPORT_FILE_BROWSER)
 	AddOption(MenuItem("<Open Soundfont directory>", "Open the soundfont directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
 #endif
 }
@@ -482,7 +482,7 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 
 #ifdef EMSCRIPTEN
 	AddOption(MenuItem("<Upload Font>", "Provide a font from your system", ""), [fs]() { Emscripten_Interface::UploadFont(); });
-#else
+#elif defined(SUPPORT_FILE_BROWSER)
 	AddOption(MenuItem("<Open Font directory>", "Open the font directory in a file browser", ""), [fs]() { DisplayUi->OpenURL(fs.GetFullPath()); });
 #endif
 }

From 0c7d9bbfb16c9d4f9e1c1e590a9b79ab6afe772b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 21:42:16 +0100
Subject: [PATCH 034/222] Settings: Support ".soundfont" WiiU: Disable Pause
 when focus lost

---
 src/platform/sdl/sdl2_ui.cpp | 1 +
 src/scene_settings.cpp       | 1 +
 src/window_settings.cpp      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index fd529bb47..67b2f63c6 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -1254,6 +1254,7 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.fullscreen.SetOptionVisible(false);
 	cfg.window_zoom.SetOptionVisible(false);
 	cfg.vsync.SetOptionVisible(false);
+	cfg.pause_when_focus_lost.SetOptionVisible(false);
 #endif
 }
 
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index 4f58dd7af..8ca612a73 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -468,6 +468,7 @@ void Scene_Settings::UpdateFont(bool mincho) {
 	last_index = index;
 
 	if (index == 0) {
+		// Built-In font
 		help_window2->Clear();
 		help_window2->SetFont(Font::DefaultBitmapFont(mincho));
 		help_window2->SetVisible(true);
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 23a4a7bb4..4ec87e65f 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -367,7 +367,7 @@ void Window_Settings::RefreshAudioSoundfont() {
 
 	std::string sf_lower = Utils::LowerCase(Audio().GetFluidsynthSoundfont());
 	for (const auto& item: *list) {
-		if (item.second.type == DirectoryTree::FileType::Regular && StringView(item.first).ends_with(".sf2")) {
+		if (item.second.type == DirectoryTree::FileType::Regular && (StringView(item.first).ends_with(".sf2") || StringView(item.first).ends_with(".soundfont"))) {
 			AddOption(MenuItem(item.second.name, "Use this custom soundfont", StringView(sf_lower).ends_with(item.first) ? "[x]" : ""), [this, fs, item]() {
 				Audio().SetFluidsynthSoundfont(FileFinder::MakePath(fs.GetFullPath(), item.second.name));
 				Pop();

From c7093ff9064f6665d210c248d9a5d9547a34b323 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 20:36:08 +0100
Subject: [PATCH 035/222] Emscripten: Do not lowercase the --game argument
 (regression fix)

---
 resources/emscripten/emscripten-pre.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/emscripten/emscripten-pre.js b/resources/emscripten/emscripten-pre.js
index 6467c5a55..40bac40dd 100644
--- a/resources/emscripten/emscripten-pre.js
+++ b/resources/emscripten/emscripten-pre.js
@@ -65,7 +65,7 @@ function parseArgs () {
 
     // Filesystem is not ready when processing arguments, store path to game
     if (tmp[0] === "game" && tmp.length > 1) {
-      Module.game = tmp[1].toLowerCase();
+      Module.game = tmp[1];
       continue;
     }
 
@@ -106,6 +106,7 @@ if (Module.game === undefined) {
   Module.game = "";
 } else {
   Module.arguments.push("--game", Module.game);
+  Module.game = Module.game.toLowerCase();
 }
 
 // Catch all errors occuring inside the window

From e5f2930c0a5922bebe71ecda64b4f1079ff9e37b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 20:39:52 +0100
Subject: [PATCH 036/222] Title scene: Allow accessing the load scene for file
 upload in emscripten with Shift

---
 src/scene_title.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/scene_title.cpp b/src/scene_title.cpp
index d9c696f23..3d4c38b07 100644
--- a/src/scene_title.cpp
+++ b/src/scene_title.cpp
@@ -179,6 +179,12 @@ void Scene_Title::vUpdate() {
 			int index = translate_window->GetIndex();
 			ChangeLanguage(lang_dirs.at(index));
 		}
+	} else if (Input::IsTriggered(Input::SHIFT)) {
+		// For emscripten: Allow accessing the load scene for file upload with Shift
+		int index = command_window->GetIndex();
+		if (index == indices.continue_game) {
+			CommandContinue();
+		}
 	} else if (Input::IsTriggered(Input::CANCEL)) {
 		if (active_window == 1) {
 			// Switch back
@@ -353,7 +359,7 @@ void Scene_Title::CommandNewGame() {
 }
 
 void Scene_Title::CommandContinue() {
-	if (continue_enabled) {
+	if (continue_enabled || Input::IsTriggered(Input::SHIFT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
 	} else {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));

From ad86eefc4e2c3a44416b6ad44d09eed39f7bdb6b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 11 Mar 2024 22:10:09 +0100
Subject: [PATCH 037/222] Emscripten: Fix canvas focus when embedded

---
 resources/emscripten/emscripten-shell.html | 5 +++--
 src/platform/sdl/sdl2_ui.cpp               | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/emscripten/emscripten-shell.html b/resources/emscripten/emscripten-shell.html
index 2227aa269..a4fbf2dc6 100644
--- a/resources/emscripten/emscripten-shell.html
+++ b/resources/emscripten/emscripten-shell.html
@@ -168,14 +168,15 @@
       // Module is ready
       easyrpgPlayer = Module;
       easyrpgPlayer.initApi();
+      canvas.focus();
 
       // Custom code here
     });
 });
 
 // Make EasyRPG player embeddable
-canvas.addEventListener('mouseenter', () => window.focus());
-canvas.addEventListener('click', () => window.focus());
+canvas.addEventListener('mouseenter', () => canvas.focus());
+canvas.addEventListener('click', () => canvas.focus());
 
 // Handle clicking on the fullscreen button
 document.querySelector('#controls-fullscreen').addEventListener('click', () => {
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 653e9f4de..bc926fe91 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -138,6 +138,8 @@ Sdl2Ui::Sdl2Ui(long width, long height, const Game_Config& cfg) : BaseUi(cfg)
 #endif
 #ifdef EMSCRIPTEN
 	SDL_SetHint(SDL_HINT_EMSCRIPTEN_ASYNCIFY, "0");
+	// Only handle keyboard events when the canvas has focus
+	SDL_SetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT, "#canvas");
 #endif
 #ifdef __WIIU__
 	//WHBProcInit();

From 2259b561319befdbb58ab828e99358bbddb782c6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 16:16:05 +0100
Subject: [PATCH 038/222] Change Sprite Association: Fix incorrect offset for
 String Picture

---
 src/game_interpreter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index acb522744..199bd7a55 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2199,7 +2199,7 @@ bool Game_Interpreter::CommandChangeSpriteAssociation(lcf::rpg::EventCommand con
 		return true;
 	}
 
-	auto file = ToString(CommandStringOrVariableBitfield(com, 3, 1, 3));
+	auto file = ToString(CommandStringOrVariableBitfield(com, 3, 1, 4));
 	int idx = ValueOrVariableBitfield(com, 3, 2, 1);
 	bool transparent = com.parameters[2] != 0;
 	actor->SetSprite(file, idx, transparent);

From 2ddbaca9fae317dac0d72f223a7f191548685b53 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 22:40:28 +0100
Subject: [PATCH 039/222] Use individual cli options for patches.

Useful for the anti lag switch and further patches that require an argument.

Update documentation.
---
 resources/unix/easyrpg-player.6.adoc | 57 ++++++++++++++++++---------
 src/cmdline_parser.h                 | 20 +++++++++-
 src/game_config.cpp                  | 32 ++++-----------
 src/game_config_game.cpp             | 58 ++++++++++++++++++++++------
 src/player.cpp                       | 33 +++++++++-------
 5 files changed, 130 insertions(+), 70 deletions(-)

diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index 7285d3cd7..cffb48af3 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -78,19 +78,36 @@ NOTE: For games that only use ASCII (English games) use '1252'.
   Disable support for the Runtime Package (RTP). Will lead to checkerboard
   graphics and silent music/sound effects in games depending on the RTP.
 
-*--patch* _PATCH_A_ [_PATCH_B_ _..._]::
-  Instead of autodetecting patches used by this game, force emulation of certain
-  patches.
-   - 'common-this' - Support for __This Event__ in common events
-   - 'dynrpg'      - DynRPG patch by Cherry
-   - 'key-patch'   - Key Patch by Ineluki
-   - 'maniac'      - Maniac Patch by BingShan
-   - 'pic-unlock'  - Pictures are not blocked by messages
-   - 'rpg2k3-cmds' - Support RPG Maker 2003 event commands in all engines
+*--patch-anti-lag-switch*:: _SWITCH_
+  Disables event page refreshing when the switch 'SWITCH' is set to 'ON'.
+
+*--patch-common-this*::
+  Enable usage of __This Event__ in common events in any version of the engine.
+  By default, this behaviour is only enabled for RPG Maker 2003 v1.12.
+
+*--patch-dynrpg*::
+  Enable limited support for the DynRPG patch from Cherry. The patches are not
+  loaded from DLL files, but re-implemented by the engine.
+
+*--patch-key-patch*::
+  Enable support for the Key Patch by Ineluki.
+
+*--patch-maniac*::
+  Enable support for the Maniac Patch by BingShan.
+
+*--patch-pic-unlock*::
+  Picture movement is not interrupted by messages in any version of the engine.
+  By default, this behaviour is only enabled for RPG Maker 2003 v1.12.
+
+*--patch-rpg2k3-cmds*::
+  Support all RPG Maker 2003 event commands in any version of the engine.
 
 *--no-patch*::
   Disable all engine patches.
 
+NOTE: Providing any patch option disables the patch autodetection of the engine.
+To disable a single patch,  prefix any of the patch options with **--no-**.
+
 *--project-path* _PATH_::
   Instead of using the working directory, the game in 'PATH' is used.
 
@@ -111,8 +128,7 @@ NOTE: For games that only use ASCII (English games) use '1252'.
   Instead of storing save files in the game directory they are stored in
   'PATH'. The directory must exist.
 
-NOTE: When using the game browser all games will share the same save
-directory!
+NOTE: When using the game browser all games will share the same save directory!
 
 *--seed* _SEED_::
   Seeds the random number generator.
@@ -282,25 +298,28 @@ Options in section 'Game':
 *Engine*=_ENGINE_::
   Same as *--engine*.
 
-Options in section 'Patch' (see also *--patch*):
+Options in section 'Patch' (see also options starting with *--patch*):
+
+*AntiLagSwitch*=_SWITCH_::
+  Same as *--patch-anti-lag-switch* 'SWITCH'.
 
 *CommonThisEvent*=_1_::
-  Same as *--patch common-this*.
+  Same as *--patch-common-this*.
 
 *DynRPG*=_1_::
-  Same as *--patch dynrpg*.
+  Same as *--patch-dynrpg*.
 
 *KeyPatch*=_1_::
-  Same as *--patch key-patch*.
+  Same as *--patch-key-patch*.
 
 *Maniac*=_1_::
-  Same as *--patch maniac*.
+  Same as *--patch-maniac*.
 
 *PicUnlock*=_1_::
-  Same as *--patch pic-unlock*.
+  Same as *--patch-pic-unlock*.
 
 *RPG2k3Commands*=_1_::
-  Same as *--patch rpg2k3-commands*.
+  Same as *--patch-rpg2k3-commands*.
 
 NOTE: Providing any patch option disables the patch autodetection of the engine.
 
@@ -344,7 +363,7 @@ Options in section 'RPG_RT':
 
   Set a custom screen height.
 
-NOTE: These resolution options invented by the Maniac Patch but they are
+NOTE: These resolution options were invented by the Maniac Patch but they are
 processed even when the patch is disabled. Using a custom resolution disables
 *--game-resolution*.
 
diff --git a/src/cmdline_parser.h b/src/cmdline_parser.h
index 1536661e7..84e30a6f4 100644
--- a/src/cmdline_parser.h
+++ b/src/cmdline_parser.h
@@ -64,6 +64,24 @@ class CmdlineArg {
 		return ptr[i + 1];
 	}
 
+	/**
+	 * Use this with boolean arguments of structure --option and --no-option
+	 * to decide if the --no- prefix was used or not.
+	 *
+	 * @return Whether the command line argument does not start with --no-
+	 */
+	bool ArgIsOn() const {
+		return !ArgIsOff();
+	}
+
+	/**
+	 * @see ArgIsOn
+	 * @return Whether the command line argument starts with --no-
+	 */
+	bool ArgIsOff() const {
+		return Arg().substr(0, 5) == "--no-";
+	}
+
 	/**
 	 * Gets an argument value to an integer
 	 *
@@ -89,7 +107,7 @@ class CmdlineArg {
 /** Commandline parser class which is used to search through command line arguments.  */
 class CmdlineParser {
 public:
-	/** 
+	/**
 	 * Construct with given arguments
 	 *
 	 * @param arguments main() argv as vector of strings
diff --git a/src/game_config.cpp b/src/game_config.cpp
index c7b83450c..48ba6a3be 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -243,12 +243,8 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 		long li_value = 0;
 		std::string str_value;
 
-		if (cp.ParseNext(arg, 0, "--vsync")) {
-			video.vsync.Set(true);
-			continue;
-		}
-		if (cp.ParseNext(arg, 0, "--no-vsync")) {
-			video.vsync.Set(false);
+		if (cp.ParseNext(arg, 0, {"--vsync", "--no-vsync"})) {
+			video.vsync.Set(arg.ArgIsOn());
 			continue;
 		}
 		if (cp.ParseNext(arg, 1, "--fps-limit")) {
@@ -261,20 +257,12 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			video.fps_limit.Set(0);
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--show-fps")) {
-			video.show_fps.Set(true);
-			continue;
-		}
-		if (cp.ParseNext(arg, 0, "--no-show-fps")) {
-			video.show_fps.Set(false);
+		if (cp.ParseNext(arg, 0, {"--show-fps", "--no-show-fps"})) {
+			video.show_fps.Set(arg.ArgIsOn());
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--fps-render-window")) {
-			video.fps_render_window.Set(true);
-			continue;
-		}
-		if (cp.ParseNext(arg, 0, "--no-fps-render-window")) {
-			video.fps_render_window.Set(false);
+		if (cp.ParseNext(arg, 0, {"--fps-render-window", "--no-fps-render-window"})) {
+			video.fps_render_window.Set(arg.ArgIsOn());
 			continue;
 		}
 		if (cp.ParseNext(arg, 0, "--window")) {
@@ -291,12 +279,8 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			}
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--stretch")) {
-			video.stretch.Set(true);
-			continue;
-		}
-		if (cp.ParseNext(arg, 0, "--no-stretch")) {
-			video.stretch.Set(false);
+		if (cp.ParseNext(arg, 0, {"--stretch", "--no-stretch"})) {
+			video.stretch.Set(arg.ArgIsOn());
 			continue;
 		}
 		if (cp.ParseNext(arg, 1, "--scaling")) {
diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index 6ce8f9382..bc44224dd 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -64,12 +64,10 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 
 	while (!cp.Done()) {
 		CmdlineArg arg;
-		if (cp.ParseNext(arg, 0, "--new-game")) {
-			new_game.Set(true);
-			continue;
-		}
-		if (cp.ParseNext(arg, 0, "--no-new-game")) {
-			new_game.Set(false);
+		long li_value = 0;
+
+		if (cp.ParseNext(arg, 0, {"--new-game", "--no-new-game"})) {
+			new_game.Set(arg.ArgIsOn());
 			continue;
 		}
 		if (cp.ParseNext(arg, 1, "--engine")) {
@@ -91,7 +89,50 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_override = true;
 			continue;
 		}
+		if (cp.ParseNext(arg, 0, {"--patch-dynrpg", "--no-patch-dynrpg"})) {
+			patch_dynrpg.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, {"--patch-maniac", "--no-patch-maniac"})) {
+			patch_maniac.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, {"--patch-common-this", "--no-patch-common-this"})) {
+			patch_common_this_event.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, {"--patch-pic-unlock", "--no-patch-pic-unlock"})) {
+			patch_unlock_pics.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, {"--patch-key-patch", "--no-patch-key-patch"})) {
+			patch_key_patch.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, {"--patch-rpg2k3-cmds", "--patch-rpg2k3-commands", "--no-patch-rpg2k3-cmds", "--no-patch-rpg2k3-commands"})) {
+			patch_rpg2k3_commands.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
+		if (cp.ParseNext(arg, 1, "--patch-antilag-switch")) {
+			if (arg.ParseValue(0, li_value)) {
+				patch_anti_lag_switch.Set(li_value);
+				patch_override = true;
+			}
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, "--no-patch-antilag-switch")) {
+			patch_anti_lag_switch.Set(0);
+			patch_override = true;
+			continue;
+		}
 		if (cp.ParseNext(arg, 6, "--patch")) {
+			// For backwards compatibility only
 			for (int i = 0; i < arg.NumValues(); ++i) {
 				const auto& v = arg.Value(i);
 				if (v == "dynrpg") {
@@ -106,11 +147,6 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 					patch_key_patch.Set(true);
 				} else if (v == "rpg2k3-cmds" || v == "rpg2k3-commands") {
 					patch_rpg2k3_commands.Set(true);
-				} else if (v.rfind("anti-lag-switch=") == 0) {
-					int num = static_cast<int>(std::strtol(v.substr(16).c_str(), nullptr, 0));
-					if (num > 0) {
-						patch_anti_lag_switch.Set(num);
-					}
 				}
 			}
 			patch_override = true;
diff --git a/src/player.cpp b/src/player.cpp
index 72a87d3c9..ac36d0b7d 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -612,11 +612,11 @@ Game_Config Player::ParseCommandLine() {
 			}
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--no-audio") || cp.ParseNext(arg, 0, "--disable-audio")) {
+		if (cp.ParseNext(arg, 0, {"--no-audio", "--disable-audio"})) {
 			no_audio_flag = true;
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--no-rtp") || cp.ParseNext(arg, 0, "--disable-rtp")) {
+		if (cp.ParseNext(arg, 0, {"--no-rtp", "--disable-rtp"})) {
 			no_rtp_flag = true;
 			continue;
 		}
@@ -1393,19 +1393,20 @@ Engine options:
  --new-game           Skip the title scene and start a new game directly.
  --no-log-color       Disable colors in terminal log.
  --no-rtp             Disable support for the Runtime Package (RTP).
- --patch PATCH...     Instead of autodetecting patches used by this game, force
-                      emulation of certain patches.
-                      Options:
-                       common-this - "This Event" in common events
-                       dynrpg      - DynRPG patch by Cherry
-                       key-patch   - Key Patch by Ineluki
-                       maniac      - Maniac Patch by BingShan
-                       pic-unlock  - Pictures are not blocked by messages
-                       rpg2k3-cmds - Support all RPG Maker 2003 event commands
-                                     in any version of the engine
-                       anti-lag-switch=[switch-id]
-                                   - Disable event page refreshes via switch
- --no-patch           Disable all engine patches.
+ --patch-anti-lag-switch SWITCH
+                      Disables event page refreshing when the switch SWITCH is
+                      enabled.
+ --patch-common-this  Enable usage of "This Event" in common events in any
+                      version of the engine.
+ --patch-dynrpg       Enable support of DynRPG patch by Cherry (very limited).
+ --patch-key-patch    Enable Key Patch by Ineluki.
+ --patch-maniac       Enable Maniac Patch by BingShan.
+ --patch-pic-unlock   Picture movement is not interrupted by messages in any
+                      version of the engine.
+ --patch-rpg2k3-cmds  Support all RPG Maker 2003 event commands in any version
+                      of the engine.
+ --no-patch           Disable all engine patches. To disable a single patch,
+                      prefix any of the patch options with --no-
  --project-path PATH  Instead of using the working directory, the game in PATH
                       is used.
  --record-input FILE  Record all button inputs to FILE.
@@ -1418,6 +1419,8 @@ Engine options:
                       will share the same save directory!
  --seed N             Seeds the random number generator with N.
 
+Providing any patch option disables the patch autodetection of the engine.
+
 Video options:
  --fps-limit          In combination with --no-vsync sets a custom frames per
                       second limit. The default is 60 FPS. Use --no-fps-limit

From 1ed93394bf35052cfda12deec3e62d4a136017f3 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 23:01:37 +0100
Subject: [PATCH 040/222] Improve MapEventCache data structure.

Get rid of the unnecessary pointer.
---
 src/game_interpreter.cpp |  5 ++--
 src/game_map.cpp         | 41 ++++++++++++++++------------
 src/game_map.h           | 59 +++++++++++++++++++++-------------------
 3 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 12fe1c7b5..57e03237d 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -450,6 +450,7 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 				// 10 per second
 				Main_Data::game_variables->Set(_keyinput.time_variable,
 						(_keyinput.wait_frames * 10) / Game_Clock::GetTargetGameFps());
+				Game_Map::SetNeedRefreshForVarChange(_keyinput.time_variable);
 			}
 			_keyinput.wait = false;
 		}
@@ -2287,9 +2288,7 @@ bool Game_Interpreter::CommandMemorizeLocation(lcf::rpg::EventCommand const& com
 	Main_Data::game_variables->Set(var_map_id, Game_Map::GetMapId());
 	Main_Data::game_variables->Set(var_x, player->GetX());
 	Main_Data::game_variables->Set(var_y, player->GetY());
-	Game_Map::SetNeedRefreshForVarChange(var_map_id);
-	Game_Map::SetNeedRefreshForVarChange(var_x);
-	Game_Map::SetNeedRefreshForVarChange(var_y);
+	Game_Map::SetNeedRefreshForVarChange({var_map_id, var_x, var_y});
 	return true;
 }
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 26c9c4f23..b9cbe26bf 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -17,6 +17,7 @@
 
 // Headers
 #include <cassert>
+#include <initializer_list>
 #include <iomanip>
 #include <sstream>
 #include <algorithm>
@@ -72,8 +73,8 @@ namespace {
 	std::vector<unsigned char> passages_up;
 	std::vector<Game_Event> events;
 	std::vector<Game_CommonEvent> common_events;
-	std::unordered_map<int, std::unique_ptr<MapEventCache>> events_cache_by_switch;
-	std::unordered_map<int, std::unique_ptr<MapEventCache>> events_cache_by_variable;
+	std::unordered_map<int, MapEventCache> events_cache_by_switch;
+	std::unordered_map<int, MapEventCache> events_cache_by_variable;
 
 	std::unique_ptr<lcf::rpg::Map> map;
 
@@ -378,19 +379,11 @@ void Game_Map::SetupCommon() {
 }
 
 void Game_Map::AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id) {
-	if (events_cache_by_switch.find(switch_id) == events_cache_by_switch.end()) {
-		std::unique_ptr<MapEventCache> cache = std::make_unique<MapEventCache>();
-		events_cache_by_switch[switch_id] = std::move(cache);
-	}
-	events_cache_by_switch[switch_id]->AddEvent(ev);
+	events_cache_by_switch[switch_id].AddEvent(ev);
 }
 
 void Game_Map::AddEventToVariableCache(lcf::rpg::Event& ev, int var_id) {
-	if (events_cache_by_variable.find(var_id) == events_cache_by_variable.end()) {
-		std::unique_ptr<MapEventCache> cache = std::make_unique<MapEventCache>();
-		events_cache_by_variable[var_id] = std::move(cache);
-	}
-	events_cache_by_variable[var_id]->AddEvent(ev);
+	events_cache_by_variable[var_id].AddEvent(ev);
 }
 
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
@@ -1544,7 +1537,8 @@ void Game_Map::SetPositionY(int y, bool reset_panorama) {
 }
 
 bool Game_Map::GetNeedRefresh() {
-	if (Player::game_config.patch_anti_lag_switch.Get() && Main_Data::game_switches->Get(Player::game_config.patch_anti_lag_switch.Get())) {
+	int anti_lag_switch = Player::game_config.patch_anti_lag_switch.Get();
+	if (anti_lag_switch > 0 && Main_Data::game_switches->Get(anti_lag_switch)) {
 		return false;
 	}
 
@@ -1555,13 +1549,12 @@ void Game_Map::SetNeedRefresh(bool refresh) {
 	need_refresh = refresh;
 }
 
-
 void MapEventCache::AddEvent(lcf::rpg::Event& ev) {
-	for (const auto& ev2 : events) {
-		if (ev.ID == ev2.ID)
-			return;
+	auto id = ev.ID;
+
+	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
+		event_ids.emplace_back(id);
 	}
-	events.emplace_back(ev);
 }
 
 void Game_Map::SetNeedRefreshForSwitchChange(int switch_id) {
@@ -1578,6 +1571,18 @@ void Game_Map::SetNeedRefreshForVarChange(int var_id) {
 		SetNeedRefresh(true);
 }
 
+void Game_Map::SetNeedRefreshForSwitchChange(std::initializer_list<int> switch_ids) {
+	for (auto switch_id: switch_ids) {
+		SetNeedRefreshForSwitchChange(switch_id);
+	}
+}
+
+void Game_Map::SetNeedRefreshForVarChange(std::initializer_list<int> var_ids) {
+	for (auto var_id: var_ids) {
+		SetNeedRefreshForVarChange(var_id);
+	}
+}
+
 std::vector<unsigned char>& Game_Map::GetPassagesDown() {
 	return passages_down;
 }
diff --git a/src/game_map.h b/src/game_map.h
index 4a6b41f23..e9ea966e2 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -20,6 +20,7 @@
 
 // Headers
 #include <cstdint>
+#include <initializer_list>
 #include <vector>
 #include <string>
 #include <unordered_set>
@@ -47,38 +48,38 @@ struct BattleArgs;
 constexpr int SCREEN_TILE_SIZE = 256;
 
 class MapUpdateAsyncContext {
-	public:
-		MapUpdateAsyncContext() = default;
-
-		static MapUpdateAsyncContext FromCommonEvent(int ce, AsyncOp aop);
-		static MapUpdateAsyncContext FromMapEvent(int ce, AsyncOp aop);
-		static MapUpdateAsyncContext FromForegroundEvent(AsyncOp aop);
-		static MapUpdateAsyncContext FromMessage(AsyncOp aop);
-
-		AsyncOp GetAsyncOp() const;
-
-		int GetParallelCommonEvent() const;
-		int GetParallelMapEvent() const;
-
-		bool IsForegroundEvent() const;
-		bool IsParallelCommonEvent() const;
-		bool IsParallelMapEvent() const;
-		bool IsMessage() const;
-		bool IsActive() const;
-	private:
-		AsyncOp async_op = {};
-		int common_event = 0;
-		int map_event = 0;
-		bool foreground_event = false;
-		bool message = false;
+public:
+	MapUpdateAsyncContext() = default;
+
+	static MapUpdateAsyncContext FromCommonEvent(int ce, AsyncOp aop);
+	static MapUpdateAsyncContext FromMapEvent(int ce, AsyncOp aop);
+	static MapUpdateAsyncContext FromForegroundEvent(AsyncOp aop);
+	static MapUpdateAsyncContext FromMessage(AsyncOp aop);
+
+	AsyncOp GetAsyncOp() const;
+
+	int GetParallelCommonEvent() const;
+	int GetParallelMapEvent() const;
+
+	bool IsForegroundEvent() const;
+	bool IsParallelCommonEvent() const;
+	bool IsParallelMapEvent() const;
+	bool IsMessage() const;
+	bool IsActive() const;
+private:
+	AsyncOp async_op = {};
+	int common_event = 0;
+	int map_event = 0;
+	bool foreground_event = false;
+	bool message = false;
 };
 
 class MapEventCache {
-	public:
-		void AddEvent(lcf::rpg::Event& ev);
+public:
+	void AddEvent(lcf::rpg::Event& ev);
 
-	private:
-		std::vector<lcf::rpg::Event> events;
+private:
+	std::vector<int> event_ids;
 };
 
 /**
@@ -689,6 +690,8 @@ namespace Game_Map {
 
 	void SetNeedRefreshForSwitchChange(int switch_id);
 	void SetNeedRefreshForVarChange(int var_id);
+	void SetNeedRefreshForSwitchChange(std::initializer_list<int> switch_ids);
+	void SetNeedRefreshForVarChange(std::initializer_list<int> var_ids);
 
 	void AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id);
 	void AddEventToVariableCache(lcf::rpg::Event& ev, int var_id);

From d1adba60b5f6be1b5000e68d463dcb7b8674c6fd Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 18 Mar 2024 12:55:24 +0100
Subject: [PATCH 041/222] Ignore invalid skills when leveling up. They are
 caused by stale database data and are harmless.

Fix #2977
---
 src/game_actor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/game_actor.cpp b/src/game_actor.cpp
index 701b9a9f9..4543a181c 100644
--- a/src/game_actor.cpp
+++ b/src/game_actor.cpp
@@ -21,7 +21,6 @@
 #include <iterator>
 #include "game_actor.h"
 #include "game_battle.h"
-#include "game_message.h"
 #include "game_party.h"
 #include "sprite_actor.h"
 #include "main_data.h"
@@ -32,7 +31,6 @@
 #include "util_macro.h"
 #include "utils.h"
 #include "pending_message.h"
-#include "compiler.h"
 #include "attribute.h"
 #include "rand.h"
 #include "algo.h"
@@ -293,7 +291,12 @@ int Game_Actor::LearnLevelSkills(int min_level, int max_level, PendingMessage* p
 	for (const lcf::rpg::Learning& learn : skills) {
 		// Skill learning, up to current level
 		if (learn.level >= min_level && learn.level <= max_level) {
-			count += LearnSkill(learn.skill_id, pm);
+			const auto* skill = lcf::ReaderUtil::GetElement(lcf::Data::skills, learn.skill_id);
+			if (!skill) {
+				Output::Debug("Actor {}: Level up (level={}). Ignoring invalid skill {}", GetId(), learn.level, learn.skill_id);
+			} else {
+				count += LearnSkill(learn.skill_id, pm);
+			}
 		}
 	}
 	return count;

From 00b881e4e217d8bb55e30e70ae32a136a46c45f1 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Sun, 24 Mar 2024 20:51:56 +0100
Subject: [PATCH 042/222] Enable animated RPG2k3e spritesheets when using RM2k
 engine with 'RPG2k3Commands=1'

---
 src/game_pictures.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game_pictures.cpp b/src/game_pictures.cpp
index 3c2fba50b..26dffc712 100644
--- a/src/game_pictures.cpp
+++ b/src/game_pictures.cpp
@@ -508,7 +508,7 @@ void Game_Pictures::Picture::Update(bool is_battle) {
 		return;
 	}
 
-	if (Player::IsRPG2k3E()) {
+	if (Player::IsRPG2k3ECommands()) {
 		++data.frames;
 	}
 
@@ -574,7 +574,7 @@ void Game_Pictures::Picture::Update(bool is_battle) {
 	}
 
 	// RPG Maker 2k3 1.12: Animated spritesheets
-	if (Player::IsRPG2k3E()
+	if (Player::IsRPG2k3ECommands()
 			&& data.spritesheet_speed > 0
 			&& data.frames > data.spritesheet_speed)
 	{

From c96d77ea37605c5995ed3b7cedfce87f56a9e246 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Thu, 28 Mar 2024 02:55:46 +0100
Subject: [PATCH 043/222] Update Gradle

---
 builds/android/build.gradle                   |  10 +++++++++-
 .../android/gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 54213 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/builds/android/build.gradle b/builds/android/build.gradle
index d5d089db0..2c911c6ff 100644
--- a/builds/android/build.gradle
+++ b/builds/android/build.gradle
@@ -1,11 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
 }
 
@@ -15,3 +19,7 @@ allprojects {
         google()
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/builds/android/gradle/wrapper/gradle-wrapper.jar b/builds/android/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..2b338a935b508eb6286ed4b84a91176ee5fb93c5 100644
GIT binary patch
literal 54213
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
W0pC&I?SueJAtDe^1>pYz0sTMJrJ5N4

literal 59536
zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa
zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^
zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~
ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u
z=ASkePDZA-X8)rp%D<bsI~h4Rm^uAFQ<BLROWJ<`0bzjv0Wtj7Q-tm9U7TJ1&X+T?
z0;sqcIk}iQkuuSn*cv%I$0$z%76noH7Ta8zN`fE6Jd*?sq^xZE*~7uq;sxnxm0bf?
zWG{%)C$J>;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5
z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ
z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU
zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C
zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc
zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5
zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL
z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59<zcSBI^y^uc-kP|_dnxBqv~xB5X_NdN`}
zMEZBv(Eb1Sf`9se`nn2=2Ie=O^J*P!I1_b5V7;&u5DG)HdYyU<<s2B@54)x{`f;Kv
zfZM5g;hgn#bvN&GK<gLO6WI!L^J1!7iGSk$15c-vlyO(z)N14Q<Fg*eH~;4+)6c>e
zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!)
zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl
z(o?YlOI=jl<yl^k$7x`{qSba_*VQ%;8j}}@TaTN?f+&raCTvE~rk97kV@}*tTpQw5
z={nQs*R=b0PCHv#8U`*OxF($@;Jc?RJJMZQ*LR;dMe=BCU_m0z&*&~=Q`lJ>(`L9^
z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG
z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY
z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d*
zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ
z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP
zWOeX5G;9(m@?GOG7g;e74i_|SmE?<N0Ng}*VO}5)^i`w@P$lv*s!yN-+Qy*o1bwsn
z#CeG-p3MXZ6>`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB
z?2iK-u<hM|!0X$eB^PL6wmad01UDpub2QY95B#<MR(CC$aEBLG+2Y!yGAVismJJHz
zIoV4iw~uG)_VY&(TT9{^RRKRu=%(c2w?!KqElWo-&$-nSRdeH2LvB+he)EthAIQ5^
zU)(6)dr6Y&P`KFe{hBbFJ|Z8^tg>(DC_T1};KaUT@3nP~LEcENT^UgP<XbpcE`+`@
zyE0v)t=HTGyW)oJ_|vjt*!jC<)t0!)>vp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz
z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)<w62C55WUy
zZx(_)1wXrXQ70oOIwxQkuFl}J0ZzmPT+bL4iW^M<ND6i_(FnAVRBYk`l=KbaDvp1k
zWmV)m&mE;lcjfvUBp}P4^&PSwPSPJhoJ685G2>na-5x1#OsVE#m*+k84Y^+UMeSAa
zbrVZHU=m<S*p*mB!e!v0(Gt07(r@|86J6rOcXp}lo8h5GB=*f;BuVJ!Q)iyaNs%*y
z&}JC?Lw>FwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7<M0Z?A)|O
z%gj7Nfysd!*#r)!d{^edzFbybaJQOF@+gl~7gK>~-6hl;*-*}2Xz;J#a8Wn;_B5=m
zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{
z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G
z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*<y-JK!Y=$BB>#1!6}5K<*xDPJ{wv4&
zM$17DFd~L*Te3A%yD<d9`~mL{6xb2g^$1)ET|rJrQ1#}(!0!`@pxRr;I)X#!dDg!k
zMd`y90Uu!`B(?B%PT#=LMjp{w$Fvjcp&iykB<D%AI)^EYZRlCcA|jfqQqkp#w;9Kw
zsF3FVnxs<?p6|yzW!Ls#;3KlDY(p2nT`W%0l1uxtk~}7Kxyc4-f@0)j_yzmTaq1#t
zS_iOx{ih{*HtF=S{-v1}h=0)6e?ZMYf#qKm@_&{nYG!WaYU}c^dqpRE3nw#YXIU#}
z7c+pF(?1eSvD&r@jvDG0fITzB3`JRz5>;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz
zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0>
z@x>;EzyBv>AI-~{D6l<i0ovd~v}7XNc$Qrs7s~OiIZ8qsp$2_MTkt%2w9$s(OrH*U
zfd`M15&oG8aU7HtJx&^{!*Cy}$j~h{+AfO=I&W`6`AgSD_*BJgYHCO>6{ST=em*U(
z(r$nuXY-#CCi^8<Uj3dkZ!`ndO0Z6BNR1GD{ior`%cY8S?_dLDKwsZou>Z2#<qq%Q
z;qM=yIWP_ODMY+y$q_cr{cgj_YYTxl7B7J!G<0CKL)lta>v#UXOt`dbYN1z5jzNF2
z411?w)whZrfA20;<o$GpxaIyLSUs^!IP9p!yvb9?(>nl&C1Gi+gk<`JSm+{|*2o<<
zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto&
z<b?XIlBsD|oN=9ayqYn-Bj>R`c~ClHpE~4Z=uKa5S(-?<gnO1?F`%kX?XI!|wy|1(
zwVmJAY>M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC
zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F><JcHvgJMi8H*agw$xFHgG@>k6k
zz21?d+dw7b&i*>Kv<IgnqxoHby(o;ZWbTS3{|84ZU&;Gb?AB4PjV%6h{jjafZE|Fc
zU#u4Mr9~%yL}yoCPIfbIqV%p4go8s-(YV%hh>5L(LH-?J%@WnqT7j#qZ9B>|Zl+=>
z^U-pV@1y_ptHo4hl^cPR<zdb)4d^x`6n&M+<+FLLB%g`&J#>WewbLQ#g6XYQ@EkiP
z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It
z0CBpU<J=>cMA*QvsPy)#lr!lIdCi@1k<V_|^~CggOC$+hgf70;a7yaAHGDEZHw$4N
zF~GE#N`2Ju*JlX*y8+ZWhw?KI(PzMqj|iiW;+5hEmVCQLoPHTeDmRi75_`$%x22vR
z8Rv7zx9Zv@$CdK0QrS-QfRaw{Kl7Lz*~3J9<=cZ&#^~~Axw~ZtS-&|9kuP5&!YrYU
z=(B&HqFxtzihhI7zry?C)sG^ez91qsoiXbRf~@)@l1N|_9+?rr)<cGBVQQ6_WMN59
zU=d@G++iVCkjPv&FM4R9k+;$@l!`L3B^I!fRs2|+BLh)KIW52`sIkdV9X}E6s(Rcy
z?b#=r^Epq1!(9`c#8@wm8?&9-DE)15W(n0*G8f(+>4V2m!NH)%Px(vu-r(Q)HYc!p
zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMi<OCyi~T>NP_o*lvx*q%_odv49Dsv$NV;6J
z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB<fQ37wV2YFf6c%BM^Cvg|i^j_i
z%HZmHQ({pzD$nT^S7)#DQ`R<D=kxr1t{=DqHW`Qn6L#@#QviQg<!=_HuCV9ihkyVC
z$K^iE5!WmhM75uk{E<6d84ND_#N;lzk$H&yMX{6MUJk>8zyvh*xhHKE``99>y#TdD
z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C
z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP
zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4
z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv
zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@
zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp
zOH4qlEOW4O<Qu2!V%A3md8KJnot9Ej%W3&hi8UALYGBbGsR8(?gQXkbXoPvNJoRxM
zl}xFdQ=_Q(sLV1%u}jP1L><GdHNxBdrrOT03q(fM-zcL&TQ2sfT&NME3uXPvrpN5~
z#IFoPoCw#6C1K6`VapP`y7VgN`ifPpYM4qbCV_Y_18=5kGr44YudZGc_XS|2=Yf(#
z!G3BaU9189`{6yfQCX6~=-1XRzgMLeZw&xRipcUzS&5=oehq7ZH6vzf4q=X22hvw2
zBlHJ$CnN~(2oCF=AiD#w{XDLE_U6qEgOyQ+O*;3$_U;@<o#a`C2!nY~*b`8ESUA0X
zKW0TCPrp?e$rA~@%?lWx%3!atErDhi8av+|P6x6?2?23EFR$__jm}B8LVu5!fTSdt
zcVrJ`-!<wU%G*!gV*5FktYHGp;oP>MUc)_m)f<IhvZ28GVhmg4m5BNFyLbthtI;H4
z3B*Oql5BF{5_x=K<%JgS&jcR0L%WJW0aDD6R6WchI)?A}9Bna{oN5b<YC&KNkPSj;
zP61~4_QIYBN{1t3@`Vnk4EXssZ;Zb6-(df~<>MR_rl^pCfXc{$fQbI*E&mV77}kRF
z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf!
zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr#
zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-Py<IS2
z4G5JodP+!@;We!jdC1b|o}h<41sOALwM3mSgHH9bg!dlmgXym-*ClVWDA%oV2nj=X
zDh~7IT^Fgn#hsr*vsEidKhB5GsjV~E1;f`KfZ=ob!EiUH;}e^vPn+Sa2JdkK$FHz^
zKl}_lPm46IJWqQ+m)W&3xYQ-g$_D+XLiad-N%xxgwl*-&AB4l}#I;B9Fd1Ke7$ZWg
z63nc50E4D$L_}i&g1UA%l>uqGn3^M^Rz%WT{e?OI^svARX&SAdU77V<bdfrPJ>(C~
zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<<p$&M&X?~!e>%z*+!*<<gYi?D-F*|
zVG6XZquokR!NW`85%`c=C6CgHKNVdvhv%xxYFl(JxTu|BYV4}`%AT5sNXaDB*GitX
znwV-Hs=Jtp=+VQ`raGz$#nGsX?dLH>e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q
zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4
z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN
zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!d<b+Y4`ZjT~b`vTqL@_8pWF
zBw|KBrTF3*6JoNRkTa+;-Omfb6Ct{*#hK9}2DQ;5te(mk$d3o7AjZ+kgHGa%!K2MZ
zF}pV!)YhU!aXKGB)1*b>chdkRiHbXW1FMrIIBwj<V9Xn-V#Y{~A?3|pp@lgyO=vpl
zS$4N|M5-}E(N_;A0Fu?x>sai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u
z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^#
z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5S<Y_fcyh`*`oZ
z%lfpmrOMhN5pg47Nft_u*syM5t^12Y?KXb}+6oNAHrDrYSWd<a;c$o+geH}p?AFZ@
zNLBqp8>hD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@
zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN
zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd
zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A
zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z
zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&<I@>5#YbXkl`q?<*XtsqD
z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-<J48;gf9NP5sNR-
zL*ovH87g|Jff92q*!6X7MIO}wdJ{AhrB1Bwyk=;h3m(+DZS-86!~o!+AjniQ8iuZ4
z<@uIglS?h9t`!GB>Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi
zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-}
z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L
za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp
z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;R<ee%K2Qwg7EL?cE>N
zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0
zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh
z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7<gIVhlrh
zAIi;a5xPRA-3kgTltlkrN%RvJ7$sBOliA03MP1yrJNN1g+SCAhQ`uw0^YzUHVQz+i
zcJ?NW<*^iu>z|=ALF5SNGkrtPG@Y~niUQV<a)%h`^JQ+}q4U57&MX8+?$k_)?28O=
z0SqdF?CIKKD2M~<Xd>2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHp<?{|YJofwR|$|<
z$>yznGG<qP&KPu(wi>4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc?
zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9<yH+X^j7<8u}06ruW;&
zs}iDffRwusBaO1}0$D=D8-n1py7gc2)3D-P%r)J~sS!Cg>ZybFY%jdnA)PeHvtBe-
zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>(
z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp
z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7
zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe
zq!K%{e-rT5jX19`(bP23LUN4+_zh2K<ffCSRwd!c6I)GO$MaGRHrZo`XLj)z|Hw@u
z+RdX7Y7*3me;hjSp5W`?z?A}~re~pNO4}djrvl|K>D~EAYzhpEO3MUG8@}uBHH@4J
zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b
z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V<J=n886<%KH
zoktK&xgnV|_$@)cIYuz!7r*y}iSfQT(R#B$M4R}*9;=WQ%XioaEG%LSiMU?SyoWSz
z)vzgS!TIc2g!y((M(GU(R6+R%8;c21Dphf_^lt0iPB@WuOrW0xubFoDbeX@K0>%|;
zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd
z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW
zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7
z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa
z@w;^c|K3da#$TB0P3;MPlF7Ru<lwrct1Un5ctcTj3dA)z@DXR;4qFalm=|M>QeXT$
zS<<|C0OF(k)>fr&wOB=gP8!Qm><?)6C=UvZSqZ4uZ1>F41u;3esv7_0l%QHt(~+n;
zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90<Y=vWGH>j<kx9ZhI;(V`;xZu
zDYCY7>H@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`?
zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H
zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb
zpe^BChDK>sc-WL<U9N|nH@rr2+|rS?enu)UZF(K<l6e9J!EL6HH%c~LxccGVPf7ny
zyFD<g^3W7R4q^j38<}Ad;d`%;&<k2qnN$eo<dQKlYPBl}m(w35KgX2_kxs^Ol_%B|
zUs0|?ZD-dup#G+GdYT}nuh=U$YJ2~fC{jaPJ2|%po84J0j!Df3Whmo-aM6VINyo*B
z8u)_s77Mp`z0j!XsS6lsg7}nmV;RNQRQjm5Lvwddtb78^PR+m1+}L;N@8hJy>Kl<6
zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re*
zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK|
zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw
z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#*
zBP=a{)K<xJfQnB$@{@0_#bhnmPY6Vhfo!rSxRVZS-E}LbOHsiq;G>#CwIY%<caT3p
zke7^)z;+<4(dkHv#H^qO=}oDC0?Gz++%ow-3#lP3XnwX+?<RuxZOQAv{n-=qHz>p}
zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!O<SR_4
zuFPyeDQd=$B`zPr!>Y{eB24%<k>xY7ml@|M7I(<O(GUP*ZgNfnNpiv%kq;;6L<^I4
z7v}W+0mMlVqUBFVTaLaEYWpw9RKdMU!6L|L_c5M;=?T;dl`@h1Kd4@M`5dTTD*3IZ
zz|bf>Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os
z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{
zv9@%7*#RI9;fv;Yii5<S1PDs~()~zZ&rhFs5NWR4B3!{LWrnVKFQ@KNvj~+<W#FDp
z&T9mM8cxq^L*%j6-hix_30sH=&wMm23N3(`R8$1S*Q-~AxYMS7Mu8D3Vs22*;9u;7
zsNVy{0SUTuot>CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0
zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r
zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC
z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^<smC?
zN&@-C*~0;py~VP%VCw_ylgz7IlGQ&Xr*AAit2$1yb1yVPW=-LwHovgWfi79r&^s)c
z3HYRx82m{Vh;IfL3RG%1A(!Y_QxZK{g|kskeKf5qwoWt^ccgLfs$<cG{_aE=N2tun
z4owbA`nL`wH+YwxKW!M%Is5~!@)AtnVw7Zg>CfoY`?|#x9)-*yjv#lo&zP=uI`M?J
zbzC<^3x7Gf<wLN<-n?hqDOF>XA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_
zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV
z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP<WK7+bYUFX4z
zZbTRd<h4b<gL68Ci~URd>+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE
zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W*
z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL
zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s<mnO6
z@_OAm{T6bgd>3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh
zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L
z@w67!DqVf7D%7Xt<h7}J>XX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k=
zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE
z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ
z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb
zv(n3<ThNqSG&qB$8@7O_+wuH*7?Ri9T^JP$3GusGXqQ+6W`<0yb(f<?l^zSO`%mC%
zks6g-xzSvv%L-J>+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L6<Q)
z<vP0!r-O29D|xTQqb#~)zE;CEmJ*9{=WNVJ3|i~)*v>5<w=I^amMMBq^LE<qi<{&?
zy=u+W!*H|7eqkYXYLpU_8JW1)k?Eg=jA>B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR
z>U+KQekVGon)Yi<93(d!(y<IFb(nUBhy`pC6^e9+fGs)}=|RCVMv5g<wr}x}n-^kG
zGdBvey?@0C08dZomlYM(`!3v_q*v-%Kg*V$qzt@>w1h3&X0N(PxN2{%vn}cnV?rYw
z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t
z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpA<s$ecap;a34-{Cdqr_AJTc
zJnVr{h=@bBGWm|EZT2|$;w*>i-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_
znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$
z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7<vrVgc&`O>sBDOA)$VThRCI0_+2=(
zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn
zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F
z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur
zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE
zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr
z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;h<q=63AkQY)
zcCE@1JWF}~_Uq6qtyJrdwH(8D7A`zTkAQHY@g0P<8v{}RJzT8a&2cjh9k&mjcPb8@
z5HE6f@kREf7%>g0Umh#c;hU3RhCU<W1B<B%crOA?)B<4{QAfz<37i#>X=8aR>rmd`
z7O<?+-8C(yGLP-1J8E*a`h<>rw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n
z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y(
zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0<X)2u(&r<#&$Nb
zEt_ST3A;7@yLaDYegwBA0{&4{NmSI`fxj&0K=IKFCC<S&X=wsfkW-it*TQb5k(wOF
zfK(&>H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF&
zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K|
z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3
zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$<zFx<I*#*Xy3HpVWLy#c+L67b@Ow&2a
z(w9*UjqcJ|P<O$5xr^-xkmBuXHWl8yT(|_IVBW_**GKxw$=qWW<c9+Z%ggo<3D7Me
zmk+*#LQ~t~)e=EH<odjj*KOd_V^8PU&({y`N4seM425JUxOk|ThAvJV57v8ue@}zI
zE`n)2|Eh{Z{|a6H8^xr={}$=0Ih#32+S{4Q+S}W>I{Z^Hsj@D=E{MnnL+TbC@H<Hc
z8daK#v}p)zZ2?BCz)+A_H%YLFSBzW>EU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ
z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv
zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v
z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi
z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG
zlP>XLMj2!VF^0k#ole7`-c~*<HrgH?o@2_1QG9>~+_T5<PY5+u>ls?x4)ah(j8vo_
zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv
zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@
z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL
z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV
zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j
z1v&%a;OSKc8EIrodmIiw$lOES<jA;6Pv*F(vI@>2hzGDcjjB`kEDfJe{r}yE6`eZL
zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3
z03s0-sSlwbvgi&_R8s={6<~M^pG<zwr8Gf260a14!Vy|NE3poENZ#G+dg-(~agX!W
z;@PF6fzbDrpSAV=Xqx8R`+f^Hj{kPf49I4f7;ILx9&A=Qe{a>vBNjKOa>tWenzS8s
zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u
zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ
z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+
zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2
zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_
z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE&
z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR
zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{
zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn
za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3
z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_<rze)r(DT^9S|-l7K0$t1QR)Lb
z2SA#W1@m5WKCiZ)ZskIX8BHZDTHR}*tb&y(Ion?7=1OO6qD>$r-2{<aZp`{ydbG&_
zl)2dkppmVD0@-e4$BhMxz_OJVB0PPwWy{|<m4A=4H?S6_3Qi7h3s|L9-e&R9xZEvM
zs&d=m-bcP)NQVxMnSfWcDZO-GNrhmp4q+2J2Utf0I3={uP#m<B8y~wTz#jSgV{zOx
zLmteKa!mWQp;}sbr^4u{F4TT^9lED*xAO(xQyv;MS5_QW$8hu8@r%`mKw$1h<U_JQ
zj_m_9jwy;fu~9?;mL(k9FEW?vr9ISOCl#C6BO??k>$d~0g2oLET<?fI=#h8Z64kjA
z>x9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f#
zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)<b}t%l
z&8~olaKAqrHz_KU2#VN1X}Gaml0zieA1)zLYi5ckvVAvFb5nFGgBLa>>gpS~1rNEh
z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W
zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&<da5V|Oh4r)k^Y)leUX5x{ak!ABkK2o}b
z_d&$gHJ+5kGa*$miQEl&^9=!sV650|3eO`7L!OwO<k-Urik~hWDiP`E9rKN0`VyiV
zCBNl{2T`$>QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-<Q)z3
z@tH3!+?ebO^ibVY$Tly)TI33;Eu@UVtZHU6VW#esNf-#FI>pqZ1t|?cnaVOd;1(h9
z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC
zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al
zvLo7Xte=C{aIt*otJD}BUq)|_pdR><DZCijoH}*5xGt?qO<pd4=&Dz`$R5RBDUo@~
z4|_%)t-x5MKE%JCHoM5HG*&ylJ3x}lbVV1zkOy3zSee9et!+~kl!Q8?OUv>{zBMT<
z(^<wl?Qn`c8##BBiXs2Lq5ll4Woq#b{WOnc@Xw}zEoZCezNvB?a^C9d2f*E?MnDoA
zJuq#iZ*wo;iztpyKR)xaUPF8Dsg{#Pp~dRBZa%4iXz&!conFo(ZCZ9dK$tqFW%{9T
zYFt%n;#wGNDW$CrM$Uy)Aqr~LoZ&4gnRl@<MJ_J!8U{PZFTz`I-R*#PVxYv6m}_8C
z{>1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o
zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb-
z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4`
z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@
zM2NV<G5clbB=?l)amM4EDay+Ys3{6wJt#k7C!t)zdzK4vX&5nR>LDxZ@GIv7*gzl1
zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U}
zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq
z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl<q6eq3x#u
zAJgn{lJ>@O!<XL?rKxukWgD2m9!NiLhjh`xSeR+02f<Sk$0N-r9A(m67Nx0u=-^qx
zR!QxaC{;~kv{J}yY(#VND=+Thll)|PSw~S+(M%n9LuD^=xVL*YGWWpEd{d9!OQBJn
zN41nUy5~!yhzQW}O|2`gEz9?Y)seU@q6w}zByNGyg)E)6#u0l5lW+o4u_OTuyAl79
zZYr{y#3Y_;fX2@Sic@Aou_QuJ4v%o8vD@f3Js|`vJb{PS2EHe74r{Tw=a@%A)!2M+
zPu7OWa=Jg3e^dtA=LW{a6{_~*^~;AytG%Mj@oXHMf+(&dQpy;;Z>Ak;(o*m!pZqe9
z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS
z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&<G!iIiNogSegbwTSt8uy>q
zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I>
z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe=
z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof
z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom
zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8<D?C5)E@;zjKd)Xb!FNvZq$1{P
zZ_cs0NlV3)JNq@`{<-zu^ZYJ1^Ld;f_M>V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq
zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65
z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM
z<X5%i4&O$X#=yI<hd(3%<Zcj=kEA#X{}c{^krf50kLn2b2E!th0Qv4dvb^+5u;4J#
zlBSWS(h}xeBFAYcd0pOqotJ3LiF)uc4%kFGc}Zy&`zE?(Qs(NL;o3Z1;~(~tG}-Bh
z2e(#~MKf9S<|z>`Ub{+J3dMD!)mzC8b(2tZtokKW<wg=;{p}0|>5pAwHa?NFiso~#
z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3
z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l
z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd
z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4
z7ib0UOPqN40<wO!kQ$zpsrK5Aa5t5Fo)*OG4}6Ijc=rma)W2{<nw4+^q{U<AB|Tsj
zFzGzwLek-UQ-^N0dGGbmR?cme`P(jA>X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ
zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl}<P!5HWk<IF(yCaRSH*zpOC
zVnf_c&=gb=7aeU5<BV!UU<*{<;6~Ix<Tjf979KqyxoS6z<Y+#znX~t67&l^I1_P;R
zK41pPH*8=Aqg-IyeH>)G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j
z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0
zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe
z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3
z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_
zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{
z0QQ(<aV*^6d~P_wyb#+W;~F}~WX)Ppd{Uq-rJ?3CqoKIVbflQxXq~BLH)v}O!}ZF_
zwWT(t!<|y>8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!Ig<fHR9_YhFRYwk
z0lw?$NL8fxGl+?v5_QUq?6<<U2J*IAcZ+<hquee?e#?tp63=pmg{$Q$rn}~C8_Y7W
zg9Ss{Y9C%t8DnIy(Qv7p&SZ&QMyJ&!SD0;=WOk;TCM7#tSI3x1NZ&4DFy%AV_Os?g
z1FiI=Pk4>DTVqt31wX#<o9b?5#rXCtnrK0M=x^0jw<PP#ZI{lh9~^Z*Vw{-_^ITr(
z)$qE#{whZ%ycec}|9G{SJ(H~@#J$K+d2)f_X!ehMzhhlS7J#@W(6Y%xsq^a<9i55w
zkaW?M%HZshsV=6<!;JBR(onxpfhzWrtuF?RU7pGvJU!4ld3$lpa}>n+@!a_A0ZQkA
zCJ2@M_4Gb5MfC<TC(f`(cPe4tM|WyrAVv_&U?4^jt8l^|fRs{p&8>rm5UPggeyh)8
zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c
zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T
zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn
z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgD<jh^Dhf>s4swy5&8RAHZ~$)hrTF4W
zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(3<Wh({z_J@YvBSrj52l(h-MLmO>5$
zWa07ON$`OMBOHgCmfO(9RFc<)?$x)<W@m9nxqk9?7~^ut3Wo;~6D2$_UAr^6a@06}
zhbaXu1z)oTmo}f|BfR^v;*fTYLT!@--|Yuq^FVD<Ky8;oZN?$@5RgpqNtO9wUm8OJ
z(9a#CRzl(H@$~ix-J(FB5=sC@g%TTae0#WF!z3#dGld4c0Y7e0pQ8NtezyJ8(UT<z
zlzmGz;&?&~R8W?GOmGtzuNl?H29sLwdx*FDA?}L)&bH_HuvpU<-j?cQBXEn4@w@}1
zbuqYDfXvV*l;DI9S91Vl1%g`e`~)CTC~I1PeFc7!f|NS(1BW@<mUQD19@qh+O+idX
z^aigEBV+x9f%uAnR1zX#7l7hctxsN{zbeKf24Dv|aRxn>N}Jd2A(<*Ll7+4jrRt9w
zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8
z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T
za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o
z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO
z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+;
zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K
z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc
z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+
zmcZ6<kJq3<!_u@D>?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50;
zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?M<wivYl0
z9t_*90Off@EFt}aRa%;dm7J2oEgwZ{jhr<T_!~ob()h%=pOtb+G1T5RP-+u*Vo?t{
zi!>M`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$<v%TK<RnoCt7xrD
z#1a6zm=3%oGmw!vZc1_wpdd)~kOOq3P5Fg9;&ePhY2HWEi*|OIc6O1AT+@CSg+~h*
zB^jjyDu8F9J(wEsc+SqawuU1NbR8wUF<>x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie
zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY
zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$
zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD
zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G
z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K
zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L
z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp
z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8
zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!<?89Ei$T3J
z?z@S9<&As@{Y9#Lyxw-W=kN_<y;^$K5sJJqwb-T$PP6h38M%T=Bx_2$^)l&CDLhvZ
zdhKj0_?g*zw~T$Y_>4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN
zv98?fqqTUH8r8C7v(cx#<Q?IVp@71+x5ZZ7f)?RcYl^)SkLc^*6^1061>BQ5P9W>-
zmW93;eH6T`vuJ~rqtIBg%A6><SYe@>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB
zK_7G3!n7PL>d!kj){<n(iP5vH{wy@r`5BfWWy8D|npiy&BeE}v;h*CtONw8=%B-XQ
z$nDwPLtcvB>HQ<Am1y3AS@s(_pH6kI+G=XSN=HQ?<&HjqAB-IHGM%$}68+PjQNzR2
z6MEkdKgnwCq(f@LQth~`U%EJ0pp$UfWb!*f)Z3+f|6Za{+?u%NWGv5&TEIqit_)>E
zE8(%J%dWLh1_k%gVX<bdrx}WL_=U8ZZ)DG8QfrZ^WL!bPM`yceWYwU}<DPMGK}pl&
zGF|1jMpDkISXK6~LGCllJDr50uEEs4h>T<ts+ig^EylHk*nut&kXb66@#0N7&v>Zt
zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i
z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF
z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb
zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i(
zZcTT@2`9(Mecptm@{3A_Y(X`w9K<ktEsd4Ox>0EwtPq~O!16bq{7c0f7#(3wn-^)h
zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7
zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH
zqgcqW>Gm?6oV#AldDPKVRc<K2aZ<FK|5AMTa5U$h{11hJ3DKMpf?!FK@|*<DSf-P|
zR5Ux_&B*2GBK~T>EyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT
zBbj@*SY;o2^_h*>R0<q}ndsA23!z&jV@X<F3)26Ts58#6p210*qO2kgtV-lHjk$52
znksgUL!R8Qn0P6?m@b(}tnV~){A=i@YDFziUORLUgY5_Td?`WtcDI1D7--;hP|D{P
zg6lo7f*&F%uY8Wrnk;ZcuiX}3zVYBag<tZOhgFkrSHK!oq`^x&te7zHkvt={+aX=k
zHo>e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p
zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot
zmb)sZaly_P%BeX<FxqFKb}^Zk<<^m2J#C7snSUnXzB-Qk`_9y(u@8Fd7&Sw1EPwJY
z`3VL+yDIcXZ16~xV|OSo65<V)K&r{Hqyo@fcwzCzVHW$e)<p~gbv~TEz2NqXy_$O=
z^i%%^vM}Q7HmxvXddu!|yd{o1pKWt`hn^&y)Q`PhOmnUP7#Z~ZdgC}VwG0Dy(n@!O
zIZ!NUu@vWw6WSZ$LxbX71jgty2f+t@;JYJJz<4bvyYxk0b!%abyz2zI$$&FG{{>_9
zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}>
z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e<z+<s+hEq4Io>!
z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-N<r?7&b
zz2}F5P28aK;29p6th6RdoQZ+!sp<&ySIJ}sgMsE5ypYc27tE7`I;zAFZ@*Q!$#U(f
z+rSIeIeV$$0cDkNX(dwoYr)v5-)#Qu-E0OP=3$fSTj<}xXUZX*rozXg&!(tigU{=k
zu^S2L88o`2Cq0phhMaFJ8maRPRO-j0r(!vIe`-(Pi+FwT;EVDkWWY8^Ze(y_f=YjJ
zXIGtL2V9<)2G;^8QU!AkH0rH0X5>j$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x
zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR=
z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@<PliB8|C;B$Ic^{gF7TgU=IQ_+{m-}Y8>a?
z%({Gn14b4-a|#uY^=@iiKH<L5U8=0GiWe*2d2;+1V&6e~6PvHo*CmhD$R0ivHhG<z
zP}t)rK}ruxci*Y%zw(Cg{8mm0?&Wj72Hb!`DC9q7?&KTcg{yONQuW1i+MlO-|1|Qe
z)l7IKS&W={vmNh~_GVA*H&u^H-E;3mqll}rP@aztjY9rBRB4t`+LTgwSR-uq)KE&g
zw}o)(loEp4v{@%<&Qn(9f2B8Br!4H+h@dj5c|zJ%TFW^tWNGK|6v1E;0}QDWC~!T5
z+L;9APi~ECKZL?GC#dq+9B$G`^d`JiRXTkLDz){ULNo4J&DL1>+k?~~wTj5K1A&hU
z2^9-<fnw7;wmVS@4ClmSP@bWBU(_(9S(P|9EY=l24)}v|>HTC)7zpoWK|$JXaBL6C
z<Yktw;8}EVH5|NNR&dZrq6vL}&i&ish1y~wU!UVGFiUBLDV^78Q^DQtYI^|8laL}3
zRfKIMiIdmyN$)~j#!$*M<r>#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF
zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#y<JrUL*UZ1Xs-Wwc~kOS|Ls%
zmd2^Rc+;0N4PVZ+!b+a3&|)LmouHXiKzE9tVjp8dcGdIv(~_BxQ#?k(Qm3UQgfB*p
z@b9LQ9=l<bBw|T_IK^I>EFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={(
zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|<et<vLon=3G`b#LSZvU3*Fx
z4P@!ir0-}5Nqmjus}`Kzo(+-nlqFJQi1<b`jRh)B)019WjG^62JW87n|I$(%2d4&!
z(Id9D9{ILUWT{s-XgC#OSZu|=r)`nsjkqAdA(=ngTyjH|WGyY5O!UW}>FAcx?r4$N
z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd<gIgGk8
zL%w-Bbfr7PUlcnM-ztP}%ch|$qPf%LKmAJB<oeStK~JdM8&{+7(d>-(+9>G7*Nt%T
zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6
zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx
zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g
z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j<HO1ae0e_H-itm|zuLd=vIkWiSW={L(
z=H<%=TEb5k$?uNKw;DEM&<Mn^J>$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S
z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe
zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8
ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5
z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%*
zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep
zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9
zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y
zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC<H5o#gSaRpVGc^4lwhtb
z7pn9IPj2W9bpOfW@2xh-tQ>?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ(
zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT
zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h
zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;?
zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?<?XTfvV{UDV}w!urD@w`o9oieKAnG
zvr2&bqJVZ)5UcTLaexM@oG|8%(IBuX(-u}wBq@Q$9V2b0IC=e3_KpIxopKVw7>S|P
z5|6<W(^KK1jj(<2{9sY0(eu3=Q6`2H<?=?p%uY0pfBOS}NZpUxTW7oZcZG$O6;(H!
zOb02qMrehW^-O;uvNd@`uJoUY#awe~_x8BN&$!(_LmW69<d=Xp`G&K%z|Di(+-~zq
zWI>b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0
zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo
z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED
zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN
zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S
z7l(riiCwgghC=Lm5hWGf5NdGp#<cbmW-yHm$M2Gqk!4_xRebASViL@mP7yl-azWda
z<G&)BE%@HQrgG5pKiLWM@B?c5lE5;m7$gFO%AuT)p*0da`p4&%Mu36ezDb#`0vLl2
zI?+<7r_l4ywhuITDxpVrxzM2FRT|Mj6M_y>01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd
z*6+-QXJ*&Kvk9ht0f0*rO_|<FF@35s-%u_Fu<XiMDuk6O&_jk45E@5cb)jBGUqtYc
zq+<bAA%Nap)oNdnpfAHjGGthNyXZoU$P&r0P!agg4>FMBALen{j7T1l%=Q>gf#kma
zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n
zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K
ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3
zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM
z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3<
zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+L<qjtS^iYLG0%p6Dg6(dvB&P#PA!!UiS
z8M%H)Uu;En{u;@>n1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7
zcMcD$Hsjko3`-{bn<!ud7m1Z~mZ_DTekgKtoQtXtR*n1nDWhBFo#?lvaRwhSh#kdu
z?xJxn&^^rmXokLOikzs2W_4Ma6TClbap=|rLJ$LL>)jPL6E9Ds{WskMrivsUu5apD
z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90<uNw#rFR;2Z6GZ17
ze*{w*kU0dO{K%@m{&o;UQ1`vul8w^Xi<|#(egn<>KT!JXUhYS`Z<L<(TN0Pxe}*?@
z?9BepK2u1NmED3q>gX3jnu@Ja^seA<awlpG9geOjCMHs8iR;8V{RX$$iKLpwrYh7J
zy<zzRakD)b0e^xC_gqD+ST^a!#bd{rFE{$rD**vNVDo&epRlclZGjt1%D-X&p&hJl
zMeQ`xEg&lWv4J|FC*!{n=|Oq))!j|iL*KHA6uHVCPZk^A0*SVmXm2ceIZ<c$1z1mw
z+l{O?&mBhNy}lUt@Ucij4M$y_RovWnQ2+i2LkJsC;AyFWDIG^-x5*(=JH@?w(q?Nf
zuGCp&qV1*%m=KH>*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R
z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S
z6NE`3z!IS^$s7m}P<dtckQ^mZuhlat7I?|z^uHV2nde%BxDauu8tr7{L+u2k^qVVR
z+;&4jjK}ms$0R9OEgumQ2MfkPgtGW^@KM(3g3S!{AkQ`LBUCqrtIuy)nf1R;YLtsR
zh@fnl+a_yruS$hYas~<3nXX=t^Podk0)3XlSCBphI*`)F7)az^Xh>CwQutVQ#~w+V
z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_)
zvE|L(L1jP@F%gOGtnlX<B}ddt5^1qSPbDW5;7XZAH;t;_VUaK671+5BNJxrXT%f|-
zB||Gz6sbN@HcS3aPJEzpY>tIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK
zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p
zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u
zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd><g_T=4@YoFnbbxiOv*bo64FLy>XI3-O?Wp
z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm
znsNt@Q&N{TLrmsoKFw0&_M9<J!)y3LiL$NuR?R?7cB%RbaJJ#f0!UjlJN6LhSP#XW
zf>$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(-
zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i
znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x<c)en!N-aFijz;1(OOhmJHF
zfx(s^ynNO{GuDX<b_XbyxG&kp&bV7|JY6(4Pbja4Pel;bLdwfO6jk$gTX?{}r3-1`
zfq=;Wf5iAd$Azk=emKi$d`5I6ll$Pql6Cbc!%+3K<LHu5$(%)^EfHw6JP+bIKr<59
zlSvXRhN(lRa!^(<bZ?4MPpOwBWQvh6-d8(I-|Tl5qj7e}00z5DFQ*;8<6O7nnYX7>
z0$<oaocz%Hn5vpcKNG^18I`r+lUzc=kP%Ffuo=#H%fsDyquHyjBl}aa0*B>!q7iFu
zZ`tryM70qBI6JWWTF<VSI|gB#JvakT1JC@qko(BKeJe@Cw%2#%jITGW2(#htszXjh
zyaXdazL*1XzhA)dbq@puOwTBYb)k1n*!7@xml1Vgc3mF*M250JY_k^b94)lj=tQR1
zQY)-LilR%XM${$QWrtDgzRu4xZptGLL)s(O4#zXjhi*6DtxaF6{Ku9|UMjMw$2FPQ
zegZe`mH9t1>9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk
zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow
z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye}
zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*<n#PELL!V{ZgnnN!mof(!tanu~
zmSTM}=Z!z!$Zo9_Q44L7$xWP6Xcy+1W7&l)I@-Id(o3|JN0ti>H9=l=D3r!GLM?UV
zO<H@%zXUHkhC?<Sndk)bai44>xa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp
z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D
zzDp3c9yEbGCY$U<8<N^<Vzk$m2JBrtWbvDp;MzTYC<=$X@H{DreLN_PoABT;COQLT
zg!$H9wyxm3T^%T9$0cxAMad1z@_bBW-x>biJ_gB*<Y2uUYt-J<Yn&F}C^vB2uiKPa
zCb@{`oZy{(J|w^R_~9lXJ=gc(Z~>`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ
zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j
ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V
zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu<C&;@9a(B3(-D-{e5
zCh4821N+78Ub?x$H#h|xCoWHvv_U*sR!j;m=?<A8Q6*gkbXb+XfTJBJ5d@2~?7h!C
z--E}<=sW2tlmes9(q1bO7zZ_buS@~<Assq%HRuMhU6A@H3psA}>$$-C=*|X?R0~hu
z8`J6TdgflslhrmDZq1f?GXF7*<mL=C__bi3!yU`@_G#4)hE$8#$(S7)@IwbJ`V5}E
zb~IjYX9J9EG2BA0d8Uq-m-(Ph2N00U0u2~s)?T+sZ%iaxXXBr3tMf`lZcFm!U3sR`
z2m1gsvn~jt+_s2R_gixBE1oQQo{e`_{QMh2O(d}&LVhu-g_rES{w)4ROwoVTVV8tm
zv5oMjN+A&$?MZUW2J}P-apYGJvttn`ED_~jIS@7X)T-HnIp$iFgG3u2skw=BSnr=L
z$_gt(H{>ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP
zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC
z)ff9Yk?wZ}dZ-^)?cbb9Fw#Ejq<e)pWaR(QgYX^AMRgkdy@$Y~4m4s?C~@N{!S$qj
zpS_0c`uXO5EKzif?%4?DKI)t}_sTxkdqAQ1!;<s2OHt&Brz<F^bi$ys>Q8<LVuHer
zTcXI-_$y%S**P8l7<wrm|9Aux_Pfq3QpiFC7EbwR8`AkzCTTB(B)%{YimU|gHzZol
zbBu9#;jxI|#Q{H~xCfK<akAB%@J)^3`M0-iA;S9H>jxF4G3=L?<TEbrwlGK&=!>Ra
zg_<pwCR^`8A(U|=C=AH)!4HJ>)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ
zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{
zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&<JQ
z=8c^7({Kmgw6nQ)mBv;P!a1Fr7T*GuvY~tSk|{nQsHXSLKmJkI2m4K*4SX+bdVepy
zG5*i@sFKIG^0>{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ
zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX
z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz
zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr
zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x
zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P
z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X
zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4
zeBs>KR)izRG1gRV<vv(ssX(TjJ|j2ub^+{fR5+a~`C0`nTl`vU<BHE^H{Q=8K=fku
zl#y=O1d1-_@3Ej%rnSvB0ND!G?vX<Lueu8V373G5wggr-3NseJ`%`U!JI{c&ltvWK
zfTCCmXYXI374E>L;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)C<fv3Dh6x<~x<1
z{AS!Ep*^!}s_n(nTqNBU8z4Fg8!hKE)5*53C3H3^Ju}^*uDWJ)0BUx9DTDH{KO`FQ
z)x<DAh2)0etSj0gk|XK7Y3JU~pMuP2v~FRkpGAjDpJj%R+lu#Kyvz4!ysP(cylLjt
zJzPCNCa|gUFDb5>WNn9pCtBE}+`Jelk4{>S)M)`Ll=!~<uxe}V6C@-AFp{x-^?a+J
zS(HdUqU#eAYT}n`q^{pG{-h7MjA%Sa<$V|oCyUp<qtxl{MZ!M<MDJD0^(&z1Y(JX4
z8TL9zT6@1@=TNEk*N2~DkUgqRu1AZQ#U(A)us+D=br<m_DrxzIVp7;{8*bKGa?TTX
zuX~!5_Y-U?WY0_$L4G%5GWf8!Cen?x1{<nC-H@8xn0<zwD4O8As{ipuduAc)yMw&d
zgZtB7;2UX#Va8^DEI+0ecneEs5E}@neZn8QqA$v7SYd-eDpZC6y3bED!h4;QM-3X*
zyGDk3Z;8r0^tzULINJR{>gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ
zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux}
z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~
z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$
zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S<GsY~$p(oBbHOWtjdOC2u
z;C1jPukkNLS!i(rre?K%OcikckV$CpT0Z};#K70surek48v+?#{gTzKR6WB`2er<B
z;v5xx<p_1(eWSp4Z}I<NBmU>=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw%
zGz)~?B4}u0C<zrAG!by*op`$JLy7jp&PsA$YFSe9o@>zOf@l^um}HZzbaIwPmb<)<
zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$
zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_`
zfnHQPA<Gt0{*7VasX?h?JYh(2!yM9WLa58F;i~zlaoViwM(CP{ezLu~TY-PV)r>Nx
z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@
zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+<RN}=)p-uzX)FT#-CuJ$@qHq$5FHc~
zqy2jk+iKVAd~*3y1%p?*lqnx_6*HO!Kjf(DwZ|uV_IP)>cU@DbR^_SXY`MC7HOsCN
z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X
zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$N<brOp(~J;!uj-<0(i)zFmnJ8Bc7T(HBf
z7bSt1RxogrN4P=Je*E_goH0~DFy9_gI}GOpOT2Z69Nn`5E?q$I%axy&9t>kI!0E;Y
z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG
zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X?
z6vV3*m~I&#4BHTy*^E!<0nA(tCOJW<LN*4<CZPziCODmiPY4dojACi}^$*zO=X)6f
z+IJa%`^{pc{GUsK|4e-`cM~I*|8fCPd-6j$#`?;odpX!wXNItbMH=ysw}u6Sq$&EH
zzPBRMY#mNi%_VL2Cb&XXit-0FbAG|Oh{h%}{?d6aBOTouo1*|_-TA8f&Fo<D(PNvZ
zD2bEuL+Hvg_v!8Yn6LZx3PTT~4*V<eCOrD5h`Wps+BWsR4Rj!9so=oI%Yg&d736LX
z^LFtc*zM|kba~43Fem11fIiX8GV-yPhdTkn)o~QTpIylkU&dgBn|IVa?{qc!uxr@a
zV-I)s;JE8|1#-V=H3EcP6kfl?F!_*c+}XUNT^443oPlHY0GO#y4{*1An5sPtj|Vbc
zAFklqy4P8jK^W!|58vEz`LVV#eV(3)gIX$yedHirRmLC<aJB0PMBU`Mx?UbG&bcin
z*56w@9L%h9EQy#W^3HIu@Y0Y^--=F_7g%&W+qq42Bs@J@1MhMyS*^`gJ`$6t&QLKX
zKzMJ7I{3kkhK4(Tgb*A&u$VmTcg9j}Hhw0GbR(zYoytX%{&@S*L5;+h49!Vqmcg~v
z0LRB*P!90yXJ@{M*yAei%^z~<8;k#h!Ic}dKIU^+Dw;Y^XQDR{iL;1ljnmTP2DIii
zG~sSp37k*m1eWSsv>2G4DsH7)BxLV<PHfw$vu3U&2UpKKUT+Y&=By}zcZll;$g#*~
z(w#Fkc<LEADz`#3E3B|>8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu
z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A
z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t
zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-<RpXZ3iG~x8AnvXAjE&~jQq5trxz%)
zrEifLNn0_<WIruE^ki$1ZnWM)c7Qft;ndJNCJ9Pr#Fc=OZAGCp7%xNkq?;H}`yS>D
zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8<OIUbKR~_3t(dM~=JPl`19$O%w
z{Z&v}P8ll!nQJV8rAAdtSuZ<z$#&~uNVir=Du&L}+*VXb%-#SAHT~7;ItFc5FBPtO
z&9lMo)>*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R
z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}Sj<H8pR
zpsv|}BPG3{T85{qt$YU7RY(|>L=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-#
zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN<A#tfUu4P8jKmpF0
zQm>*zw9N+_=odt<$_<b12ma4;h2qIf^H4N$g1itP5{=DR$=Xs5H(sAOv3H?if*T4n
zzatsUQ3WhNg&VbZ*^wQUchIloy4u<3aM8GI=JSX#D4&T4cmC4SXeJT)pV3vdR2+^$
zi3TBR1qaG2D{@}%ipPsdlir-11{tN<PnAO(S3>H_8db<E&pmb~TY;XYF3F?V2~8gL
z#T_*T$Ign4A6_A?o!k)@JFb5}xbem{(`&u;(SJ_raUNAvx`%S!l|=%23jf~vPNg7b
z132!uODAdEqnZVa-svQvx3~=ta2=$!I~^$D+oT=X>o;0=42wcAETPCVGUr~v(`Uai
zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3
zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xf<v!
z^WND;J@GgASzquA9=<n~rk$%bj>VqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6
zImRCr?(iyu_4W_6AWo3*vxTPUw@v<MrSk^bVPG*8PEdA;bIq8PAh9CoO)I})g=Y<4
za4o|IrT&mj;nc*E)e7bezgN=Is?q~A$J7N`5J{prGv|&Hmj7lZpmr&u$lmL73m3ng
z3j52I7&WR3_Q628&zsQ3HtULWqW4C3a9TLw%a3T)>Pwy@E0`(>1Qi=%>5eSIrp^``
zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh
z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6
z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|<RS;Z+*5iFfn_*Vc-QMNxxfo!o?
zH51@GQOg_iT_Q17n%fc`4||OPs#m$}D9z{#Y$0r%8xkDNATAbf6eR|UnR9~M2;QOQ
zWo}VoMMoSTp!eu`{W%hKt7IV;D$P^JFFEGv1xrbWe5%UELHA&Z!FI1pu&jIF$<Vi1
zqv*np?Vsw@ZF7cOCZ_(9p}qe437yPr)m#~vrQw2~0qu9v#+*k^tkvKMzY#VL`gA{{
zWmXsD%fldey5BAf)|6_zjB!{~xOAXgUHprdP|_e#Mc#>ITJ}JDg@o8y>(rF9mXk5M
z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh
z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX
zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j!
zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(X<Ph=0r1{ZL;Vg=bE
zSIZl>uAYtTsYy-dz+w=<h$^Gt<{s|t5K7A#b?Ba+c#2dgaCBoNt&o;lNKaQo-<3%W
z_Gm=1En^0pU<_TMC#F7<p-<<KL+8mNWHHs6DN54Gal+oP3$*$f)1teZHp+)@OZ|7@
z;4kqmUEtU57s&s;9I|8*1@o_|Dc<+%Ulw=&;r&ME_8%fbbpM}kto`>$ir)VJpe!_$
z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~
z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3a<RsNwzYmXyAy!v9eE{MXlo4F6@4Yve3q
zXJhjX8p&ALntXRnuHP`y|AvoJly&Tog;4oGVWQ5~iCda|MFf)L6shG)5Rn(mS&6EV
z7KTO*G*)f&(_lpaegiv&46O4*1b^a~xAEeCr8eCg9B*@ZU9~$MZEp$q`F%qC5?>Pp
z;o)|L6Rk569KGxFLUPx@<HGa60}pjye$du13O98sg<VhBsmD^qsWBr!@Uqcra_^Lu
zsMyu&@|p<2Ij6`c7w7~HH5|l{8%OF|Y?fACrCZ(rrD`LKd)JNg%JDxRdz!H!vQaSj
z-8S{m{FPVhjZ$b?sZx%VWgCMOI%vHgop-00<|TKE7Xnt5f^}ZxW2)7V2qRJy0u$C$
zMOT<_m3Y6N+RsNj7W34O`8&|SO1E#Sf2R^NQrCInFYHS4zyoeEofI}!^r{|hCxgxo
z&dG11wq<9$xXFTi8Xon`m@>!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME
z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1
z4=jk@7EEj`u(jy$HnzE<Ca$JsCo?;tQXzoUOkX+?zYs79$PXT3<8rR1%%;jD6Jw(n
zm^y+3QHQXVHV`HCf@Rzv`e>33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5
zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H
z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|m<ae<x+Ns+QWn
z%oXLB$NLx$k)b3C(CU_gi-x47n<W*b%40&KN&<gl^T>oUBAV_^f$hpaUuyQeY3da^
zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl
z-Oy<F@F@fiD&L?No+bK6$L{r^zJ-Q{p$SwwuOmPR_%DQ8egwJqMa(|eksIZl`OzDR
zj9|d_CtGA};|2*J>lnqOpLg}or7_VNwRg2za3VBK6FUfFX{|<DWg0nlj3js2ESj`s
z)aM8n{xN?kOqh!@HS}G4z?FSc#p^WY%(ZBPdECx5J#1eC-&m(8*(Jq-fEL#|u`fQz
zXc=b2j4*X=@}W~$suCtX<0?@hoKHZX?+h)?5F?poTrr(p#%naK*J`b%Yy9O3d8>TD
z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t
zE<cajo+vA%Zvnkf<Iq-uHaW5<G|r^0CJ5bpSE3Dm-XgRa=`TdZMm(Oh&l*^8bihfw
zjB+5}XkLLPMPn8Vt2^eI*&~fT5E~r^W^g0OQIT)LTbOS;9a!u^T(;BGgu^3>%t!J0
zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9
z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$
zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_<RI*_O_lrvJ84DAH256#
z3eC1MHn`$0#$&-`hFSZh;iBbqR##S0E6UBhDXl3x?ZSR5AY@&R7^+OsqIHi=p?x8f
z=n2(LP-vG(Ae@jSmdB){8{9pO8%p1Z^iV(^;>muEFI}U_4$phjvY<qx5oqqagY80}
zrMk_jzGev7+Ub({^uk=;i(|2TS(oD6X_C8S90!mq-RNoDmEh@N74pLl?H6FiWbnXd
zKu*ceutW(s&Fk|m3PAv{LV&YGGhKI}fwTor`jg)D5FSOW^NyP(df=&9ic6DTl)hNf
zUc>gleK~`Fo`;GiC07&Hq1F<%p;9Q;<Xe3_FCmg*|Aach^kFcFlskYNsa&am9I}k`
zjXroS`w*4Lx;YY3e81m0xhI@%#}sG{yo63Bxo4!+;|ZL&#zVJo2-xNFZY@HhTGA5Q
zu_nZQ#s_sEev4!LGx~~vNj5<MuZ)PDFaUh&0A9P)^7+E`87vnM_IL6?F`lDj429(&
z#BB`WF4!(8o{w1j9by$~5!UcNX3;Y8#7gvT;|RNTLV<A`wP$9R?iJ;fMB3%bX~t!5
z6Hy`IbI3n>tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%<E8
zt2}_a<+M^mcDE({`12obY(CX99zVZXD$?Kg=l^hb{@de8$kEKj=G%JlTSVH#{=d-1
zl!R$1P$tw6`BxS|bBm@8&EJ8`CY2wXs?fyH1AhimFBdJ+#Z8gNr^;#%EB*}pxGoqX
zrBi8wG<8Vwa=dbrAA1`;!|`Wfm8R6647R~=!GHrf&W6c-g!~)!$>&p~D=K#KpfoJ@
zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXz<OPvYM
z5<_c34C*OE@`cJ{f4(B^NcsSrM$&?U;!j7RIo-XBEar5|7vm$X!C`;X2=e7LRm9|1
zW+mXxqY=9^2BXsNYaA&S3N3I(Kv%5pjqQsbg(_}s51H=ZfgwEwlnKSz*=1$XL+(nh
zlLg$P{)vV=wQ7ASg-3n4bfik^%qn#+KiXxQv1%gQ1z>jYaM{8$s&wEx@aVkQ6M{E2
zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S
zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7<rJ@yb}8E74K*Q4p4r_hYN
zomxAfCr-CH7kerDL>am^_F!Lz>;~{VrIO$;!#30X<R4_`F1&{kP+iobC%p71pBBa?
zNANR{wxl73<g3~CY81Sb1_|?u5&D=z4u969-7iBj(0k^r6CDL4i@!$hv*pFttVfne
zlP!;DYTV-2pF3Q!2^3Ln^i;yhqzVc^uX5&ahCV88>RhE1QqO_~#+Ux;B_D{Nk=grn
z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG
z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R
zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO
z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H
z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC
zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw
z*T#a=+WcTwL78exTgBn|i<XD(`oSVL$C7XWbynrm2=bmODFAID^^%i>NE3#EsOorO
z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d
zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8#
z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4
z0DIL&vsJ1_s%<@y%<g3`xa^3kvJfMBEmGJ~tFndO1Z%vCc8Zgxf=aJF97QE>U*-eX
z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY
zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H
z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8#
zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY
z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika
zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK}
zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{Jo<HJ2(zVM
zdrfuS=(NcS+d)i8*|qCcZ>hU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V
zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn
z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV
ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~-
zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$)
z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^<sxO5Y)({<KJW0sm-F~qcE*g3#C#zOPO
zBYiC#^m`{=`02@UiZA2R&;jR3r8t1)l|9s>VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$
z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm
zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)<YKT3UI7Fjk$9>2r9W<>
zT5L8BB^er<uILO|7Vl_#M<z3)r`u9+5Nvp_BV6l<^mzpQMIo?B#o;MQV8|s2bR#`<
z`UKNR%7CMs26OfWf@l5AnWyxI63&JZ`Ej`{6?tU#m|>3zxKt1v(y&OYk!^aoQisqU
zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i
z8lWr4g5nctBHtigX<z4z;FUZs1Rt0BH4BG~ITKEL*uQvkdUTa0Gdp`|7#=OQt*dyu
z7fhPO-g;DpXn%xZ!0N?v9@(e33a})zG5+WkbB4~AAtYO@PBcvIxR^9bA$P2b6-<hj
zWSnYBc`K6l(dd`$_0-tRt=|?8|0kdFei2qx@Lin`zCZsMRsExi$Qw9(tBwCZdUin(
z0^iDg2qItR4GmB(2dyEN0lGO95Mlo0As6ymv!HROJKAnQ@T7&!PCGDn!SGjK|LH6;
z$RUhjC>%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i
zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_<FX;|+Z
z^VFB*^&iv@396~5)VEJ}*Y{-Zf9Pxfw}Sa!KUKi=n_UsLaBy@|ayI<0um83EI-q(c
zi>!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB<Q`Lb@j61(w~b)-4<$Y4~1r
zlNw<^Y2#<8)rf)gl`%G+VcW^c&Fty(`FV@lO`uA`LOd%jq$~(cgk*?uZwT?k0pPrZ
zo+t*5VvGXE*+XhiNg&uE93qaQ{2BcsNeh|_vmvoDEaCvjn4pf8){P{&ub|Z!BU6#l
zNQ(3~>>u&aUQl+7GiY2|dAEg@%Al<Yf2v??M)puOFh}$+$gHS0<cXhikE<trh{({3
zhgCTb7i{`FW@rCx9EibOs=%P;Ix8anbF00OQj~}u9STY#lEVQ;xi^QSBh_dON=*q5
zQYgN%BCXb-uu(>3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3
zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI
z_(gk!k+0%CG)%!<DxMw1l>WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7
z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug
z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x
zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb
z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H
zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_
z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz
z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrH<kQHd~}J
zAD~wybRfTM+UmvVHc2ZQv1aD2<C1U)I83*JbOj6S@{{dn0KVxABZRwI4nuUlVG1``
zz32s=kZ8L9hxSharf^>Fcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4<ja$`!-2NG
zn1D|W)Q{TEH;iad_?nOeRVGH%&7ij4jI-l1^&;mP@tv+SMwoP_AAUQSX;OE}VKxrL
zDD8Z5eDc%O)YazgZm9_$$kcw#H%bA-BEmVIr83W)AXEZGsoF{UEX810x!of({PzeV
zTc7+$JZl-5`$9uS*qORqi`DW%fp<0-U>;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^%
zmrkc4o6rvBI;Q<?{}d_lXUu}Z_^RXH`ei@z%1y9jOmNv@<RB6tQ|ip%Kw=sbh!b^L
zRDS3D=`*MM&~l$H3izy<rT$FPqC;o3Tu6>8rj4*=AZacy*<VG&^x#1hI8HG+wj7-(
zu0K|S#l{`RH5@>n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K&
z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO
zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq
zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^<w!JEN0S;;1e`H0*1-T
zupKOqL;~E|dEpg(`q;y<)_+f;cw~Y7@~b0!il*@ekIYqdHFu4|6N#{w!y$w$8ChyG
z;4lI>(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1<WB97)WIclt^ZdN7u+$j|Sp
z<&S%p=BO^C&5noW|E?bvjn7aE(t~q<8W9_iOC8{?-T=X@6k(EX;Gl#78!F7F#(-nO
zf^^X>NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w
zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0
zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dW<jjp35)K11ftRLl8F-P=VGZ`sFP
zww@0NLvS#YtkDf9tP~TVdN?+o&_F{JExGS|AruEcYyxViRKAT&XwW$dn{a)<nRJhh
zFOJdIIjTK^f{g<T#})H6(>B7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG
ztIH<c*V1d}IIH*J46D|@k(->pY8<mzZk@T4fMCV)+hn7&D5;Dj^pIAj!lty5@KGj*
zWSa@5;uM}%tIJ^7xoDY!-I|G_Nk*w@sq}Y8W&CO`{ji&w5Q>F5xBP{mtQidqNRoz=
z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC
zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$#
zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G
zFj6bV{`Y6)YoKgqnir2&+sl+i<T@$SEZ%eR9?l3zWj#g`c-Lw}H7wQ*r%L{XdsDm&
z%d`kqM-m;<j+A8In$Vlqeios90uAT`vDQO7uZmwH8gBC#bT5E<AMsy(8}NZTRA}g5
zTK30aF-Hyup})^AeBroLxIZn6#16A7#mJ(H`l~mUL{1+RMoJ4$9z4FMdw5G;@K^4m
zcMEnAzX4%>6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+=
zYO=&t#5oSKB^pYhNd<Hq_&5{uJ|}pm4r<SDecAPoUA})>zPgH~aEGW2=ec1O#s-KG
z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn<
zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ|
zJ5Wlj+4<imnt5VSh{#EH?J85I(D8{GqX*DGBG49y<*RAh@;ZVb$!`%S>q~($hbtuY
zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l<x6}uP1
zAy`CA0Bn|?gC?$)o7%Qs19JHqWWaXBCF@4@7RA}nZKgehb4TZC*x(C&xzuvJ+8p>~
zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5&
znWoHlA-(z@<cR(|uZoa?qsg}_q=}8Ah10jYp3?UPpN-i!=>3n0=l{E)R-p8sB9XkV
zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J
zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g=
zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8
zCRvMB^{GO<hYvzi_zNjJ_f%lxMg&9p?Ue@Bdh}R->@j=cHfmy}_pCGbP%xb{pNN>?
z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0
zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jn<zuQv}MXkAvmK
z>TT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{<TCqd(tXkN<qFIG%?R^v;WX
zn@Z<x5J?wa8IzkozW<V%%VzNINoS-teut4!#}JvaS$+?)NB!fdp*~2?$LZz3i8Q2r
z!CUUyUL(KHY8!VCmh65-0wn!+JT@Z8qQ=xI$;jR00W|fZrD=EqH{JU&r7kt4#0uda
z)tyVkud^oypV5-GL|S9Q28-Fgh^g{+au*XvyU+PBRfde~V0YH&@(=OFm+uu5PIyD2
z+;GM173j-eR|o~!g`__Cp<-MxPR0C>)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)U<p_
z<(fJm141A9@ejJ#>s)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF
zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP#
zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w
zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|<OurhKj7AhIP9fa$WiDxZw0O`C
zl$gnInaT+JaxeYOWIX~L<E94!&v5t=YTZBB-Cejh&+7w2k6+i1yjrI>Uivj5u!xk0
z_^-N9r9o;(rFDt~<P@Uu1t^5KOIo3gYd*`+46a`i-I#16i8XEPtky1NUO^ug&iuG=
zvcW04MPuGtIQgs|CBh>q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL<LzN&s2xwaP
z8P|_&72HKdi^keo%R095hI}33g;^60x{bsqED0sYIW|UJo&%49uguwTV<~-C>^d!r
z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94
zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5<AQixtYx1IUP=}l%5^_Vk
zu_~{>VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?<l+{YY65v<7NSu!rgIjTK|JAKh0
zP(mT3%fX!OeiDy<K|oE?PGArmhz{oS_I0Ffe{Q0yn`EUkI>w}{>8>$3236T-VMh@B
zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG`
zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj
z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h<XV+-N;tx7Dg{-1n
z4p0EoIaaPlw?t`=Vny0SXwENgYJ(lh(Z0P4l7`dlY4^8VbjP>9sF@U20DHSB3~WMa
zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR
zE%B`Vi&m8f3T~&myTEK28BDWCV<JA}5XF~uqL>zfWir1I?03;pX))|kY5ClO^+bae
z*7E?g=3g7Eiis<nc{>YOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU=
zE*OY%QY58fW<zr{<(Uw3xq|Z8^Mt>#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=<le;F=
zNs927DJRmD$0H@82PP1_jl&kHJS}a$d*M^1?FQbZu@dl@L(S19iWIN@PkJieLZ8sp
zWY}fWj;RQBA+ZxXrxN|C>tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB
znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj
zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW<npgIKZod@86=L$l@UV-og~+P
zF^Cq!u7D=|VMssPkEa~A#3<M9hgAcQ9`d11wAsH9Sl4?LVQELZovE(0lc~Ohbk)C_
z<Uzj3F8qYsOgDW=8`rDOJHt5aS+k8n^;(uN&7QKLhxLK9vsuOPMltzH#|9W3f5>>Z
z<VqeGR8aAE?l-?A+*Lo-P!QVmbwiKi_?6Zbt!a;7y({Dt7R>`)>V2XC?NJT26mL^@
zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZup<vW@-CN-^l*>zM77m^=9
z&(a?-LxIq}*nvv)y?27lZ<w7FkNveuzOo#MDeLbLLG**T2Ocb2*L;5sp+~mbR!o6i
zKxHfT2+fHk9Qx0JhNz-tt5+@9eHK=q`=)`=@vlL!BQyWnYCHMCk+WkP9P&1aa~>{j
zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS
z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{<Q4%^#r!5dYcoI>`4
zU#kYOv{#A&gGPwT+$Ud}AXlK<N$OH?L<)1|=t5F9Z~D2jDlAR8LLg=oDRU<zMhGVd
zxlEk}Y|W?2c3`}Yh7uXk`PbaI96C&N@IrUyx&+@fCIYGa>3K7hYzo$(fBSFjrP{QQ
zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G!
z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4
zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms|
zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X
zu<yJ^W3#GSbIOvgJ#U%B0Ma!=977uBu!NN4nw=AO0Uo1e6rz&Jb-<htqoz3ltJJxR
z&6b%_$(g>cyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~
z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^
zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF!
z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJ<UrT~Lej6O)L
z%<A<Iu-Oj_+m%8nrO_-mEvGKjib6^rfHb|C@$p4s{u36j#BVGTi;!Z-nGpsHIq~r6
zKU7nX2qWk|M6E)<1IGmp6>isifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8
z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS
zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu
zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~
zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h<e;~yQl{K5W|5PTi-)$yIVACEY
z&8L*vkXrpk*<nYCDuS9r0473Zi#-H7*I&5^7bLd>?Y8rS1S&-G+m$FNMP?(8N`MZP
zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!b<q^T*2LyS}f6ndNi
zfjcbe>y?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA
zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP
zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|)
z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P
zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw
z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I
z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c
zfs`a<xZMUK<`7~5^<maZ213lG&62zHI6a~gdOM)+$bD)|YlPL&D6{#Kj2VP@S%l4C
zYEFS%WX?k%9)ZEUjfWdcDJy3``ws^Tby5uU+~V@g2xU>w?II0e(h=|7o&T+hq&m$;
zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h)
zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+<CUMBq319vPYnVd1J>K@61f}0e
z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$J<y%Uu
zA^rjI2h#ieAP(KB`x-3Pi#%$Cm1U!()0rCco^-tAJ-YY#czA*K6-gj9W+2YV?s{dQ
zHk9=TQt1W$)<+Yekq~#}jwB~i<?vGJS3<NTTEz5VlU}=L$BY9ri58&X2LIVtQTnY8
zUUAsD(>e1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`T<B}%UTJ{z-MxbW3W;d2}>Hd>2
zsWfU$9=p;<AM^JHlS(g}^P6vxdqrE;j;!9nG)BLNzCx~AkR?Q~I4xd|a>yLyJyM^t
zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2
zO?n3DEzpT+EoSV-%O<y((yvvSF?QMqxdQfG=o*Q6#R-cR=e>dvZvNF+pDd-ZVZ&d8
zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J
zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op%
z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX
ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx
zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc&
zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{<Q5<VrXfa>8r?;q3_kpZZ${?|(
z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K>
zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A
z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8
z6Mkf<hYq+N+d^*%bt_6*x!{0GmZRKsJJXiLN8wpS(Uv=olQpSC#H7i}3dsj}115`A
zRrOEh*UAQ#31Q<@<FO&t-@6oSx!J?T$;HK~a6bi~bg~t6E->>2)WunY2eU@C-Uj-A
zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q
zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK``
z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg
z191a<?QW(%>WoR<Qn_nViJDB$eYA@48M=Vocd~UoI?UjIG{dEPWMb>^rDX#@iSq0n
z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$
zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a
zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh
z)lMbA69y7*5u<i&?VY%Z=W?mMfy3!z6<A1aI%K1}Xd?Hl?dJQf>fET>P*gXQrxsW+
zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(<b<$P
zrQKJVs<E1Cpc3eq{3sQ_NehleK9n6)`f-wm%<q^77~-$G<~nFep?9LH|3iED7_8P#
zcw*i>6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBX<l&dvNqpyQo2jw$
zrd@`#K5C%`FsuU@hy`J^e+~XZ3lQXCVeo}vq)&vQ(T_FQ|Fd4iU8&|Q2ohawyv;R;
zfx)TQlL8omDR8_o9e(fA+gNuwe@-|Vw#@Z}KdC$td3&HZG{EU_+@l5Lz{S(H7g0}P
z!wyv;ZOFn|7phLo&)(PwGssTS%gCwaxG2(FB%{(6vQk<H{0)~}{b>QI2|g}FGJfJ+
zY-*2hB?o{TVL;Wt_ek;AP5PBqf<gA?#tcK;3^SZ5-nTDHqG&ERXI>DR4@Z->_182W
z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF
zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ
zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v
z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24
z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB
zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU*
zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t
zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB
z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N
z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk
zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo
z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA
zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)<c+_iMEd;(
zGLL=^97>cEZ%vge965AS_am#DK#pjPRr-!^za<I@zZ*$TBru6v#z=6sEocpKgm#@U
z8o7luVux;FoG93HzhvJ}mON7C5%uR;xrayiAZGNC25Gw>8>`kksCAUj(Xr*1NW5~e
zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s
zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj
zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%#
zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0<FW2(C+;`6@R(&V!T}nZ@BGPI13Hv
z<wqNxyJ4{qEz%XIXh)}VQsGBJBoDvJcT!nGH#oi>bD@_vGAr*NcFoMW;@r?@LUhRI
zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V>
zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh
z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g
zJGpKk%%Sdc5xBa$Q^_I~<!_b}V(wPjwRuYPvu?CY74EfG{}|QRE`T_gwr1k;)AuG4
z7le)9kxPOUWtpA~sIkm<L{dH~l*$S@4o(d-tyN{jEBNIBYeG}HF7_8v+HzYED*|%m
zo~*PNdU^)=dYkf6m{DgH^_nDQUSMrL<&_+Cb{%V>(F97eqDO7AN3EN0u)PNBAb+n+
zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v
z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$<ViJ-e8>N4yr^^o$ON8d{PQ=!O
zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35<qfV6)x_E#voH;)VbhGP8>va%4v>gc
zEX-@h8esj=a4s<wvJ3e2MtqV4>zW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1*
znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI
z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP>
zrp)BWKA9<}^R9g!0q7yWlh;g<zBc-?aGM%MCadUqnSv$C^W}sc59-0BreO!U{Mm|0
z3CDAgRc_dM>r_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(<RuHtO~&Za=?X_6<nz7
zw(HF9k0ZpKdtPF=yvHVvN@D1{T&=OwIXOy02tRXE<`|>36sFU&K8}hA85U61faW&{
zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx
zK%<ABSV(UXDR}tgQCAbq(aE-w5#QvQ^4cIwYTF>p23>M&=KTCgR!Ee8c?DAO2_R?B
zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU
zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B
zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw-
z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8
z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd
zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H
z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*(
ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)<fhL{STW
zCKVgP7+L7gGirDH*j4IcU3f+n$%@j+eIwPIz$nGcF%^9^L2-@+?uuB<mmhNS>diEX
zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_
zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J<Uo3Dow}b4<sm|~AepFFx<JRQ
z;@C=8w-3XbRxy&{Ri1>^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm
zZi-noqS!^F<U+etqoP_oqv6A;<$i>tb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@
zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*<aeKQiWTU&n{UPJAOz<P@4J
zLqbvAGWRlxF3rJT%Zs#uS%ba=YGlv6m;ga0Ewku2<S19&D8R64@(L`VAVh(8wD|a2
zr+h;*m)6-DlG$`>kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn`
zEgAp!h|r03h7B!$#<HdIGQExFhMG!)fkjs5v&9PaH42FGQy5*O@=Mvk-UY_Gjdhg{
zvXsB7u`m7#3R)`#yb_psv&Go{I{71(Pz_@Kp_dr6+OaLI-Jh6nqN`=rKkn2-j4l=~
zYV<9a%WWWoOL5m!gNO<%&fi56IJq$3#9Y||T~aHe+CWEN85g|<-R(`rSx|8q&z5fG
zd75dhW<xu{a>OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP
zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D
zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@
zK^kpH8=yFuP+vI^+59|3%Zqnb5lT<C_&&||JwB2A8I(SxBd85_4FP4jGKo^H&e|eh
z{d@VmkE?$Kgi<iX4wyn09aB8Tf;0fMC8){<Qgh<n659r*EfjMjE^|aLlTWs>DAykf
z9S#X`3N(X^SpdMyWQGO<uE=seV_X&nqnW_Lk7sq{{&Q9?zp^a+hc!9kPH%|mucKx2
z@`VUe$H6R>QRjhiwlj!0W-yD<3aEj^&X%<ayxe}$9y@mShqPE>=?`6lCy~?`&WSWt
z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRH<GjGM;DtcQ_6CnGGZEFIC
z{oVB-i}}7|r?+TCBn^~xMYR1g0)Sx$EjbHH8xH6*4MzpCVY~oV)XnYWx^M#3>Zphp
zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ
z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p
zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY<o7#$@8F`
z!^QQ~Gv>>zwgfm81DdoaVwNH;or{{eSyybt)m<=<Vv7lN92gNv->zXoA^RALYG-2t
zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhR<Y)DXC&;d=#e1HGk8LY;(a
zRJpcT4vE?_ZuN@`wVDIg%|R*=%xWzKr4jboKeb0rtwd<hA~78z6+Pa!>mh=)R0bg~
zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+
zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai<
z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF#
zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg%
zbOg8>mbRN%7^Um-7<qV!+EeJ_zzmJ+Tgur}U#*6$Xcp8z*Erk}1Kx!T1TSj!Nswev
zz_ql(^DNp0ZbjpmY1w3W5F<##TmeY91I$!r%9zh+l}r0Y03NDni(BSIIE9`<14)`F
z(O%vG+8J>oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq
zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi
zPbLg_pxm`+HZu<m?!7U-4WAkRIvA?nkvkJk^_16ra(2ol=>rtFZ;wZ=`Vk*do~$wB
zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P<!sMD{S;N+2xm_Iy|A<THmJ(q(zBs9
z{`8hwZw!;sY52Mv{PZHNHdMGpe-l}XgFAc7L((Zh-efNS8&OBK-q*?=k1^yLp9oq?
zXKGDo7f{c}l4LuYSg!=s#O8zm>;=!y-AjFrERh%<NThjqhiN^V&cU^&0-;PJ-F8o{
z_0WafIFBVHmq4f^7G$>8l<Q<3EuAjQ2q!ir*~U)WahySJt}|r+?=qIwHXpDm6o0y4
zzu1;usI_fWkfUF+HsiI?ahJJ9;Zy11^6IY&Kw{T6$^HwGhw+Cf&Eq|(xs<PVL%KQ(
zQ(mvhGN-!4ZWNu3_#zaJTKdHI-8`QWO9D^dPb8JaC}@_xNk?GJ!lvd3ZMmgA6_e+p
z#@uxY5VKmuz<aik42){V43PazPE_}c*!@hylFvpJ9qtcUEd#F;R*Z*5^rX1nTU*fW
zk^}Q55;Q5lk8=t6r#5<g@CoRaOWly*ek@2htiS<GRTz8ghOM`CwfXzHPsayr?@$gd
z?xR|uU$EmVB>a!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2
zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJ<h%wEQI?90-3Iwb5Q2a%HTg`X<|!{)4e
zIVme?9=s)>SBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-}
z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU?
zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R%
zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm
ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD
zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=<xP|}i?;|Ha4Ho!yWz@5
z!M=V~bc)aJpXa3@dSFq!67b<KyrYoy^rImueW0uZ>Es(9&S@K@)ZjA{lj3ea7_MBP
zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5
zI7{`Z=z_X*no8s>mY;>BvEXK%b<X{{%STg47gt$X*9kutJS&BGvKTvIweD(VYC<nt
zwQMUA5>`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo
zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2<oIH0nh^_?~eM}}~
zM7RGy;nU|Q_W|eq@L03*W<UGBkT&I?Zq{4O%6R@g4^9BKqeDs()g%6Z`RPF)ydD2q
z8w2L|?G6ragu-Hm=md;sV(YRKmTS5{_zi+ns1c)&a1_t)h6&9F$1NT+<uEnM6G8{C
z<Lg(8m7?V_PW;n-jq|<XvRcYiZ=8$4=u~^;ePSN}YzFqC(YI$x)`<b55vQhNpTU{E
z3=Lm@BZ{S%qMhHcZ_)Zu0LFnjvj~2Fq^PLetO|gRSn-Sj4cEB&J5tdh4j{U(o~Fs~
z6f!EiUkMIpVkbfns$%>O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw
z`P+tft^E2B$domKT@|nNW`EHwyj>&<JatrLQ=_3X%vd%nHh^z@vIk(<5%IRAa&Hjz
zw`TSyVMLV^L$N5Kk_i3ey6byDt)F^UuM+Ub4*8+XZpnnPUSBgu^ijLtQD>}K;eDpe
z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo
zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H
z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw
zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z
z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA
zv!b;%yo{g*9l2)>tsZJOOp}<O4sc<yR1sNBy|5I7n74G=1z0Dr2ehy3iPvLBZ;f-b
zZ-*+w=#CC69w!XBK{CuqVUpHW<6EX=3mlpSo;1W`I<PzL`wVUn4zAc@>U~8VUH`}$
z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK
zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z
z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3
z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I
zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6<
znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N
zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_
z%7SUeH6=TrXt<MN?vn1gM{@sUcicXMx<wh*157!ACmet?8y}@k4YruRB)zu6|2SUr
z_SY$8aVT%f+nX!cL>3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9A<A
z9eG$he;_xYvTb<C^^O*ri<NP#2zDKa{3y0iUAX-bh($%SEY-zDrc(H;-{|C^MBH%7
zQ<XKr(!C2H!h20PxJ$fAhF>TD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx
zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X
z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L
z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j(
ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA
zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|H<kb|JP0Sf2iU8
z*A!RH!WG*L)kkz~__ja%l+-0&S;j~!=>Q`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^
zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K!
z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^<YwjQ_+}b9YN{-?
z8$nPR24eGm^0ONvx{_yQUftd?gZA9r1&AhZE`KyH(E&?Dr(T%7y4}wf23_<g_P~Lo
zfl2!Lz3^s|Bt0Y`J=L2;hE6O2^iI|2sy!KlJ6QXd!shmpT`efAiS|rJ#~@;A=ElU4
zf|Atszw~DyBHZz~DYJKdP^YF$CmA;Av_d^2r$xk*Ol3#2AaLE+`4$D>vq@Q_SRl|V
z<K6MCDh!HyhqG~6QZl9vgOu*O*A%hXw@C^N4vl$K%J_Un%Pj8sntS$tL2JL8@fGnz
zKdgwc#)4>#lU<~n67$mT)NvHh`%als+G-)<RP8}Lm1(>x1`Y%4Bp*6Un5Ri9h=_Db
zA-AdP!f>f0m@~>7X#uBM?diI@)<i^0HH{;?N#a0(iBzci_Wf~4Q30>Egjuz@jXKvm
zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#>
z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|<ymri8HZUvO#j1!=ghZfRc+IFzD}2jz
zF~-YaCK0eJaU|71)hkYhd3gpMX`~acH9p)o*(lH_l$NvVTFyw>rlC1EA<1#`iuyNO
z(=;irt{_&K=i4)<v!an~8M+!RO3Pu5i8ijMT5k?QA!WfgLbPwaNncG**$|bYY&^b|
za#}BovCAZwmv~T_NxDWlgaf%8mm~;hEYyh@LBDEL_Lv;G<6cMw@}C)ae%*fY_bz1E
zYjRbUnF722om(1?(5Od?Fv6U9v}V123!1}%+k=AKAUJ8(RW}Z|JRbT?1IKy6+KdLl
zg4^-+2WQKQ(n#tgf>^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN
zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf
z<Dm0m6*5#9z#Or>L#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b
z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY
z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ
zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84
z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d
zbzar4Fz&RSR(-|s!Z6+za<RMqM6r<a8m4_W4@xudUaL`kYe!J{3$)f)<@qubwM>&Z
zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G<v0=FK_o4?)_o$On2SwsLA)
zAL=#giAbzu?wj?Q!HMZ88z~dvA0qhj><yLu;FG~#j}T@O&r9^`c*wbrvR+;FAlICf
z>{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr
zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm<x=jTo9rTg0-%J
zWNEm*V8c4r7QAx26oZW5UF9cVFc0`g<KL-WgeOmnmRPjT$|lN6TF;HvY7vV(tRLTb
z8uIAJ{`Es>%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ
z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv<YASosL#4GF1!A3@keRVH!qKUDe
zs>5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<xwCoyd4@^k2~0q8Df75qt{KP;
z3{98Wv)@EV;OO`|NfGH;xuoE9ZDc^|)V9EwIm62D><815<5sOHQdeax9_!PyM&;{P
zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l
zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J
zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA
z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm
z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L%
z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+W<RPz6+mY*%d3J)K!a*Ub0W$a5pu1
zpyaIK1a78VM236d(*4sF@@>XyYu*y3?px*=8MAK@E<PuYbQvYYK2!f5b9Cy!e$TNp
zMY7J8HpGh|9Bjf*Idamg2ERm)e{b9LHdb9?YNyojTH<?DjjnUQ>A+jRX8{CG?GI-<
z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*<xX3U4nrX>qVE*y0`7J>l2wCmW
zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw
z4)>7caf^Ki_KJ^Zx2JU<ZPR++15&8=g)pSnC#hVMzLaXTIn)IvSecpkHX^1;d_rY?
zWm=trnZ!T)YDNnx<@(zFs`C45VphY}?`!eK+aW8;n<`R!$HEHFhJAb}ZIlv@QNH>b
z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ
zC(JupLfFp8y43%PMj2<jX-4>}T|VS@%LVp>hv4Y!RPMF?pp8U_$xC<zY9x_$+V&y?
z%ggZbvSdVgik5BAbm-Ftp~4HWL&=)5o*T4|NCw7tuov0#3S6)pIFp~1kKbXck>J)S
zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST
zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl
z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR&
zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk
z<FxEze9^xvxnESw>wDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){}
zGr}Exom_qDO<O<j9nJ)?Y~gzRH)#Pa9m&xBkERN?emFcV5ufEOJ2@ymi~NADMO#e|
zm3$Y`Qr6eFm@fJzy6{bQyYa!h5_7$!31PwlzM;{PTS(jOqytiFR=Z^G(T6=3zki3Z
zODwSc&;!1$`j^}Chu=p8`l*I`?c%7uCEEWb!B!D}!KqHMqto!(tM<}~69fA2M#rQM
zHL({#Y<tF{W1#`xjsf>{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy
z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7<IimT^vc0C7pVQ-47I(-2v`Zz3QM
zH>z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6
zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj
zKYug($r*Q#W9`p%Bf{bi6;IY0v`p<Cd?8q@KbSVydTLPOx!FvQL^AvtYyA50`0#iE
z*~tCT1#fR@Pd<y%kQR&FN$Lu72{CyZH^s&)c%`^AhWPp5M`u~n>B^^qu)gbg9QHQ7
zWBj(a1Y<Ascy19=4!Q5eQC}Cr8HZOpnQ?fvLusFy^%nO}+WZ^Q6PUc#b7?-wv8^Lo
zCo^00U@TT;aDw34ybbw`7ygAGV{2A+JoS3Q;ln?y3c-5q`v*;!(lb%b(SwJW($i3K
zYz1ErOBGIXEq>Su)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>k<aytXNR7m
zdbaDr(Radm6E^VfQ9=(LPZw%GEe@A#*X=d23tcN*8@XP}le-XkXD@l%m$sh|$yGN)
zZq_i?GJ2mC;ffRUMr7{|d&uO?lZ6rqd9YKmjm@p=TY^qSbE8pKm%C7}*~@h?M>YJC
z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8i<y3`IAxI(@3{*kt%`K$WVM
zSPYzL`zEXl3>Vx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E
z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg
zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d
zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju
z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR
zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O
zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY
zSmfi)F`m94zL8>#zu;8|{aBui@<qa6D<KXBg_4<Uq2!V_1GyE#=XV!Sw1?$fa1P)-
z0k6#qT=1StiUXrh1Fa8C47_m|x8>RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm)<gBX8r
z;(`D;^1J(C2?R5coEz)AkTn3>{>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o
zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(<!Q7sdN|q2!XB#p&W!)*qtk
z$JSJU5UViu`N#q)-a>*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(X<b%Mfi~wW2
zcrMz2oi2^;F!aNKoS`<riqQz?gEhn9y!`RBy9Vu7omK=UiNXd32HAy%gZEt0MzExo
zMgPuBMp;L+x!?Nv-dzHmZtxOY#AOF3DH>ekg*ix@r|ymDw*{*s0?dlVys2e)z62u1
z+k3esbJE=-<rwJFjbPjscWJCH?e_iV0s9*YSI-0M>P5S$&KdFp+2H7_2e=}OKDrf(
z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9
z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB
z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc
zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>K<s82;aM7oy#NR<HL(|<XRL><DEv>we
zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L<CSg)I*<&=O@v_L$?1=
zEYv!liaioa5BukR6(|#GBur)2M$u!=$7d{eEQfmbQmIAJE1)j#;0tX&)OeICv^#F4
zLi648+lCY>0JV9f3g{-RK!A?vBUA}${YF(vO<sZ0ij3f(no##Hs;2ST6=>4)@`6f1
z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ
zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg
zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi!
zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0&
QuEJmfE|#`Dqx|px0L@K;Y5)KL

diff --git a/builds/android/gradle/wrapper/gradle-wrapper.properties b/builds/android/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..fae08049a 100644
--- a/builds/android/gradle/wrapper/gradle-wrapper.properties
+++ b/builds/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From db484945ba3a04c06ab941d2ac23d896353167b9 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Thu, 28 Mar 2024 11:42:46 +0100
Subject: [PATCH 044/222] Update Android SDL to 2.30.1 Minimize diff

---
 .gitattributes                                           | 4 +---
 builds/android/app/build.gradle                          | 1 +
 builds/android/app/src/main/AndroidManifest.xml          | 9 +++++++--
 .../org/easyrpg/player/player/EasyRpgPlayerActivity.java | 8 ++++++++
 .../src/main/java/org/libsdl/app/HIDDeviceManager.java   | 7 +++++++
 .../app/src/main/java/org/libsdl/app/SDLActivity.java    | 6 +++---
 .../app/src/main/java/org/libsdl/app/SDLSurface.java     | 4 ++--
 7 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 38bc2e14d..cdc1f9d1a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,8 +17,6 @@ src/midisequencer.* -diff linguist-vendored
 src/midisynth.* -diff linguist-vendored
 src/picojson.h -diff linguist-vendored
 CMakePresets.json -diff linguist-generated
-builds/android/app/src/main/java/org/libsdl/app/SDL*.java -diff linguist-vendored
+builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
 builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
-builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java diff
-builds/android/app/src/main/java/org/libsdl/app/HID*.java -diff linguist-vendored
 src/generated/* -diff linguist-generated
diff --git a/builds/android/app/build.gradle b/builds/android/app/build.gradle
index 4c227e130..5eca60e3c 100644
--- a/builds/android/app/build.gradle
+++ b/builds/android/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 android {
+    namespace "org.easyrpg.player"
     compileSdkVersion 33
     buildToolsVersion '33.0.0'
     ndkVersion '21.4.7075529'
diff --git a/builds/android/app/src/main/AndroidManifest.xml b/builds/android/app/src/main/AndroidManifest.xml
index 9ef5c3332..877625116 100644
--- a/builds/android/app/src/main/AndroidManifest.xml
+++ b/builds/android/app/src/main/AndroidManifest.xml
@@ -2,9 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.easyrpg.player"
-    android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.0">
+    android:versionName="1.0"
+    android:installLocation="auto">
+
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />
     <!-- Touchscreen support -->
@@ -38,6 +39,10 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
 
+        <!-- Setting SDL hints from AndroidManifest.xml: -->
+        <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0" />
+        <meta-data android:name="SDL_ENV.SDL_APP_NAME" android:value="EasyRPG Player" />
+
         <!-- Startup Activity -->
         <activity
             android:name=".InitActivity"
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
index fc37f6144..50a269321 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
@@ -84,6 +84,14 @@ public class EasyRpgPlayerActivity extends SDLActivity implements NavigationView
     private boolean uiVisible = true;
     SurfaceView surface;
 
+    @Override
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            "easyrpg_android"
+        };
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index 5310d6016..e7281fdf2 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -285,6 +285,7 @@ private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterfa
             0x24c6, // PowerA
             0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -358,6 +359,12 @@ private void connectHIDDeviceUSB(UsbDevice usbDevice) {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
         if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
             mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
diff --git a/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index e1f5e8434..c594704f6 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -62,8 +62,8 @@
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 28;
-    private static final int SDL_MICRO_VERSION = 5;
+    private static final int SDL_MINOR_VERSION = 30;
+    private static final int SDL_MICRO_VERSION = 1;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -276,7 +276,7 @@ protected String[] getLibraries() {
             // "SDL2_mixer",
             // "SDL2_net",
             // "SDL2_ttf",
-            "easyrpg_android"
+            "main"
         };
     }
 
diff --git a/builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java b/builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java
index d894c9791..0857e4b6f 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java
@@ -354,11 +354,11 @@ public void onSensorChanged(SensorEvent event) {
                 SDLActivity.onNativeOrientationChanged(newOrientation);
             }
 
-            /* EasyRPG modification: prevent movement to be input
             SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
                                       y / SensorManager.GRAVITY_EARTH,
                                       event.values[2] / SensorManager.GRAVITY_EARTH);
-            */
+
+
         }
     }
 

From ae1e7594295a3f3e9b5d5429704c311f15568645 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 30 Mar 2024 00:39:09 +0100
Subject: [PATCH 045/222] CMake: Add WiiU preset

---
 CMakePresets.json                       | 84 +++++++++++++++++++++++++
 builds/cmake/CMakePresets.json.template |  9 +++
 2 files changed, 93 insertions(+)

diff --git a/CMakePresets.json b/CMakePresets.json
index ff2cde875..d97ed5bab 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -656,6 +656,66 @@
 				"type-release"
 			]
 		},
+		{
+			"name": "wiiu-parent",
+			"toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake",
+			"cacheVariables": {
+				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
+			},
+			"inherits": "dkp-user",
+			"hidden": true
+		},
+		{
+			"name": "wiiu-debug",
+			"displayName": "Nintendo WiiU (Debug)",
+			"inherits": [
+				"wiiu-parent",
+				"type-debug"
+			]
+		},
+		{
+			"name": "wiiu-relwithdebinfo",
+			"displayName": "Nintendo WiiU (RelWithDebInfo)",
+			"inherits": [
+				"wiiu-parent",
+				"type-relwithdebinfo"
+			]
+		},
+		{
+			"name": "wiiu-release",
+			"displayName": "Nintendo WiiU (Release)",
+			"inherits": [
+				"wiiu-parent",
+				"type-release"
+			]
+		},
+		{
+			"name": "wiiu-libretro-debug",
+			"displayName": "Nintendo WiiU (libretro core) (Debug)",
+			"inherits": [
+				"build-libretro",
+				"wiiu-parent",
+				"type-debug"
+			]
+		},
+		{
+			"name": "wiiu-libretro-relwithdebinfo",
+			"displayName": "Nintendo WiiU (libretro core) (RelWithDebInfo)",
+			"inherits": [
+				"build-libretro",
+				"wiiu-parent",
+				"type-relwithdebinfo"
+			]
+		},
+		{
+			"name": "wiiu-libretro-release",
+			"displayName": "Nintendo WiiU (libretro core) (Release)",
+			"inherits": [
+				"build-libretro",
+				"wiiu-parent",
+				"type-release"
+			]
+		},
 		{
 			"name": "psvita-parent",
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/vita/vitasdk/share/vita.toolchain.cmake",
@@ -971,6 +1031,30 @@
 			"name": "wii-libretro-release",
 			"configurePreset": "wii-libretro-release"
 		},
+		{
+			"name": "wiiu-debug",
+			"configurePreset": "wiiu-debug"
+		},
+		{
+			"name": "wiiu-relwithdebinfo",
+			"configurePreset": "wiiu-relwithdebinfo"
+		},
+		{
+			"name": "wiiu-release",
+			"configurePreset": "wiiu-release"
+		},
+		{
+			"name": "wiiu-libretro-debug",
+			"configurePreset": "wiiu-libretro-debug"
+		},
+		{
+			"name": "wiiu-libretro-relwithdebinfo",
+			"configurePreset": "wiiu-libretro-relwithdebinfo"
+		},
+		{
+			"name": "wiiu-libretro-release",
+			"configurePreset": "wiiu-libretro-release"
+		},
 		{
 			"name": "psvita-debug",
 			"configurePreset": "psvita-debug"
diff --git a/builds/cmake/CMakePresets.json.template b/builds/cmake/CMakePresets.json.template
index 3ac67ab38..842a573da 100644
--- a/builds/cmake/CMakePresets.json.template
+++ b/builds/cmake/CMakePresets.json.template
@@ -111,6 +111,15 @@
 			},
 			"inherits": "dkp-user"
 		},
+		{
+			"name": "wiiu",
+			"displayName": "Nintendo WiiU",
+			"toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake",
+			"cacheVariables": {
+				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
+			},
+			"inherits": "dkp-user"
+		},
 		{
 			"name": "psvita",
 			"displayName": "PlayStation Vita",

From ed628245517eeaa4f3f0f9403bbbe7bbb456075e Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 30 Mar 2024 13:27:58 +0100
Subject: [PATCH 046/222] CMake Presets: Remove windows-x86 and windows-x64 and
 replace it with windows.

Ninja does not support setting of the machine type.
Instead the appropriate VS setup script must be executed beforehand.

VS2022 targets are kept as they support this.
---
 CMakePresets.json                       | 148 +++++-------------------
 builds/cmake/CMakePresets.json.template |  15 +--
 2 files changed, 35 insertions(+), 128 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index d97ed5bab..212cdb2f7 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -133,61 +133,61 @@
 			]
 		},
 		{
-			"name": "windows-x86-parent",
+			"name": "windows-parent",
 			"cacheVariables": {
-				"VCPKG_TARGET_TRIPLET": "x86-windows-static"
+				"VCPKG_TARGET_TRIPLET": "$env{VSCMD_ARG_TGT_ARCH}-windows-static"
 			},
 			"inherits": "win-user",
 			"hidden": true
 		},
 		{
-			"name": "windows-x86-debug",
-			"displayName": "Windows (x86) (Debug)",
+			"name": "windows-debug",
+			"displayName": "Windows (Debug)",
 			"inherits": [
-				"windows-x86-parent",
+				"windows-parent",
 				"type-debug"
 			]
 		},
 		{
-			"name": "windows-x86-relwithdebinfo",
-			"displayName": "Windows (x86) (RelWithDebInfo)",
+			"name": "windows-relwithdebinfo",
+			"displayName": "Windows (RelWithDebInfo)",
 			"inherits": [
-				"windows-x86-parent",
+				"windows-parent",
 				"type-relwithdebinfo"
 			]
 		},
 		{
-			"name": "windows-x86-release",
-			"displayName": "Windows (x86) (Release)",
+			"name": "windows-release",
+			"displayName": "Windows (Release)",
 			"inherits": [
-				"windows-x86-parent",
+				"windows-parent",
 				"type-release"
 			]
 		},
 		{
-			"name": "windows-x86-libretro-debug",
-			"displayName": "Windows (x86) (libretro core) (Debug)",
+			"name": "windows-libretro-debug",
+			"displayName": "Windows (libretro core) (Debug)",
 			"inherits": [
 				"build-libretro",
-				"windows-x86-parent",
+				"windows-parent",
 				"type-debug"
 			]
 		},
 		{
-			"name": "windows-x86-libretro-relwithdebinfo",
-			"displayName": "Windows (x86) (libretro core) (RelWithDebInfo)",
+			"name": "windows-libretro-relwithdebinfo",
+			"displayName": "Windows (libretro core) (RelWithDebInfo)",
 			"inherits": [
 				"build-libretro",
-				"windows-x86-parent",
+				"windows-parent",
 				"type-relwithdebinfo"
 			]
 		},
 		{
-			"name": "windows-x86-libretro-release",
-			"displayName": "Windows (x86) (libretro core) (Release)",
+			"name": "windows-libretro-release",
+			"displayName": "Windows (libretro core) (Release)",
 			"inherits": [
 				"build-libretro",
-				"windows-x86-parent",
+				"windows-parent",
 				"type-release"
 			]
 		},
@@ -252,66 +252,6 @@
 				"type-release"
 			]
 		},
-		{
-			"name": "windows-x64-parent",
-			"architecture": "x64",
-			"cacheVariables": {
-				"VCPKG_TARGET_TRIPLET": "x64-windows-static"
-			},
-			"inherits": "win-user",
-			"hidden": true
-		},
-		{
-			"name": "windows-x64-debug",
-			"displayName": "Windows (x64) (Debug)",
-			"inherits": [
-				"windows-x64-parent",
-				"type-debug"
-			]
-		},
-		{
-			"name": "windows-x64-relwithdebinfo",
-			"displayName": "Windows (x64) (RelWithDebInfo)",
-			"inherits": [
-				"windows-x64-parent",
-				"type-relwithdebinfo"
-			]
-		},
-		{
-			"name": "windows-x64-release",
-			"displayName": "Windows (x64) (Release)",
-			"inherits": [
-				"windows-x64-parent",
-				"type-release"
-			]
-		},
-		{
-			"name": "windows-x64-libretro-debug",
-			"displayName": "Windows (x64) (libretro core) (Debug)",
-			"inherits": [
-				"build-libretro",
-				"windows-x64-parent",
-				"type-debug"
-			]
-		},
-		{
-			"name": "windows-x64-libretro-relwithdebinfo",
-			"displayName": "Windows (x64) (libretro core) (RelWithDebInfo)",
-			"inherits": [
-				"build-libretro",
-				"windows-x64-parent",
-				"type-relwithdebinfo"
-			]
-		},
-		{
-			"name": "windows-x64-libretro-release",
-			"displayName": "Windows (x64) (libretro core) (Release)",
-			"inherits": [
-				"build-libretro",
-				"windows-x64-parent",
-				"type-release"
-			]
-		},
 		{
 			"name": "windows-x64-vs2022-parent",
 			"generator": "Visual Studio 17 2022",
@@ -828,28 +768,28 @@
 			"configurePreset": "linux-libretro-release"
 		},
 		{
-			"name": "windows-x86-debug",
-			"configurePreset": "windows-x86-debug"
+			"name": "windows-debug",
+			"configurePreset": "windows-debug"
 		},
 		{
-			"name": "windows-x86-relwithdebinfo",
-			"configurePreset": "windows-x86-relwithdebinfo"
+			"name": "windows-relwithdebinfo",
+			"configurePreset": "windows-relwithdebinfo"
 		},
 		{
-			"name": "windows-x86-release",
-			"configurePreset": "windows-x86-release"
+			"name": "windows-release",
+			"configurePreset": "windows-release"
 		},
 		{
-			"name": "windows-x86-libretro-debug",
-			"configurePreset": "windows-x86-libretro-debug"
+			"name": "windows-libretro-debug",
+			"configurePreset": "windows-libretro-debug"
 		},
 		{
-			"name": "windows-x86-libretro-relwithdebinfo",
-			"configurePreset": "windows-x86-libretro-relwithdebinfo"
+			"name": "windows-libretro-relwithdebinfo",
+			"configurePreset": "windows-libretro-relwithdebinfo"
 		},
 		{
-			"name": "windows-x86-libretro-release",
-			"configurePreset": "windows-x86-libretro-release"
+			"name": "windows-libretro-release",
+			"configurePreset": "windows-libretro-release"
 		},
 		{
 			"name": "windows-x86-vs2022-debug",
@@ -875,30 +815,6 @@
 			"name": "windows-x86-vs2022-libretro-release",
 			"configurePreset": "windows-x86-vs2022-libretro-release"
 		},
-		{
-			"name": "windows-x64-debug",
-			"configurePreset": "windows-x64-debug"
-		},
-		{
-			"name": "windows-x64-relwithdebinfo",
-			"configurePreset": "windows-x64-relwithdebinfo"
-		},
-		{
-			"name": "windows-x64-release",
-			"configurePreset": "windows-x64-release"
-		},
-		{
-			"name": "windows-x64-libretro-debug",
-			"configurePreset": "windows-x64-libretro-debug"
-		},
-		{
-			"name": "windows-x64-libretro-relwithdebinfo",
-			"configurePreset": "windows-x64-libretro-relwithdebinfo"
-		},
-		{
-			"name": "windows-x64-libretro-release",
-			"configurePreset": "windows-x64-libretro-release"
-		},
 		{
 			"name": "windows-x64-vs2022-debug",
 			"configurePreset": "windows-x64-vs2022-debug"
diff --git a/builds/cmake/CMakePresets.json.template b/builds/cmake/CMakePresets.json.template
index 842a573da..e70920e14 100644
--- a/builds/cmake/CMakePresets.json.template
+++ b/builds/cmake/CMakePresets.json.template
@@ -22,10 +22,10 @@
 			}
 		},
 		{
-			"name": "windows-x86",
-			"displayName": "Windows (x86)",
+			"name": "windows",
+			"displayName": "Windows",
 			"cacheVariables": {
-				"VCPKG_TARGET_TRIPLET": "x86-windows-static"
+				"VCPKG_TARGET_TRIPLET": "$env{VSCMD_ARG_TGT_ARCH}-windows-static"
 			},
 			"inherits": "win-user"
 		},
@@ -39,15 +39,6 @@
 			},
 			"inherits": "win-user"
 		},
-		{
-			"name": "windows-x64",
-			"displayName": "Windows (x64)",
-			"architecture": "x64",
-			"cacheVariables": {
-				"VCPKG_TARGET_TRIPLET": "x64-windows-static"
-			},
-			"inherits": "win-user"
-		},
 		{
 			"name": "windows-x64-vs2022",
 			"displayName": "Windows (x64) using Visual Studio 2022",

From efd2d18d263971ec6712a08772ea69e721a5c9df Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 30 Mar 2024 13:37:21 +0100
Subject: [PATCH 047/222] CMake Presets: The Prefix path is now appended, not
 overwritten

---
 CMakeLists.txt                          |  3 +++
 CMakePresets.json                       | 14 +++++++-------
 builds/cmake/CMakePresets.json.template | 14 +++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88c93137a..23e1bf412 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,9 @@ include(PlayerBuildType)
 include(PlayerMisc)
 include(GetGitRevisionDescription)
 
+# Dependencies provided by CMake Presets
+list(APPEND CMAKE_PREFIX_PATH "${PLAYER_PREFIX_PATH_APPEND}")
+
 # C++17 is required
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/CMakePresets.json b/CMakePresets.json
index 212cdb2f7..2f2d4e5da 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -76,7 +76,7 @@
 			"name": "linux-parent",
 			"toolchainFile": "${sourceDir}/builds/cmake/LinuxToolchain.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/linux-static"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/linux-static"
 			},
 			"hidden": true,
 			"inherits": "base-user"
@@ -316,7 +316,7 @@
 		{
 			"name": "macos-parent",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/osx",
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/osx",
 				"CMAKE_OSX_DEPLOYMENT_TARGET": "10.9"
 			},
 			"condition": {
@@ -382,7 +382,7 @@
 			"name": "emscripten-parent",
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/emscripten/emsdk-portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
 				"CMAKE_FIND_ROOT_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
 				"PLAYER_JS_BUILD_SHELL": "ON"
 			},
@@ -418,7 +418,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "3ds",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
 			},
 			"inherits": "dkp-user",
 			"hidden": true
@@ -479,7 +479,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "switch",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/switch"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch"
 			},
 			"inherits": "dkp-user",
 			"hidden": true
@@ -540,7 +540,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "wii",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wii"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii"
 			},
 			"inherits": "dkp-user",
 			"hidden": true
@@ -600,7 +600,7 @@
 			"name": "wiiu-parent",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
 			},
 			"inherits": "dkp-user",
 			"hidden": true
diff --git a/builds/cmake/CMakePresets.json.template b/builds/cmake/CMakePresets.json.template
index e70920e14..15a21b7ea 100644
--- a/builds/cmake/CMakePresets.json.template
+++ b/builds/cmake/CMakePresets.json.template
@@ -18,7 +18,7 @@
 			"displayName": "Linux",
 			"toolchainFile": "${sourceDir}/builds/cmake/LinuxToolchain.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/linux-static"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/linux-static"
 			}
 		},
 		{
@@ -53,7 +53,7 @@
 			"name": "macos",
 			"displayName": "macOS",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/osx",
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/osx",
 				"CMAKE_OSX_DEPLOYMENT_TARGET": "10.9"
 			},
 			"condition": {
@@ -67,7 +67,7 @@
 			"displayName": "Emscripten (Web)",
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/emscripten/emsdk-portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
 				"CMAKE_FIND_ROOT_PATH": "$env{EASYRPG_BUILDSCRIPTS}/emscripten",
 				"PLAYER_JS_BUILD_SHELL": "ON"
 			}
@@ -78,7 +78,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "3ds",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
 			},
 			"inherits": "dkp-user"
 		},
@@ -88,7 +88,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "switch",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/switch"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch"
 			},
 			"inherits": "dkp-user"
 		},
@@ -98,7 +98,7 @@
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake",
 			"cacheVariables": {
 				"PLAYER_TARGET_PLATFORM": "wii",
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wii"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii"
 			},
 			"inherits": "dkp-user"
 		},
@@ -107,7 +107,7 @@
 			"displayName": "Nintendo WiiU",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/WiiU.cmake",
 			"cacheVariables": {
-				"CMAKE_PREFIX_PATH": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
+				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wiiu"
 			},
 			"inherits": "dkp-user"
 		},

From 73c0023d447b92971dfccadc00bedc0430e76876 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Wed, 27 Mar 2024 23:26:15 +0100
Subject: [PATCH 048/222] Resolve flathub linter warnings

---
 resources/unix/easyrpg-player.metainfo.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/unix/easyrpg-player.metainfo.xml b/resources/unix/easyrpg-player.metainfo.xml
index a90f184c2..cb5bc4f05 100644
--- a/resources/unix/easyrpg-player.metainfo.xml
+++ b/resources/unix/easyrpg-player.metainfo.xml
@@ -2,7 +2,7 @@
 <component type="desktop-application">
 	<id>org.easyrpg.player</id>
 	<name>EasyRPG Player</name>
-	<summary>Play your RPG Maker games everywhere</summary>
+	<summary>RPG Maker 2000/2003 interpreter</summary>
 	<developer_name>EasyRPG Team</developer_name>
 	<update_contact>easyrpg_AT_easyrpg.org</update_contact>
 
@@ -52,12 +52,15 @@
 	<screenshots>
 		<screenshot type="default">
 			<image>https://easyrpg.org/images/player/testgame.png</image>
+			<caption>Our TestGame</caption>
 		</screenshot>
 		<screenshot>
 			<image>https://easyrpg.org/images/player/name_input.png</image>
+			<caption>Name Input Scene</caption>
 		</screenshot>
 		<screenshot>
 			<image>https://easyrpg.org/images/player/yume_nikki.png</image>
+			<caption>Yume Nikki freeware game</caption>
 		</screenshot>
 	</screenshots>
 

From 631f8eb99012f2421ac45d35da04aaed8bdb7793 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Wed, 27 Mar 2024 23:33:44 +0100
Subject: [PATCH 049/222] Add former unsupported URL types

---
 resources/unix/easyrpg-player.metainfo.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/unix/easyrpg-player.metainfo.xml b/resources/unix/easyrpg-player.metainfo.xml
index cb5bc4f05..0e851040e 100644
--- a/resources/unix/easyrpg-player.metainfo.xml
+++ b/resources/unix/easyrpg-player.metainfo.xml
@@ -43,10 +43,8 @@
 	<url type="contact">https://easyrpg.org/contact</url>
 	<url type="bugtracker">https://github.com/EasyRPG/Player/issues</url>
 	<url type="translate">https://translate.easyrpg.org</url>
-	<!-- these tags are reported as invalid currently, old appstream-util: https://github.com/ximion/appstream/blob/v0.15.4/NEWS#L31
-		<url type="contribute">https://easyrpg.org/contribute</url>
-		<url type="vcs-browser">https://github.com/EasyRPG/Player</url>
-	-->
+	<url type="contribute">https://easyrpg.org/contribute</url>
+	<url type="vcs-browser">https://github.com/EasyRPG/Player</url>
 
 	<launchable type="desktop-id">easyrpg-player.desktop</launchable>
 	<screenshots>

From 3c3bd732a1a424f810b23722bd47436741b617f9 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Thu, 28 Mar 2024 02:21:31 +0100
Subject: [PATCH 050/222] Update flatpak manifest from flathub package Build
 liblcf out-of-tree

---
 builds/flatpak/org.easyrpg.player.yml | 90 +++++++++++----------------
 1 file changed, 38 insertions(+), 52 deletions(-)

diff --git a/builds/flatpak/org.easyrpg.player.yml b/builds/flatpak/org.easyrpg.player.yml
index 25b4a0b65..c99edee76 100644
--- a/builds/flatpak/org.easyrpg.player.yml
+++ b/builds/flatpak/org.easyrpg.player.yml
@@ -1,6 +1,6 @@
 app-id: org.easyrpg.player
 runtime: org.freedesktop.Platform
-runtime-version: '21.08'
+runtime-version: '23.08'
 sdk: org.freedesktop.Sdk
 command: easyrpg-player
 rename-desktop-file: easyrpg-player.desktop
@@ -11,26 +11,29 @@ finish-args:
   - --socket=wayland
   - --socket=fallback-x11
   - --socket=pulseaudio
-  - --filesystem=host # insecure
-#  - --filesystem=home # more secure
-  - --device=all # needed for gamepad
+  - --filesystem=host # insecure, next is more secure
+#  - --filesystem=home # user can store games anywhere
+  - --device=all # needed for gamepad access
   - --allow=devel
+cleanup:
+  - /include
+  - /lib/cmake
+  - /lib/pkgconfig
+  - /lib/*.so
 modules:
-  - name: liblcf
+  # external libraries
+  # this is copied from shared-modules to not add the dependency on it
+  - name: libfluidsynth
     buildsystem: cmake-ninja
     config-opts:
       - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DLIBLCF_ENABLE_TOOLS=OFF
-      - -DLIBLCF_WITH_XML=OFF
-      - -DLIBLCF_ENABLE_TESTS=OFF
     sources:
       - type: git
-        url: https://github.com/EasyRPG/liblcf.git
-        #tag: '0.7.0'
+        url: https://github.com/FluidSynth/fluidsynth.git
+        tag: v2.3.4
+        commit: 5ecdc4568e45123216c6888892caad07918ef127
     cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib/cmake
+      - /bin
       - /share
   - name: libfmt
     buildsystem: cmake-ninja
@@ -41,60 +44,43 @@ modules:
     sources:
       - type: git
         url: https://github.com/fmtlib/fmt.git
-        tag: '8.1.1'
-    cleanup:
-      - /include
-      - /lib/pkgconfig
-      - /lib/cmake
-  # this is copied from shared-modules
-  - name: libfluidsynth
+        tag: '9.1.0'
+        commit: a33701196adfad74917046096bf5a2aa0ab0bb50
+  - name: libxmp
     buildsystem: cmake-ninja
     config-opts:
-      - -DLIB_SUFFIX=
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DBUILD_STATIC=OFF
+      - -DLIBXMP_DISABLE_DEPACKERS=ON
+      - -DLIBXMP_DISABLE_PROWIZARD=ON
     sources:
       - type: git
-        url: https://github.com/FluidSynth/fluidsynth.git
-        tag: v2.2.7
-    cleanup:
-      - /bin
-      - /include
-      - /lib/pkgconfig
-      - /share
-  - name: libxmp
-    # use cmake when 4.5.1 is ready
-    #buildsystem: cmake-ninja
-    #config-opts:
-    #  - -DBUILD_STATIC=OFF
-    #  - -DLIBXMP_DISABLE_DEPACKERS=ON
-    #  - -DLIBXMP_DISABLE_PROWIZARD=ON
-    buildsystem: autotools
+        url: https://github.com/libxmp/libxmp.git
+        tag: libxmp-4.6.0
+        commit: 8201d26cf933688a8be64292457c429fd8e654ab
+  # own libraries
+  - name: liblcf
+    buildsystem: cmake-ninja
+    builddir: true
     config-opts:
-      - --disable-depackers
-      - --disable-prowizard
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DLIBLCF_ENABLE_TOOLS=OFF
+      - -DLIBLCF_WITH_XML=OFF
+      - -DLIBLCF_ENABLE_TESTS=OFF
+      - -DLIBLCF_UPDATE_MIMEDB=OFF
     sources:
       - type: git
-        url: https://github.com/libxmp/libxmp.git
-        tag: libxmp-4.5.0
-      # hack, see https://github.com/flatpak/flatpak-builder/issues/111
-      - type: script
-        dest-filename: autogen.sh
-        commands:
-          - "autoreconf -fi"
+        url: https://github.com/EasyRPG/liblcf.git
     cleanup:
-      - /include
-      - /lib/pkgconfig
+      - /share
   - name: player
     buildsystem: cmake-ninja
     config-opts:
-    # remove this line after switching to 22.08 or newer
-      - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
       - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DPLAYER_VERSION_APPEND='(Flatpak)'
     sources:
       - type: git
         url: https://github.com/EasyRPG/Player.git
     cleanup:
       - /share/bash-completion
       - /share/pixmaps
-    post-install:
-      # Fixup for app id (since rename-* options leave out things)
-      - sed -i 's|easyrpg-player.desktop|org.easyrpg.player.desktop|' /app/share/metainfo/easyrpg-player.metainfo.xml

From 048372cb5331da77ff43eeec323e0cb922c62518 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sat, 30 Mar 2024 21:42:42 +0100
Subject: [PATCH 051/222] 3DS: Fix crash by increasing linear heap memory

---
 src/platform/3ds/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/3ds/main.cpp b/src/platform/3ds/main.cpp
index 34ec27132..61668fdaf 100644
--- a/src/platform/3ds/main.cpp
+++ b/src/platform/3ds/main.cpp
@@ -31,7 +31,7 @@
 /* 8 MB required for booting and need extra linear memory for the sound
  * effect cache and frame buffers
  */
-u32 __ctru_linear_heap_size = 12*1024*1024;
+u32 __ctru_linear_heap_size = 22*1024*1024;
 
 namespace {
 	u32 old_time_limit;

From 5047d86c45bf8eb2a339bc81dc46c4f173d9826f Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sat, 30 Mar 2024 22:03:28 +0100
Subject: [PATCH 052/222] 3DS: Make rendering more robust - Should work with
 any resolution now (e.g. wide mode or double) - Fix bug where the LCD toggles
 endlessly when keeping button touched - Draw bottom screen UI in proper
 layers, not first to last

---
 src/platform/3ds/ui.cpp | 150 +++++++++++++++++++++++-----------------
 src/platform/3ds/ui.h   |   1 -
 2 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/src/platform/3ds/ui.cpp b/src/platform/3ds/ui.cpp
index 4a22cab55..ffb8f838d 100644
--- a/src/platform/3ds/ui.cpp
+++ b/src/platform/3ds/ui.cpp
@@ -48,16 +48,22 @@ using namespace std::chrono_literals;
 
 namespace {
 	Point touch_pos;
+	bool released_touch = true;
 	enum class screen_state { off, keep, touched, refresh };
 	screen_state bottom_state = screen_state::refresh;
+	// texture data
+	u32* screen_buffer = nullptr;
+	BitmapRef screen_surface; // contains screen_buffer, linear heap allocated
+	C3D_Tex tex, keyb_tex;
 	Tex3DS_SubTexture subt3x;
+	Tex3DS_Texture keyb_t3x;
+	struct _render_parms {
+		int top, left;
+		float stretch_x, stretch_y;
+	} renderer;
 	constexpr int button_width = 80;
 	constexpr int button_height = 60;
-	constexpr int width_pow2 = 512;
-	constexpr int height_pow2 = 256;
 	constexpr int z = 0.5f;
-	u32* screen_buffer;
-	BitmapRef screen_surface; // contains screen_surface, linear heap allocated
 	aptHookCookie cookie;
 #ifndef _DEBUG
 	struct _batt {
@@ -72,6 +78,11 @@ namespace {
 #endif
 }
 
+__attribute__ ((const)) static inline u32 tex_dim(u32 x) {
+	if (x < 32) return 32;
+	return 1 << (32 - __builtin_clz(x - 1));
+}
+
 static void _aptHook(APT_HookType hook, void*) {
 	switch (hook) {
 		case APTHOOK_ONSUSPEND:
@@ -122,8 +133,7 @@ void CtrUi::ToggleBottomScreen(bool state) {
 	}
 }
 
-CtrUi::CtrUi(int width, int height, const Game_Config& cfg) : BaseUi(cfg)
-{
+CtrUi::CtrUi(int width, int height, const Game_Config& cfg) : BaseUi(cfg) {
 	SetIsFullscreen(true);
 	aptHook(&cookie, _aptHook, 0);
 	ptmuInit();
@@ -141,30 +151,31 @@ CtrUi::CtrUi(int width, int height, const Game_Config& cfg) : BaseUi(cfg)
 	Bitmap::SetFormat(Bitmap::ChooseFormat(format));
 	main_surface = Bitmap::Create(width, height, Color(0, 0, 0, 255));
 
+	// compute render params to center/stretch image correctly
+	renderer.top = (GSP_SCREEN_WIDTH - height) / 2;
+	renderer.left = (GSP_SCREEN_HEIGHT_TOP - width) / 2;
+	renderer.stretch_x = (float)GSP_SCREEN_HEIGHT_TOP / width;
+	renderer.stretch_y = (float)GSP_SCREEN_WIDTH / height;
+
+	if(!C3D_TexInit(&tex, tex_dim(width), tex_dim(height), GPU_RGB8))
+		Output::Error("Could not create main texture.");
+	memset(tex.data, 0, tex.size);
+	tex.border = 0xFFFFFFFF;
+	C3D_TexSetWrap(&tex, GPU_CLAMP_TO_BORDER, GPU_CLAMP_TO_BORDER);
+
 	const auto screen_format = format_A8B8G8R8_n().format();
-	screen_buffer = (u32*)linearAlloc((width_pow2*height_pow2*4));
-	screen_surface = Bitmap::Create(screen_buffer, width, height, width_pow2*4, screen_format);
-
-	// default for both screens
-	subt3x.width = width_pow2;
-	subt3x.height = height_pow2;
-	subt3x.left = 0.0f;
-	subt3x.top = 1.0f;
-	subt3x.right = 1.0f;
-	subt3x.bottom = 0.0f;
-
-	C3D_Tex* tex = (C3D_Tex*)malloc(sizeof(C3D_Tex));
-	C3D_TexInit(tex, width_pow2, height_pow2, GPU_RGB8);
-	memset(tex->data, 0, tex->size);
-	tex->border = 0xFFFFFFFF;
-	C3D_TexSetWrap(tex, GPU_CLAMP_TO_BORDER, GPU_CLAMP_TO_BORDER);
-	top_image.tex = tex;
-	top_image.subtex = &subt3x;
+	if(!(screen_buffer = (u32*)linearAlloc(tex.width * tex.height * 4)))
+		Output::Error("Could not create main buffer.");
+	screen_surface = Bitmap::Create(screen_buffer, width, height, tex.width * 4, screen_format);
+
+	// only show actual image, texture dimensions are bigger
+	subt3x = { (u16)width, (u16)height, 0.0f, 1.0f,
+		width/(float)tex.width, 1.0f - height/(float)tex.height };
 
 	if (vcfg.stretch.Get()) {
-		C3D_TexSetFilter(top_image.tex, GPU_LINEAR, GPU_LINEAR);
+		C3D_TexSetFilter(&tex, GPU_LINEAR, GPU_LINEAR);
 	} else {
-		C3D_TexSetFilter(top_image.tex, GPU_NEAREST, GPU_NEAREST);
+		C3D_TexSetFilter(&tex, GPU_NEAREST, GPU_NEAREST);
 	}
 
 #ifdef SUPPORT_AUDIO
@@ -174,11 +185,7 @@ CtrUi::CtrUi(int width, int height, const Game_Config& cfg) : BaseUi(cfg)
 #ifndef _DEBUG
 	bottom_screen = C2D_CreateScreenTarget(GFX_BOTTOM, GFX_LEFT);
 
-	C3D_Tex* keyb_tex = (C3D_Tex*)malloc(sizeof(C3D_Tex));
-	Tex3DS_Texture keyb_t3x = Tex3DS_TextureImport(keyboard_t3x, keyboard_t3x_size, keyb_tex, nullptr, false);
-	Tex3DS_TextureFree(keyb_t3x);
-	bottom_image.tex = keyb_tex;
-	bottom_image.subtex = &subt3x;
+	keyb_t3x = Tex3DS_TextureImport(keyboard_t3x, keyboard_t3x_size, &keyb_tex, nullptr, false);
 
 	battery.sheet = C2D_SpriteSheetLoadFromMem(battery_t3x, battery_t3x_size);
 	battery.image = C2D_SpriteSheetGetImage(battery.sheet, 0);
@@ -191,12 +198,11 @@ CtrUi::CtrUi(int width, int height, const Game_Config& cfg) : BaseUi(cfg)
 }
 
 CtrUi::~CtrUi() {
-	C3D_TexDelete(top_image.tex);
-	free(top_image.tex);
+	C3D_TexDelete(&tex);
 
 #ifndef _DEBUG
-	C3D_TexDelete(bottom_image.tex);
-	free(bottom_image.tex);
+	C3D_TexDelete(&keyb_tex);
+	Tex3DS_TextureFree(keyb_t3x);
 
 	C2D_SpriteSheetFree(battery.sheet);
 #endif
@@ -265,18 +271,29 @@ void CtrUi::ProcessEvents() {
 
 			// Turn off touchscreen for top right button
 			if (row == 0 && col == 3) {
-				ToggleBottomScreen(false);
+				if(released_touch) {
+					ToggleBottomScreen(false);
+					released_touch = false;
+				}
 			} else {
 				keys[keys_tbl[col + (row * 4)]] = true;
 			}
 
 			touch_pos.x = pos.px;
 			touch_pos.y = pos.py;
-		} else {
+		} else if (released_touch) {
+			// Turn on touch screen
 			ToggleBottomScreen(true);
+			released_touch = false;
 		}
 	}
 
+	// Reset touch state
+	u32 input_up = hidKeysUp();
+	if (input_up & KEY_TOUCH) {
+		released_touch = true;
+	}
+
 	// info display, query every 10s
 	auto t = Game_Clock::now();
 	auto s = std::chrono::duration_cast<std::chrono::seconds>(t - info_tick);
@@ -314,36 +331,34 @@ void CtrUi::UpdateDisplay() {
 	// required because pixman has no fast-paths for non AXXX buffers and 3DS wants RGBA
 	screen_surface->BlitFast(0, 0, *main_surface, main_surface->GetRect(), Opacity::Opaque());
 
-	GSPGPU_FlushDataCache(screen_buffer, (width_pow2*height_pow2*4));
+	GSPGPU_FlushDataCache(screen_buffer, tex.width * tex.height * 4);
 
+	// Convert the texture before starting a frame, so this uses a safe transfer
 	// Using RGB8 as output format is faster and improves framerate ¯\_(ツ)_/¯
-	const u32 flags = (GX_TRANSFER_FLIP_VERT(0) |
-		GX_TRANSFER_OUT_TILED(1) |
-		GX_TRANSFER_RAW_COPY(0) |
-		GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) |
-		GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) |
-		GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO));
-
-	// Doing this after FrameBegin corrupts the output, probably because this
-	// is asynchronous and FrameBegin will block until it finishes
-	C3D_SyncDisplayTransfer(
-		(u32*)screen_buffer,
-		GX_BUFFER_DIM(width_pow2, height_pow2),
-		(u32*)top_image.tex->data,
-		GX_BUFFER_DIM(width_pow2, height_pow2),
-		flags
+	u32 dim = GX_BUFFER_DIM(tex.width, tex.height);
+	C3D_SyncDisplayTransfer(screen_buffer, dim, (u32*)tex.data, dim,
+		(GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(1) | GX_TRANSFER_RAW_COPY(0) |
+		GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) |
+		GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
 	 );
 
-	C3D_FrameBegin(0);
+	// start frame, clear targets
+	C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
+	C2D_TargetClear(top_screen, C2D_Color32f(0, 0, 0, 1));
+#ifndef _DEBUG
+	// only clear if needed
+	if (bottom_state > screen_state::keep)
+		C2D_TargetClear(bottom_screen, C2D_Color32f(0, 0, 0, 1));
+#endif
 
 	// top screen
 	C2D_SceneBegin(top_screen);
-	C2D_TargetClear(top_screen, C2D_Color32f(0, 0, 0, 1));
 
+	C2D_Image img = { &tex, &subt3x };
 	if (vcfg.stretch.Get()) {
-		C2D_DrawImageAt(top_image, 0, 0, z, nullptr, 1.25f, 1.0f);
+		C2D_DrawImageAt(img, 0, 0, z, nullptr, renderer.stretch_x, renderer.stretch_y);
 	} else {
-		C2D_DrawImageAt(top_image, 40, 0, z);
+		C2D_DrawImageAt(img, renderer.left, renderer.top, z);
 	}
 
 	// bottom screen
@@ -355,6 +370,7 @@ void CtrUi::UpdateDisplay() {
 		int x = col * w;
 		int y = row * h;
 		int b = 2; // border width
+		int z = 0.6f;
 		constexpr u32 white = C2D_Color32f(1, 1, 1, 1);
 		constexpr u32 darkgray = C2D_Color32f(0.5f, 0.5f, 0.5f, 1);
 		constexpr u32 lightgray = C2D_Color32f(0.8f, 0.8f, 0.8f, 1);
@@ -369,6 +385,7 @@ void CtrUi::UpdateDisplay() {
 
 	// "circle" cursor
 	auto draw_cursor = [this](Point p) {
+		int z = 0.7f;
 		constexpr u32 green = C2D_Color32f(0.1f, 0.7f, 0.1f, 0.9f);
 		C2D_DrawRectSolid(p.x-1, p.y, z, 3, 1, green);
 		C2D_DrawRectSolid(p.x, p.y-1, z, 1, 3, green);
@@ -376,6 +393,13 @@ void CtrUi::UpdateDisplay() {
 		//C2D_DrawCircleSolid(p.x, p.y, z, 2, green);
 	};
 
+	// battery indicator
+	auto draw_battery = [this](int x, int y) {
+		int w = battery.image.subtex->width;
+		int h = battery.image.subtex->height;
+		C2D_DrawImageAt(battery.image, x-w, y-h, 0.8f);
+	};
+
 	/* More low hanging fruit optimisation: Only refresh the bottom screen
 	 * when there is something to draw (a touch happens, battery level changed,
 	 * etc) and one frame after
@@ -383,8 +407,7 @@ void CtrUi::UpdateDisplay() {
 	if (bottom_state > screen_state::keep) {
 		C2D_SceneBegin(bottom_screen);
 
-		C2D_TargetClear(bottom_screen, C2D_Color32f(0, 0, 0, 1));
-		C2D_DrawImageAt(bottom_image, 0, 0, z);
+		C2D_DrawImageAt({&keyb_tex, Tex3DS_GetSubTexture(keyb_t3x, 0)}, 0, 0, z);
 
 		if (bottom_state == screen_state::touched) {
 			draw_button(touch_pos, button_width, button_height);
@@ -397,11 +420,12 @@ void CtrUi::UpdateDisplay() {
 			bottom_state = screen_state::keep;
 		}
 
-		// image is 41*12, position with 2 pixels border at bottom right
-		C2D_DrawImageAt(battery.image, 320-41-2, 240-12-2, z);
+		// position with 2 pixels border at bottom right
+		draw_battery(GSP_SCREEN_HEIGHT_BOTTOM-2, GSP_SCREEN_WIDTH-2);
 	}
 #endif
 
+	// show everything
 	C3D_FrameEnd(0);
 }
 
@@ -409,9 +433,9 @@ void CtrUi::ToggleStretch() {
 	vcfg.stretch.Toggle();
 
 	if (vcfg.stretch.Get()) {
-		C3D_TexSetFilter(top_image.tex, GPU_LINEAR, GPU_LINEAR);
+		C3D_TexSetFilter(&tex, GPU_LINEAR, GPU_LINEAR);
 	} else {
-		C3D_TexSetFilter(top_image.tex, GPU_NEAREST, GPU_NEAREST);
+		C3D_TexSetFilter(&tex, GPU_NEAREST, GPU_NEAREST);
 	}
 }
 
diff --git a/src/platform/3ds/ui.h b/src/platform/3ds/ui.h
index cb1ca5062..02cc60cda 100644
--- a/src/platform/3ds/ui.h
+++ b/src/platform/3ds/ui.h
@@ -62,7 +62,6 @@ class CtrUi final : public BaseUi {
 
 private:
 	C3D_RenderTarget *top_screen, *bottom_screen;
-	C2D_Image top_image, bottom_image;
 	void ToggleBottomScreen(bool state);
 
 #ifdef SUPPORT_AUDIO

From 034a2a4c7b0615fe67428e4619a6a6fe518b2150 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 2 Apr 2024 00:56:50 +0200
Subject: [PATCH 053/222] Party: Change the startup sanity checks from Warning
 to Debug

Fix #3008
---
 src/game_party.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game_party.cpp b/src/game_party.cpp
index 0729df693..bfd8e9dd8 100644
--- a/src/game_party.cpp
+++ b/src/game_party.cpp
@@ -690,14 +690,14 @@ void Game_Party::RemoveInvalidData() {
 		if (Main_Data::game_actors->ActorExists(*it)) {
 			data.party.push_back(*it);
 		} else {
-			Output::Warning("Removing invalid party member {}", *it);
+			Output::Debug("Removing invalid party member {}", *it);
 		}
 	}
 
 	// Remove non existing items
 	for (it = data.item_ids.begin(); it != data.item_ids.end(); ) {
 		if (!lcf::ReaderUtil::GetElement(lcf::Data::items, *it)) {
-			Output::Warning("Removing invalid item {} from party", *it);
+			Output::Debug("Removing invalid item {} from party", *it);
 			it = data.item_ids.erase(it);
 		} else {
 			++it;

From 54cbb336610169aadcc1cc8159d12cc9af4fea81 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Tue, 2 Apr 2024 01:36:15 +0200
Subject: [PATCH 054/222] metainfo: add 0.8 release

---
 resources/unix/easyrpg-player.metainfo.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/unix/easyrpg-player.metainfo.xml b/resources/unix/easyrpg-player.metainfo.xml
index 0e851040e..b65225d45 100644
--- a/resources/unix/easyrpg-player.metainfo.xml
+++ b/resources/unix/easyrpg-player.metainfo.xml
@@ -67,6 +67,16 @@
 	</content_rating>
 
 	<releases>
+		<release version="0.8" date="2023-04-29">
+			<description>
+				<p>
+					"Paralyze"
+				</p>
+				<p>
+					https://blog.easyrpg.org/2023/04/easyrpg-player-0-8-paralyze/
+				</p>
+			</description>
+		</release>
 		<release version="0.7.0" date="2021-10-29" />
 		<release version="0.6.2.3" date="2020-10-03" />
 		<release version="0.6.2.2" date="2020-09-08" />

From 20b421536f48e857ab8df0f2c76d814f1feb8c4f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 8 Apr 2024 23:26:38 +0200
Subject: [PATCH 055/222] Rename ActivateEventAt to TriggerEventAt as discussed

---
 src/game_interpreter_map.cpp | 9 +++++----
 src/game_interpreter_map.h   | 3 ++-
 src/game_player.cpp          | 2 +-
 src/game_player.h            | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 9298969dd..88e5cde25 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -142,8 +142,8 @@ bool Game_Interpreter_Map::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandOpenLoadMenu(com);
 		case Cmd::ToggleAtbMode:
 			return CommandToggleAtbMode(com);
-		case static_cast <Game_Interpreter::Cmd>(2002): //Cmd::easyrpg_ActivateEvent
-			return CommandActivateEventAt(com);
+		case static_cast <Game_Interpreter::Cmd>(2002): // Cmd::EasyRpg_TriggerEventAt
+			return CommandEasyRpgTriggerEventAt(com);
 		default:
 			return Game_Interpreter::ExecuteCommand(com);
 	}
@@ -677,10 +677,11 @@ bool Game_Interpreter_Map::CommandToggleAtbMode(lcf::rpg::EventCommand const& /*
 	return true;
 }
 
-bool Game_Interpreter_Map::CommandActivateEventAt(lcf::rpg::EventCommand const& com) {
+bool Game_Interpreter_Map::CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand const& com) {
 	int x = ValueOrVariable(com.parameters[0], com.parameters[1]);
 	int y = ValueOrVariable(com.parameters[2], com.parameters[3]);
 
-	bool b = Main_Data::game_player->ActivateEventAt(x, y);
+	Main_Data::game_player->TriggerEventAt(x, y);
+
 	return true;
 }
diff --git a/src/game_interpreter_map.h b/src/game_interpreter_map.h
index 0a43343fd..a52e7da0a 100644
--- a/src/game_interpreter_map.h
+++ b/src/game_interpreter_map.h
@@ -81,7 +81,8 @@ class Game_Interpreter_Map : public Game_Interpreter
 	bool CommandOpenMainMenu(lcf::rpg::EventCommand const& com);
 	bool CommandOpenLoadMenu(lcf::rpg::EventCommand const& com);
 	bool CommandToggleAtbMode(lcf::rpg::EventCommand const& com);
-	bool CommandActivateEventAt(lcf::rpg::EventCommand const& com);
+
+	bool CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand const& com);
 
 	AsyncOp ContinuationShowInnStart(int indent, int choice_result, int price);
 
diff --git a/src/game_player.cpp b/src/game_player.cpp
index d4bbcb134..71c8694ac 100644
--- a/src/game_player.cpp
+++ b/src/game_player.cpp
@@ -835,6 +835,6 @@ void Game_Player::UpdatePan() {
 	data()->pan_current_y -= dy;
 }
 
-bool Game_Player::ActivateEventAt(int x, int y) {
+bool Game_Player::TriggerEventAt(int x, int y) {
 	return CheckEventTriggerThere({ lcf::rpg::EventPage::Trigger_action }, x, y, true);
 }
diff --git a/src/game_player.h b/src/game_player.h
index 97c4f8b51..79b24d820 100644
--- a/src/game_player.h
+++ b/src/game_player.h
@@ -60,7 +60,7 @@ class Game_Player : public Game_PlayerBase {
 	TeleportTarget GetTeleportTarget() const;
 	void ResetTeleportTarget(TeleportTarget tt = {});
 
-	bool ActivateEventAt(int x, int y);
+	bool TriggerEventAt(int x, int y);
 
 	/**
 	 * Sets the map, position and direction that the game player must have after the teleport is over

From 95ec668c8b708b7c3175790cbeb26ecd7402a4f1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 13 Apr 2024 21:55:48 +0200
Subject: [PATCH 056/222] Add "Wait For Single Movement" Event command by
 @jetrotal

---
 src/game_character.cpp       |  4 +++
 src/game_character.h         | 20 +++++++++++++++
 src/game_interpreter.cpp     |  2 +-
 src/game_interpreter_map.cpp | 50 +++++++++++++++++++++++++++++++++++-
 src/game_interpreter_map.h   |  1 +
 5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/game_character.cpp b/src/game_character.cpp
index 0619addb8..5d596ee50 100644
--- a/src/game_character.cpp
+++ b/src/game_character.cpp
@@ -301,6 +301,7 @@ void Game_Character::UpdateMoveRoute(int32_t& current_index, const lcf::rpg::Mov
 					SetDirection(prev_direction);
 					SetFacing(prev_facing);
 				} else {
+					SetMoveFailureCount(GetMoveFailureCount() + 1);
 					return;
 				}
 			}
@@ -365,6 +366,7 @@ void Game_Character::UpdateMoveRoute(int32_t& current_index, const lcf::rpg::Mov
 							SetFacing(prev_facing);
 						} else {
 							current_index = saved_index;
+							SetMoveFailureCount(GetMoveFailureCount() + 1);
 							return;
 						}
 					}
@@ -449,6 +451,7 @@ void Game_Character::UpdateMoveRoute(int32_t& current_index, const lcf::rpg::Mov
 					break;
 			}
 		}
+		SetMoveFailureCount(0);
 		++current_index;
 
 		if (current_index == start_index) {
@@ -770,6 +773,7 @@ void Game_Character::ForceMoveRoute(const lcf::rpg::MoveRoute& new_route,
 	SetMoveFrequency(frequency);
 	SetMoveRouteOverwritten(true);
 	SetMoveRoute(new_route);
+	SetMoveFailureCount(0);
 	if (frequency != original_move_frequency) {
 		SetMaxStopCountForStep();
 	}
diff --git a/src/game_character.h b/src/game_character.h
index 152b275bb..3928ee30e 100644
--- a/src/game_character.h
+++ b/src/game_character.h
@@ -242,6 +242,18 @@ class Game_Character {
 	 */
 	void SetMoveRouteFinished(bool finished);
 
+	/**
+	 * @return How often the current move action failed.
+	 */
+	int GetMoveFailureCount() const;
+
+	/**
+	 * Sets how often the current move action failed.
+	 *
+	 * @param count amount
+	 */
+	void SetMoveFailureCount(int count);
+
 	/**
 	 * Gets sprite name. Usually the name of the graphic file.
 	 *
@@ -1059,6 +1071,14 @@ inline void Game_Character::SetMoveRouteFinished(bool finished) {
 	data()->move_route_finished = finished;
 }
 
+inline int Game_Character::GetMoveFailureCount() const {
+	return data()->easyrpg_move_failure_count;
+}
+
+inline void Game_Character::SetMoveFailureCount(int count) {
+	data()->easyrpg_move_failure_count = count;
+}
+
 inline const std::string& Game_Character::GetSpriteName() const {
 	return data()->sprite_name;
 }
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 84dc8748f..fe9366736 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -833,7 +833,7 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacControlStrings(com);
 		case Cmd::Maniac_CallCommand:
 			return CommandManiacCallCommand(com);
-		case static_cast<Game_Interpreter::Cmd>(2053): //Cmd::EasyRpg_SetInterpreterFlag
+		case Cmd::EasyRpg_SetInterpreterFlag: //Cmd::EasyRpg_SetInterpreterFlag
 			return CommandEasyRpgSetInterpreterFlag(com);
 		default:
 			return true;
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index e0d4f4257..fb1934bc8 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -229,8 +229,10 @@ bool Game_Interpreter_Map::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandOpenLoadMenu(com);
 		case Cmd::ToggleAtbMode:
 			return CommandToggleAtbMode(com);
-		case static_cast <Game_Interpreter::Cmd>(2002): // Cmd::EasyRpg_TriggerEventAt
+		case Cmd::EasyRpg_TriggerEventAt:
 			return CommandEasyRpgTriggerEventAt(com);
+		case Cmd::EasyRpg_WaitForSingleMovement:
+			return CommandEasyRpgWaitForSingleMovement(com);
 		default:
 			return Game_Interpreter::ExecuteCommand(com);
 	}
@@ -781,3 +783,49 @@ bool Game_Interpreter_Map::CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand c
 
 	return true;
 }
+
+bool Game_Interpreter_Map::CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCommand const& com) {
+	int event_id = ValueOrVariable(com.parameters[0], com.parameters[1]);
+
+	Game_Character* chara = GetCharacter(event_id);
+	if (chara == nullptr) {
+		return true;
+	}
+
+	int failure_limit = 0;
+	if (com.parameters.size() >= 4) {
+		failure_limit = ValueOrVariable(com.parameters[2], com.parameters[3]);
+	}
+
+	int output_var = 0;
+	if (com.parameters.size() >= 6) {
+		failure_limit = ValueOrVariable(com.parameters[4], com.parameters[5]);
+	}
+
+	bool exists = chara->IsMoveRouteOverwritten();
+	bool finished = chara->IsMoveRouteFinished();
+
+	if (!exists || (exists && finished)) {
+		if (output_var > 0) {
+			// Move route inexistant or ended: Report success (1)
+			Main_Data::game_variables->Set(output_var, 1);
+			Game_Map::SetNeedRefresh(true);
+		}
+		return true;
+	}
+
+	// !finished
+	if (failure_limit == 0 || chara->GetMoveFailureCount() < failure_limit) {
+		// Below threshold: Yield
+		return false;
+	}
+
+	// Cancel move route and report abort (0)
+	chara->CancelMoveRoute();
+	if (output_var > 0) {
+		Main_Data::game_variables->Set(output_var, 0);
+		Game_Map::SetNeedRefresh(true);
+	}
+
+	return true;
+}
diff --git a/src/game_interpreter_map.h b/src/game_interpreter_map.h
index 1bdb89de1..e94dd0dc9 100644
--- a/src/game_interpreter_map.h
+++ b/src/game_interpreter_map.h
@@ -85,6 +85,7 @@ class Game_Interpreter_Map : public Game_Interpreter
 	bool CommandToggleAtbMode(lcf::rpg::EventCommand const& com);
 
 	bool CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand const& com);
+	bool CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCommand const& com);
 
 	AsyncOp ContinuationShowInnStart(int indent, int choice_result, int price);
 

From 7339082d21e83f5d49dc4af5c9cf82dc5dcaa7f6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 15 Apr 2024 18:56:48 +0200
Subject: [PATCH 057/222] Image API: Refactor. Return original bit depth of the
 image.

---
 src/bitmap.cpp    | 47 +++++++++++++++++++++++------------------------
 src/bitmap.h      | 21 +++++++++++++++++++++
 src/image_bmp.cpp | 21 ++++++++++-----------
 src/image_bmp.h   |  5 +++--
 src/image_png.cpp | 42 ++++++++++++++++++++++--------------------
 src/image_png.h   |  7 ++++---
 src/image_xyz.cpp | 22 +++++++++++-----------
 src/image_xyz.h   |  5 +++--
 8 files changed, 97 insertions(+), 73 deletions(-)

diff --git a/src/bitmap.cpp b/src/bitmap.cpp
index 25992d636..d74a358e9 100644
--- a/src/bitmap.cpp
+++ b/src/bitmap.cpp
@@ -99,9 +99,7 @@ Bitmap::Bitmap(Filesystem_Stream::InputStream stream, bool transparent, uint32_t
 		return;
 	}
 
-	int w = 0;
-	int h = 0;
-	void* pixels = nullptr;
+	ImageOut image_out;
 
 	uint8_t data[4] = {};
 	size_t bytes = stream.read(reinterpret_cast<char*>(data),  4).gcount();
@@ -109,27 +107,28 @@ Bitmap::Bitmap(Filesystem_Stream::InputStream stream, bool transparent, uint32_t
 
 	bool img_okay = false;
 
-	if (bytes >= 4 && strncmp((char*)data, "XYZ1", 4) == 0)
-		img_okay = ImageXYZ::ReadXYZ(stream, transparent, w, h, pixels);
-	else if (bytes > 2 && strncmp((char*)data, "BM", 2) == 0)
-		img_okay = ImageBMP::ReadBMP(stream, transparent, w, h, pixels);
-	else if (bytes >= 4 && strncmp((char*)(data + 1), "PNG", 3) == 0)
-		img_okay = ImagePNG::ReadPNG(stream, transparent, w, h, pixels);
-	else
+	if (bytes >= 4 && strncmp((char*)data, "XYZ1", 4) == 0) {
+		img_okay = ImageXYZ::Read(stream, transparent, image_out);
+	} else if (bytes > 2 && strncmp((char*)data, "BM", 2) == 0) {
+		img_okay = ImageBMP::Read(stream, transparent, image_out);
+	} else if (bytes >= 4 && strncmp((char*)(data + 1), "PNG", 3) == 0) {
+		img_okay = ImagePNG::Read(stream, transparent, image_out);
+	} else
 		Output::Warning("Unsupported image file {} (Magic: {:02X})", stream.GetName(), *reinterpret_cast<uint32_t*>(data));
 
 	if (!img_okay) {
-		free(pixels);
-		pixels = nullptr;
+		free(image_out.pixels);
 		return;
 	}
 
-	Init(w, h, nullptr);
+	Init(image_out.width, image_out.height, nullptr);
 
-	ConvertImage(w, h, pixels, transparent);
+	ConvertImage(image_out.width, image_out.height, image_out.pixels, transparent);
 
 	CheckPixels(flags);
 
+	original_bpp = image_out.bpp;
+
 	filename = ToString(stream.GetName());
 }
 
@@ -137,29 +136,29 @@ Bitmap::Bitmap(const uint8_t* data, unsigned bytes, bool transparent, uint32_t f
 	format = (transparent ? pixel_format : opaque_pixel_format);
 	pixman_format = find_format(format);
 
-	int w = 0, h = 0;
-	void* pixels = nullptr;
+	ImageOut image_out;
 
 	bool img_okay = false;
 
 	if (bytes > 4 && strncmp((char*) data, "XYZ1", 4) == 0)
-		img_okay = ImageXYZ::ReadXYZ(data, bytes, transparent, w, h, pixels);
+		img_okay = ImageXYZ::Read(data, bytes, transparent, image_out);
 	else if (bytes > 2 && strncmp((char*) data, "BM", 2) == 0)
-		img_okay = ImageBMP::ReadBMP(data, bytes, transparent, w, h, pixels);
+		img_okay = ImageBMP::Read(data, bytes, transparent, image_out);
 	else if (bytes > 4 && strncmp((char*)(data + 1), "PNG", 3) == 0)
-		img_okay = ImagePNG::ReadPNG((const void*) data, transparent, w, h, pixels);
+		img_okay = ImagePNG::Read((const void*) data, transparent, image_out);
 	else
 		Output::Warning("Unsupported image (Magic: {:02X})", bytes >= 4 ? *reinterpret_cast<const uint32_t*>(data) : 0);
 
 	if (!img_okay) {
-		free(pixels);
-		pixels = nullptr;
+		free(image_out.pixels);
 		return;
 	}
 
-	Init(w, h, nullptr);
+	Init(image_out.width, image_out.height, nullptr);
+
+	ConvertImage(image_out.width, image_out.height, image_out.pixels, transparent);
 
-	ConvertImage(w, h, pixels, transparent);
+	original_bpp = image_out.bpp;
 
 	CheckPixels(flags);
 }
@@ -183,7 +182,7 @@ bool Bitmap::WritePNG(std::ostream& os) const {
 	pixman_image_composite32(PIXMAN_OP_SRC, bitmap.get(), NULL, dst.get(),
 							 0, 0, 0, 0, 0, 0, width, height);
 
-	return ImagePNG::WritePNG(os, width, height, &data.front());
+	return ImagePNG::Write(os, width, height, &data.front());
 }
 
 size_t Bitmap::GetSize() const {
diff --git a/src/bitmap.h b/src/bitmap.h
index 3fbfc699d..b7be3f1db 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -224,6 +224,13 @@ class Bitmap {
 	 */
 	StringView GetFilename() const;
 
+	/**
+	 * Gets bpp of the source image.
+	 *
+	 * @return Bpp
+	 */
+	int GetOriginalBpp() const;
+
 	void CheckPixels(uint32_t flags);
 
 	/**
@@ -599,6 +606,9 @@ class Bitmap {
 
 	std::string filename;
 
+	/** Bpp of the source image */
+	int original_bpp;
+
 	/** Bitmap data. */
 	PixmanImagePtr bitmap;
 	pixman_format_code_t pixman_format;
@@ -636,6 +646,13 @@ class Bitmap {
 	bool read_only = false;
 };
 
+struct ImageOut {
+	int width = 0;
+	int height = 0;
+	void* pixels = nullptr;
+	int bpp = 0;
+};
+
 inline ImageOpacity Bitmap::GetImageOpacity() const {
 	return image_opacity;
 }
@@ -672,4 +689,8 @@ inline StringView Bitmap::GetFilename() const {
 	return filename;
 }
 
+inline int Bitmap::GetOriginalBpp() const {
+	return original_bpp;
+}
+
 #endif
diff --git a/src/image_bmp.cpp b/src/image_bmp.cpp
index fb8d67d6c..2adf6fc90 100644
--- a/src/image_bmp.cpp
+++ b/src/image_bmp.cpp
@@ -84,9 +84,8 @@ ImageBMP::BitmapHeader ImageBMP::ParseHeader(const uint8_t*& ptr, uint8_t const*
 	return hdr;
 }
 
-bool ImageBMP::ReadBMP(const uint8_t* data, unsigned len, bool transparent,
-					   int& width, int& height, void*& pixels) {
-	pixels = nullptr;
+bool ImageBMP::Read(const uint8_t* data, unsigned len, bool transparent, ImageOut& output) {
+	output.pixels = nullptr;
 
 	if (len < 64) {
 		Output::Warning("Not a valid BMP file.");
@@ -142,13 +141,13 @@ bool ImageBMP::ReadBMP(const uint8_t* data, unsigned len, bool transparent,
 	int line_width = (hdr.depth == 4) ? (hdr.w + 1) >> 1 : hdr.w;
 	int padding = (-line_width)&3;
 
-	pixels = malloc(hdr.w * hdr.h * 4);
-	if (!pixels) {
+	output.pixels = malloc(hdr.w * hdr.h * 4);
+	if (!output.pixels) {
 		Output::Warning("Error allocating BMP pixel buffer.");
 		return false;
 	}
 
-	uint8_t* dst = (uint8_t*) pixels;
+	uint8_t* dst = (uint8_t*) output.pixels;
 	for (int y = 0; y < hdr.h; y++) {
 		const uint8_t* src = src_pixels + (vflip ? hdr.h - 1 - y : y) * (line_width + padding);
 		for (int x = 0; x < hdr.w; x += 2) {
@@ -182,13 +181,13 @@ bool ImageBMP::ReadBMP(const uint8_t* data, unsigned len, bool transparent,
 		}
 	}
 
-	width = hdr.w;
-	height = hdr.h;
+	output.width = hdr.w;
+	output.height = hdr.h;
+	output.bpp = hdr.depth; // Currently only 4 and 8 bit (indexed) are supported
 	return true;
 }
 
-bool ImageBMP::ReadBMP(Filesystem_Stream::InputStream& stream, bool transparent,
-					int& width, int& height, void*& pixels) {
+bool ImageBMP::Read(Filesystem_Stream::InputStream& stream, bool transparent, ImageOut& output) {
 	std::vector<uint8_t> buffer = Utils::ReadStream(stream);
-	return ReadBMP(&buffer.front(), (unsigned) buffer.size(), transparent, width, height, pixels);
+	return Read(&buffer.front(), (unsigned) buffer.size(), transparent, output);
 }
diff --git a/src/image_bmp.h b/src/image_bmp.h
index 9c449bf0c..85979befa 100644
--- a/src/image_bmp.h
+++ b/src/image_bmp.h
@@ -19,6 +19,7 @@
 #define EP_IMAGE_BMP_H
 
 #include <cstdint>
+#include "bitmap.h"
 #include "filesystem_stream.h"
 
 namespace ImageBMP {
@@ -33,8 +34,8 @@ namespace ImageBMP {
 		int palette_size = 0;
 	};
 
-	bool ReadBMP(const uint8_t* data, unsigned len, bool transparent, int& width, int& height, void*& pixels);
-	bool ReadBMP(Filesystem_Stream::InputStream& stream, bool transparent, int& width, int& height, void*& pixels);
+	bool Read(const uint8_t* data, unsigned len, bool transparent, ImageOut& output);
+	bool Read(Filesystem_Stream::InputStream& stream, bool transparent, ImageOut& output);
 
 	BitmapHeader ParseHeader(const uint8_t*& ptr, uint8_t const* e);
 }
diff --git a/src/image_png.cpp b/src/image_png.cpp
index 186241661..4eaddcb61 100644
--- a/src/image_png.cpp
+++ b/src/image_png.cpp
@@ -47,26 +47,23 @@ static void on_png_error(png_structp, png_const_charp error_msg) {
 	Output::Warning("libpng: {}", error_msg);
 }
 
-static bool ReadPNGWithReadFunction(png_voidp,png_rw_ptr, bool, int&, int&, void*&);
+static bool ReadPNGWithReadFunction(png_voidp,png_rw_ptr, bool, ImageOut&);
 static void ReadPalettedData(png_struct*, png_info*, png_uint_32, png_uint_32, bool, uint32_t*);
 static void ReadGrayData(png_struct*, png_info*, png_uint_32, png_uint_32, bool, uint32_t*);
 static void ReadGrayAlphaData(png_struct*, png_info*, png_uint_32, png_uint_32, uint32_t*);
 static void ReadRGBData(png_struct*, png_info*, png_uint_32, png_uint_32, uint32_t*);
 static void ReadRGBAData(png_struct*, png_info*, png_uint_32, png_uint_32, uint32_t*);
 
-bool ImagePNG::ReadPNG(const void* buffer, bool transparent,
-	int& width, int& height, void*& pixels) {
-	return ReadPNGWithReadFunction((png_voidp)&buffer, read_data, transparent, width, height, pixels);
+bool ImagePNG::Read(const void* buffer, bool transparent, ImageOut& output) {
+	return ReadPNGWithReadFunction((png_voidp)&buffer, read_data, transparent, output);
 }
 
-bool ImagePNG::ReadPNG(Filesystem_Stream::InputStream& stream, bool transparent,
-	int& width, int& height, void*& pixels) {
-	return ReadPNGWithReadFunction(&stream, read_data_istream, transparent, width, height, pixels);
+bool ImagePNG::Read(Filesystem_Stream::InputStream& stream, bool transparent, ImageOut& output) {
+	return ReadPNGWithReadFunction(&stream, read_data_istream, transparent, output);
 }
 
-static bool ReadPNGWithReadFunction(png_voidp user_data, png_rw_ptr fn, bool transparent,
-					   int& width, int& height, void*& pixels) {
-	pixels = nullptr;
+static bool ReadPNGWithReadFunction(png_voidp user_data, png_rw_ptr fn, bool transparent, ImageOut& output) {
+	output.pixels = nullptr;
 
 	png_struct *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, on_png_error, on_png_warning);
 	if (png_ptr == NULL) {
@@ -94,35 +91,40 @@ static bool ReadPNGWithReadFunction(png_voidp user_data, png_rw_ptr fn, bool tra
 	png_get_IHDR(png_ptr, info_ptr, &w, &h,
 				 &bit_depth, &color_type, NULL, NULL, NULL);
 
-	pixels = malloc(w * h * 4);
-	if (!pixels) {
+	output.pixels = malloc(w * h * 4);
+	if (!output.pixels) {
 		Output::Warning("Error allocating PNG pixel buffer.");
 		return false;
 	}
 
 	switch (color_type) {
 		case PNG_COLOR_TYPE_PALETTE:
-			ReadPalettedData(png_ptr, info_ptr, w, h, transparent, (uint32_t*)pixels);
+			ReadPalettedData(png_ptr, info_ptr, w, h, transparent, (uint32_t*)output.pixels);
+			output.bpp = 8;
 			break;
 		case PNG_COLOR_TYPE_GRAY:
-			ReadGrayData(png_ptr, info_ptr, w, h, transparent, (uint32_t*)pixels);
+			ReadGrayData(png_ptr, info_ptr, w, h, transparent, (uint32_t*)output.pixels);
+			output.bpp = 8;
 			break;
 		case PNG_COLOR_TYPE_GRAY_ALPHA:
-			ReadGrayAlphaData(png_ptr, info_ptr, w, h, (uint32_t*)pixels);
+			ReadGrayAlphaData(png_ptr, info_ptr, w, h, (uint32_t*)output.pixels);
+			output.bpp = 8;
 			break;
 		case PNG_COLOR_TYPE_RGB:
-			ReadRGBData(png_ptr, info_ptr, w, h, (uint32_t*)pixels);
+			ReadRGBData(png_ptr, info_ptr, w, h, (uint32_t*)output.pixels);
+			output.bpp = 24;
 			break;
 		case PNG_COLOR_TYPE_RGB_ALPHA:
-			ReadRGBAData(png_ptr, info_ptr, w, h, (uint32_t*)pixels);
+			ReadRGBAData(png_ptr, info_ptr, w, h, (uint32_t*)output.pixels);
+			output.bpp = 32;
 			break;
 	}
 
 	png_read_end(png_ptr, NULL);
 	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
-	width = w;
-	height = h;
+	output.width = w;
+	output.height = h;
 	return true;
 }
 
@@ -251,7 +253,7 @@ static void flush_stream(png_structp out_ptr) {
 	reinterpret_cast<Filesystem_Stream::OutputStream*>(png_get_io_ptr(out_ptr))->flush();
 }
 
-bool ImagePNG::WritePNG(std::ostream& os, uint32_t width, uint32_t height, uint32_t* data) {
+bool ImagePNG::Write(std::ostream& os, uint32_t width, uint32_t height, uint32_t* data) {
 	png_structp write = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 	if (!write) {
 		Output::Warning("Bitmap::WritePNG: error in png_create_write");
diff --git a/src/image_png.h b/src/image_png.h
index f81dd9496..d8ffd112f 100644
--- a/src/image_png.h
+++ b/src/image_png.h
@@ -19,12 +19,13 @@
 #define EP_IMAGE_PNG_H
 
 #include <cstdint>
+#include "bitmap.h"
 #include "filesystem_stream.h"
 
 namespace ImagePNG {
-	bool ReadPNG(const void* buffer, bool transparent, int& width, int& height, void*& pixels);
-	bool ReadPNG(Filesystem_Stream::InputStream& is, bool transparent, int& width, int& height, void*& pixels);
-	bool WritePNG(std::ostream& os, uint32_t width, uint32_t height, uint32_t* data);
+	bool Read(const void* buffer, bool transparent, ImageOut& output);
+	bool Read(Filesystem_Stream::InputStream& is, bool transparent, ImageOut& output);
+	bool Write(std::ostream& os, uint32_t width, uint32_t height, uint32_t* data);
 }
 
 #endif
diff --git a/src/image_xyz.cpp b/src/image_xyz.cpp
index 5a9fa8575..26d1a5cda 100644
--- a/src/image_xyz.cpp
+++ b/src/image_xyz.cpp
@@ -24,9 +24,8 @@
 #include "output.h"
 #include "image_xyz.h"
 
-bool ImageXYZ::ReadXYZ(const uint8_t* data, unsigned len, bool transparent,
-					   int& width, int& height, void*& pixels) {
-	pixels = nullptr;
+bool ImageXYZ::Read(const uint8_t* data, unsigned len, bool transparent, ImageOut& output) {
+	output.pixels = nullptr;
 
 	if (len < 8) {
 		Output::Warning("Not a valid XYZ file.");
@@ -47,13 +46,13 @@ bool ImageXYZ::ReadXYZ(const uint8_t* data, unsigned len, bool transparent,
 	}
 	const uint8_t (*palette)[3] = (const uint8_t(*)[3]) &dst_buffer.front();
 
-	pixels = malloc(w * h * 4);
-	if (!pixels) {
+	output.pixels = malloc(w * h * 4);
+	if (!output.pixels) {
 		Output::Warning("Error allocating XYZ pixel buffer.");
 		return false;
 	}
 
-	uint8_t* dst = (uint8_t*) pixels;
+	uint8_t* dst = (uint8_t*) output.pixels;
 	const uint8_t* src = (const uint8_t*) &dst_buffer[768];
 	for (int y = 0; y < h; y++) {
 		for (int x = 0; x < w; x++) {
@@ -66,13 +65,14 @@ bool ImageXYZ::ReadXYZ(const uint8_t* data, unsigned len, bool transparent,
 		}
 	}
 
-	width = w;
-	height = h;
+	output.width = w;
+	output.height = h;
+	output.bpp = 8;
+
 	return true;
 }
 
-bool ImageXYZ::ReadXYZ(Filesystem_Stream::InputStream& stream, bool transparent,
-					   int& width, int& height, void*& pixels) {
+bool ImageXYZ::Read(Filesystem_Stream::InputStream& stream, bool transparent, ImageOut& output) {
 	std::vector<uint8_t> buffer = Utils::ReadStream(stream);
-	return ReadXYZ(&buffer.front(), (unsigned) buffer.size(), transparent, width, height, pixels);
+	return Read(&buffer.front(), (unsigned) buffer.size(), transparent, output);
 }
diff --git a/src/image_xyz.h b/src/image_xyz.h
index 9890b22bc..bc80f6ed9 100644
--- a/src/image_xyz.h
+++ b/src/image_xyz.h
@@ -20,11 +20,12 @@
 
 #include <cstdio>
 #include <cstdint>
+#include "bitmap.h"
 #include "filesystem_stream.h"
 
 namespace ImageXYZ {
-	bool ReadXYZ(const uint8_t* data, unsigned len, bool transparent, int& width, int& height, void*& pixels);
-	bool ReadXYZ(Filesystem_Stream::InputStream& stream, bool transparent, int& width, int& height, void*& pixels);
+	bool Read(const uint8_t* data, unsigned len, bool transparent, ImageOut& output);
+	bool Read(Filesystem_Stream::InputStream& stream, bool transparent, ImageOut& output);
 }
 
 #endif

From 6cbd0a26e6142de40c4f6dc7d37ec6b10ff38451 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 15 Apr 2024 01:00:07 +0200
Subject: [PATCH 058/222] Add EasyRPG Patch Flag and lock some extensions
 behind it.

Is mostly for features that can break games by accident.

Currently behind it is:

- Our custom event commands
- Large charset
- 32 bit image support. Reporting 32 bit images is useful because this prevents that games tested with EasyRPG do not run in RPG_RT by accident.

32 bit is also enabled when: A translation is active or Maniac Patch is used.
---
 resources/unix/easyrpg-player.6.adoc |  3 +++
 src/cache.cpp                        |  9 +++++++++
 src/game_config_game.cpp             |  9 +++++++++
 src/game_config_game.h               |  1 +
 src/game_interpreter_map.cpp         |  4 ++++
 src/player.cpp                       |  7 ++++---
 src/player.h                         |  9 +++++++++
 src/sprite_character.cpp             | 15 ++++++++++-----
 8 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index cffb48af3..6c25be6da 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -89,6 +89,9 @@ NOTE: For games that only use ASCII (English games) use '1252'.
   Enable limited support for the DynRPG patch from Cherry. The patches are not
   loaded from DLL files, but re-implemented by the engine.
 
+*--patch-easyrpg*::
+  Enable EasyRPG extensions such as support for 32 bit images and large charsets.
+
 *--patch-key-patch*::
   Enable support for the Key Patch by Ineluki.
 
diff --git a/src/cache.cpp b/src/cache.cpp
index bfa3dfbb2..5e55a868f 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -35,6 +35,7 @@
 #include "player.h"
 #include <lcf/data.h>
 #include "game_clock.h"
+#include "translation.h"
 
 using namespace std::chrono_literals;
 
@@ -272,6 +273,14 @@ namespace {
 					bmp = Bitmap::Create(std::move(is), transparent, flags);
 					if (!bmp) {
 						Output::Warning("Invalid image: {}/{}", s.directory, filename);
+					} else {
+						if (bmp->GetOriginalBpp() > 8) {
+							if (!Player::HasEasyRpgExtensions() && !Player::IsPatchManiac() && !Tr::HasActiveTranslation()) {
+								Output::Warning("Image {}/{} has a bit depth of {} that is not supported by RPG_RT. Enable EasyRPG Extensions or Maniac Patch to load such images.", s.directory, filename, bmp->GetOriginalBpp());
+							}
+
+							bmp.reset();
+						}
 					}
 				}
 			}
diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index bc44224dd..1a5d3d54b 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -89,6 +89,11 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_override = true;
 			continue;
 		}
+		if (cp.ParseNext(arg, 0, {"--patch-easyrpg", "--no-patch-easyrpg"})) {
+			patch_easyrpg.Set(arg.ArgIsOn());
+			patch_override = true;
+			continue;
+		}
 		if (cp.ParseNext(arg, 0, {"--patch-dynrpg", "--no-patch-dynrpg"})) {
 			patch_dynrpg.Set(arg.ArgIsOn());
 			patch_override = true;
@@ -170,6 +175,10 @@ void Game_ConfigGame::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	engine_str.FromIni(ini);
 	fake_resolution.FromIni(ini);
 
+	if (patch_easyrpg.FromIni(ini)) {
+		patch_override = true;
+	}
+
 	if (patch_dynrpg.FromIni(ini)) {
 		patch_override = true;
 	}
diff --git a/src/game_config_game.h b/src/game_config_game.h
index c91d5d1e2..b7cd8cfe4 100644
--- a/src/game_config_game.h
+++ b/src/game_config_game.h
@@ -38,6 +38,7 @@ struct Game_ConfigGame {
 	BoolConfigParam new_game{ "Start new game", "Skips the title screen and starts a new game directly", "Game", "NewGame", false };
 	StringConfigParam engine_str{ "Engine", "", "Game", "Engine", std::string() };
 	BoolConfigParam fake_resolution{ "Fake Metrics", "Makes games run on higher resolutions (with some success)", "Game", "FakeResolution", false };
+	BoolConfigParam patch_easyrpg{ "EasyRPG", "EasyRPG Engine Extensions", "Patch", "EasyRPG", false };
 	BoolConfigParam patch_dynrpg{ "DynRPG", "", "Patch", "DynRPG", false };
 	BoolConfigParam patch_maniac{ "Maniac Patch", "", "Patch", "Maniac", false };
 	BoolConfigParam patch_common_this_event{ "Common This Event", "Support \"This Event\" in Common Events", "Patch", "CommonThisEvent", false };
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 88e5cde25..7490ae105 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -678,6 +678,10 @@ bool Game_Interpreter_Map::CommandToggleAtbMode(lcf::rpg::EventCommand const& /*
 }
 
 bool Game_Interpreter_Map::CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand const& com) {
+	if (!Player::HasEasyRpgExtensions()) {
+		return true;
+	}
+
 	int x = ValueOrVariable(com.parameters[0], com.parameters[1]);
 	int y = ValueOrVariable(com.parameters[2], com.parameters[3]);
 
diff --git a/src/player.cpp b/src/player.cpp
index ac36d0b7d..ea71ec5ed 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -825,8 +825,9 @@ void Player::CreateGameObjects() {
 		}
 	}
 
-	Output::Debug("Patch configuration: dynrpg={} maniac={} key-patch={} common-this={} pic-unlock={} 2k3-commands={} anti-lag-switch={}",
-		Player::IsPatchDynRpg(), Player::IsPatchManiac(), Player::IsPatchKeyPatch(), game_config.patch_common_this_event.Get(), game_config.patch_unlock_pics.Get(), game_config.patch_rpg2k3_commands.Get(), game_config.patch_anti_lag_switch.Get());
+	Output::Debug("Patch configuration: easyrpg={} dynrpg={} maniac={} key-patch={} common-this={} pic-unlock={} 2k3-commands={} anti-lag-switch={}",
+		Player::HasEasyRpgExtensions(), Player::IsPatchDynRpg(), Player::IsPatchManiac(), Player::IsPatchKeyPatch(), game_config.patch_common_this_event.Get(),
+		game_config.patch_unlock_pics.Get(), game_config.patch_rpg2k3_commands.Get(), game_config.patch_anti_lag_switch.Get());
 
 	ResetGameObjects();
 
@@ -1399,6 +1400,7 @@ Engine options:
  --patch-common-this  Enable usage of "This Event" in common events in any
                       version of the engine.
  --patch-dynrpg       Enable support of DynRPG patch by Cherry (very limited).
+ --patch-easyrpg      Enable EasyRPG extensions.
  --patch-key-patch    Enable Key Patch by Ineluki.
  --patch-maniac       Enable Maniac Patch by BingShan.
  --patch-pic-unlock   Picture movement is not interrupted by messages in any
@@ -1549,4 +1551,3 @@ std::string Player::GetEngineVersion() {
 	if (EngineVersion() > 0) return std::to_string(EngineVersion());
 	return std::string();
 }
-
diff --git a/src/player.h b/src/player.h
index dc7dd13b0..812cb5b00 100644
--- a/src/player.h
+++ b/src/player.h
@@ -292,6 +292,11 @@ namespace Player {
 	 */
 	bool IsPatchKeyPatch();
 
+	/**
+	 * @return True when EasyRpg extensions are on
+	 */
+	bool HasEasyRpgExtensions();
+
 	/**
 	 * @return Running engine version. 2000 for RPG2k and 2003 for RPG2k3
 	 */
@@ -480,4 +485,8 @@ inline bool Player::IsPatchKeyPatch() {
 	return game_config.patch_key_patch.Get();
 }
 
+inline bool Player::HasEasyRpgExtensions() {
+	return game_config.patch_easyrpg.Get();
+}
+
 #endif
diff --git a/src/sprite_character.cpp b/src/sprite_character.cpp
index d291b5ad5..bc702d4f4 100644
--- a/src/sprite_character.cpp
+++ b/src/sprite_character.cpp
@@ -20,6 +20,7 @@
 #include "cache.h"
 #include "game_map.h"
 #include "bitmap.h"
+#include "output.h"
 
 Sprite_Character::Sprite_Character(Game_Character* character, CloneType type) :
 	character(character),
@@ -124,16 +125,20 @@ void Sprite_Character::ChipsetUpdated() {
 
 Rect Sprite_Character::GetCharacterRect(StringView name, int index, const Rect bitmap_rect) {
 	Rect rect;
+	rect.width = 24 * (TILE_SIZE / 16) * 3;
+	rect.height = 32 * (TILE_SIZE / 16) * 4;
+
 	// Allow large 4x2 spriteset of 3x4 sprites
 	// when the character name starts with a $ sign.
 	// This is not exactly the VX Ace way because
 	// VX Ace uses a single 1x1 spriteset of 3x4 sprites.
 	if (!name.empty() && name.front() == '$') {
-		rect.width = bitmap_rect.width * (TILE_SIZE / 16) / 4;
-		rect.height = bitmap_rect.height * (TILE_SIZE / 16) / 2;
-	} else {
-		rect.width = 24 * (TILE_SIZE / 16) * 3;;
-		rect.height = 32 * (TILE_SIZE / 16) * 4;
+		if (!Player::HasEasyRpgExtensions()) {
+			Output::Debug("Ignoring large charset {}. EasyRPG Extension not enabled.");
+		} else {
+			rect.width = bitmap_rect.width * (TILE_SIZE / 16) / 4;
+			rect.height = bitmap_rect.height * (TILE_SIZE / 16) / 2;
+		}
 	}
 	rect.x = (index % 4) * rect.width;
 	rect.y = (index / 4) * rect.height;

From c3382029c8146479e9fa6a11cd698564b8a5ebfb Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 15 Apr 2024 14:58:04 +0200
Subject: [PATCH 059/222] Redo the X/Y shifting (Sprite clones) on looping
 maps.

The change doubles the amount of sprites on looping maps but this fixes all the rendering issues, especially with big charsets ($).

Most of the sprites are culled because they are out of bounds on larger maps, so the performance implications are small.

Fix #3149
---
 src/battle_animation.cpp     |  2 +-
 src/game_character.cpp       | 18 +++++-------------
 src/game_character.h         | 11 +++++------
 src/game_event.cpp           |  4 ++--
 src/game_event.h             |  2 +-
 src/game_player.cpp          |  4 ++--
 src/game_player.h            |  2 +-
 src/game_vehicle.cpp         |  4 ++--
 src/game_vehicle.h           |  2 +-
 src/sprite_airshipshadow.cpp | 12 +++++-------
 src/sprite_airshipshadow.h   |  6 +++---
 src/sprite_character.cpp     | 18 ++++++++----------
 src/sprite_character.h       |  9 +++++----
 src/spriteset_map.cpp        | 31 ++++++++++++++++++++-----------
 14 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/battle_animation.cpp b/src/battle_animation.cpp
index 6c552bbd1..ee0fe7b38 100644
--- a/src/battle_animation.cpp
+++ b/src/battle_animation.cpp
@@ -264,7 +264,7 @@ void BattleAnimationMap::DrawSingle(Bitmap& dst) {
 	}
 	const int character_height = 24;
 	int x_off = target.GetScreenX();
-	int y_off = target.GetScreenY(false, false);
+	int y_off = target.GetScreenY(false);
 	if (Scene::instance->type == Scene::Map) {
 		x_off += static_cast<Scene_Map*>(Scene::instance.get())->spriteset->GetRenderOx();
 		y_off += static_cast<Scene_Map*>(Scene::instance.get())->spriteset->GetRenderOy();
diff --git a/src/game_character.cpp b/src/game_character.cpp
index 8c9150db3..0619addb8 100644
--- a/src/game_character.cpp
+++ b/src/game_character.cpp
@@ -71,7 +71,7 @@ int Game_Character::GetJumpHeight() const {
 	return 0;
 }
 
-int Game_Character::GetScreenX(bool apply_shift) const {
+int Game_Character::GetScreenX() const {
 	int x = GetSpriteX() / TILE_SIZE - Game_Map::GetDisplayX() / TILE_SIZE + TILE_SIZE;
 
 	if (Game_Map::LoopHorizontal()) {
@@ -79,14 +79,10 @@ int Game_Character::GetScreenX(bool apply_shift) const {
 	}
 	x -= TILE_SIZE / 2;
 
-	if (apply_shift) {
-		x += Game_Map::GetTilesX() * TILE_SIZE;
-	}
-
 	return x;
 }
 
-int Game_Character::GetScreenY(bool apply_shift, bool apply_jump) const {
+int Game_Character::GetScreenY(bool apply_jump) const {
 	int y = GetSpriteY() / TILE_SIZE - Game_Map::GetDisplayY() / TILE_SIZE + TILE_SIZE;
 
 	if (apply_jump) {
@@ -97,14 +93,10 @@ int Game_Character::GetScreenY(bool apply_shift, bool apply_jump) const {
 		y = Utils::PositiveModulo(y, Game_Map::GetTilesY() * TILE_SIZE);
 	}
 
-	if (apply_shift) {
-		y += Game_Map::GetTilesY() * TILE_SIZE;
-	}
-
 	return y;
 }
 
-Drawable::Z_t Game_Character::GetScreenZ(bool apply_shift) const {
+Drawable::Z_t Game_Character::GetScreenZ(int x_offset, int y_offset) const {
 	Drawable::Z_t z = 0;
 
 	if (IsFlying()) {
@@ -118,8 +110,8 @@ Drawable::Z_t Game_Character::GetScreenZ(bool apply_shift) const {
 	}
 
 	// 0x8000 (32768) is added to shift negative numbers into the positive range
-	Drawable::Z_t y = static_cast<Drawable::Z_t>(GetScreenY(apply_shift, false) + 0x8000);
-	Drawable::Z_t x = static_cast<Drawable::Z_t>(GetScreenX(apply_shift) + 0x8000);
+	Drawable::Z_t y = static_cast<Drawable::Z_t>(GetScreenY(false) + y_offset + 0x8000);
+	Drawable::Z_t x = static_cast<Drawable::Z_t>(GetScreenX() + x_offset + 0x8000);
 
 	// The rendering order of characters is: Highest Y-coordinate, Highest X-coordinate, Highest ID
 	// To encode this behaviour all of them get 16 Bit in the Z value
diff --git a/src/game_character.h b/src/game_character.h
index 64dcf2e4d..152b275bb 100644
--- a/src/game_character.h
+++ b/src/game_character.h
@@ -693,27 +693,26 @@ class Game_Character {
 	/**
 	 * Gets sprite x coordinate transformed to screen coordinate in pixels.
 	 *
-	 * @param apply_shift When true the coordinate is shifted by the map width (for looping maps)
 	 * @return screen x coordinate in pixels.
 	 */
-	virtual int GetScreenX(bool apply_shift = false) const;
+	virtual int GetScreenX() const;
 
 	/**
 	 * Gets sprite y coordinate transformed to screen coordinate in pixels.
 	 *
-	 * @param apply_shift When true the coordinate is shifted by the map height (for looping maps)
 	 * @param apply_jump Apply jump height modifier if character is jumping
 	 * @return screen y coordinate in pixels.
 	 */
-	virtual int GetScreenY(bool apply_shift = false, bool apply_jump = true) const;
+	virtual int GetScreenY(bool apply_jump = true) const;
 
 	/**
 	 * Gets screen z coordinate
 	 *
-	 * @param apply_shift Forwarded to GetScreenY
+	 * @param x_offset Offset to apply to the X coordinate
+	 * @param y_offset Offset to apply to the Y coordinate
 	 * @return screen z coordinate
 	 */
-	virtual Drawable::Z_t GetScreenZ(bool apply_shift = false) const;
+	virtual Drawable::Z_t GetScreenZ(int x_offset, int y_offset) const;
 
 	/**
 	 * Gets tile graphic ID.
diff --git a/src/game_event.cpp b/src/game_event.cpp
index 83d0be0c4..858427119 100644
--- a/src/game_event.cpp
+++ b/src/game_event.cpp
@@ -115,10 +115,10 @@ lcf::rpg::SaveMapEvent Game_Event::GetSaveData() const {
 	return save;
 }
 
-Drawable::Z_t Game_Event::GetScreenZ(bool apply_shift) const {
+Drawable::Z_t Game_Event::GetScreenZ(int x_offset, int y_offset) const {
 	// Lowest 16 bit are reserved for the ID
 	// See base function for full explanation
-	return Game_Character::GetScreenZ(apply_shift) + GetId();
+	return Game_Character::GetScreenZ(x_offset, y_offset) + GetId();
 }
 
 int Game_Event::GetOriginalMoveRouteIndex() const {
diff --git a/src/game_event.h b/src/game_event.h
index 7b763adf5..b1dede55b 100644
--- a/src/game_event.h
+++ b/src/game_event.h
@@ -49,7 +49,7 @@ class Game_Event : public Game_EventBase {
 	 * Implementation of abstract methods
 	 */
 	/** @{ */
-	Drawable::Z_t GetScreenZ(bool apply_shift = false) const override;
+	Drawable::Z_t GetScreenZ(int x_offset, int y_offset) const override;
 	bool Move(int dir) override;
 	void UpdateNextMovementAction() override;
 	bool IsVisible() const override;
diff --git a/src/game_player.cpp b/src/game_player.cpp
index 71c8694ac..c20a02a9e 100644
--- a/src/game_player.cpp
+++ b/src/game_player.cpp
@@ -65,13 +65,13 @@ lcf::rpg::SavePartyLocation Game_Player::GetSaveData() const {
 	return *data();
 }
 
-Drawable::Z_t Game_Player::GetScreenZ(bool apply_shift) const {
+Drawable::Z_t Game_Player::GetScreenZ(int x_offset, int y_offset) const {
 	// Player is always "same layer as hero".
 	// When the Player is on the same Y-coordinate as an event the Player is always rendered first.
 	// This is different to events where, when Y is the same, the highest X-coordinate is rendered first.
 	// To ensure this, fake a very high X-coordinate of 65535 (all bits set)
 	// See base function for full explanation of the bitmask
-	return Game_Character::GetScreenZ(apply_shift) | (0xFFFFu << 16u);
+	return Game_Character::GetScreenZ(x_offset, y_offset) | (0xFFFFu << 16u);
 }
 
 void Game_Player::ReserveTeleport(int map_id, int x, int y, int direction, TeleportTarget::Type tt) {
diff --git a/src/game_player.h b/src/game_player.h
index 79b24d820..9cd826b07 100644
--- a/src/game_player.h
+++ b/src/game_player.h
@@ -47,7 +47,7 @@ class Game_Player : public Game_PlayerBase {
 	 * Implementation of abstract methods
 	 */
 	/** @{ */
-	Drawable::Z_t GetScreenZ(bool apply_shift = false) const override;
+	Drawable::Z_t GetScreenZ(int x_offset, int y_offset) const override;
 	bool IsVisible() const override;
 	bool MakeWay(int from_x, int from_y, int to_x, int to_y) override;
 	void UpdateNextMovementAction() override;
diff --git a/src/game_vehicle.cpp b/src/game_vehicle.cpp
index 176e086fe..50688c8eb 100644
--- a/src/game_vehicle.cpp
+++ b/src/game_vehicle.cpp
@@ -147,8 +147,8 @@ int Game_Vehicle::GetAltitude() const {
 		return SCREEN_TILE_SIZE / (SCREEN_TILE_SIZE / TILE_SIZE);
 }
 
-int Game_Vehicle::GetScreenY(bool apply_shift, bool apply_jump) const {
-	return Game_Character::GetScreenY(apply_shift, apply_jump) - GetAltitude();
+int Game_Vehicle::GetScreenY(bool apply_jump) const {
+	return Game_Character::GetScreenY(apply_jump) - GetAltitude();
 }
 
 bool Game_Vehicle::CanLand() const {
diff --git a/src/game_vehicle.h b/src/game_vehicle.h
index e4072a7ea..eb78c8a71 100644
--- a/src/game_vehicle.h
+++ b/src/game_vehicle.h
@@ -72,7 +72,7 @@ class Game_Vehicle : public Game_VehicleBase {
 	bool IsAboard() const;
 	void SyncWithRider(const Game_Character* rider);
 	bool AnimateAscentDescent();
-	int GetScreenY(bool apply_shift = false, bool apply_jump = true) const override;
+	int GetScreenY(bool apply_jump = true) const override;
 	bool CanLand() const;
 	void StartAscent();
 	void StartDescent();
diff --git a/src/sprite_airshipshadow.cpp b/src/sprite_airshipshadow.cpp
index 15a0da95b..ca57f231d 100644
--- a/src/sprite_airshipshadow.cpp
+++ b/src/sprite_airshipshadow.cpp
@@ -25,16 +25,14 @@
 #include "sprite_airshipshadow.h"
 #include <string>
 
-Sprite_AirshipShadow::Sprite_AirshipShadow(CloneType type) {
+Sprite_AirshipShadow::Sprite_AirshipShadow(int x_offset, int y_offset) :
+	x_offset(x_offset), y_offset(y_offset) {
 	SetBitmap(Bitmap::Create(16,16));
 
 	SetOx(TILE_SIZE/2);
 	SetOy(TILE_SIZE);
 
 	RecreateShadow();
-
-	x_shift = ((type & XClone) == XClone);
-	y_shift = ((type & YClone) == YClone);
 }
 
 // Draws the two shadow sprites to a single intermediate bitmap to be blit to the map
@@ -70,8 +68,8 @@ void Sprite_AirshipShadow::Update() {
 	const double opacity = (double)altitude / max_altitude;
 	SetOpacity(opacity * 255);
 
-	SetX(Main_Data::game_player->GetScreenX(x_shift));
-	SetY(Main_Data::game_player->GetScreenY(y_shift) + Main_Data::game_player->GetJumpHeight());
+	SetX(Main_Data::game_player->GetScreenX() + x_offset);
+	SetY(Main_Data::game_player->GetScreenY() + y_offset + Main_Data::game_player->GetJumpHeight());
 	// Synchronized with airship priority
-	SetZ(airship->GetScreenZ(y_shift) - 1);
+	SetZ(airship->GetScreenZ(x_offset, y_offset) - 1);
 }
diff --git a/src/sprite_airshipshadow.h b/src/sprite_airshipshadow.h
index adf689c9a..2d5b89ea3 100644
--- a/src/sprite_airshipshadow.h
+++ b/src/sprite_airshipshadow.h
@@ -37,13 +37,13 @@ class Sprite_AirshipShadow : public Sprite {
 		YClone = 4
 	};
 
-	Sprite_AirshipShadow(CloneType type = CloneType::Original);
+	Sprite_AirshipShadow(int x_offset = 0, int y_offset = 0);
 	void Update();
 	void RecreateShadow();
 
 private:
-	bool x_shift = false;
-	bool y_shift = false;
+	int x_offset = 0;
+	int y_offset = 0;
 };
 
 #endif
diff --git a/src/sprite_character.cpp b/src/sprite_character.cpp
index bc702d4f4..86218e04a 100644
--- a/src/sprite_character.cpp
+++ b/src/sprite_character.cpp
@@ -22,15 +22,14 @@
 #include "bitmap.h"
 #include "output.h"
 
-Sprite_Character::Sprite_Character(Game_Character* character, CloneType type) :
+Sprite_Character::Sprite_Character(Game_Character* character, int x_offset, int y_offset) :
 	character(character),
 	tile_id(-1),
 	character_index(0),
 	chara_width(0),
-	chara_height(0) {
-
-	x_shift = ((type & XClone) == XClone);
-	y_shift = ((type & YClone) == YClone);
+	chara_height(0),
+	x_offset(x_offset),
+	y_offset(y_offset) {
 
 	Update();
 }
@@ -76,10 +75,9 @@ void Sprite_Character::Update() {
 	SetOpacity(character->GetOpacity());
 	SetVisible(character->IsVisible());
 
-	SetX(character->GetScreenX(x_shift));
-	SetY(character->GetScreenY(y_shift));
-	// y_shift because Z is calculated via the screen Y position
-	SetZ(character->GetScreenZ(y_shift));
+	SetX(character->GetScreenX() + x_offset);
+	SetY(character->GetScreenY() + y_offset);
+	SetZ(character->GetScreenZ(x_offset, y_offset));
 
 	int bush_split = 4 - character->GetBushDepth();
 	SetBushDepth(bush_split > 3 ? 0 : GetHeight() / bush_split);
@@ -134,7 +132,7 @@ Rect Sprite_Character::GetCharacterRect(StringView name, int index, const Rect b
 	// VX Ace uses a single 1x1 spriteset of 3x4 sprites.
 	if (!name.empty() && name.front() == '$') {
 		if (!Player::HasEasyRpgExtensions()) {
-			Output::Debug("Ignoring large charset {}. EasyRPG Extension not enabled.");
+			Output::Debug("Ignoring large charset {}. EasyRPG Extension not enabled.", name);
 		} else {
 			rect.width = bitmap_rect.width * (TILE_SIZE / 16) / 4;
 			rect.height = bitmap_rect.height * (TILE_SIZE / 16) / 2;
diff --git a/src/sprite_character.h b/src/sprite_character.h
index 16920c48d..5c820c0a6 100644
--- a/src/sprite_character.h
+++ b/src/sprite_character.h
@@ -42,9 +42,10 @@ class Sprite_Character : public Sprite {
 	 * Constructor.
 	 *
 	 * @param character game character to display
-	 * @param type Type of the sprite for multiple renderings on looping maps
+	 * @param x_offset X Render offset when being a clone
+	 * @param y_offset Y Render offset when being a clone
 	 */
-	Sprite_Character(Game_Character* character, CloneType type = CloneType::Original);
+	Sprite_Character(Game_Character* character, int x_offset = 0, int y_offset = 0);
 
 	/**
 	 * Updates sprite state.
@@ -94,8 +95,8 @@ class Sprite_Character : public Sprite {
 	/** Returns true for charset sprites; false for tiles. */
 	bool UsesCharset() const;
 
-	bool x_shift = false;
-	bool y_shift = false;
+	int x_offset = 0;
+	int y_offset = 0;
 	bool refresh_bitmap = false;
 
 	void OnTileSpriteReady(FileRequestResult*);
diff --git a/src/spriteset_map.cpp b/src/spriteset_map.cpp
index 4d19c2483..0d16a5277 100644
--- a/src/spriteset_map.cpp
+++ b/src/spriteset_map.cpp
@@ -218,14 +218,18 @@ void Spriteset_Map::CreateSprite(Game_Character* character, bool create_x_clone,
 
 	add_sprite(std::make_unique<Sprite_Character>(character));
 	if (create_x_clone) {
-		add_sprite(std::make_unique<Sprite_Character>(character, CloneType::XClone));
+		add_sprite(std::make_unique<Sprite_Character>(character, -map_tiles_x, 0));
+		add_sprite(std::make_unique<Sprite_Character>(character, map_tiles_x, 0));
 	}
 	if (create_y_clone) {
-		add_sprite(std::make_unique<Sprite_Character>(character, CloneType::YClone));
+		add_sprite(std::make_unique<Sprite_Character>(character, 0, -map_tiles_y));
+		add_sprite(std::make_unique<Sprite_Character>(character, 0, map_tiles_y));
 	}
 	if (create_x_clone && create_y_clone) {
-		add_sprite(std::make_unique<Sprite_Character>(character,
-			(CloneType)(CloneType::XClone | CloneType::YClone)));
+		add_sprite(std::make_unique<Sprite_Character>(character, map_tiles_x, map_tiles_y));
+		add_sprite(std::make_unique<Sprite_Character>(character, -map_tiles_x, map_tiles_y));
+		add_sprite(std::make_unique<Sprite_Character>(character, map_tiles_x, -map_tiles_y));
+		add_sprite(std::make_unique<Sprite_Character>(character, -map_tiles_x, -map_tiles_y));
 	}
 }
 
@@ -240,14 +244,18 @@ void Spriteset_Map::CreateAirshipShadowSprite(bool create_x_clone, bool create_y
 
 	add_sprite(std::make_unique<Sprite_AirshipShadow>());
 	if (create_x_clone) {
-		add_sprite(std::make_unique<Sprite_AirshipShadow>(CloneType::XClone));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(-map_tiles_x, 0));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(map_tiles_x, 0));
 	}
 	if (create_y_clone) {
-		add_sprite(std::make_unique<Sprite_AirshipShadow>(CloneType::YClone));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(0, -map_tiles_y));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(0, map_tiles_y));
 	}
 	if (create_x_clone && create_y_clone) {
-		add_sprite(std::make_unique<Sprite_AirshipShadow>(
-			(CloneType)(CloneType::XClone | CloneType::YClone)));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(map_tiles_x, map_tiles_y));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(-map_tiles_x, map_tiles_y));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(map_tiles_x, -map_tiles_y));
+		add_sprite(std::make_unique<Sprite_AirshipShadow>(-map_tiles_x, -map_tiles_y));
 	}
 }
 
@@ -277,8 +285,10 @@ void Spriteset_Map::OnPanoramaSpriteReady(FileRequestResult* result) {
 void Spriteset_Map::CalculateMapRenderOffset() {
 	map_render_ox = 0;
 	map_render_oy = 0;
-	map_tiles_x = 0;
-	map_tiles_y = 0;
+
+	// Smallest possible map. Smaller maps are hacked
+	map_tiles_x = std::max<int>(Game_Map::GetTilesX(), 20) * TILE_SIZE;
+	map_tiles_y = std::max<int>(Game_Map::GetTilesY(), 15) * TILE_SIZE;
 
 	panorama->SetRenderOx(0);
 	panorama->SetRenderOy(0);
@@ -286,7 +296,6 @@ void Spriteset_Map::CalculateMapRenderOffset() {
 
 	if (Player::game_config.fake_resolution.Get()) {
 		// Resolution hack for tiles and sprites
-		// Smallest possible map. Smaller maps are hacked
 		map_tiles_x = std::max<int>(Game_Map::GetTilesX(), 20) * TILE_SIZE;
 		map_tiles_y = std::max<int>(Game_Map::GetTilesY(), 15) * TILE_SIZE;
 

From 89b45373ce5fecb988a7cabe6dfcaa950ff8e4e0 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 15 Apr 2024 18:49:43 +0200
Subject: [PATCH 060/222] Sprite_Character/AirshipShadow: Move functions that
 are only used by Sprite from Update to Draw.

This is similiar how Pictures do it since years.

Avoids some unnecessary function calls when Player is frame-skipping as less draw related code is processed.
---
 src/sprite_airshipshadow.cpp | 20 ++++++++++++-------
 src/sprite_airshipshadow.h   |  1 +
 src/sprite_character.cpp     | 38 +++++++++++++++++++++---------------
 src/sprite_character.h       |  2 ++
 tests/game_character.cpp     | 14 -------------
 5 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/sprite_airshipshadow.cpp b/src/sprite_airshipshadow.cpp
index ca57f231d..ce51f8230 100644
--- a/src/sprite_airshipshadow.cpp
+++ b/src/sprite_airshipshadow.cpp
@@ -54,6 +54,19 @@ void Sprite_AirshipShadow::RecreateShadow() {
 	GetBitmap()->Blit(0, 0, *system, Rect(128+16,32,16,16), opacity);
 }
 
+void Sprite_AirshipShadow::Draw(Bitmap &dst) {
+	Game_Vehicle* airship = Game_Map::GetVehicle(Game_Vehicle::Airship);
+	const int altitude = airship->GetAltitude();
+	const int max_altitude = TILE_SIZE;
+	const double opacity = (double)altitude / max_altitude;
+	SetOpacity(opacity * 255);
+
+	SetX(Main_Data::game_player->GetScreenX() + x_offset);
+	SetY(Main_Data::game_player->GetScreenY() + y_offset + Main_Data::game_player->GetJumpHeight());
+
+	Sprite::Draw(dst);
+}
+
 void Sprite_AirshipShadow::Update() {
 	if (!Main_Data::game_player->InAirship()) {
 		SetVisible(false);
@@ -63,13 +76,6 @@ void Sprite_AirshipShadow::Update() {
 
 	Game_Vehicle* airship = Game_Map::GetVehicle(Game_Vehicle::Airship);
 
-	const int altitude = airship->GetAltitude();
-	const int max_altitude = TILE_SIZE;
-	const double opacity = (double)altitude / max_altitude;
-	SetOpacity(opacity * 255);
-
-	SetX(Main_Data::game_player->GetScreenX() + x_offset);
-	SetY(Main_Data::game_player->GetScreenY() + y_offset + Main_Data::game_player->GetJumpHeight());
 	// Synchronized with airship priority
 	SetZ(airship->GetScreenZ(x_offset, y_offset) - 1);
 }
diff --git a/src/sprite_airshipshadow.h b/src/sprite_airshipshadow.h
index 2d5b89ea3..f73226864 100644
--- a/src/sprite_airshipshadow.h
+++ b/src/sprite_airshipshadow.h
@@ -38,6 +38,7 @@ class Sprite_AirshipShadow : public Sprite {
 	};
 
 	Sprite_AirshipShadow(int x_offset = 0, int y_offset = 0);
+	void Draw(Bitmap& dst) override;
 	void Update();
 	void RecreateShadow();
 
diff --git a/src/sprite_character.cpp b/src/sprite_character.cpp
index 86218e04a..f0dccc497 100644
--- a/src/sprite_character.cpp
+++ b/src/sprite_character.cpp
@@ -34,6 +34,27 @@ Sprite_Character::Sprite_Character(Game_Character* character, int x_offset, int
 	Update();
 }
 
+void Sprite_Character::Draw(Bitmap &dst) {
+	if (UsesCharset()) {
+		int row = character->GetFacing();
+		auto frame = character->GetAnimFrame();
+		if (frame >= lcf::rpg::EventPage::Frame_middle2) frame = lcf::rpg::EventPage::Frame_middle;
+		SetSrcRect({frame * chara_width, row * chara_height, chara_width, chara_height});
+	}
+
+	SetFlashEffect(character->GetFlashColor());
+
+	SetOpacity(character->GetOpacity());
+
+	SetX(character->GetScreenX() + x_offset);
+	SetY(character->GetScreenY() + y_offset);
+
+	int bush_split = 4 - character->GetBushDepth();
+	SetBushDepth(bush_split > 3 ? 0 : GetHeight() / bush_split);
+
+	Sprite::Draw(dst);
+}
+
 void Sprite_Character::Update() {
 	if (tile_id != character->GetTileId() ||
 		character_name != character->GetSpriteName() ||
@@ -63,29 +84,14 @@ void Sprite_Character::Update() {
 		}
 	}
 
-	if (UsesCharset()) {
-		int row = character->GetFacing();
-		auto frame = character->GetAnimFrame();
-		if (frame >= lcf::rpg::EventPage::Frame_middle2) frame = lcf::rpg::EventPage::Frame_middle;
-		SetSrcRect({frame * chara_width, row * chara_height, chara_width, chara_height});
-	}
-
-	SetFlashEffect(character->GetFlashColor());
-
-	SetOpacity(character->GetOpacity());
 	SetVisible(character->IsVisible());
-
-	SetX(character->GetScreenX() + x_offset);
-	SetY(character->GetScreenY() + y_offset);
 	SetZ(character->GetScreenZ(x_offset, y_offset));
-
-	int bush_split = 4 - character->GetBushDepth();
-	SetBushDepth(bush_split > 3 ? 0 : GetHeight() / bush_split);
 }
 
 Game_Character* Sprite_Character::GetCharacter() {
 	return character;
 }
+
 void Sprite_Character::SetCharacter(Game_Character* new_character) {
 	character = new_character;
 }
diff --git a/src/sprite_character.h b/src/sprite_character.h
index 5c820c0a6..bb8f9187d 100644
--- a/src/sprite_character.h
+++ b/src/sprite_character.h
@@ -47,6 +47,8 @@ class Sprite_Character : public Sprite {
 	 */
 	Sprite_Character(Game_Character* character, int x_offset = 0, int y_offset = 0);
 
+	void Draw(Bitmap& dst) override;
+
 	/**
 	 * Updates sprite state.
 	 */
diff --git a/tests/game_character.cpp b/tests/game_character.cpp
index 99c6bc9bb..09f0ab281 100644
--- a/tests/game_character.cpp
+++ b/tests/game_character.cpp
@@ -77,20 +77,6 @@ static_assert(Game_Character::IsDirectionFixedAnimationType(lcf::rpg::EventPage:
 static_assert(!Game_Character::IsDirectionFixedAnimationType(lcf::rpg::EventPage::AnimType_spin), "DirFixedBroken");
 static_assert(!Game_Character::IsDirectionFixedAnimationType(lcf::rpg::EventPage::AnimType_step_frame_fix), "DirFixedBroken");
 
-#if 0
-
-	/** @return the direction we would need to face the hero. */
-	int GetDirectionToHero();
-
-	/** @return the direction we would need to face away from hero. */
-	int GetDirectionAwayHero();
-
-	virtual Drawable::Z_t GetScreenZ(bool apply_shift = false) const;
-
-	int DistanceXfromPlayer() const;
-	int DistanceYfromPlayer() const;
-#endif
-
 TEST_SUITE_BEGIN("Game_Character");
 
 static void testInit(Game_Character& ch, int max_stop_count = 0) {

From e1ec581f4035e20481c22394ef129ebd66faf995 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 11 Apr 2024 19:54:05 +0200
Subject: [PATCH 061/222] Fix Finger (Touch) Input on Windows

On some devices the ID is not 0-4 but counts upwards.

Introduced a new finger ID field to resolve this.
---
 src/input_source.cpp         |  9 +++++++++
 src/input_source.h           |  9 ++++++---
 src/platform/sdl/sdl2_ui.cpp | 36 ++++++++++++++++++++----------------
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/input_source.cpp b/src/input_source.cpp
index 25d6f1946..c05b31e3b 100644
--- a/src/input_source.cpp
+++ b/src/input_source.cpp
@@ -334,4 +334,13 @@ void Input::LogSource::UpdateSystem() {
 	// input log does not record actions outside of logical frames.
 }
 
+void Input::TouchInput::Down(int id, int x, int y) {
+	this->id = id;
+	this->position = { x, y };
+	this->pressed = true;
+}
 
+void Input::TouchInput::Up() {
+	id = -1;
+	pressed = false;
+}
diff --git a/src/input_source.h b/src/input_source.h
index d42a5754a..c3b91f0dc 100644
--- a/src/input_source.h
+++ b/src/input_source.h
@@ -59,10 +59,13 @@ namespace Input {
 	};
 
 	struct TouchInput {
-		bool pressed = false;
-		Point position;
+		void Down(int id, int x, int y);
+		void Up();
 
-		// Fields for use by InputSource. Do not modify in Ui!
+		// Do not alter the fields from the Ui class, use Down and Up
+		int id = -1;
+		Point position;
+		bool pressed = false;
 		bool prev_frame_pressed = false;
 		Game_Clock::time_point touch_begin;
 		Game_Clock::time_point touch_end;
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index bc926fe91..aa1fe91a5 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -940,29 +940,33 @@ void Sdl2Ui::ProcessFingerEvent(SDL_Event& evnt) {
 	// We currently ignore swipe gestures
 	// A finger touch is detected when the fingers go up a brief delay after going down
 	if (evnt.type == SDL_FINGERDOWN) {
-		int finger = evnt.tfinger.fingerId;
-		if (finger < static_cast<int>(finger_input.size())) {
-			auto& fi = touch_input[finger];
-			fi.position.x = (evnt.tfinger.x - viewport.x) * main_surface->width() / xw;
-			fi.position.y = (evnt.tfinger.y - viewport.y) * main_surface->height() / yh;
+		auto fi = std::find_if(touch_input.begin(), touch_input.end(), [&](const auto& input) {
+			return input.id == -1;
+		});
+		if (fi == touch_input.end()) {
+			// already tracking 5 fingers
+			return;
+		}
 
 #ifdef EMSCRIPTEN
-			double display_ratio = emscripten_get_device_pixel_ratio();
-			fi.position.x = (evnt.tfinger.x * display_ratio - viewport.x) * main_surface->width() / xw;
-			fi.position.y = (evnt.tfinger.y * display_ratio - viewport.y) * main_surface->height() / yh;
+		double display_ratio = emscripten_get_device_pixel_ratio();
+		int x = (evnt.tfinger.x * display_ratio - viewport.x) * main_surface->width() / xw;
+		int y = (evnt.tfinger.y * display_ratio - viewport.y) * main_surface->height() / yh;
 #else
-			fi.position.x = (evnt.tfinger.x - viewport.x) * main_surface->width() / xw;
-			fi.position.y = (evnt.tfinger.y - viewport.y) * main_surface->height() / yh;
+		int x = (evnt.tfinger.x - viewport.x) * main_surface->width() / xw;
+		int y = (evnt.tfinger.y - viewport.y) * main_surface->height() / yh;
 #endif
 
-			fi.pressed = true;
-		}
+		fi->Down(evnt.tfinger.fingerId, x, y);
 	} else if (evnt.type == SDL_FINGERUP) {
-		int finger = evnt.tfinger.fingerId;
-		if (finger < static_cast<int>(finger_input.size())) {
-			auto& fi = touch_input[finger];
-			fi.pressed = false;
+		auto fi = std::find_if(touch_input.begin(), touch_input.end(), [&](const auto& input) {
+			return input.id == evnt.tfinger.fingerId;
+		});
+		if (fi == touch_input.end()) {
+			// Finger is not tracked
+			return;
 		}
+		fi->Up();
 	}
 #else
 	/* unused */

From cd7f2120cdea5e0cc192d715b4d4addb457df85b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 11 Apr 2024 20:00:45 +0200
Subject: [PATCH 062/222] Remove __WINRT__ (OS is not developed anymore by
 Microsoft)

---
 src/platform/sdl/main.cpp    | 2 +-
 src/platform/sdl/sdl2_ui.cpp | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index f9effd3e4..031a542f8 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -64,7 +64,7 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 extern "C" int main(int argc, char* argv[]) {
 	std::vector<std::string> args;
 
-#if defined(_WIN32) && !defined(__WINRT__)
+#if defined(_WIN32)
 	// Use widestring args
 	int argc_w;
 	LPWSTR *argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w);
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index aa1fe91a5..6156bf2e1 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -647,15 +647,10 @@ void Sdl2Ui::SetTitle(const std::string &title) {
 }
 
 bool Sdl2Ui::ShowCursor(bool flag) {
-#ifdef __WINRT__
-	// Prevent cursor hide in WinRT because it is hidden everywhere while the app runs...
-	return flag;
-#else
 	bool temp_flag = cursor_visible;
 	cursor_visible = flag;
 	SDL_ShowCursor(flag ? SDL_ENABLE : SDL_DISABLE);
 	return temp_flag;
-#endif
 }
 
 void Sdl2Ui::ProcessEvent(SDL_Event &evnt) {
@@ -975,7 +970,7 @@ void Sdl2Ui::ProcessFingerEvent(SDL_Event& evnt) {
 }
 
 void Sdl2Ui::SetAppIcon() {
-#if defined(__WINRT__) || defined(__MORPHOS__)
+#if defined(__MORPHOS__)
 	// do nothing
 #elif defined(_WIN32)
 	SDL_SysWMinfo wminfo;

From 5d2a88e7f1d590aada4f3a1a935b7c4d5cfc290f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 11 Apr 2024 20:20:01 +0200
Subject: [PATCH 063/222] Windows 11: Disable Window rounding

This looses pixels in the edges of the game.

No error check. Will silently fail when unsupported.
---
 CMakeLists.txt               |  4 ++++
 src/platform/sdl/sdl2_ui.cpp | 35 ++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23e1bf412..40535dc7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -578,6 +578,10 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 		target_sources(${PROJECT_NAME} PRIVATE
 			src/platform/wiiu/input_buttons.cpp)
 	endif()
+
+	if(WIN32)
+		target_link_libraries(${PROJECT_NAME} "Dwmapi")
+	endif()
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL1")
 	target_sources(${PROJECT_NAME} PRIVATE
 		src/platform/sdl/sdl_audio.cpp
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 6156bf2e1..6e5255166 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -25,6 +25,7 @@
 #ifdef _WIN32
 #  include <windows.h>
 #  include <SDL_syswm.h>
+#  include <dwmapi.h>
 #elif defined(__ANDROID__)
 #  include <jni.h>
 #  include <SDL_system.h>
@@ -118,6 +119,19 @@ static uint32_t SelectFormat(const SDL_RendererInfo& rinfo, bool print_all) {
 	return current_fmt;
 }
 
+#ifdef _WIN32
+HWND GetWindowHandle(SDL_Window* window) {
+	SDL_SysWMinfo wminfo;
+	SDL_VERSION(&wminfo.version)
+		SDL_bool success = SDL_GetWindowWMInfo(window, &wminfo);
+
+	if (success < 0)
+		Output::Error("Wrong SDL version");
+
+	return wminfo.info.win.window;
+}
+#endif
+
 static int FilterUntilFocus(const SDL_Event* evnt);
 
 #if defined(USE_KEYBOARD) && defined(SUPPORT_KEYBOARD)
@@ -354,8 +368,8 @@ bool Sdl2Ui::RefreshDisplayMode() {
 		window.size_changed = true;
 
 		auto window_sg = lcf::makeScopeGuard([&]() {
-				SDL_DestroyWindow(sdl_window);
-				sdl_window = nullptr;
+			SDL_DestroyWindow(sdl_window);
+			sdl_window = nullptr;
 		});
 
 		SetAppIcon();
@@ -415,6 +429,13 @@ bool Sdl2Ui::RefreshDisplayMode() {
 			return false;
 		}
 
+#ifdef _WIN32
+		HWND window = GetWindowHandle(sdl_window);
+		// Not using the enum names because this will fail to build when not using a recent Windows 11 SDK
+		int window_rounding = 1; // DWMWCP_DONOTROUND
+		DwmSetWindowAttribute(window, 33 /* DWMWA_WINDOW_CORNER_PREFERENCE */, &window_rounding, sizeof(window_rounding));
+#endif
+
 		renderer_sg.Dismiss();
 		window_sg.Dismiss();
 	} else {
@@ -973,14 +994,6 @@ void Sdl2Ui::SetAppIcon() {
 #if defined(__MORPHOS__)
 	// do nothing
 #elif defined(_WIN32)
-	SDL_SysWMinfo wminfo;
-	SDL_VERSION(&wminfo.version)
-	SDL_bool success = SDL_GetWindowWMInfo(sdl_window, &wminfo);
-
-	if (success < 0)
-		Output::Error("Wrong SDL version");
-
-	HWND window;
 	HINSTANCE handle = GetModuleHandle(NULL);
 	HICON icon = LoadIcon(handle, MAKEINTRESOURCE(23456));
 	HICON icon_small = (HICON) LoadImage(handle, MAKEINTRESOURCE(23456), IMAGE_ICON,
@@ -989,7 +1002,7 @@ void Sdl2Ui::SetAppIcon() {
 	if (icon == NULL || icon_small == NULL)
 		Output::Warning("Could not load window icon.");
 
-	window = wminfo.info.win.window;
+	HWND window = GetWindowHandle(sdl_window);
 	SetClassLongPtr(window, GCLP_HICON, (LONG_PTR) icon);
 	SetClassLongPtr(window, GCLP_HICONSM, (LONG_PTR) icon_small);
 #else

From 13d7e27fc118f987eda7af4128a5aff9a902292f Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sat, 20 Apr 2024 23:26:39 +0200
Subject: [PATCH 064/222] Fix: Add inih to workflow (liblcf dep)

---
 .github/workflows/stable-compilation.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stable-compilation.yml b/.github/workflows/stable-compilation.yml
index 5971edd83..fd6d4bc71 100644
--- a/.github/workflows/stable-compilation.yml
+++ b/.github/workflows/stable-compilation.yml
@@ -42,9 +42,10 @@ jobs:
           apt-get update
           apt-get install -yqq --no-install-recommends --no-install-suggests \
             ca-certificates build-essential cmake ninja-build git \
-            libicu-dev libexpat1-dev libsdl2-dev libpng-dev libpixman-1-dev \
-            libfmt-dev libfreetype6-dev libharfbuzz-dev libmpg123-dev \
-            libsndfile-dev libvorbis-dev libopusfile-dev libspeexdsp-dev \
+            libicu-dev libexpat1-dev libinih-dev \
+            libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
+            libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
+            libvorbis-dev libopusfile-dev libspeexdsp-dev \
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository

From d97bda6d4bce1ebbc11269116a31cea23c0384f8 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Tue, 7 May 2024 14:47:21 -0300
Subject: [PATCH 065/222] New Command 2056 - Spawn Map Event

Command that clones Events from any map inside the current map.

Co-Authored-By: Primekick <thetrueaxer@gmail.com>
---
 src/game_event.h         |   4 ++
 src/game_interpreter.cpp |  12 +++++
 src/game_interpreter.h   |   1 +
 src/game_map.cpp         | 106 +++++++++++++++++++++++++++++++--------
 src/game_map.h           |   8 +++
 5 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/src/game_event.h b/src/game_event.h
index 6b7e0d77f..017a54fc6 100644
--- a/src/game_event.h
+++ b/src/game_event.h
@@ -39,6 +39,10 @@ class Game_Event : public Game_EventBase {
 	 */
 	Game_Event(int map_id, const lcf::rpg::Event* event);
 
+	void SetUnderlyingEvent(const lcf::rpg::Event* ev) {
+		event = ev;
+	}
+
 	/** Load from saved game */
 	void SetSaveData(lcf::rpg::SaveMapEvent save);
 
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 025d9a5be..11c033b1d 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -787,6 +787,8 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacCallCommand(com);
 		case Cmd::EasyRpg_SetInterpreterFlag:
 			return CommandEasyRpgSetInterpreterFlag(com);
+		case static_cast<Cmd>(2056): //EasyRPG_SpawnMapEvent
+			return CommandSpawnMapEvent(com);
 		default:
 			return true;
 	}
@@ -5007,7 +5009,17 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 
 	if (flag_name == "rpg2k-battle")
 		lcf::Data::system.easyrpg_use_rpg2k_battle_system = flag_value;
+	
+	return true;
+}
+
+bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
+	int src_map = ValueOrVariable(com.parameters[0], com.parameters[1]);	
+	int src_event = ValueOrVariable(com.parameters[2], com.parameters[3]);
+	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
+	int target_y = ValueOrVariable(com.parameters[6], com.parameters[7]);
 
+	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y);
 	return true;
 }
 
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index b2cc5bc71..71d17c647 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -292,6 +292,7 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 	bool CommandManiacControlStrings(lcf::rpg::EventCommand const& com);
 	bool CommandManiacCallCommand(lcf::rpg::EventCommand const& com);
 	bool CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com);
+	bool CommandSpawnMapEvent(lcf::rpg::EventCommand const& com);
 
 	void SetSubcommandIndex(int indent, int idx);
 	uint8_t& ReserveSubcommandIndex(int indent);
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 4f2c5901b..177caa0d9 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -341,41 +341,41 @@ std::unique_ptr<lcf::rpg::Map> Game_Map::loadMapFile(int map_id) {
 
 void Game_Map::SetupCommon() {
 	if (!Tr::GetCurrentTranslationId().empty()) {
-		// Build our map translation id.
-		std::stringstream ss;
-		ss << "map" << std::setfill('0') << std::setw(4) << GetMapId() << ".po";
-
-		// Translate all messages for this map
-		Player::translation.RewriteMapMessages(ss.str(), *map);
+		TranslateMapMessages(GetMapId(), *map);
 	}
 	SetNeedRefresh(true);
 
 	PrintPathToMap();
 
-	// Restart all common events after translation change
-	// Otherwise new strings are not applied
 	if (translation_changed) {
 		InitCommonEvents();
 	}
 
 	map_cache->Clear();
-	using Op = Caching::ObservedVarOps;
 
-	// Create the map events
+	CreateMapEvents();
+}
+
+void Game_Map::CreateMapEvents() {
 	events.reserve(map->events.size());
 	for (auto& ev : map->events) {
 		events.emplace_back(GetMapId(), &ev);
+		AddEventToCache(ev);
+	}
+}
 
-		for (const auto& pg : ev.pages) {
-			if (pg.condition.flags.switch_a) {
-				map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_a_id, ev);
-			}
-			if (pg.condition.flags.switch_b) {
-				map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_b_id, ev);
-			}
-			if (pg.condition.flags.variable) {
-				map_cache->AddEventAsRefreshTarget<Op::VarSet>(pg.condition.variable_id, ev);
-			}
+void Game_Map::AddEventToCache(lcf::rpg::Event& ev) {
+	using Op = Caching::ObservedVarOps;
+
+	for (const auto& pg : ev.pages) {
+		if (pg.condition.flags.switch_a) {
+			map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_a_id, ev);
+		}
+		if (pg.condition.flags.switch_b) {
+			map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_b_id, ev);
+		}
+		if (pg.condition.flags.variable) {
+			map_cache->AddEventAsRefreshTarget<Op::VarSet>(pg.condition.variable_id, ev);
 		}
 	}
 }
@@ -386,6 +386,72 @@ void Game_Map::Caching::MapCache::Clear() {
 	}
 }
 
+bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y) {
+	auto source_map = Game_Map::loadMapFile(src_map_id);
+	if (source_map == nullptr) {
+		Output::Warning("CloneMapEvent: Invalid source map ID {}", src_map_id);
+		return true;
+	}
+
+	if (!Tr::GetCurrentTranslationId().empty()) {
+		TranslateMapMessages(src_map_id, *source_map);
+	}
+
+	const lcf::rpg::Event* source_event = FindEventById(source_map->events, src_event_id);
+	if (source_event == nullptr) {
+		Output::Warning("CloneMapEvent: Event ID {} not found on source map {}", src_event_id, src_map_id);
+		return true;
+	}
+
+	lcf::rpg::Event new_event = *source_event;
+	new_event.ID = GetNextAvailableEventId();
+	new_event.x = target_x;
+	new_event.y = target_y;
+
+	map->events.push_back(new_event);
+
+	events.emplace_back(GetMapId(), &map->events.back());
+	FixUnderlyingEventReferences();
+
+	AddEventToCache(new_event);
+
+	Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
+	scene->spriteset->Refresh();
+
+	return true;
+}
+
+void Game_Map::TranslateMapMessages(int mapId, lcf::rpg::Map& map) {
+	std::stringstream ss;
+	ss << "map" << std::setfill('0') << std::setw(4) << mapId << ".po";
+	Player::translation.RewriteMapMessages(ss.str(), map);
+}
+
+
+inline void Game_Map::FixUnderlyingEventReferences() {
+	size_t idx = 0;
+	for (auto& ev : events) {
+		ev.SetUnderlyingEvent(&map->events.at(idx++));
+	}
+}
+
+const lcf::rpg::Event* Game_Map::FindEventById(const std::vector<lcf::rpg::Event>& events, int eventId) {
+	for (const auto& ev : events) {
+		if (ev.ID == eventId) {
+			return &ev;
+		}
+	}
+	return nullptr;
+}
+
+int Game_Map::GetNextAvailableEventId() {
+	int maxEventId = 0;
+	for (const auto& ev : map->events) {
+		maxEventId = std::max(maxEventId, ev.ID);
+	}
+	return maxEventId + 1;
+}
+
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
 	save.foreground_event_execstate = interpreter->GetSaveState();
 
diff --git a/src/game_map.h b/src/game_map.h
index fad15a346..eb8f4a86d 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -96,6 +96,14 @@ namespace Game_Map {
 	/** Disposes Game_Map. */
 	void Dispose();
 
+	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y);
+	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
+	void CreateMapEvents();
+	inline void FixUnderlyingEventReferences();
+	void AddEventToCache(lcf::rpg::Event& ev);
+	const lcf::rpg::Event* FindEventById(const std::vector<lcf::rpg::Event>& events, int eventId);
+	int GetNextAvailableEventId();
+
 	/**
 	 * Loads the map from disk
 	 *

From eff51e156dc92f94c5491f4c4bb5d9c5dbc34e2b Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Tue, 7 May 2024 16:22:05 -0300
Subject: [PATCH 066/222] Spawn Map Event - Handling cases where it clones
 events from its current map

---
 src/game_interpreter.cpp |  2 ++
 src/game_map.cpp         | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 11c033b1d..033b720a2 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -5019,6 +5019,8 @@ bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
 	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
 	int target_y = ValueOrVariable(com.parameters[6], com.parameters[7]);
 
+	if (src_map == 0) src_map = Game_Map::GetMapId();
+
 	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y);
 	return true;
 }
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 177caa0d9..50b638f78 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -387,14 +387,20 @@ void Game_Map::Caching::MapCache::Clear() {
 }
 
 bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y) {
-	auto source_map = Game_Map::loadMapFile(src_map_id);
-	if (source_map == nullptr) {
-		Output::Warning("CloneMapEvent: Invalid source map ID {}", src_map_id);
-		return true;
-	}
+	std::unique_ptr<lcf::rpg::Map> source_map;
 
-	if (!Tr::GetCurrentTranslationId().empty()) {
-		TranslateMapMessages(src_map_id, *source_map);
+	if (src_map_id == GetMapId()) source_map = std::make_unique<lcf::rpg::Map>(GetMap());
+	else {
+		source_map = Game_Map::loadMapFile(src_map_id);
+
+		if (source_map == nullptr) {
+			Output::Warning("CloneMapEvent: Invalid source map ID {}", src_map_id);
+			return true;
+		}
+
+		if (!Tr::GetCurrentTranslationId().empty()) {
+			TranslateMapMessages(src_map_id, *source_map);
+		}
 	}
 
 	const lcf::rpg::Event* source_event = FindEventById(source_map->events, src_event_id);

From 1e585a38e0d5c66714a86789517f48bdd5c63343 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Wed, 8 May 2024 12:31:40 -0300
Subject: [PATCH 067/222] Spawn Map Event - Overwrite paramater

Updates on DestroyMapEvent

You can also replace an older event with a new one with this optional parameter
---
 src/game_character.h     |  1 -
 src/game_interpreter.cpp |  3 +-
 src/game_map.cpp         | 60 ++++++++++++++++++++++++++++++++++++++--
 src/game_map.h           |  4 ++-
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/game_character.h b/src/game_character.h
index 6bcdfc4bd..541c6edcb 100644
--- a/src/game_character.h
+++ b/src/game_character.h
@@ -1379,7 +1379,6 @@ inline Game_CharacterDataStorage<T>::Game_CharacterDataStorage(Game_CharacterDat
 template <typename T>
 inline Game_CharacterDataStorage<T>& Game_CharacterDataStorage<T>::operator=(Game_CharacterDataStorage&& o) noexcept
 {
-	static_cast<Game_Character*>(this) = std::move(o);
 	if (this != &o) {
 		_data = std::move(o._data);
 		Game_Character::_data = &this->_data;
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 033b720a2..8d2441d3b 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -5018,10 +5018,11 @@ bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
 	int src_event = ValueOrVariable(com.parameters[2], com.parameters[3]);
 	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
 	int target_y = ValueOrVariable(com.parameters[6], com.parameters[7]);
+	int target_event = ValueOrVariable(com.parameters[8], com.parameters[9]);
 
 	if (src_map == 0) src_map = Game_Map::GetMapId();
 
-	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y);
+	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y, target_event);
 	return true;
 }
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 50b638f78..7c9f3a05f 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -386,7 +386,7 @@ void Game_Map::Caching::MapCache::Clear() {
 	}
 }
 
-bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y) {
+bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id = 0) {
 	std::unique_ptr<lcf::rpg::Map> source_map;
 
 	if (src_map_id == GetMapId()) source_map = std::make_unique<lcf::rpg::Map>(GetMap());
@@ -410,7 +410,11 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 	}
 
 	lcf::rpg::Event new_event = *source_event;
-	new_event.ID = GetNextAvailableEventId();
+	if (target_event_id > 0) {
+		DestroyMapEvent(target_event_id);
+		new_event.ID = target_event_id;
+	}
+	else new_event.ID = GetNextAvailableEventId();
 	new_event.x = target_x;
 	new_event.y = target_y;
 
@@ -423,6 +427,58 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 
 	Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
 	scene->spriteset->Refresh();
+	SetNeedRefresh(true);
+
+	return true;
+}
+
+bool Game_Map::DestroyMapEvent(const int event_id) {
+	const lcf::rpg::Event* event = FindEventById(map->events, event_id);
+
+	if (event == nullptr) {
+		Output::Warning("DestroyMapEvent: Event ID {} not found on current map", event_id);
+		return true;
+	}
+
+	// Remove event from cache
+	//	for (auto& pg : event->pages) {
+	//		if (pg.condition.flags.switch_a) {
+	//			events_cache_by_switch[pg.condition.switch_a_id].RemoveEvent(*event);
+	//		}
+	//		if (pg.condition.flags.switch_b) {
+	//			events_cache_by_switch[pg.condition.switch_b_id].RemoveEvent(*event);
+	//		}
+	//		if (pg.condition.flags.variable) {
+	//			events_cache_by_variable[pg.condition.variable_id].RemoveEvent(*event);
+	//		}
+	//	}
+
+
+	// Remove event from events vector
+	auto it = events.end();
+	for (auto iter = events.begin(); iter != events.end(); ++iter) {
+		if (iter->GetId() == event_id) {
+			it = iter;
+			break;
+		}
+	}
+	if (it != events.end()) {
+		events.erase(it);
+	}
+
+	// Remove event from map
+	for (auto it = map->events.begin(); it != map->events.end(); ++it) {
+		if (it->ID == event_id) {
+			map->events.erase(it);
+			break;
+		}
+	}
+
+	FixUnderlyingEventReferences();
+
+	Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
+	scene->spriteset->Refresh();
+	SetNeedRefresh(true);
 
 	return true;
 }
diff --git a/src/game_map.h b/src/game_map.h
index eb8f4a86d..d098053bc 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -96,7 +96,9 @@ namespace Game_Map {
 	/** Disposes Game_Map. */
 	void Dispose();
 
-	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y);
+	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id);
+	bool DestroyMapEvent(const int event_id);
+
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
 	void CreateMapEvents();
 	inline void FixUnderlyingEventReferences();

From 13a500612fef397f829a445569e6867365033b10 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 9 May 2024 16:51:31 +0200
Subject: [PATCH 068/222] Maniac Patch: Add flag "2" to disable the
 annoying/game-breaking variable range adjustment.

---
 resources/unix/easyrpg-player.6.adoc |  8 +++++++-
 src/game_config_game.cpp             |  7 ++++++-
 src/game_config_game.h               |  2 +-
 src/player.cpp                       |  9 ++++++---
 src/player.h                         |  2 +-
 tests/cmdline_parser.cpp             | 17 +++++++++++++++++
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index 6c25be6da..0a4081d08 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -95,8 +95,14 @@ NOTE: For games that only use ASCII (English games) use '1252'.
 *--patch-key-patch*::
   Enable support for the Key Patch by Ineluki.
 
-*--patch-maniac*::
+*--patch-maniac*:: _[N]_
   Enable support for the Maniac Patch by BingShan.
+  Values for N:
+   - 1: Enable the patch (default)
+   - 2: Enable the patch but do not adjust variable ranges to 32 bit.
+
+  Not adjusting the variable ranges is useful if you are adding the patch to an
+  existing game, as this reduces the likelihood that the game will stop working.
 
 *--patch-pic-unlock*::
   Picture movement is not interrupted by messages in any version of the engine.
diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index 1a5d3d54b..c297936e5 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -99,8 +99,13 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_override = true;
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, {"--patch-maniac", "--no-patch-maniac"})) {
+		if (cp.ParseNext(arg, 1, {"--patch-maniac", "--no-patch-maniac"})) {
 			patch_maniac.Set(arg.ArgIsOn());
+
+			if (arg.ArgIsOn() && arg.ParseValue(0, li_value)) {
+				patch_maniac.Set(li_value);
+			}
+
 			patch_override = true;
 			continue;
 		}
diff --git a/src/game_config_game.h b/src/game_config_game.h
index b7cd8cfe4..0106d67b2 100644
--- a/src/game_config_game.h
+++ b/src/game_config_game.h
@@ -40,7 +40,7 @@ struct Game_ConfigGame {
 	BoolConfigParam fake_resolution{ "Fake Metrics", "Makes games run on higher resolutions (with some success)", "Game", "FakeResolution", false };
 	BoolConfigParam patch_easyrpg{ "EasyRPG", "EasyRPG Engine Extensions", "Patch", "EasyRPG", false };
 	BoolConfigParam patch_dynrpg{ "DynRPG", "", "Patch", "DynRPG", false };
-	BoolConfigParam patch_maniac{ "Maniac Patch", "", "Patch", "Maniac", false };
+	ConfigParam<int> patch_maniac{ "Maniac Patch", "", "Patch", "Maniac", 0 };
 	BoolConfigParam patch_common_this_event{ "Common This Event", "Support \"This Event\" in Common Events", "Patch", "CommonThisEvent", false };
 	BoolConfigParam patch_unlock_pics{ "Unlock Pictures", "Allow picture commands while a message is shown", "Patch", "PicUnlock", false };
 	BoolConfigParam patch_key_patch{ "Ineluki Key Patch", "Support \"Ineluki Key Patch\"", "Patch", "KeyPatch", false };
diff --git a/src/player.cpp b/src/player.cpp
index ea71ec5ed..46e20d9de 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -880,7 +880,7 @@ void Player::ResetGameObjects() {
 
 	auto min_var = lcf::Data::system.easyrpg_variable_min_value;
 	if (min_var == 0) {
-		if (Player::IsPatchManiac()) {
+		if ((Player::game_config.patch_maniac.Get() & 1) == 1) {
 			min_var = std::numeric_limits<Game_Variables::Var_t>::min();
 		} else {
 			min_var = Player::IsRPG2k3() ? Game_Variables::min_2k3 : Game_Variables::min_2k;
@@ -888,7 +888,7 @@ void Player::ResetGameObjects() {
 	}
 	auto max_var = lcf::Data::system.easyrpg_variable_max_value;
 	if (max_var == 0) {
-		if (Player::IsPatchManiac()) {
+		if ((Player::game_config.patch_maniac.Get() & 1) == 1) {
 			max_var = std::numeric_limits<Game_Variables::Var_t>::max();
 		} else {
 			max_var = Player::IsRPG2k3() ? Game_Variables::max_2k3 : Game_Variables::max_2k;
@@ -1402,7 +1402,10 @@ Engine options:
  --patch-dynrpg       Enable support of DynRPG patch by Cherry (very limited).
  --patch-easyrpg      Enable EasyRPG extensions.
  --patch-key-patch    Enable Key Patch by Ineluki.
- --patch-maniac       Enable Maniac Patch by BingShan.
+ --patch-maniac [N]   Enable Maniac Patch by BingShan. Values for N:
+                       - 1: Enable the patch (default)
+                       - 2: Enable the patch but do not adjust variable ranges
+                            to 32 bit.
  --patch-pic-unlock   Picture movement is not interrupted by messages in any
                       version of the engine.
  --patch-rpg2k3-cmds  Support all RPG Maker 2003 event commands in any version
diff --git a/src/player.h b/src/player.h
index 812cb5b00..bf220f91f 100644
--- a/src/player.h
+++ b/src/player.h
@@ -478,7 +478,7 @@ inline bool Player::IsPatchDynRpg() {
 }
 
 inline bool Player::IsPatchManiac() {
-	return game_config.patch_maniac.Get();
+	return game_config.patch_maniac.Get() > 0;
 }
 
 inline bool Player::IsPatchKeyPatch() {
diff --git a/tests/cmdline_parser.cpp b/tests/cmdline_parser.cpp
index 2ce378cfa..faff3823b 100644
--- a/tests/cmdline_parser.cpp
+++ b/tests/cmdline_parser.cpp
@@ -69,6 +69,23 @@ TEST_CASE("ParseMulti") {
 	REQUIRE_EQ(li, 2);
 }
 
+TEST_CASE("Parse Optional Value") {
+	std::vector<std::string> args = { "testapp", "--arg1", "--arg2", "1", "--arg3", "a", "b" };
+
+	CmdlineParser cp(args);
+
+	CmdlineArg arg;
+
+	REQUIRE(cp.ParseNext(arg, 1, "--arg1"));
+	REQUIRE(arg.NumValues() == 0);
+
+	REQUIRE(cp.ParseNext(arg, 2, "--arg2"));
+	REQUIRE(arg.NumValues() == 1);
+
+	REQUIRE(cp.ParseNext(arg, 3, "--arg3"));
+	REQUIRE(arg.NumValues() == 2);
+}
+
 TEST_CASE("ParseNull") {
 	std::vector<std::string> args;
 	CmdlineParser cp(args);

From d51633607eb25bfe6830a47fd1a2e60f8478e00c Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Sat, 20 Apr 2024 17:23:01 -0300
Subject: [PATCH 069/222] String Variable's ToFile - Relax File extension and
 path

When saving a file, maniacs forces the File in Text/ folder with .txt extension.
Through this PR, if '*' is at the end of filename, the file extension is relaxed.

It also better handles the creation of nested directories.
---
 src/game_strings.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/game_strings.cpp b/src/game_strings.cpp
index 351fc43cf..1626dd709 100644
--- a/src/game_strings.cpp
+++ b/src/game_strings.cpp
@@ -183,19 +183,27 @@ StringView Game_Strings::ToFile(Str_Params params, std::string filename, int enc
 	}
 
 	// Maniacs forces the File in Text/ folder with .txt extension
-	// TODO: Maybe relax this?
-	filename = "Text/" + filename + ".txt";
+	filename = "Text/" + filename;
+	
+	// EasyRPG Extension: When "*" is at the end of filename, ".txt" is not appended
+	if (filename.back() == '*') {
+		filename.pop_back();
+	} else {
+		filename += ".txt";
+	}
 
 	auto txt_out = FileFinder::Save().OpenOutputStream(filename);
+	auto txt_dir = FileFinder::GetPathAndFilename(filename).first;
+
 	if (!txt_out) {
-		if (!FileFinder::Save().MakeDirectory("Text", false)) {
-			Output::Warning("Maniac String Op ToFile failed: Cannot create Text directory");
+		if (!FileFinder::Save().MakeDirectory(txt_dir, false)) {
+			Output::Warning("Maniac String Op ToFile failed. Cannot create directory {}", txt_dir);
 			return {};
 		}
 
 		txt_out = FileFinder::Save().OpenOutputStream(filename);
 		if (!txt_out) {
-			Output::Warning("Maniac String Op ToFile failed: Cannot write to {}", filename);
+			Output::Warning("Maniac String Op ToFile failed. Cannot write to {}", filename);
 			return {};
 		}
 	}

From 533651143f318e68100faf7ffdec625a5065aa2f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 9 May 2024 23:47:37 +0200
Subject: [PATCH 070/222] Guard more extensions behind the flag

---
 src/game_strings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game_strings.cpp b/src/game_strings.cpp
index 1626dd709..1258a854e 100644
--- a/src/game_strings.cpp
+++ b/src/game_strings.cpp
@@ -25,6 +25,7 @@
 #include "game_switches.h"
 #include "game_variables.h"
 #include "output.h"
+#include "player.h"
 #include "utils.h"
 
 void Game_Strings::WarnGet(int id) const {
@@ -186,7 +187,7 @@ StringView Game_Strings::ToFile(Str_Params params, std::string filename, int enc
 	filename = "Text/" + filename;
 	
 	// EasyRPG Extension: When "*" is at the end of filename, ".txt" is not appended
-	if (filename.back() == '*') {
+	if (Player::HasEasyRpgExtensions() && filename.back() == '*') {
 		filename.pop_back();
 	} else {
 		filename += ".txt";

From c7bd1796ab064f8030dda65ab029de6510655baa Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 10 May 2024 15:19:41 +0200
Subject: [PATCH 071/222] Generalize ToHero functions to be ToCharacter
 instead.

Based on work of @jetrotal
---
 src/game_character.cpp | 50 +++++++++++++++++++++++-------------------
 src/game_character.h   | 36 +++++++++++++++++++++---------
 src/game_event.cpp     |  6 ++---
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/game_character.cpp b/src/game_character.cpp
index 5d596ee50..02a2fb05b 100644
--- a/src/game_character.cpp
+++ b/src/game_character.cpp
@@ -283,10 +283,10 @@ void Game_Character::UpdateMoveRoute(int32_t& current_index, const lcf::rpg::Mov
 					TurnRandom();
 					break;
 				case Code::move_towards_hero:
-					TurnTowardHero();
+					TurnTowardCharacter(GetPlayer());
 					break;
 				case Code::move_away_from_hero:
-					TurnAwayFromHero();
+					TurnAwayFromCharacter(GetPlayer());
 					break;
 				case Code::move_forward:
 					break;
@@ -341,10 +341,10 @@ void Game_Character::UpdateMoveRoute(int32_t& current_index, const lcf::rpg::Mov
 					TurnRandom();
 					break;
 				case Code::face_hero:
-					TurnTowardHero();
+					TurnTowardCharacter(GetPlayer());
 					break;
 				case Code::face_away_from_hero:
-					TurnAwayFromHero();
+					TurnAwayFromCharacter(GetPlayer());
 					break;
 				default:
 					break;
@@ -538,9 +538,9 @@ void Game_Character::Turn90DegreeLeftOrRight() {
 	}
 }
 
-int Game_Character::GetDirectionToHero() {
-	int sx = DistanceXfromPlayer();
-	int sy = DistanceYfromPlayer();
+int Game_Character::GetDirectionToCharacter(const Game_Character& target) {
+	int sx = GetDistanceXfromCharacter(target);
+	int sy = GetDistanceYfromCharacter(target);
 
 	if ( std::abs(sx) > std::abs(sy) ) {
 		return (sx > 0) ? Left : Right;
@@ -549,9 +549,9 @@ int Game_Character::GetDirectionToHero() {
 	}
 }
 
-int Game_Character::GetDirectionAwayHero() {
-	int sx = DistanceXfromPlayer();
-	int sy = DistanceYfromPlayer();
+int Game_Character::GetDirectionAwayCharacter(const Game_Character& target) {
+	int sx = GetDistanceXfromCharacter(target);
+	int sy = GetDistanceYfromCharacter(target);
 
 	if ( std::abs(sx) > std::abs(sy) ) {
 		return (sx > 0) ? Right : Left;
@@ -560,12 +560,12 @@ int Game_Character::GetDirectionAwayHero() {
 	}
 }
 
-void Game_Character::TurnTowardHero() {
-	SetDirection(GetDirectionToHero());
+void Game_Character::TurnTowardCharacter(const Game_Character& target) {
+	SetDirection(GetDirectionToCharacter(target));
 }
 
-void Game_Character::TurnAwayFromHero() {
-	SetDirection(GetDirectionAwayHero());
+void Game_Character::TurnAwayFromCharacter(const Game_Character& target) {
+	SetDirection(GetDirectionAwayCharacter(target));
 }
 
 void Game_Character::TurnRandom() {
@@ -601,10 +601,10 @@ bool Game_Character::BeginMoveRouteJump(int32_t& current_index, const lcf::rpg::
 					TurnRandom();
 					break;
 				case Code::move_towards_hero:
-					TurnTowardHero();
+					TurnTowardCharacter(GetPlayer());
 					break;
 				case Code::move_away_from_hero:
-					TurnAwayFromHero();
+					TurnAwayFromCharacter(GetPlayer());
 					break;
 				case Code::move_forward:
 					break;
@@ -645,10 +645,10 @@ bool Game_Character::BeginMoveRouteJump(int32_t& current_index, const lcf::rpg::
 					TurnRandom();
 					break;
 				case Code::face_hero:
-					TurnTowardHero();
+					TurnTowardCharacter(GetPlayer());
 					break;
 				case Code::face_away_from_hero:
-					TurnAwayFromHero();
+					TurnAwayFromCharacter(GetPlayer());
 					break;
 				default:
 					break;
@@ -734,8 +734,8 @@ bool Game_Character::Jump(int x, int y) {
 	return true;
 }
 
-int Game_Character::DistanceXfromPlayer() const {
-	int sx = GetX() - Main_Data::game_player->GetX();
+int Game_Character::GetDistanceXfromCharacter(const Game_Character& target) const {
+	int sx = GetX() - target.GetX();
 	if (Game_Map::LoopHorizontal()) {
 		if (std::abs(sx) > Game_Map::GetTilesX() / 2) {
 			if (sx > 0)
@@ -747,8 +747,8 @@ int Game_Character::DistanceXfromPlayer() const {
 	return sx;
 }
 
-int Game_Character::DistanceYfromPlayer() const {
-	int sy = GetY() - Main_Data::game_player->GetY();
+int Game_Character::GetDistanceYfromCharacter(const Game_Character& target) const {
+	int sy = GetY() - target.GetY();
 	if (Game_Map::LoopVertical()) {
 		if (std::abs(sy) > Game_Map::GetTilesY() / 2) {
 			if (sy > 0)
@@ -888,6 +888,12 @@ Game_Character* Game_Character::GetCharacter(int character_id, int event_id) {
 	}
 }
 
+Game_Character& Game_Character::GetPlayer() {
+	assert(Main_Data::game_player);
+
+	return *Main_Data::game_player;
+}
+
 int Game_Character::ReverseDir(int dir) {
 	constexpr static char reversed[] =
 		{ Down, Left, Up, Right, DownLeft, UpLeft, UpRight, DownRight };
diff --git a/src/game_character.h b/src/game_character.h
index 3928ee30e..6bcdfc4bd 100644
--- a/src/game_character.h
+++ b/src/game_character.h
@@ -639,11 +639,17 @@ class Game_Character {
 	 */
 	void Turn90DegreeLeftOrRight();
 
-	/** @return the direction we would need to face the hero. */
-	int GetDirectionToHero();
+	/**
+	 * @param target Target character
+	 * @return the direction we would need to face the target
+	 */
+	int GetDirectionToCharacter(const Game_Character& target);
 
-	/** @return the direction we would need to face away from hero. */
-	int GetDirectionAwayHero();
+	/**
+	 * @param target Target character
+	 * @return the direction we would need to face away from the target.
+	 */
+	int GetDirectionAwayCharacter(const Game_Character& target);
 
 	/**
 	 * @param dir input direction
@@ -672,14 +678,14 @@ class Game_Character {
 	void TurnRandom();
 
 	/**
-	 * Character looks towards the hero.
+	 * @param target character looks towards this target.
 	 */
-	void TurnTowardHero();
+	void TurnTowardCharacter(const Game_Character& target);
 
 	/**
-	 * Character looks away from the hero.
+	 * @param target character looks away from this target.
 	 */
-	void TurnAwayFromHero();
+	void TurnAwayFromCharacter(const Game_Character& target);
 
 	/**
 	 * Character waits for 20 frames more.
@@ -775,8 +781,17 @@ class Game_Character {
 	 */
 	void SetAnimationType(AnimType anim_type);
 
-	int DistanceXfromPlayer() const;
-	int DistanceYfromPlayer() const;
+	/**
+	 * @param target Target to calculate distance of
+	 * @return X distance to target
+	 */
+	int GetDistanceXfromCharacter(const Game_Character& target) const;
+
+	/**
+	 * @param target Target to calculate distance of
+	 * @return Y distance to target
+	 */
+	int GetDistanceYfromCharacter(const Game_Character& target) const;
 
 	/**
 	 * Tests if the character is currently on the tile at x/y or moving
@@ -889,6 +904,7 @@ class Game_Character {
 	static int ReverseDir(int dir);
 
 	static Game_Character* GetCharacter(int character_id, int event_id);
+	static Game_Character& GetPlayer();
 
 	static constexpr int GetDxFromDirection(int dir);
 	static constexpr int GetDyFromDirection(int dir);
diff --git a/src/game_event.cpp b/src/game_event.cpp
index 52cba0887..1345c888e 100644
--- a/src/game_event.cpp
+++ b/src/game_event.cpp
@@ -349,7 +349,7 @@ bool Game_Event::ScheduleForegroundExecution(bool by_decision_key, bool face_pla
 	}
 
 	if (face_player && !(IsFacingLocked() || IsSpinning())) {
-		SetFacing(GetDirectionToHero());
+		SetFacing(GetDirectionToCharacter(GetPlayer()));
 	}
 
 	data()->waiting_execution = true;
@@ -570,8 +570,8 @@ void Game_Event::MoveTypeTowardsOrAwayPlayer(bool towards) {
 			dir = Rand::GetRandomNumber(0, 3);
 		} else {
 			dir = towards
-				? GetDirectionToHero()
-				: GetDirectionAwayHero();
+				? GetDirectionToCharacter(GetPlayer())
+				: GetDirectionAwayCharacter(GetPlayer());
 		}
 	}
 

From db0dfcda5a6296619dfb57afee8171f96d883875 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 10 May 2024 15:50:39 +0200
Subject: [PATCH 072/222] WaitForSingleMovement: Similiar to other waiting
 commands preserve the state.

Is required to prevent that the variable changes across waits and causes issues.
---
 src/game_interpreter_map.cpp | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index fb1934bc8..c16623309 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -785,21 +785,29 @@ bool Game_Interpreter_Map::CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand c
 }
 
 bool Game_Interpreter_Map::CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCommand const& com) {
-	int event_id = ValueOrVariable(com.parameters[0], com.parameters[1]);
+	_state.easyrpg_parameters.resize(3);
 
-	Game_Character* chara = GetCharacter(event_id);
-	if (chara == nullptr) {
-		return true;
-	}
+	int& event_id = _state.easyrpg_parameters[0];
+	int& failure_limit = _state.easyrpg_parameters[1];
+	int& output_var = _state.easyrpg_parameters[2];
+
+	if (!_state.easyrpg_active) {
+		event_id = ValueOrVariable(com.parameters[0], com.parameters[1]);
+
+		if (com.parameters.size() >= 4) {
+			failure_limit = ValueOrVariable(com.parameters[2], com.parameters[3]);
+		}
 
-	int failure_limit = 0;
-	if (com.parameters.size() >= 4) {
-		failure_limit = ValueOrVariable(com.parameters[2], com.parameters[3]);
+		if (com.parameters.size() >= 6) {
+			output_var = ValueOrVariable(com.parameters[4], com.parameters[5]);
+		}
 	}
 
-	int output_var = 0;
-	if (com.parameters.size() >= 6) {
-		failure_limit = ValueOrVariable(com.parameters[4], com.parameters[5]);
+	_state.easyrpg_active = false;
+
+	Game_Character* chara = GetCharacter(event_id);
+	if (chara == nullptr) {
+		return true;
 	}
 
 	bool exists = chara->IsMoveRouteOverwritten();
@@ -817,6 +825,7 @@ bool Game_Interpreter_Map::CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCo
 	// !finished
 	if (failure_limit == 0 || chara->GetMoveFailureCount() < failure_limit) {
 		// Below threshold: Yield
+		_state.easyrpg_active = true;
 		return false;
 	}
 

From 19a700c0294ce6275fa7b3902cd70d71e076293a Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sun, 12 May 2024 01:58:40 +0200
Subject: [PATCH 073/222] Flatpak: add libinih Fix git revision, in "detached
 head" state is no prefix

---
 CMakeLists.txt                        | 4 ++--
 builds/flatpak/org.easyrpg.player.yml | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40535dc7c..a57c27d7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,12 +503,12 @@ if(NOT GIT_TAG)
 			list(GET GIT_DESCRIPTION 2 GIT_HASH)
 			string(APPEND GIT_MESSAGE "${GIT_COMMITS} commits since tag \"${GIT_TAG}\", ")
 			string(PREPEND GIT_COMMITS "+")
+			# strip the g prefix
+			string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
 		else()
 			# no tags found, only hash
 			list(GET GIT_DESCRIPTION 0 GIT_HASH)
 		endif()
-		# strip the g prefix
-		string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
 		set(PLAYER_VERSION_GIT "git${GIT_COMMITS}@${GIT_HASH}")
 		string(APPEND GIT_MESSAGE "object hash is ${GIT_HASH}")
 		git_local_changes(GIT_DIRTY)
diff --git a/builds/flatpak/org.easyrpg.player.yml b/builds/flatpak/org.easyrpg.player.yml
index c99edee76..89028f2e5 100644
--- a/builds/flatpak/org.easyrpg.player.yml
+++ b/builds/flatpak/org.easyrpg.player.yml
@@ -58,6 +58,15 @@ modules:
         url: https://github.com/libxmp/libxmp.git
         tag: libxmp-4.6.0
         commit: 8201d26cf933688a8be64292457c429fd8e654ab
+  - name: libinih
+    buildsystem: meson
+    config-opts:
+      - --buildtype=debugoptimized
+    sources:
+      - type: git
+        url: https://github.com/benhoyt/inih.git
+        tag: 58
+        commit: 5cc5e2c24642513aaa5b19126aad42d0e4e0923e
   # own libraries
   - name: liblcf
     buildsystem: cmake-ninja

From 70794e8d0ff73778b30727e3ca628d0d6527af93 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Sat, 14 Oct 2023 16:01:40 -0300
Subject: [PATCH 074/222] New Commands: 2053 SetInterpreterFlag

Usages:

2053, "flag Name", on_off_Value_IsVariable, on_off_Value

2053, "dynrpg", 0, 1 // dynrpg patch
---
 src/game_interpreter.cpp | 31 +++++++++++++++++++++++++++++++
 src/game_interpreter.h   |  1 +
 2 files changed, 32 insertions(+)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 6ba308651..e3b9dd0b4 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -826,6 +826,8 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacControlStrings(com);
 		case Cmd::Maniac_CallCommand:
 			return CommandManiacCallCommand(com);
+		case static_cast<Game_Interpreter::Cmd>(2053): //Cmd::EasyRpg_SetInterpreterFlag
+			return CommandEasyRpgSetInterpreterFlag(com);
 		default:
 			return true;
 	}
@@ -5108,6 +5110,35 @@ bool Game_Interpreter::CommandManiacCallCommand(lcf::rpg::EventCommand const& co
 	return true;
 }
 
+bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com) {
+	if (!Player::HasEasyRpgExtensions()) {
+		return true;
+	}
+
+	// FIXME: Store them as part of the interpreter state
+
+	std::string flag_name = Utils::LowerCase(ToString(com.string));
+	int flag_value = ValueOrVariable(com.parameters[0], com.parameters[1]);
+
+	if (flag_name == "dynrpg")
+		Player::game_config.patch_dynrpg.Set(flag_value);
+	if (flag_name == "maniac")
+		Player::game_config.patch_maniac.Set(flag_value);
+	if (flag_name == "common-this")
+		Player::game_config.patch_common_this_event.Set(flag_value);
+	if (flag_name == "pic-unlock")
+		Player::game_config.patch_unlock_pics.Set(flag_value);
+	if (flag_name == "key-patch")
+		Player::game_config.patch_key_patch.Set(flag_value);
+	if (flag_name == "rpg2k3-cmds" || flag_name == "rpg2k3-commands")
+		Player::game_config.patch_rpg2k3_commands.Set(flag_value);
+
+	if (flag_name == "rpg2k-battle")
+		lcf::Data::system.easyrpg_use_rpg2k_battle_system = flag_value;
+
+	return true;
+}
+
 Game_Interpreter& Game_Interpreter::GetForegroundInterpreter() {
 	return Game_Battle::IsBattleRunning()
 		? Game_Battle::GetInterpreter()
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index f349b3918..df5f4c4e4 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -289,6 +289,7 @@ class Game_Interpreter
 	bool CommandManiacSetGameOption(lcf::rpg::EventCommand const& com);
 	bool CommandManiacControlStrings(lcf::rpg::EventCommand const& com);
 	bool CommandManiacCallCommand(lcf::rpg::EventCommand const& com);
+	bool CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com);
 
 	int DecodeInt(lcf::DBArray<int32_t>::const_iterator& it);
 	const std::string DecodeString(lcf::DBArray<int32_t>::const_iterator& it);

From e36df23aa7365c77fb79a7349d1a9009d08e34a0 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 28 Feb 2024 16:24:42 +0100
Subject: [PATCH 075/222] Implemented DirectMenuPatch

---
 resources/unix/easyrpg-player.6.adoc |  9 ++-
 src/game_config_game.cpp             | 68 ++++++++++++++++++--
 src/game_config_game.h               |  4 ++
 src/game_interpreter_map.cpp         | 95 ++++++++++++++++++++++++++--
 src/game_interpreter_map.h           |  2 +
 src/game_player.cpp                  |  2 +-
 src/player.cpp                       |  9 +--
 src/scene_equip.cpp                  | 12 ++--
 src/scene_skill.cpp                  | 28 ++++++--
 src/scene_skill.h                    |  4 +-
 src/scene_status.cpp                 | 17 +++--
 src/scene_status.h                   |  4 +-
 12 files changed, 221 insertions(+), 33 deletions(-)

diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index 0a4081d08..e18725774 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -78,16 +78,21 @@ NOTE: For games that only use ASCII (English games) use '1252'.
   Disable support for the Runtime Package (RTP). Will lead to checkerboard
   graphics and silent music/sound effects in games depending on the RTP.
 
-*--patch-anti-lag-switch*:: _SWITCH_
+*--patch-antilag-switch*:: _SWITCH_
   Disables event page refreshing when the switch 'SWITCH' is set to 'ON'.
 
 *--patch-common-this*::
   Enable usage of __This Event__ in common events in any version of the engine.
   By default, this behaviour is only enabled for RPG Maker 2003 v1.12.
 
+*--patch-direct-menu*:: _VAR_
+  Directly access subscreens of the default menu by setting VAR.
+  See also: https://dev.makerpendium.de/docs/patch_db/main-en.htm?page=direct_menu
+
 *--patch-dynrpg*::
   Enable limited support for the DynRPG patch from Cherry. The patches are not
-  loaded from DLL files, but re-implemented by the engine.
+  loaded from DLL files, but re-implemented by the engine. See also:
+  https://rpg-maker.cherrytree.at/dynrpg/getting_started.html
 
 *--patch-easyrpg*::
   Enable EasyRPG extensions such as support for 32 bit images and large charsets.
diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index c297936e5..3be970697 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -17,6 +17,7 @@
 
 #include "game_config_game.h"
 #include "cmdline_parser.h"
+#include "directory_tree.h"
 #include "filefinder.h"
 #include "options.h"
 #include "output.h"
@@ -85,7 +86,8 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_common_this_event.Lock(false);
 			patch_key_patch.Lock(false);
 			patch_rpg2k3_commands.Lock(false);
-			patch_anti_lag_switch.Lock(false);
+			patch_anti_lag_switch.Lock(0);
+			patch_direct_menu.Lock(0);
 			patch_override = true;
 			continue;
 		}
@@ -129,16 +131,28 @@ void Game_ConfigGame::LoadFromArgs(CmdlineParser& cp) {
 			patch_override = true;
 			continue;
 		}
-		if (cp.ParseNext(arg, 1, "--patch-antilag-switch")) {
-			if (arg.ParseValue(0, li_value)) {
+		if (cp.ParseNext(arg, 1, {"--patch-antilag-switch", "--no-patch-antilag-switch"})) {
+			if (arg.ArgIsOn() && arg.ParseValue(0, li_value)) {
 				patch_anti_lag_switch.Set(li_value);
 				patch_override = true;
 			}
+
+			if (arg.ArgIsOff()) {
+				patch_anti_lag_switch.Set(0);
+				patch_override = true;
+			}
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, "--no-patch-antilag-switch")) {
-			patch_anti_lag_switch.Set(0);
-			patch_override = true;
+		if (cp.ParseNext(arg, 1, {"--patch-direct-menu", "--no-patch-direct-menu"})) {
+			if (arg.ArgIsOn() && arg.ParseValue(0, li_value)) {
+				patch_direct_menu.Set(li_value);
+				patch_override = true;
+			}
+
+			if (arg.ArgIsOff()) {
+				patch_direct_menu.Set(0);
+				patch_override = true;
+			}
 			continue;
 		}
 		if (cp.ParseNext(arg, 6, "--patch")) {
@@ -211,4 +225,46 @@ void Game_ConfigGame::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	if (patch_anti_lag_switch.FromIni(ini)) {
 		patch_override = true;
 	}
+
+	if (patch_direct_menu.FromIni(ini)) {
+		patch_override = true;
+	}
+}
+
+void Game_ConfigGame::PrintActivePatches() {
+	std::vector<std::string> patches;
+
+	auto add_bool = [&](auto& patch) {
+		if (patch.Get()) {
+			patches.push_back(ToString(patch.GetName()));
+		}
+	};
+
+	add_bool(patch_easyrpg);
+	add_bool(patch_dynrpg);
+	add_bool(patch_maniac);
+	add_bool(patch_common_this_event);
+	add_bool(patch_unlock_pics);
+	add_bool(patch_key_patch);
+	add_bool(patch_rpg2k3_commands);
+
+	auto add_int = [&](auto& patch) {
+		if (patch.Get() > 0) {
+			patches.push_back(fmt::format("{} ({})", patch.GetName(), patch.Get()));
+		}
+	};
+
+	add_int(patch_anti_lag_switch);
+	add_int(patch_direct_menu);
+
+	if (patches.empty()) {
+		Output::Debug("Patch configuration: None");
+	} else {
+		std::string out = "Patch configuration: ";
+		for (const auto& s: patches) {
+			out += s + " ";
+		}
+		out.pop_back();
+		Output::DebugStr(out);
+	}
 }
diff --git a/src/game_config_game.h b/src/game_config_game.h
index 0106d67b2..ef8e70d56 100644
--- a/src/game_config_game.h
+++ b/src/game_config_game.h
@@ -46,6 +46,7 @@ struct Game_ConfigGame {
 	BoolConfigParam patch_key_patch{ "Ineluki Key Patch", "Support \"Ineluki Key Patch\"", "Patch", "KeyPatch", false };
 	BoolConfigParam patch_rpg2k3_commands{ "RPG2k3 Event Commands", "Enable support for RPG2k3 event commands", "Patch", "RPG2k3Commands", false };
 	ConfigParam<int> patch_anti_lag_switch{ "Anti-Lag Switch", "Disable event page refreshes when switch is set", "Patch", "AntiLagSwitch", 0 };
+	ConfigParam<int> patch_direct_menu{ "Direct Menu", " Allows direct access to subscreens of the default menu", "Patch", "DirectMenu", 0 };
 
 	// Command line only
 	BoolConfigParam patch_support{ "Support patches", "When OFF all patch support is disabled", "", "", true };
@@ -75,6 +76,9 @@ struct Game_ConfigGame {
 	 * @post values of this are updated with values found in command line args.
 	 */
 	void LoadFromArgs(CmdlineParser& cp);
+
+	/** Outputs a list of active patches */
+	void PrintActivePatches();
 };
 
 #endif
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 7490ae105..74e301f96 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -23,6 +23,7 @@
 #include <sstream>
 #include <cassert>
 #include "audio.h"
+#include "feature.h"
 #include "game_map.h"
 #include "game_battle.h"
 #include "game_event.h"
@@ -38,8 +39,13 @@
 #include "sprite_character.h"
 #include "scene_map.h"
 #include "scene_battle.h"
+#include "scene_equip.h"
+#include "scene_item.h"
 #include "scene_menu.h"
+#include "scene_order.h"
 #include "scene_save.h"
+#include "scene_status.h"
+#include "scene_skill.h"
 #include "scene_load.h"
 #include "scene_name.h"
 #include "scene_shop.h"
@@ -83,6 +89,82 @@ void Game_Interpreter_Map::OnMapChange() {
 	}
 }
 
+bool Game_Interpreter_Map::RequestMainMenuScene(int subscreen_id, int actor_index, bool is_db_actor) {
+
+	if (Player::game_config.patch_direct_menu.Get() && subscreen_id == -1) {
+		subscreen_id = Main_Data::game_variables->Get(Player::game_config.patch_direct_menu.Get());
+		actor_index = Main_Data::game_variables->Get(Player::game_config.patch_direct_menu.Get() + 1);
+		is_db_actor = (actor_index < 0);
+		actor_index = std::abs(actor_index);
+	}
+
+	switch (subscreen_id)
+	{
+	case 1: // Inventory
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Item>());
+		return true;
+	case 2: // Skills
+	case 3: // Equipment
+	case 4: // Status
+		if (!is_db_actor) {
+			if (actor_index == 0 || actor_index > 4) {
+				actor_index = 1;
+			}
+			actor_index--;
+		}
+
+		if (is_db_actor && !Main_Data::game_actors->GetActor(actor_index)) {
+			Output::Warning("Invalid actor ID {}", actor_index);
+			return false;
+		}
+
+		if (subscreen_id == 2) {
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Skill>(actor_index, 0, is_db_actor));
+		}
+		else if (subscreen_id == 3) {
+			Game_Actor* actor;
+			if (!is_db_actor) {
+				actor = Main_Data::game_party->GetActors()[actor_index];
+			}
+			else {
+				actor = Main_Data::game_actors->GetActor(actor_index);
+			}
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Equip>(*actor));
+		}
+		else if (subscreen_id == 4) {
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Status>(actor_index, is_db_actor));
+		}
+		return true;
+	case 5: // Order
+		if (!Feature::HasRow()) {
+			break;
+		}
+
+		if (Main_Data::game_party->GetActors().size() <= 1) {
+			Output::Warning("Party size must exceed '1' for 'Order' subscreen to be opened");
+			return false;
+		}
+		else {
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Order>());
+			return true;
+		}
+	/*
+	case 6: // Settings
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Settings>());
+		return true;
+	case 7: // Language
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Language>());
+		return true;
+	case 8: // Debug
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Debug>());
+		return true;
+		*/
+	}
+
+	Scene::instance->SetRequestedScene(std::make_shared<Scene_Menu>());
+	return true;
+}
+
 /**
  * Execute Command.
  */
@@ -638,7 +720,7 @@ bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& /*
 	return false;
 }
 
-bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const& /* com */) { // code 11950
+bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const& com) { // code 11950
 	auto& frame = GetFrame();
 	auto& index = frame.current_command;
 
@@ -646,9 +728,14 @@ bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const& /*
 		return false;
 	}
 
-	Scene::instance->SetRequestedScene(std::make_shared<Scene_Menu>());
-	++index;
-	return false;
+	int subscreen_id = -1, actor_index = 0;
+	bool is_db_actor = false;
+
+	if (RequestMainMenuScene(subscreen_id, actor_index, is_db_actor)) {
+		++index;
+		return false;
+	}
+	return true;
 }
 
 bool Game_Interpreter_Map::CommandOpenLoadMenu(lcf::rpg::EventCommand const& /* com */) {
diff --git a/src/game_interpreter_map.h b/src/game_interpreter_map.h
index a52e7da0a..1bdb89de1 100644
--- a/src/game_interpreter_map.h
+++ b/src/game_interpreter_map.h
@@ -51,6 +51,8 @@ class Game_Interpreter_Map : public Game_Interpreter
 	 */
 	void OnMapChange();
 
+	bool RequestMainMenuScene(int subscreen_id = -1, int actor_index = 0, bool is_db_actor = false);
+
 	bool ExecuteCommand(lcf::rpg::EventCommand const& com) override;
 
 private:
diff --git a/src/game_player.cpp b/src/game_player.cpp
index c20a02a9e..48091e967 100644
--- a/src/game_player.cpp
+++ b/src/game_player.cpp
@@ -295,7 +295,7 @@ void Game_Player::UpdateNextMovementAction() {
 
 		ResetAnimation();
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
-		Scene::instance->SetRequestedScene(std::make_shared<Scene_Menu>());
+		Game_Map::GetInterpreter().RequestMainMenuScene();
 		return;
 	}
 
diff --git a/src/player.cpp b/src/player.cpp
index 46e20d9de..5f69eec6a 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -825,9 +825,7 @@ void Player::CreateGameObjects() {
 		}
 	}
 
-	Output::Debug("Patch configuration: easyrpg={} dynrpg={} maniac={} key-patch={} common-this={} pic-unlock={} 2k3-commands={} anti-lag-switch={}",
-		Player::HasEasyRpgExtensions(), Player::IsPatchDynRpg(), Player::IsPatchManiac(), Player::IsPatchKeyPatch(), game_config.patch_common_this_event.Get(),
-		game_config.patch_unlock_pics.Get(), game_config.patch_rpg2k3_commands.Get(), game_config.patch_anti_lag_switch.Get());
+	game_config.PrintActivePatches();
 
 	ResetGameObjects();
 
@@ -1394,11 +1392,14 @@ Engine options:
  --new-game           Skip the title scene and start a new game directly.
  --no-log-color       Disable colors in terminal log.
  --no-rtp             Disable support for the Runtime Package (RTP).
- --patch-anti-lag-switch SWITCH
+ --patch-antilag-switch SWITCH
                       Disables event page refreshing when the switch SWITCH is
                       enabled.
  --patch-common-this  Enable usage of "This Event" in common events in any
                       version of the engine.
+ --patch-direct-menu VAR
+                      Directly access subscreens of the default menu by setting
+                      VAR.
  --patch-dynrpg       Enable support of DynRPG patch by Cherry (very limited).
  --patch-easyrpg      Enable EasyRPG extensions.
  --patch-key-patch    Enable Key Patch by Ineluki.
diff --git a/src/scene_equip.cpp b/src/scene_equip.cpp
index 6dc13f8d2..e25820761 100644
--- a/src/scene_equip.cpp
+++ b/src/scene_equip.cpp
@@ -179,13 +179,17 @@ void Scene_Equip::UpdateEquipSelection() {
 	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		int actor_index = Main_Data::game_party->GetActorPositionInParty(actor.GetId());
-		actor_index = (actor_index + 1) % Main_Data::game_party->GetActors().size();
-		Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
+		if (actor_index != -1) {
+			actor_index = (actor_index + 1) % Main_Data::game_party->GetActors().size();
+			Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
+		}
 	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::LEFT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		int actor_index = Main_Data::game_party->GetActorPositionInParty(actor.GetId());
-		actor_index = (actor_index + Main_Data::game_party->GetActors().size() - 1) % Main_Data::game_party->GetActors().size();
-		Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
+		if (actor_index != -1) {
+			actor_index = (actor_index + Main_Data::game_party->GetActors().size() - 1) % Main_Data::game_party->GetActors().size();
+			Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
+		}
 	}
 }
 
diff --git a/src/scene_skill.cpp b/src/scene_skill.cpp
index 21e9bcb1f..1066fcb19 100644
--- a/src/scene_skill.cpp
+++ b/src/scene_skill.cpp
@@ -18,6 +18,7 @@
 // Headers
 #include "scene_skill.h"
 #include "algo.h"
+#include "game_actors.h"
 #include "game_map.h"
 #include "game_party.h"
 #include "game_player.h"
@@ -28,8 +29,8 @@
 #include "scene_teleport.h"
 #include "transition.h"
 
-Scene_Skill::Scene_Skill(int actor_index, int skill_index) :
-	actor_index(actor_index), skill_index(skill_index) {
+Scene_Skill::Scene_Skill(int actor_index, int skill_index, bool is_db_actor) :
+	actor_index(actor_index), skill_index(skill_index), is_db_actor(is_db_actor) {
 	Scene::type = Scene::Skill;
 }
 
@@ -41,9 +42,16 @@ void Scene_Skill::Start() {
 	skillstatus_window.reset(new Window_SkillStatus(Player::menu_offset_x, Player::menu_offset_y + window_help_height, MENU_WIDTH, window_skillstatus_height));
 	skill_window.reset(new Window_Skill(Player::menu_offset_x, Player::menu_offset_y + window_help_height + window_skillstatus_height, MENU_WIDTH, MENU_HEIGHT - (window_help_height + window_skillstatus_height)));
 
+	Game_Actor* actor;
+	if (!is_db_actor) {
+		actor = Main_Data::game_party->GetActors()[actor_index];
+	}
+	else {
+		actor = Main_Data::game_actors->GetActor(actor_index);
+	}
 	// Assign actors and help to windows
-	skill_window->SetActor(Main_Data::game_party->GetActors()[actor_index]->GetId());
-	skillstatus_window->SetActor(Main_Data::game_party->GetActors()[actor_index]->GetId());
+	skill_window->SetActor(actor->GetId());
+	skillstatus_window->SetActor(actor->GetId());
 	skill_window->SetIndex(skill_index);
 	skill_window->SetHelpWindow(help_window.get());
 }
@@ -65,7 +73,13 @@ void Scene_Skill::vUpdate() {
 		const lcf::rpg::Skill* skill = skill_window->GetSkill();
 		int skill_id = skill ? skill->ID : 0;
 
-		Game_Actor* actor = Main_Data::game_party->GetActors()[actor_index];
+		Game_Actor* actor;
+		if (!is_db_actor) {
+			actor = Main_Data::game_party->GetActors()[actor_index];
+		}
+		else {
+			actor = Main_Data::game_actors->GetActor(actor_index);
+		}
 
 		if (skill && skill_window->CheckEnable(skill_id)) {
 			if (skill->type == lcf::rpg::Skill::Type_switch) {
@@ -74,6 +88,10 @@ void Scene_Skill::vUpdate() {
 				Scene::PopUntil(Scene::Map);
 				Game_Map::SetNeedRefresh(true);
 			} else if (Algo::IsNormalOrSubskill(*skill)) {
+				int actor_target_index = actor_index;
+				if (is_db_actor) {
+					actor_index = 0;
+				}
 				Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
 				Scene::Push(std::make_shared<Scene_ActorTarget>(skill_id, actor_index));
 				skill_index = skill_window->GetIndex();
diff --git a/src/scene_skill.h b/src/scene_skill.h
index 8fc921eff..81ce93ba5 100644
--- a/src/scene_skill.h
+++ b/src/scene_skill.h
@@ -33,7 +33,7 @@ class Scene_Skill : public Scene {
 	/**
 	 * Constructor.
 	 */
-	Scene_Skill(int actor_index, int skill_index = 0);
+	Scene_Skill(int actor_index, int skill_index = 0, bool is_db_actor = false);
 
 	void Start() override;
 	void Continue(SceneType prev_scene) override;
@@ -45,6 +45,8 @@ class Scene_Skill : public Scene {
 	int actor_index;
 	/** Skill to select at startup. */
 	int skill_index;
+	/** Given actor index refers to a database actor instead of a party member index. */
+	bool is_db_actor;
 	/** Displays available skills. */
 	std::unique_ptr<Window_Skill> skill_window;
 	/** Displays information about the actor. */
diff --git a/src/scene_status.cpp b/src/scene_status.cpp
index bc6d529da..2bcfdac0d 100644
--- a/src/scene_status.cpp
+++ b/src/scene_status.cpp
@@ -19,13 +19,14 @@
 #include <string>
 #include <vector>
 #include "scene_status.h"
+#include "game_actors.h"
 #include "game_party.h"
 #include "game_system.h"
 #include "input.h"
 #include <player.h>
 
-Scene_Status::Scene_Status(int actor_index) :
-	actor_index(actor_index) {
+Scene_Status::Scene_Status(int actor_index, bool is_db_actor) :
+	actor_index(actor_index), is_db_actor(is_db_actor) {
 	type = Scene::Status;
 }
 
@@ -41,8 +42,14 @@ void Scene_Status::Start() {
 	int window_equip_width = 196;
 	int window_equip_height = 96;
 
-	int actor = Main_Data::game_party->GetActors()[actor_index]->GetId();
+	int actor;
 
+	if (!is_db_actor) {
+		actor = Main_Data::game_party->GetActors()[actor_index]->GetId();
+	}
+	else {
+		actor = Main_Data::game_actors->GetActor(actor_index)->GetId();
+	}
 	actorinfo_window.reset(new Window_ActorInfo(Player::menu_offset_x, Player::menu_offset_y, window_actor_info_width, window_actor_info_height, actor));
 	gold_window.reset(new Window_Gold(Player::menu_offset_x, Player::menu_offset_y + window_actor_info_height, window_gold_width, window_gold_height));
 	actorstatus_window.reset(new Window_ActorStatus(Player::menu_offset_x + window_actor_info_width, Player::menu_offset_y, window_actor_status_width, window_actor_status_height, actor));
@@ -63,11 +70,11 @@ void Scene_Status::vUpdate() {
 	if (Input::IsTriggered(Input::CANCEL)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cancel));
 		Scene::Pop();
-	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::RIGHT)) {
+	} else if (!is_db_actor && Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		actor_index = (actor_index + 1) % Main_Data::game_party->GetActors().size();
 		Scene::Push(std::make_shared<Scene_Status>(actor_index), true);
-	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::LEFT)) {
+	} else if (!is_db_actor && Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::LEFT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		actor_index = (actor_index + Main_Data::game_party->GetActors().size() - 1) % Main_Data::game_party->GetActors().size();
 		Scene::Push(std::make_shared<Scene_Status>(actor_index), true);
diff --git a/src/scene_status.h b/src/scene_status.h
index 4db7ce8a6..2f9260d4b 100644
--- a/src/scene_status.h
+++ b/src/scene_status.h
@@ -37,13 +37,15 @@ class Scene_Status : public Scene {
 	 *
 	 * @param actor_index party index of the actor.
 	 */
-	Scene_Status(int actor_index);
+	Scene_Status(int actor_index, bool is_db_actor = false);
 
 	void Start() override;
 	void vUpdate() override;
 
 private:
 	int actor_index;
+	/** Given actor index refers to a database actor instead of a party member index. */
+	bool is_db_actor;
 
 	std::unique_ptr<Window_ActorInfo> actorinfo_window;
 	std::unique_ptr<Window_ActorStatus> actorstatus_window;

From 99d381fd9895586534867a691fcc7ed93049ac44 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 10 May 2024 20:19:55 +0200
Subject: [PATCH 076/222] Scene/Window refactor: Instead of actor_id most
 scenes accept now an instance of Game_Actor

Scenes that can handle multiple actors expect now an vector of actors.
Makes it more flexible.
---
 src/game_config_game.cpp     | 10 +++++++---
 src/game_interpreter_map.cpp | 37 ++++++++++++++++++++----------------
 src/scene_equip.cpp          | 36 +++++++++++++++++++----------------
 src/scene_equip.h            | 10 ++++++----
 src/scene_menu.cpp           |  6 +++---
 src/scene_skill.cpp          | 36 ++++++++++++-----------------------
 src/scene_skill.h            |  9 +++++----
 src/scene_status.cpp         | 33 ++++++++++++++++----------------
 src/scene_status.h           |  9 +++++----
 src/window_actorinfo.cpp     |  8 +++-----
 src/window_actorinfo.h       |  4 ++--
 src/window_actorstatus.cpp   | 29 ++++++++++++++--------------
 src/window_actorstatus.h     |  4 ++--
 src/window_battlecommand.cpp | 13 +++++--------
 src/window_battlecommand.h   |  4 ++--
 src/window_equip.cpp         |  9 ++++-----
 src/window_equip.h           |  7 +++----
 src/window_equipitem.cpp     | 10 +++++-----
 src/window_equipitem.h       |  8 ++++----
 src/window_equipstatus.cpp   | 17 ++++++++---------
 src/window_equipstatus.h     |  9 +++++----
 src/window_face.cpp          |  8 ++++----
 src/window_face.h            |  4 ++--
 src/window_paramstatus.cpp   | 14 ++++++--------
 src/window_paramstatus.h     |  6 +++---
 src/window_skill.cpp         | 11 ++++-------
 src/window_skill.h           |  6 +++---
 src/window_skillstatus.cpp   | 22 ++++++++++-----------
 src/window_skillstatus.h     |  6 +++---
 29 files changed, 187 insertions(+), 198 deletions(-)

diff --git a/src/game_config_game.cpp b/src/game_config_game.cpp
index 3be970697..9cb133e4a 100644
--- a/src/game_config_game.cpp
+++ b/src/game_config_game.cpp
@@ -242,7 +242,6 @@ void Game_ConfigGame::PrintActivePatches() {
 
 	add_bool(patch_easyrpg);
 	add_bool(patch_dynrpg);
-	add_bool(patch_maniac);
 	add_bool(patch_common_this_event);
 	add_bool(patch_unlock_pics);
 	add_bool(patch_key_patch);
@@ -254,6 +253,7 @@ void Game_ConfigGame::PrintActivePatches() {
 		}
 	};
 
+	add_int(patch_maniac);
 	add_int(patch_anti_lag_switch);
 	add_int(patch_direct_menu);
 
@@ -261,10 +261,14 @@ void Game_ConfigGame::PrintActivePatches() {
 		Output::Debug("Patch configuration: None");
 	} else {
 		std::string out = "Patch configuration: ";
+		bool first = true;
 		for (const auto& s: patches) {
-			out += s + " ";
+			if (!first) {
+				out += ", ";
+			}
+			out += s;
+			first = false;
 		}
-		out.pop_back();
 		Output::DebugStr(out);
 	}
 }
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 74e301f96..5bf55e435 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -90,14 +90,16 @@ void Game_Interpreter_Map::OnMapChange() {
 }
 
 bool Game_Interpreter_Map::RequestMainMenuScene(int subscreen_id, int actor_index, bool is_db_actor) {
-
 	if (Player::game_config.patch_direct_menu.Get() && subscreen_id == -1) {
 		subscreen_id = Main_Data::game_variables->Get(Player::game_config.patch_direct_menu.Get());
 		actor_index = Main_Data::game_variables->Get(Player::game_config.patch_direct_menu.Get() + 1);
+		// When true refers to the index of an actor, instead of a party index
 		is_db_actor = (actor_index < 0);
 		actor_index = std::abs(actor_index);
 	}
 
+	std::vector<Game_Actor*> actors;
+
 	switch (subscreen_id)
 	{
 	case 1: // Inventory
@@ -106,33 +108,36 @@ bool Game_Interpreter_Map::RequestMainMenuScene(int subscreen_id, int actor_inde
 	case 2: // Skills
 	case 3: // Equipment
 	case 4: // Status
-		if (!is_db_actor) {
+		if (is_db_actor) {
+			Game_Actor* actor = Main_Data::game_actors->GetActor(actor_index);
+			if (!actor) {
+				Output::Warning("RequestMainMenu: Invalid actor ID {}", actor_index);
+				return false;
+			}
+			actors = std::vector{actor};
+			actor_index = 0;
+		} else {
+			// 0, 1 and 5+ refer to the first actor
 			if (actor_index == 0 || actor_index > 4) {
 				actor_index = 1;
 			}
 			actor_index--;
-		}
+			actors = Main_Data::game_party->GetActors();
 
-		if (is_db_actor && !Main_Data::game_actors->GetActor(actor_index)) {
-			Output::Warning("Invalid actor ID {}", actor_index);
-			return false;
+			if (actor_index < 0 || actor_index >= actors.size()) {
+				Output::Warning("RequestMainMenu: Invalid actor party member {}", actor_index);
+				return false;
+			}
 		}
 
 		if (subscreen_id == 2) {
-			Scene::instance->SetRequestedScene(std::make_shared<Scene_Skill>(actor_index, 0, is_db_actor));
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Skill>(actors, actor_index));
 		}
 		else if (subscreen_id == 3) {
-			Game_Actor* actor;
-			if (!is_db_actor) {
-				actor = Main_Data::game_party->GetActors()[actor_index];
-			}
-			else {
-				actor = Main_Data::game_actors->GetActor(actor_index);
-			}
-			Scene::instance->SetRequestedScene(std::make_shared<Scene_Equip>(*actor));
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Equip>(actors, actor_index));
 		}
 		else if (subscreen_id == 4) {
-			Scene::instance->SetRequestedScene(std::make_shared<Scene_Status>(actor_index, is_db_actor));
+			Scene::instance->SetRequestedScene(std::make_shared<Scene_Status>(actors, actor_index));
 		}
 		return true;
 	case 5: // Order
diff --git a/src/scene_equip.cpp b/src/scene_equip.cpp
index e25820761..a945fb651 100644
--- a/src/scene_equip.cpp
+++ b/src/scene_equip.cpp
@@ -27,10 +27,11 @@
 #include "scene_menu.h"
 #include <lcf/rpg/item.h>
 
-Scene_Equip::Scene_Equip(Game_Actor& actor, int equip_index) :
-	actor(actor),
-	equip_index(equip_index) {
+Scene_Equip::Scene_Equip(std::vector<Game_Actor*> actors, int actor_index, int equip_index) :
+	actors(actors), actor_index(actor_index), equip_index(equip_index) {
 	type = Scene::Equip;
+
+	assert(!actors.empty());
 }
 
 void Scene_Equip::Start() {
@@ -40,9 +41,11 @@ void Scene_Equip::Start() {
 	int menu_equip_status_height = 96;
 	int menu_equip_height = 96;
 
+	const auto& actor = *actors[actor_index];
+
 	help_window.reset(new Window_Help(Player::menu_offset_x, Player::menu_offset_y, MENU_WIDTH, menu_help_height));
-	equipstatus_window.reset(new Window_EquipStatus(Player::menu_offset_x, Player::menu_offset_y + menu_help_height, menu_equip_status_width, menu_equip_status_height, actor.GetId()));
-	equip_window.reset(new Window_Equip(Player::menu_offset_x + menu_equip_status_width, Player::menu_offset_y + menu_help_height, (MENU_WIDTH - menu_equip_status_width), menu_equip_height, actor.GetId()));
+	equipstatus_window.reset(new Window_EquipStatus(Player::menu_offset_x, Player::menu_offset_y + menu_help_height, menu_equip_status_width, menu_equip_status_height, actor));
+	equip_window.reset(new Window_Equip(Player::menu_offset_x + menu_equip_status_width, Player::menu_offset_y + menu_help_height, (MENU_WIDTH - menu_equip_status_width), menu_equip_height, actor));
 
 	equip_window->SetIndex(equip_index);
 
@@ -94,6 +97,7 @@ void Scene_Equip::UpdateStatusWindow() {
 		const lcf::rpg::Item* current_item = item_window->GetItem();
 
 		const auto eidx = equip_window->GetIndex();
+		const auto& actor = *actors[actor_index];
 
 		auto atk = actor.GetBaseAtk(Game_Battler::WeaponAll, true, false);
 		auto def = actor.GetBaseDef(Game_Battler::WeaponAll, true, false);
@@ -167,6 +171,7 @@ void Scene_Equip::UpdateEquipSelection() {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cancel));
 		Scene::Pop();
 	} else if (Input::IsTriggered(Input::DECISION)) {
+		const auto& actor = *actors[actor_index];
 		if (!CanRemoveEquipment(actor, equip_window->GetIndex())) {
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));
 			return;
@@ -176,20 +181,18 @@ void Scene_Equip::UpdateEquipSelection() {
 		equip_window->SetActive(false);
 		item_window->SetActive(true);
 		item_window->SetIndex(0);
-	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::RIGHT)) {
+	} else if (actors.size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		int actor_index = Main_Data::game_party->GetActorPositionInParty(actor.GetId());
-		if (actor_index != -1) {
-			actor_index = (actor_index + 1) % Main_Data::game_party->GetActors().size();
-			Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
-		}
-	} else if (Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::LEFT)) {
+		const auto& actor = actors[actor_index];
+		actor_index = (actor_index + 1) % actors.size();
+		Scene::Push(std::make_shared<Scene_Equip>(actors, actor_index, equip_window->GetIndex()), true);
+	} else if (actors.size() > 1 && Input::IsTriggered(Input::LEFT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		int actor_index = Main_Data::game_party->GetActorPositionInParty(actor.GetId());
-		if (actor_index != -1) {
-			actor_index = (actor_index + Main_Data::game_party->GetActors().size() - 1) % Main_Data::game_party->GetActors().size();
-			Scene::Push(std::make_shared<Scene_Equip>((*Main_Data::game_party)[actor_index], equip_window->GetIndex()), true);
+		actor_index = actor_index - 1;
+		if (actor_index < 0) {
+			actor_index = actors.size() - 1;
 		}
+		Scene::Push(std::make_shared<Scene_Equip>(actors, actor_index, equip_window->GetIndex()), true);
 	}
 }
 
@@ -204,6 +207,7 @@ void Scene_Equip::UpdateItemSelection() {
 
 		const lcf::rpg::Item* current_item = item_window->GetItem();
 		int current_item_id = current_item ? current_item->ID : 0;
+		auto& actor = *actors[actor_index];
 
 		actor.ChangeEquipment(
 			equip_window->GetIndex() + 1, current_item_id);
diff --git a/src/scene_equip.h b/src/scene_equip.h
index f96018d2c..0fae6e8c9 100644
--- a/src/scene_equip.h
+++ b/src/scene_equip.h
@@ -36,10 +36,11 @@ class Scene_Equip : public Scene {
 	/**
 	 * Constructor.
 	 *
-	 * @param actor actor in the party.
+	 * @param actors Vector containing all the actors
+	 * @param actor_index actor whose equipment is shown.
 	 * @param equip_index selected equipment.
 	 */
-	Scene_Equip(Game_Actor& actor, int equip_index = 0);
+	Scene_Equip(std::vector<Game_Actor*> actors, int actor_index, int equip_index = 0);
 
 	void Start() override;
 	void vUpdate() override;
@@ -70,8 +71,9 @@ class Scene_Equip : public Scene {
 	void UpdateItemSelection();
 
 private:
-	/** Actor in the party whose equipment is displayed. */
-	Game_Actor& actor;
+	std::vector<Game_Actor*> actors;
+	/** Index of the actor in the party whose equipment is displayed. */
+	int actor_index;
 	/** Selected equipment on startup. */
 	int equip_index;
 
diff --git a/src/scene_menu.cpp b/src/scene_menu.cpp
index 9ab35a34e..98c3b8112 100644
--- a/src/scene_menu.cpp
+++ b/src/scene_menu.cpp
@@ -271,15 +271,15 @@ void Scene_Menu::UpdateActorSelection() {
 				return;
 			}
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
-			Scene::Push(std::make_shared<Scene_Skill>(menustatus_window->GetIndex()));
+			Scene::Push(std::make_shared<Scene_Skill>(Main_Data::game_party->GetActors(), menustatus_window->GetIndex()));
 			break;
 		case Equipment:
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
-			Scene::Push(std::make_shared<Scene_Equip>(*menustatus_window->GetActor()));
+			Scene::Push(std::make_shared<Scene_Equip>(Main_Data::game_party->GetActors(), menustatus_window->GetIndex()));
 			break;
 		case Status:
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
-			Scene::Push(std::make_shared<Scene_Status>(menustatus_window->GetIndex()));
+			Scene::Push(std::make_shared<Scene_Status>(Main_Data::game_party->GetActors(), menustatus_window->GetIndex()));
 			break;
 		case Row:
 		{
diff --git a/src/scene_skill.cpp b/src/scene_skill.cpp
index 1066fcb19..6824c278c 100644
--- a/src/scene_skill.cpp
+++ b/src/scene_skill.cpp
@@ -29,9 +29,11 @@
 #include "scene_teleport.h"
 #include "transition.h"
 
-Scene_Skill::Scene_Skill(int actor_index, int skill_index, bool is_db_actor) :
-	actor_index(actor_index), skill_index(skill_index), is_db_actor(is_db_actor) {
+Scene_Skill::Scene_Skill(std::vector<Game_Actor*> actors, int actor_index, int skill_index) :
+	actors(actors), actor_index(actor_index), skill_index(skill_index) {
 	Scene::type = Scene::Skill;
+
+	assert(!actors.empty());
 }
 
 void Scene_Skill::Start() {
@@ -42,16 +44,11 @@ void Scene_Skill::Start() {
 	skillstatus_window.reset(new Window_SkillStatus(Player::menu_offset_x, Player::menu_offset_y + window_help_height, MENU_WIDTH, window_skillstatus_height));
 	skill_window.reset(new Window_Skill(Player::menu_offset_x, Player::menu_offset_y + window_help_height + window_skillstatus_height, MENU_WIDTH, MENU_HEIGHT - (window_help_height + window_skillstatus_height)));
 
-	Game_Actor* actor;
-	if (!is_db_actor) {
-		actor = Main_Data::game_party->GetActors()[actor_index];
-	}
-	else {
-		actor = Main_Data::game_actors->GetActor(actor_index);
-	}
+	const auto& actor = *actors[actor_index];
+
 	// Assign actors and help to windows
-	skill_window->SetActor(actor->GetId());
-	skillstatus_window->SetActor(actor->GetId());
+	skill_window->SetActor(actor);
+	skillstatus_window->SetActor(actor);
 	skill_window->SetIndex(skill_index);
 	skill_window->SetHelpWindow(help_window.get());
 }
@@ -73,34 +70,25 @@ void Scene_Skill::vUpdate() {
 		const lcf::rpg::Skill* skill = skill_window->GetSkill();
 		int skill_id = skill ? skill->ID : 0;
 
-		Game_Actor* actor;
-		if (!is_db_actor) {
-			actor = Main_Data::game_party->GetActors()[actor_index];
-		}
-		else {
-			actor = Main_Data::game_actors->GetActor(actor_index);
-		}
+		auto& actor = *actors[actor_index];
 
 		if (skill && skill_window->CheckEnable(skill_id)) {
 			if (skill->type == lcf::rpg::Skill::Type_switch) {
 				Main_Data::game_system->SePlay(skill->sound_effect);
-				Main_Data::game_party->UseSkill(skill_id, actor, actor);
+				Main_Data::game_party->UseSkill(skill_id, &actor, &actor);
 				Scene::PopUntil(Scene::Map);
 				Game_Map::SetNeedRefresh(true);
 			} else if (Algo::IsNormalOrSubskill(*skill)) {
 				int actor_target_index = actor_index;
-				if (is_db_actor) {
-					actor_index = 0;
-				}
 				Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
 				Scene::Push(std::make_shared<Scene_ActorTarget>(skill_id, actor_index));
 				skill_index = skill_window->GetIndex();
 			} else if (skill->type == lcf::rpg::Skill::Type_teleport) {
 				Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
-				Scene::Push(std::make_shared<Scene_Teleport>(*actor, *skill));
+				Scene::Push(std::make_shared<Scene_Teleport>(actor, *skill));
 			} else if (skill->type == lcf::rpg::Skill::Type_escape) {
 				Main_Data::game_system->SePlay(skill->sound_effect);
-				Main_Data::game_party->UseSkill(skill_id, actor, actor);
+				Main_Data::game_party->UseSkill(skill_id, &actor, &actor);
 				Main_Data::game_player->ForceGetOffVehicle();
 				Main_Data::game_player->ReserveTeleport(Main_Data::game_targets->GetEscapeTarget());
 
diff --git a/src/scene_skill.h b/src/scene_skill.h
index 81ce93ba5..23c1f7b57 100644
--- a/src/scene_skill.h
+++ b/src/scene_skill.h
@@ -19,6 +19,7 @@
 #define EP_SCENE_SKILL_H
 
 // Headers
+#include <vector>
 #include "scene.h"
 #include "window_help.h"
 #include "window_skill.h"
@@ -33,7 +34,8 @@ class Scene_Skill : public Scene {
 	/**
 	 * Constructor.
 	 */
-	Scene_Skill(int actor_index, int skill_index = 0, bool is_db_actor = false);
+
+	Scene_Skill(std::vector<Game_Actor*> actors, int actor_index, int skill_index = 0);
 
 	void Start() override;
 	void Continue(SceneType prev_scene) override;
@@ -41,12 +43,11 @@ class Scene_Skill : public Scene {
 	void TransitionOut(SceneType next_scene) override;
 
 private:
-	/** Actor in the party whose skills are displayed. */
+	std::vector<Game_Actor*> actors;
+	/** Actor in the span whose skills are displayed. */
 	int actor_index;
 	/** Skill to select at startup. */
 	int skill_index;
-	/** Given actor index refers to a database actor instead of a party member index. */
-	bool is_db_actor;
 	/** Displays available skills. */
 	std::unique_ptr<Window_Skill> skill_window;
 	/** Displays information about the actor. */
diff --git a/src/scene_status.cpp b/src/scene_status.cpp
index 2bcfdac0d..4a41a98fc 100644
--- a/src/scene_status.cpp
+++ b/src/scene_status.cpp
@@ -23,11 +23,13 @@
 #include "game_party.h"
 #include "game_system.h"
 #include "input.h"
-#include <player.h>
+#include "player.h"
 
-Scene_Status::Scene_Status(int actor_index, bool is_db_actor) :
-	actor_index(actor_index), is_db_actor(is_db_actor) {
+Scene_Status::Scene_Status(std::vector<Game_Actor*> actors, int actor_index) :
+	actors(actors), actor_index(actor_index) {
 	type = Scene::Status;
+
+	assert(!actors.empty());
 }
 
 void Scene_Status::Start() {
@@ -42,14 +44,7 @@ void Scene_Status::Start() {
 	int window_equip_width = 196;
 	int window_equip_height = 96;
 
-	int actor;
-
-	if (!is_db_actor) {
-		actor = Main_Data::game_party->GetActors()[actor_index]->GetId();
-	}
-	else {
-		actor = Main_Data::game_actors->GetActor(actor_index)->GetId();
-	}
+	const auto& actor = *actors[actor_index];
 	actorinfo_window.reset(new Window_ActorInfo(Player::menu_offset_x, Player::menu_offset_y, window_actor_info_width, window_actor_info_height, actor));
 	gold_window.reset(new Window_Gold(Player::menu_offset_x, Player::menu_offset_y + window_actor_info_height, window_gold_width, window_gold_height));
 	actorstatus_window.reset(new Window_ActorStatus(Player::menu_offset_x + window_actor_info_width, Player::menu_offset_y, window_actor_status_width, window_actor_status_height, actor));
@@ -70,13 +65,17 @@ void Scene_Status::vUpdate() {
 	if (Input::IsTriggered(Input::CANCEL)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cancel));
 		Scene::Pop();
-	} else if (!is_db_actor && Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::RIGHT)) {
+	} else if (actors.size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		actor_index = (actor_index + 1) % Main_Data::game_party->GetActors().size();
-		Scene::Push(std::make_shared<Scene_Status>(actor_index), true);
-	} else if (!is_db_actor && Main_Data::game_party->GetActors().size() > 1 && Input::IsTriggered(Input::LEFT)) {
+		const auto& actor = actors[actor_index];
+		actor_index = (actor_index + 1) % actors.size();
+		Scene::Push(std::make_shared<Scene_Status>(actors, actor_index), true);
+	} else if (actors.size() > 1 && Input::IsTriggered(Input::LEFT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		actor_index = (actor_index + Main_Data::game_party->GetActors().size() - 1) % Main_Data::game_party->GetActors().size();
-		Scene::Push(std::make_shared<Scene_Status>(actor_index), true);
+		actor_index = actor_index - 1;
+		if (actor_index < 0) {
+			actor_index = actors.size() - 1;
+		}
+		Scene::Push(std::make_shared<Scene_Status>(actors, actor_index), true);
 	}
 }
diff --git a/src/scene_status.h b/src/scene_status.h
index 2f9260d4b..1a2504631 100644
--- a/src/scene_status.h
+++ b/src/scene_status.h
@@ -19,6 +19,7 @@
 #define EP_SCENE_STATUS_H
 
 // Headers
+#include <vector>
 #include "scene.h"
 #include "window_actorinfo.h"
 #include "window_actorstatus.h"
@@ -35,17 +36,17 @@ class Scene_Status : public Scene {
 	/**
 	 * Constructor.
 	 *
-	 * @param actor_index party index of the actor.
+	 * @param actors list of actors
+	 * @param index index in the span to show
 	 */
-	Scene_Status(int actor_index, bool is_db_actor = false);
+	Scene_Status(std::vector<Game_Actor*> actors, int actor_index);
 
 	void Start() override;
 	void vUpdate() override;
 
 private:
+	std::vector<Game_Actor*> actors;
 	int actor_index;
-	/** Given actor index refers to a database actor instead of a party member index. */
-	bool is_db_actor;
 
 	std::unique_ptr<Window_ActorInfo> actorinfo_window;
 	std::unique_ptr<Window_ActorStatus> actorstatus_window;
diff --git a/src/window_actorinfo.cpp b/src/window_actorinfo.cpp
index 81acb8f42..5d81663dd 100644
--- a/src/window_actorinfo.cpp
+++ b/src/window_actorinfo.cpp
@@ -25,9 +25,9 @@
 #include "font.h"
 #include "feature.h"
 
-Window_ActorInfo::Window_ActorInfo(int ix, int iy, int iwidth, int iheight, int actor_id) :
+Window_ActorInfo::Window_ActorInfo(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor) :
 	Window_Base(ix, iy, iwidth, iheight),
-	actor_id(actor_id) {
+	actor(actor) {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
 
@@ -43,12 +43,10 @@ void Window_ActorInfo::Refresh() {
 void Window_ActorInfo::DrawInfo() {
 	if (Feature::HasRow()) {
 		// Draw Row formation.
-		std::string battle_row = Main_Data::game_actors->GetActor(actor_id)->GetBattleRow() == Game_Actor::RowType::RowType_back ? lcf::rpg::Terms::TermOrDefault(lcf::Data::terms.easyrpg_status_scene_back, "Back") : lcf::rpg::Terms::TermOrDefault(lcf::Data::terms.easyrpg_status_scene_front, "Front");
+		std::string battle_row = actor.GetBattleRow() == Game_Actor::RowType::RowType_back ? lcf::rpg::Terms::TermOrDefault(lcf::Data::terms.easyrpg_status_scene_back, "Back") : lcf::rpg::Terms::TermOrDefault(lcf::Data::terms.easyrpg_status_scene_front, "Front");
 		contents->TextDraw(contents->GetWidth(), 2, Font::ColorDefault, battle_row, Text::AlignRight);
 	}
 
-	const Game_Actor& actor = *Main_Data::game_actors->GetActor(actor_id);
-
 	// Draw Face
 	DrawActorFace(actor, 0, 0);
 
diff --git a/src/window_actorinfo.h b/src/window_actorinfo.h
index 11cd9d640..8578c5b02 100644
--- a/src/window_actorinfo.h
+++ b/src/window_actorinfo.h
@@ -31,7 +31,7 @@ class Window_ActorInfo : public Window_Base {
 	/**
 	 * Constructor.
 	 */
-	Window_ActorInfo(int ix, int iy, int iwidth, int iheight, int actor_id);
+	Window_ActorInfo(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor);
 
 	/**
 	 * Renders the stats on the window.
@@ -43,7 +43,7 @@ class Window_ActorInfo : public Window_Base {
 	 */
 	void DrawInfo();
 private:
-	int actor_id;
+	const Game_Actor& actor;
 };
 
 #endif
diff --git a/src/window_actorstatus.cpp b/src/window_actorstatus.cpp
index 634ef2d4b..17424c272 100644
--- a/src/window_actorstatus.cpp
+++ b/src/window_actorstatus.cpp
@@ -24,9 +24,9 @@
 #include "bitmap.h"
 #include "font.h"
 
-Window_ActorStatus::Window_ActorStatus(int ix, int iy, int iwidth, int iheight, int actor_id) :
+Window_ActorStatus::Window_ActorStatus(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor) :
 	Window_Base(ix, iy, iwidth, iheight),
-	actor_id(actor_id) {
+	actor(actor) {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
 
@@ -40,9 +40,6 @@ void Window_ActorStatus::Refresh() {
 }
 
 void Window_ActorStatus::DrawStatus() {
-
-	Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
-
 	int have, max;
 	auto fontcolor = [&have, &max](bool can_knockout) {
 		if (can_knockout && have == 0) return Font::ColorKnockout;
@@ -52,14 +49,14 @@ void Window_ActorStatus::DrawStatus() {
 
 	// Draw Hp
 	contents->TextDraw(1, 2, 1, lcf::Data::terms.health_points);
-	have = actor->GetHp();
-	max = actor->GetMaxHp();
+	have = actor.GetHp();
+	max = actor.GetMaxHp();
 	DrawMinMax(90, 2, have, max, fontcolor(true));
 
 	// Draw Sp
 	contents->TextDraw(1, 18, 1, lcf::Data::terms.spirit_points);
-	have = actor->GetSp();
-	max = actor->GetMaxSp();
+	have = actor.GetSp();
+	max = actor.GetMaxSp();
 	DrawMinMax(90, 18, have, max, fontcolor(false));
 
 	// Draw Exp
@@ -69,16 +66,18 @@ void Window_ActorStatus::DrawStatus() {
 
 void Window_ActorStatus::DrawMinMax(int cx, int cy, int min, int max, int color) {
 	std::stringstream ss;
-	if (max >= 0)
+	if (max >= 0) {
 		ss << min;
-	else
-		ss << Main_Data::game_actors->GetActor(actor_id)->GetExpString(true);
+	} else {
+		ss << actor.GetExpString(true);
+	}
 	contents->TextDraw(cx, cy, color, ss.str(), Text::AlignRight);
 	contents->TextDraw(cx, cy, Font::ColorDefault, "/");
 	ss.str("");
-	if (max >= 0)
+	if (max >= 0) {
 		ss << max;
-	else
-		ss << Main_Data::game_actors->GetActor(actor_id)->GetNextExpString(true);
+	} else {
+		ss << actor.GetNextExpString(true);
+	}
 	contents->TextDraw(cx + 48, cy, Font::ColorDefault, ss.str(), Text::AlignRight);
 }
diff --git a/src/window_actorstatus.h b/src/window_actorstatus.h
index f8c3f3337..d44d04613 100644
--- a/src/window_actorstatus.h
+++ b/src/window_actorstatus.h
@@ -32,7 +32,7 @@ class Window_ActorStatus : public Window_Base {
 	/**
 	 * Constructor.
 	 */
-	Window_ActorStatus(int ix, int iy, int iwidth, int iheight, int actor_id);
+	Window_ActorStatus(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor);
 
 	/**
 	 * Renders the stats on the window.
@@ -50,7 +50,7 @@ class Window_ActorStatus : public Window_Base {
 	void DrawMinMax(int cx, int cy, int min, int max, int color = Font::ColorDefault);
 
 private:
-	int actor_id;
+	const Game_Actor& actor;
 };
 
 #endif
diff --git a/src/window_battlecommand.cpp b/src/window_battlecommand.cpp
index 9dcf370dd..cbf76ae28 100644
--- a/src/window_battlecommand.cpp
+++ b/src/window_battlecommand.cpp
@@ -30,8 +30,6 @@
 Window_BattleCommand::Window_BattleCommand(int x, int y, int width, int height) :
 	Window_Base(x, y, width, height) {
 
-	SetActor(0);
-
 	disabled.resize(commands.size());
 	index = -1;
 	top_row = 0;
@@ -133,18 +131,17 @@ void Window_BattleCommand::SetIndex(int _index) {
 	index = _index;
 }
 
-void Window_BattleCommand::SetActor(int _actor_id) {
-	actor_id = Feature::HasRpg2kBattleSystem() ? 0 : _actor_id;
+void Window_BattleCommand::SetActor(const Game_Actor* actor) {
+	this->actor = Feature::HasRpg2kBattleSystem() ? nullptr : actor;
 	commands.clear();
 
-	if (actor_id == 0) {
+	if (actor == nullptr) {
 		commands.push_back(!lcf::Data::terms.command_attack.empty() ? ToString(lcf::Data::terms.command_attack) : "Attack");
 		commands.push_back(!lcf::Data::terms.command_defend.empty() ? ToString(lcf::Data::terms.command_defend) : "Defend");
 		commands.push_back(!lcf::Data::terms.command_item.empty() ? ToString(lcf::Data::terms.command_item) : "Item");
 		commands.push_back(!lcf::Data::terms.command_skill.empty() ? ToString(lcf::Data::terms.command_skill) : "Skill");
 	}
 	else {
-		Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
 		const std::vector<const lcf::rpg::BattleCommand*> bcmds = actor->GetBattleCommands();
 		for (const lcf::rpg::BattleCommand* command : bcmds) {
 			commands.push_back(ToString(command->name));
@@ -156,10 +153,10 @@ void Window_BattleCommand::SetActor(int _actor_id) {
 }
 
 int Window_BattleCommand::GetSkillSubset() {
-	if (actor_id == 0)
+	if (actor == nullptr) {
 		return lcf::rpg::Skill::Type_normal;
+	}
 
-	Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
 	const std::vector<const lcf::rpg::BattleCommand*> bcmds = actor->GetBattleCommands();
 	int bcmd = bcmds[index]->ID;
 
diff --git a/src/window_battlecommand.h b/src/window_battlecommand.h
index dae98b09d..6bf7eeffe 100644
--- a/src/window_battlecommand.h
+++ b/src/window_battlecommand.h
@@ -53,7 +53,7 @@ class Window_BattleCommand: public Window_Base {
 	 */
 	void SetEnabled(int index, bool enabled);
 
-	void SetActor(int actor_id);
+	void SetActor(const Game_Actor* actor);
 
 	int GetIndex();
 	void SetIndex(int index);
@@ -62,7 +62,7 @@ class Window_BattleCommand: public Window_Base {
 	int GetSkillSubset();
 
 protected:
-	int actor_id;
+	const Game_Actor* actor = nullptr;
 	std::vector<std::string> commands;
 	int index;
 	int num_rows;
diff --git a/src/window_equip.cpp b/src/window_equip.cpp
index 0cff3b8ec..eb47ceca9 100644
--- a/src/window_equip.cpp
+++ b/src/window_equip.cpp
@@ -22,9 +22,9 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 
-Window_Equip::Window_Equip(int ix, int iy, int iwidth, int iheight, int actor_id) :
+Window_Equip::Window_Equip(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor) :
 	Window_Selectable(ix, iy, iwidth, iheight),
-	actor_id(actor_id) {
+	actor(actor) {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
 
@@ -42,16 +42,15 @@ void Window_Equip::Refresh() {
 
 	// Add the equipment of the actor to data
 	data.clear();
-	Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
 	for (int i = 1; i <= 5; ++i) {
-		const lcf::rpg::Item* item = actor->GetEquipment(i);
+		const lcf::rpg::Item* item = actor.GetEquipment(i);
 		data.push_back(item ? item->ID : 0);
 	}
 	item_max = data.size();
 
 	// Draw equipment text
 	for (int i = 0; i < 5; ++i) {
-		DrawEquipmentType(*actor, 0, (12 + 4) * i + 2, i);
+		DrawEquipmentType(actor, 0, (12 + 4) * i + 2, i);
 		if (data[i] > 0) {
 			// Equipment and items are guaranteed to be valid
 			DrawItemName(*lcf::ReaderUtil::GetElement(lcf::Data::items, data[i]), 60, (12 + 4) * i + 2);
diff --git a/src/window_equip.h b/src/window_equip.h
index 33938010b..c416ae6b1 100644
--- a/src/window_equip.h
+++ b/src/window_equip.h
@@ -34,9 +34,9 @@ class Window_Equip : public Window_Selectable {
 	 * @param iy window y position.
 	 * @param iwidth window width.
 	 * @param iheight window height.
-	 * @param actor_id actor whose inventory is displayed.
+	 * @param actor actor whose inventory is displayed.
 	 */
-	Window_Equip(int ix, int iy, int iwidth, int iheight, int actor_id);
+	Window_Equip(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor);
 
 	/**
 	 * Refreshes.
@@ -56,8 +56,7 @@ class Window_Equip : public Window_Selectable {
 	void UpdateHelp() override;
 
 private:
-	int actor_id;
-
+	const Game_Actor& actor;
 	std::vector<int> data;
 
 };
diff --git a/src/window_equipitem.cpp b/src/window_equipitem.cpp
index 57e2b62e0..457341c95 100644
--- a/src/window_equipitem.cpp
+++ b/src/window_equipitem.cpp
@@ -22,16 +22,16 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 
-Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight, int actor_id, int equip_type) :
+Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight,  const Game_Actor& actor, int equip_type) :
 	Window_Item(ix, iy, iwidth, iheight),
-	actor_id(actor_id) {
+	actor(actor) {
 	this->equip_type = equip_type;
 	if (equip_type > 4 || equip_type < 0) {
 		this->equip_type = Window_EquipItem::other;
 	}
 
 	if (this->equip_type == Window_EquipItem::shield &&
-		Main_Data::game_actors->GetActor(actor_id)->HasTwoWeapons()) {
+		actor.HasTwoWeapons()) {
 
 		this->equip_type = Window_EquipItem::weapon;
 	}
@@ -39,7 +39,7 @@ Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight, int
 
 bool Window_EquipItem::CheckInclude(int item_id) {
 	// Do not show equippable items if the actor has its equipment fixed
-	if (Main_Data::game_actors->GetActor(actor_id)->IsEquipmentFixed(false)) {
+	if (actor.IsEquipmentFixed(false)) {
 		return false;
 	}
 
@@ -78,7 +78,7 @@ bool Window_EquipItem::CheckInclude(int item_id) {
 		if (Main_Data::game_party->GetItemCount(item_id) == 0) {
 			return false;
 		} else {
-			return Main_Data::game_actors->GetActor(actor_id)->IsEquippable(item_id);
+			return actor.IsEquippable(item_id);
 		}
 	} else {
 		return false;
diff --git a/src/window_equipitem.h b/src/window_equipitem.h
index c427b3c5e..4a6da1c58 100644
--- a/src/window_equipitem.h
+++ b/src/window_equipitem.h
@@ -40,10 +40,10 @@ class Window_EquipItem : public Window_Item {
 	/**
 	 * Constructor.
 	 *
-	 * @param actor_id actor whos equipment is displayed.
+	 * @param actor actor whos equipment is displayed.
 	 * @param equip_type type of equipment to show.
 	 */
-	Window_EquipItem(int ix, int iy, int iwidth, int iheight, int actor_id, int equip_type);
+	Window_EquipItem(int ix, int iy, int iwidth, int iheight,  const Game_Actor& actor, int equip_type);
 
 	/**
 	 * Checks if the item should be in the list based on
@@ -61,8 +61,8 @@ class Window_EquipItem : public Window_Item {
 	bool CheckEnable(int item_id) override;
 
 private:
-	int actor_id;
-	int equip_type;
+	const Game_Actor& actor;
+ 	int equip_type;
 };
 
 #endif
diff --git a/src/window_equipstatus.cpp b/src/window_equipstatus.cpp
index ce379c74e..719fced29 100644
--- a/src/window_equipstatus.cpp
+++ b/src/window_equipstatus.cpp
@@ -24,9 +24,9 @@
 #include "font.h"
 #include "player.h"
 
-Window_EquipStatus::Window_EquipStatus(int ix, int iy, int iwidth, int iheight, int actor_id) :
+Window_EquipStatus::Window_EquipStatus(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor) :
 	Window_Base(ix, iy, iwidth, iheight),
-	actor_id(actor_id),
+	actor(actor),
 	draw_params(false),
 	dirty(true) {
 
@@ -43,7 +43,7 @@ void Window_EquipStatus::Refresh() {
 
 		y_offset = 18;
 		// Actor data is guaranteed to be valid
-		DrawActorName(*Main_Data::game_actors->GetActor(actor_id), 0, 2);
+		DrawActorName(actor, 0, 2);
 
 		for (int i = 0; i < 4; ++i) {
 			DrawParameter(0, y_offset + ((12 + 4) * i), i);
@@ -87,27 +87,26 @@ void Window_EquipStatus::DrawParameter(int cx, int cy, int type) {
 	StringView name;
 	int value;
 	int new_value;
-	Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
 
 	switch (type) {
 	case 0:
 		name = lcf::Data::terms.attack;
-		value = actor->GetAtk();
+		value = actor.GetAtk();
 		new_value = atk;
 		break;
 	case 1:
 		name = lcf::Data::terms.defense;
-		value = actor->GetDef();
+		value = actor.GetDef();
 		new_value = def;
 		break;
 	case 2:
 		name = lcf::Data::terms.spirit;
-		value = actor->GetSpi();
+		value = actor.GetSpi();
 		new_value = spi;
 		break;
 	case 3:
 		name = lcf::Data::terms.agility;
-		value = actor->GetAgi();
+		value = actor.GetAgi();
 		new_value = agi;
 		break;
 	default:
@@ -115,7 +114,7 @@ void Window_EquipStatus::DrawParameter(int cx, int cy, int type) {
 	}
 
 	// Check if 4 digits are needed instead of 3
-	int limit = actor->MaxStatBaseValue();
+	int limit = actor.MaxStatBaseValue();
 	bool more_space_needed = (Player::IsRPG2k3() && limit >= 500) || limit >= 1000;
 
 	// Draw Term
diff --git a/src/window_equipstatus.h b/src/window_equipstatus.h
index 1c4094e68..a4eb5d8ca 100644
--- a/src/window_equipstatus.h
+++ b/src/window_equipstatus.h
@@ -22,7 +22,7 @@
 #include "window_base.h"
 
 /**
- * Window_EquipLeft class.
+ * Window_EquipStatus class.
  * Displays stats of the hero/item.
  */
 class Window_EquipStatus : public Window_Base {
@@ -35,9 +35,9 @@ class Window_EquipStatus : public Window_Base {
 	 * @param iy window y position.
 	 * @param iwidth window width.
 	 * @param iheight window height.
-	 * @param actor_id actor whose stats are displayed.
+	 * @param actor actor whose stats are displayed.
 	 */
-	Window_EquipStatus(int ix, int iy, int iwidth, int iheight, int actor_id);
+	Window_EquipStatus(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor);
 
 	/**
 	 * Refreshes screen.
@@ -78,7 +78,8 @@ class Window_EquipStatus : public Window_Base {
 	void DrawParameter(int cx, int cy, int type);
 
 private:
-	int actor_id;
+ 	const Game_Actor& actor;
+
 	/** Draws the params if true. */
 	bool draw_params;
 
diff --git a/src/window_face.cpp b/src/window_face.cpp
index 77f3c861d..914829ae3 100644
--- a/src/window_face.cpp
+++ b/src/window_face.cpp
@@ -21,7 +21,7 @@
 #include "window_face.h"
 
 Window_Face::Window_Face(int ix, int iy, int iwidth, int iheight) :
-	Window_Base(ix, iy, iwidth, iheight), actor_id(1) {
+	Window_Base(ix, iy, iwidth, iheight) {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
 }
@@ -29,10 +29,10 @@ Window_Face::Window_Face(int ix, int iy, int iwidth, int iheight) :
 void Window_Face::Refresh() {
 	contents->Clear();
 	// Actor data is guaranteed to be valid
-	DrawActorFace(*Main_Data::game_actors->GetActor(actor_id), 0, 0);
+	DrawActorFace(*actor, 0, 0);
 }
 
-void Window_Face::Set(int id) {
-	actor_id = id;
+void Window_Face::Set(const Game_Actor& actor) {
+	this->actor = &actor;
 	Refresh();
 }
diff --git a/src/window_face.h b/src/window_face.h
index 475a22eef..1e780079b 100644
--- a/src/window_face.h
+++ b/src/window_face.h
@@ -37,10 +37,10 @@ class Window_Face :	public Window_Base {
 	 */
 	void Refresh();
 
-	void Set(int actor_id);
+	void Set(const Game_Actor& actor);
 
 protected:
-	int actor_id;
+	const Game_Actor* actor = nullptr;
 };
 
 #endif
diff --git a/src/window_paramstatus.cpp b/src/window_paramstatus.cpp
index 21087d98a..87d75bcd7 100644
--- a/src/window_paramstatus.cpp
+++ b/src/window_paramstatus.cpp
@@ -23,9 +23,9 @@
 #include "bitmap.h"
 #include "font.h"
 
-Window_ParamStatus::Window_ParamStatus(int ix, int iy, int iwidth, int iheight, int actor_id) :
+Window_ParamStatus::Window_ParamStatus(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor) :
 	Window_Base(ix, iy, iwidth, iheight),
-	actor_id(actor_id)
+	actor(actor)
 {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
@@ -36,8 +36,6 @@ Window_ParamStatus::Window_ParamStatus(int ix, int iy, int iwidth, int iheight,
 void Window_ParamStatus::Refresh() {
 	contents->Clear();
 
-	auto* actor = Main_Data::game_actors->GetActor(actor_id);
-
 	auto draw = [this](int y, StringView name, int value) {
 		// Draw Term
 		contents->TextDraw(0, y, 1, name);
@@ -48,9 +46,9 @@ void Window_ParamStatus::Refresh() {
 	};
 
 	int y = 2;
-	y = draw(y, lcf::Data::terms.attack, actor->GetAtk());
-	y = draw(y, lcf::Data::terms.defense, actor->GetDef());
-	y = draw(y, lcf::Data::terms.spirit, actor->GetSpi());
-	y = draw(y, lcf::Data::terms.agility, actor->GetAgi());
+	y = draw(y, lcf::Data::terms.attack, actor.GetAtk());
+	y = draw(y, lcf::Data::terms.defense, actor.GetDef());
+	y = draw(y, lcf::Data::terms.spirit, actor.GetSpi());
+	y = draw(y, lcf::Data::terms.agility, actor.GetAgi());
 }
 
diff --git a/src/window_paramstatus.h b/src/window_paramstatus.h
index ac585e59c..2de712221 100644
--- a/src/window_paramstatus.h
+++ b/src/window_paramstatus.h
@@ -35,9 +35,9 @@ class Window_ParamStatus : public Window_Base {
 	 * @param iy window y position.
 	 * @param iwidth window width.
 	 * @param iheight window height.
-	 * @param actor_id actor whose stats are displayed.
+	 * @param actor actor whose stats are displayed.
 	 */
-	Window_ParamStatus(int ix, int iy, int iwidth, int iheight, int actor_id);
+	Window_ParamStatus(int ix, int iy, int iwidth, int iheight,  const Game_Actor& actor);
 
 	/**
 	 * Refreshes screen.
@@ -45,7 +45,7 @@ class Window_ParamStatus : public Window_Base {
 	void Refresh();
 
 private:
-	int actor_id = 0;
+	 const Game_Actor& actor;
 };
 
 #endif
diff --git a/src/window_skill.cpp b/src/window_skill.cpp
index 625e1cca1..b237f9c7e 100644
--- a/src/window_skill.cpp
+++ b/src/window_skill.cpp
@@ -30,12 +30,12 @@
 #include "game_battle.h"
 
 Window_Skill::Window_Skill(int ix, int iy, int iwidth, int iheight) :
-	Window_Selectable(ix, iy, iwidth, iheight), actor_id(-1), subset(0) {
+	Window_Selectable(ix, iy, iwidth, iheight), subset(0) {
 	column_max = 2;
 }
 
-void Window_Skill::SetActor(int actor_id) {
-	this->actor_id = actor_id;
+void Window_Skill::SetActor(const Game_Actor& actor) {
+	this->actor = &actor;
 	Refresh();
 }
 
@@ -50,7 +50,7 @@ const lcf::rpg::Skill* Window_Skill::GetSkill() const {
 void Window_Skill::Refresh() {
 	data.clear();
 
-	const std::vector<int16_t>& skills = Main_Data::game_actors->GetActor(actor_id)->GetSkills();
+	const std::vector<int16_t>& skills = actor->GetSkills();
 	for (size_t i = 0; i < skills.size(); ++i) {
 		if (CheckInclude(skills[i]))
 			data.push_back(skills[i]);
@@ -78,7 +78,6 @@ void Window_Skill::DrawItem(int index) {
 	int skill_id = data[index];
 
 	if (skill_id > 0) {
-		const Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
 		int costs = actor->CalculateSkillCost(skill_id);
 
 		bool enabled = CheckEnable(skill_id);
@@ -119,8 +118,6 @@ bool Window_Skill::CheckInclude(int skill_id) {
 }
 
 bool Window_Skill::CheckEnable(int skill_id) {
-	const Game_Actor* actor = Main_Data::game_actors->GetActor(actor_id);
-
 	return actor->IsSkillLearned(skill_id) && actor->IsSkillUsable(skill_id);
 }
 
diff --git a/src/window_skill.h b/src/window_skill.h
index f79938dc5..12ac75d2e 100644
--- a/src/window_skill.h
+++ b/src/window_skill.h
@@ -36,9 +36,9 @@ class Window_Skill : public Window_Selectable {
 	/**
 	 * Sets the actor whose skills are displayed.
 	 *
-	 * @param actor_id ID of the actor.
+	 * @param actor actor.
 	 */
-	void SetActor(int actor_id);
+	void SetActor(const Game_Actor& actor);
 
 	/**
 	 * Gets skill.
@@ -88,7 +88,7 @@ class Window_Skill : public Window_Selectable {
 protected:
 	std::vector<int> data;
 
-	int actor_id;
+	const Game_Actor* actor;
 
 	int subset;
 };
diff --git a/src/window_skillstatus.cpp b/src/window_skillstatus.cpp
index d0629ee19..d8b9984f7 100644
--- a/src/window_skillstatus.cpp
+++ b/src/window_skillstatus.cpp
@@ -24,13 +24,13 @@
 #include "player.h"
 
 Window_SkillStatus::Window_SkillStatus(int ix, int iy, int iwidth, int iheight) :
-	Window_Base(ix, iy, iwidth, iheight), actor_id(-1) {
+	Window_Base(ix, iy, iwidth, iheight) {
 
 	SetContents(Bitmap::Create(width - 16, height - 16));
 }
 
-void Window_SkillStatus::SetActor(int actor_id) {
-	this->actor_id = actor_id;
+void Window_SkillStatus::SetActor(const Game_Actor& actor) {
+	this->actor = &actor;
 	Refresh();
 }
 
@@ -38,19 +38,17 @@ void Window_SkillStatus::Refresh() {
 	contents->ClearRect(Rect(0, 0, contents->GetWidth(), 16));
 
 	// Actors are guaranteed to be valid
-	const Game_Actor& actor = *Main_Data::game_actors->GetActor(actor_id);
-
 	int x = 0;
 	int y = 2;
-	DrawActorName(actor, x, y);
+	DrawActorName(*actor, x, y);
 	x += 80;
-	DrawActorLevel(actor, x, y);
+	DrawActorLevel(*actor, x, y);
 	x += 44;
-	DrawActorState(actor, x, y);
-	int hpdigits = (actor.MaxHpValue() >= 1000) ? 4 : 3;
-	int spdigits = (actor.MaxSpValue() >= 1000) ? 4 : 3;
+	DrawActorState(*actor, x, y);
+	int hpdigits = (actor->MaxHpValue() >= 1000) ? 4 : 3;
+	int spdigits = (actor->MaxSpValue() >= 1000) ? 4 : 3;
 	x += (96 - hpdigits * 6 - spdigits * 6);
-	DrawActorHp(actor, x, y, hpdigits);
+	DrawActorHp(*actor, x, y, hpdigits);
 	x += (66 + hpdigits * 6 - spdigits * 6);
-	DrawActorSp(actor, x, y, spdigits);
+	DrawActorSp(*actor, x, y, spdigits);
 }
diff --git a/src/window_skillstatus.h b/src/window_skillstatus.h
index 313ade823..193e10b98 100644
--- a/src/window_skillstatus.h
+++ b/src/window_skillstatus.h
@@ -34,9 +34,9 @@ class Window_SkillStatus : public Window_Base {
 
 	/**
 	 * Sets the actor whose stats are displayed.
-	 * @param actor_id ID of the actor.
+	 * @param actor actor.
 	 */
-	void SetActor(int actor_id);
+	void SetActor(const Game_Actor& actor);
 
 	/**
 	 * Renders the stats of the actor.
@@ -44,7 +44,7 @@ class Window_SkillStatus : public Window_Base {
 	void Refresh();
 
 private:
-	int actor_id;
+	const Game_Actor* actor = nullptr;
 };
 
 #endif

From b107a82e4c66c046e7cb4b1cb5dfde95ea3019a5 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 8 May 2024 15:24:49 +0200
Subject: [PATCH 077/222] Scene_Debug; Minor menueing inconsistency: Play
 Cursor SE when moving between tabs of the range window

---
 src/scene_debug.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index 209417ea7..b6dee0142 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -451,23 +451,31 @@ void Scene_Debug::vUpdate() {
 		}
 		Game_Map::SetNeedRefresh(true);
 	} else if (range_window->GetActive() && Input::IsRepeated(Input::RIGHT)) {
+		int range_page_prev = range_page;
 		if (range_page < GetLastPage()) {
 			++range_page;
 		} else {
 			range_page = 0;
 		}
-		var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
-		UpdateRangeListWindow();
-		var_window->Refresh();
+		if (range_page != range_page_prev) {
+			var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+			UpdateRangeListWindow();
+			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
+			var_window->Refresh();
+		}
 	} else if (range_window->GetActive() && Input::IsRepeated(Input::LEFT)) {
+		int range_page_prev = range_page;
 		if (range_page > 0) {
 			--range_page;
 		} else {
 			range_page = GetLastPage();
 		}
-		var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
-		UpdateRangeListWindow();
-		var_window->Refresh();
+		if (range_page != range_page_prev) {
+			var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
+			UpdateRangeListWindow();
+			var_window->Refresh();
+		}
 	}
 
 	UpdateArrows();

From f8e43f0cd8e222d06d77b2df5f2015f36b50ab37 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 8 May 2024 15:26:19 +0200
Subject: [PATCH 078/222] Scene_Debug: Implemented new debug view for viewing
 Maniac strings

---
 CMakeLists.txt            |   2 +
 src/scene_debug.cpp       |  72 +++++++++++++++++++-
 src/scene_debug.h         |  14 +++-
 src/window_stringview.cpp | 140 ++++++++++++++++++++++++++++++++++++++
 src/window_stringview.h   |  51 ++++++++++++++
 src/window_varlist.cpp    |  26 ++++++-
 src/window_varlist.h      |   6 +-
 7 files changed, 306 insertions(+), 5 deletions(-)
 create mode 100644 src/window_stringview.cpp
 create mode 100644 src/window_stringview.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57c27d7d..9d3de9f5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,6 +453,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/window_skill.h
 	src/window_skillstatus.cpp
 	src/window_skillstatus.h
+	src/window_stringview.cpp
+	src/window_stringview.h
 	src/window_targetstatus.cpp
 	src/window_targetstatus.h
 	src/window_teleport.cpp
diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index b6dee0142..75ce0ea0e 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -25,6 +25,7 @@
 #include "input.h"
 #include "game_variables.h"
 #include "game_switches.h"
+#include "game_strings.h"
 #include "game_map.h"
 #include "game_system.h"
 #include "game_battle.h"
@@ -69,14 +70,18 @@ void Scene_Debug::Start() {
 	CreateRangeWindow();
 	CreateVarListWindow();
 	CreateNumberInputWindow();
+	CreateStringViewWindow();
 
 	SetupUiRangeList();
 
 	range_window->SetActive(true);
 	var_window->SetActive(false);
+	stringview_window->SetActive(false);
 
 	UpdateRangeListWindow();
 	var_window->Refresh();
+
+	strings_cached = false;
 }
 
 Scene_Debug::StackFrame& Scene_Debug::GetFrame(int n) {
@@ -115,6 +120,8 @@ Window_VarList::Mode Scene_Debug::GetWindowMode() const {
 			return Window_VarList::eCommonEvent;
 		case eCallMapEvent:
 			return Window_VarList::eMapEvent;
+		case eString:
+			return Window_VarList::eString;
 		default:
 			return Window_VarList::eNone;
 	}
@@ -140,6 +147,9 @@ void Scene_Debug::UpdateFrameValueFromUi() {
 		case eUiNumberInput:
 			frame.value = numberinput_window->GetNumber();
 			break;
+		eUiStringView:
+			frame.value = stringview_window->GetIndex();
+			break;
 	}
 }
 
@@ -152,6 +162,8 @@ void Scene_Debug::Push(UiMode ui) {
 	var_window->SetActive(false);
 	numberinput_window->SetActive(false);
 	numberinput_window->SetVisible(false);
+	stringview_window->SetActive(false);
+	stringview_window->SetVisible(false);
 }
 
 void Scene_Debug::SetupUiRangeList() {
@@ -161,7 +173,7 @@ void Scene_Debug::SetupUiRangeList() {
 	range_index = idx.range_index;
 	range_page = idx.range_page;
 
-	var_window->SetMode(vmode);
+	var_window->SetMode(vmode, mode == eString ? strings.size() : 0);
 	var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
 
 	range_window->SetIndex(range_index);
@@ -212,6 +224,28 @@ void Scene_Debug::PushUiNumberInput(int init_value, int digits, bool show_operat
 	UpdateRangeListWindow();
 }
 
+void Scene_Debug::PushUiStringView() {
+	const auto str_id = GetFrame().value;
+
+	auto value = ToString(Main_Data::game_strings->Get(str_id));
+
+	if (value.empty()) {
+		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));
+		return;
+	}
+	Push(eUiStringView);
+
+	var_window->SetActive(false);
+	stringview_window->SetActive(true);
+	stringview_window->SetVisible(true);
+
+	Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
+	stringview_window->SetDisplayData(value);
+	stringview_window->SetIndex(0);
+	stringview_window->Refresh();
+}
+
+
 void Scene_Debug::Pop() {
 	auto pui = GetFrame().uimode;
 
@@ -223,6 +257,8 @@ void Scene_Debug::Pop() {
 	var_window->SetActive(false);
 	numberinput_window->SetActive(false);
 	numberinput_window->SetVisible(false);
+	stringview_window->SetActive(false);
+	stringview_window->SetVisible(false);
 
 	if (stack_index == 0) {
 		Scene::Pop();
@@ -255,6 +291,10 @@ void Scene_Debug::Pop() {
 			numberinput_window->SetActive(true);
 			numberinput_window->SetVisible(true);
 			break;
+		case eUiStringView:
+			stringview_window->SetActive(true);
+			stringview_window->SetVisible(true);
+			break;
 	}
 
 	if (stack_index == 0) {
@@ -274,6 +314,9 @@ void Scene_Debug::vUpdate() {
 	}
 	var_window->Update();
 
+	if (stringview_window->GetActive())
+		stringview_window->Update();
+
 	if (numberinput_window->GetActive())
 		numberinput_window->Update();
 
@@ -445,6 +488,21 @@ void Scene_Debug::vUpdate() {
 					}
 				}
 				break;
+			case eString:
+				if (sz > 3) {
+					//TODO
+				} else if (sz > 2) {
+					PushUiStringView();
+				} else if (sz > 1) {
+					PushUiVarList();
+				} else if (sz > 0) {
+					if (!strings_cached) {
+						strings = Main_Data::game_strings->GetLcfData();
+						strings_cached = true;
+					}
+					PushUiRangeList();
+				}
+				break;
 			case eOpenMenu:
 				DoOpenMenu();
 				break;
@@ -529,6 +587,7 @@ void Scene_Debug::UpdateRangeListWindow() {
 				addItem("Call ComEvent");
 				addItem("Call MapEvent", Scene::Find(Scene::Map) != nullptr);
 				addItem("Call BtlEvent", is_battle);
+				addItem("Strings", Player::IsPatchManiac());
 				addItem("Open Menu", !is_battle);
 			}
 			break;
@@ -605,6 +664,8 @@ void Scene_Debug::UpdateRangeListWindow() {
 				}
 			}
 			break;
+		case eString:
+			fillRange("St");
 		default:
 			break;
 	}
@@ -635,6 +696,12 @@ void Scene_Debug::CreateNumberInputWindow() {
 	numberinput_window->SetShowOperator(true);
 }
 
+void Scene_Debug::CreateStringViewWindow() {
+	stringview_window.reset(new Window_StringView(Player::menu_offset_x + 15, Player::menu_offset_y + 16, 288, 208));
+	stringview_window->SetVisible(false);
+	stringview_window->SetIndex(-1);
+}
+
 int Scene_Debug::GetNumMainMenuItems() const {
 	return static_cast<int>(eLastMainMenuOption) - 1;
 }
@@ -671,6 +738,9 @@ int Scene_Debug::GetLastPage() {
 		case eCallMapEvent:
 			num_elements = Game_Map::GetHighestEventId();
 			break;
+		case eString:
+			num_elements = strings.size();
+			break;
 		default:
 			break;
 	}
diff --git a/src/scene_debug.h b/src/scene_debug.h
index d039607d9..c1aaf3a1c 100644
--- a/src/scene_debug.h
+++ b/src/scene_debug.h
@@ -24,6 +24,7 @@
 #include "window_command.h"
 #include "window_numberinput.h"
 #include "window_varlist.h"
+#include "window_stringview.h"
 
 /**
  * Scene Equip class.
@@ -68,6 +69,7 @@ class Scene_Debug : public Scene {
 		eCallCommonEvent,
 		eCallMapEvent,
 		eCallBattleEvent,
+		eString,
 		eOpenMenu,
 		eLastMainMenuOption,
 	};
@@ -76,7 +78,8 @@ class Scene_Debug : public Scene {
 		eUiMain,
 		eUiRangeList,
 		eUiVarList,
-		eUiNumberInput
+		eUiNumberInput,
+		eUiStringView
 	};
 private:
 	Mode mode = eMain;
@@ -95,6 +98,9 @@ class Scene_Debug : public Scene {
 	/** Creates number input window. */
 	void CreateNumberInputWindow();
 
+	/** Creates string view window. */
+	void CreateStringViewWindow();
+
 	/** Get the last page for the current mode */
 	int GetLastPage();
 
@@ -120,6 +126,8 @@ class Scene_Debug : public Scene {
 	std::unique_ptr<Window_VarList> var_window;
 	/** Number Editor. */
 	std::unique_ptr<Window_NumberInput> numberinput_window;
+	/** Windows for displaying multiline strings. */
+	std::unique_ptr<Window_StringView> stringview_window;
 
 	struct StackFrame {
 		UiMode uimode = eUiMain;
@@ -140,6 +148,7 @@ class Scene_Debug : public Scene {
 	void PushUiRangeList();
 	void PushUiVarList();
 	void PushUiNumberInput(int init_value, int digits, bool show_operator);
+	void PushUiStringView();
 
 	Window_VarList::Mode GetWindowMode() const;
 	void UpdateFrameValueFromUi();
@@ -148,6 +157,9 @@ class Scene_Debug : public Scene {
 
 	void UpdateArrows();
 	int arrow_frame = 0;
+
+	bool strings_cached = false;
+	std::vector<lcf::DBString> strings;
 };
 
 #endif
diff --git a/src/window_stringview.cpp b/src/window_stringview.cpp
new file mode 100644
index 000000000..670fd0009
--- /dev/null
+++ b/src/window_stringview.cpp
@@ -0,0 +1,140 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Headers
+#include <vector>
+#include "window_stringview.h"
+#include "bitmap.h"
+#include "game_message.h"
+#include "game_system.h"
+#include "input.h"
+#include "player.h"
+
+Window_StringView::Window_StringView(int ix, int iy, int iwidth, int iheight) :
+	Window_Selectable(ix, iy, iwidth, iheight) {
+	column_max = 1;
+}
+
+Window_StringView::~Window_StringView() {
+
+}
+
+void Window_StringView::SetDisplayData(StringView data) {
+	display_data_raw = ToString(data);
+}
+
+std::string Window_StringView::GetDisplayData(bool eval_cmds) {
+	if (eval_cmds)
+		return PendingMessage::ApplyTextInsertingCommands(display_data_raw, Player::escape_char, Game_Message::CommandCodeInserter);
+	return display_data_raw;
+}
+
+void Window_StringView::Refresh() {
+	lines.clear();
+	lines_numbered.clear();
+	line_count = 0;
+
+	std::string value = GetDisplayData(cmd_eval);
+
+	// determine line count
+	size_t pos = 0;
+	while ((pos = value.find("\n", pos)) != std::string::npos) {
+		value = value.substr(pos + 1);
+		pos = 0;
+		line_count++;
+	}
+	if (!value.empty()) {
+		line_count++;
+	}
+
+	//compute how many digits there are needed for the line numbers
+	line_no_max_digits = std::log10(line_count) + 1;
+	line_no_tpl = fmt::format("{{:0{}d}}:", line_no_max_digits);
+
+	value = GetDisplayData(cmd_eval);
+
+	//create vector of display lines
+	pos = 0;
+	while ((pos = value.find("\n", pos)) != std::string::npos) {
+		std::string new_line = value.substr(0, pos);
+		lines_numbered.push_back(true);
+
+		while (auto_linebreak && new_line.size() > (max_str_length - line_no_max_digits)) {
+			lines.push_back(new_line.substr(0, (max_str_length - line_no_max_digits)));
+			lines_numbered.push_back(false);
+			new_line = new_line.substr((max_str_length - line_no_max_digits));
+		}
+		lines.push_back(new_line);
+		value = value.substr(pos + 1);
+		pos = 0;
+	}
+	if (!value.empty()) {
+		lines.push_back(value);
+		lines_numbered.push_back(true);
+	}
+
+	item_max = lines.size() + top_lines_reserved;
+
+	CreateContents();
+	contents->Clear();
+	DrawCmdLines();
+
+	for (int i = 0; i < item_max - top_lines_reserved; ++i) {
+		DrawLine(i);
+	}
+}
+
+void Window_StringView::Update() {
+	Window_Selectable::Update();
+	if (active && index >= 0 && index <= 1 && Input::IsTriggered(Input::DECISION)) {
+		if (index == 0)
+			auto_linebreak = !auto_linebreak;
+		else
+			cmd_eval = !cmd_eval;
+
+		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
+		Refresh();
+	}
+}
+
+void Window_StringView::DrawCmdLines() {
+	Rect rect = GetItemRect(0);
+	contents->ClearRect(rect);
+
+	contents->TextDraw(rect.x, rect.y, Font::ColorHeal, "Automatic line break: ");
+	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorCritical, auto_linebreak ? "[ON]" : "[OFF]", Text::AlignRight);
+
+	rect = GetItemRect(1);
+	contents->ClearRect(rect);
+
+	contents->TextDraw(rect.x, rect.y, Font::ColorHeal, "Command evaluation: ");
+	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorCritical, cmd_eval ? "[ON]" : "[OFF]", Text::AlignRight);
+}
+
+void Window_StringView::DrawLine(int index) {
+	Rect rect = GetItemRect(index + top_lines_reserved);
+	contents->ClearRect(rect);
+
+	std::string line = lines[index];
+
+	if (!line.empty()) {
+		if (lines_numbered[index]) {
+			contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format(line_no_tpl, index + 1));
+		}
+		contents->TextDraw(rect.x + line_no_max_digits * 8 + 8, rect.y, Font::ColorDefault, line);
+	}
+}
diff --git a/src/window_stringview.h b/src/window_stringview.h
new file mode 100644
index 000000000..d6b502b91
--- /dev/null
+++ b/src/window_stringview.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EP_WINDOW_STRINGVIEW_H
+#define EP_WINDOW_STRINGVIEW_H
+
+// Headers
+#include "window_command.h"
+
+class Window_StringView : public Window_Selectable {
+public:
+	Window_StringView(int ix, int iy, int iwidth, int iheight);
+	~Window_StringView() override;
+
+	void Update() override;
+
+	void SetDisplayData(StringView data);
+	std::string GetDisplayData(bool eval_cmds);
+
+	void Refresh();
+protected:
+	void DrawCmdLines();
+	void DrawLine(int index);
+private:
+	const int top_lines_reserved = 2, max_str_length = 42;
+	bool auto_linebreak = false, cmd_eval = false;
+
+	std::string display_data_raw;
+
+	std::vector<std::string> lines;
+	std::vector<bool> lines_numbered;
+
+	int line_count = 0, line_no_max_digits = 0;
+	std::string line_no_tpl = "";
+};
+
+#endif
diff --git a/src/window_varlist.cpp b/src/window_varlist.cpp
index bd87116bb..5ac9ff3b3 100644
--- a/src/window_varlist.cpp
+++ b/src/window_varlist.cpp
@@ -21,6 +21,7 @@
 #include "window_varlist.h"
 #include "game_switches.h"
 #include "game_variables.h"
+#include "game_strings.h"
 #include "bitmap.h"
 #include <lcf/data.h>
 #include "output.h"
@@ -93,6 +94,25 @@ void Window_VarList::DrawItemValue(int index){
 				contents->TextDraw(GetWidth() - 16, 16 * index + 2, Font::ColorDefault, std::to_string(value), Text::AlignRight);
 			}
 			break;
+		case eString:
+		{
+			auto value = ToString(Main_Data::game_strings->Get(first_var + index));
+			DrawItem(index, Font::ColorDefault);
+			if (value.empty()) {
+				contents->TextDraw(34, 16 * index + 2, Font::ColorDisabled, "undefined", Text::AlignLeft);
+			} else {
+				size_t pos = 0;
+				while ((pos = value.find("\n", pos)) != std::string::npos) {
+					value.replace(pos, 1, "\\n");
+					pos += 3;
+				}
+				if (value.length() > 28) {
+					value = value.substr(0, 25) + "...";
+				}
+				contents->TextDraw(34, 16 * index + 2, Font::ColorDefault, value, Text::AlignLeft);
+			}
+		}
+		break;
 		case eNone:
 			break;
 	}
@@ -155,6 +175,7 @@ void Window_VarList::UpdateList(int first_value){
 			case eMapEvent:
 				ss << Game_Map::GetEvent(first_value+i)->GetName();
 				break;
+			case eString:
 			default:
 				break;
 		}
@@ -162,8 +183,9 @@ void Window_VarList::UpdateList(int first_value){
 	}
 }
 
-void Window_VarList::SetMode(Mode mode) {
+void Window_VarList::SetMode(Mode mode, int max_length_strings) {
 	this->mode = mode;
+	this->max_length_strings = max_length_strings;
 	SetVisible((mode != eNone));
 	Refresh();
 }
@@ -188,6 +210,8 @@ bool Window_VarList::DataIsValid(int range_index) {
 			return range_index > 0 && range_index <= static_cast<int>(lcf::Data::commonevents.size());
 		case eMapEvent:
 			return Game_Map::GetEvent(range_index) != nullptr;
+		case eString:
+			return range_index > 0 && range_index <= max_length_strings;
 		default:
 			break;
 	}
diff --git a/src/window_varlist.h b/src/window_varlist.h
index 4211010ea..3efd3b0be 100644
--- a/src/window_varlist.h
+++ b/src/window_varlist.h
@@ -35,6 +35,7 @@ class Window_VarList : public Window_Command
 		eLevel,
 		eCommonEvent,
 		eMapEvent,
+		eString
 	};
 
 	/**
@@ -61,8 +62,9 @@ class Window_VarList : public Window_Command
 	 * Indicate what to display.
 	 *
 	 * @param mode the mode to set.
+	 * @param max_length_strings maximum size for items (Used for Strings)
 	 */
-	void SetMode(Mode mode);
+	void SetMode(Mode mode, int max_length_strings = 0);
 
 	/**
 	 * Returns the current mode.
@@ -79,7 +81,7 @@ class Window_VarList : public Window_Command
 	void DrawItemValue(int index);
 
 	Mode mode = eNone;
-	int first_var = 0;
+	int first_var = 0, max_length_strings = 0;
 
 	bool DataIsValid(int range_index);
 

From 9648b82d6980a79d15345877b04614edda6a33f7 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 8 May 2024 19:34:20 +0200
Subject: [PATCH 079/222] Scene_Debug: Implemented new debug view for
 displaying current interpreter stack states

---
 CMakeLists.txt             |   2 +
 src/game_commonevent.h     |   2 +
 src/game_event.h           |   2 +
 src/scene_debug.cpp        | 211 ++++++++++++++++++++++++++++++++++---
 src/scene_debug.h          |  25 ++++-
 src/window_interpreter.cpp | 166 +++++++++++++++++++++++++++++
 src/window_interpreter.h   |  57 ++++++++++
 src/window_stringview.cpp  |   5 +-
 src/window_stringview.h    |   1 -
 9 files changed, 449 insertions(+), 22 deletions(-)
 create mode 100644 src/window_interpreter.cpp
 create mode 100644 src/window_interpreter.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d3de9f5b..42ba4e6bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,6 +419,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/window_input_settings.h
 	src/window_item.cpp
 	src/window_item.h
+	src/window_interpreter.cpp
+	src/window_interpreter.h
 	src/window_keyboard.cpp
 	src/window_keyboard.h
 	src/window_menustatus.cpp
diff --git a/src/game_commonevent.h b/src/game_commonevent.h
index 4bdceb86c..c00970754 100644
--- a/src/game_commonevent.h
+++ b/src/game_commonevent.h
@@ -112,6 +112,8 @@ class Game_CommonEvent {
 
 	/** Interpreter for parallel common events. */
 	std::unique_ptr<Game_Interpreter_Map> interpreter;
+
+	friend class Scene_Debug;
 };
 
 #endif
diff --git a/src/game_event.h b/src/game_event.h
index b1dede55b..6b7e0d77f 100644
--- a/src/game_event.h
+++ b/src/game_event.h
@@ -212,6 +212,8 @@ class Game_Event : public Game_EventBase {
 	const lcf::rpg::Event* event = nullptr;
 	const lcf::rpg::EventPage* page = nullptr;
 	std::unique_ptr<Game_Interpreter_Map> interpreter;
+
+	friend class Scene_Debug;
 };
 
 inline int Game_Event::GetNumPages() const {
diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index 75ce0ea0e..fcdf59b57 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -45,6 +45,7 @@
 #include <lcf/data.h>
 #include "output.h"
 #include "transition.h"
+#include "lcf/reader_util.h"
 
 namespace {
 struct IndexSet {
@@ -71,17 +72,20 @@ void Scene_Debug::Start() {
 	CreateVarListWindow();
 	CreateNumberInputWindow();
 	CreateStringViewWindow();
+	CreateInterpreterWindow();
 
 	SetupUiRangeList();
 
 	range_window->SetActive(true);
 	var_window->SetActive(false);
 	stringview_window->SetActive(false);
+	interpreter_window->SetActive(false);
 
 	UpdateRangeListWindow();
 	var_window->Refresh();
 
 	strings_cached = false;
+	interpreter_states_cached = false;
 }
 
 Scene_Debug::StackFrame& Scene_Debug::GetFrame(int n) {
@@ -138,11 +142,11 @@ void Scene_Debug::UpdateFrameValueFromUi() {
 		case eUiRangeList:
 			idx.range_index = range_index;
 			idx.range_page = range_page;
-			frame.value = range_page * 100 + range_index * 10;
+			frame.value = GetSelectedIndexFromRange() - 1;
 			break;
 		case eUiVarList:
 			idx.range_page_index = var_window->GetIndex();
-			frame.value = range_page * 100 + range_index * 10 + var_window->GetIndex() + 1;
+			frame.value = GetSelectedIndexFromRange() + var_window->GetIndex();
 			break;
 		case eUiNumberInput:
 			frame.value = numberinput_window->GetNumber();
@@ -150,6 +154,10 @@ void Scene_Debug::UpdateFrameValueFromUi() {
 		eUiStringView:
 			frame.value = stringview_window->GetIndex();
 			break;
+		case eUiInterpreterView:
+			idx.range_page_index = interpreter_window->GetIndex();
+			frame.value = GetSelectedIndexFromRange() + interpreter_window->GetIndex();
+			break;
 	}
 }
 
@@ -160,12 +168,23 @@ void Scene_Debug::Push(UiMode ui) {
 
 	range_window->SetActive(false);
 	var_window->SetActive(false);
+	interpreter_window->SetActive(false);
+	interpreter_window->SetVisible(false);
 	numberinput_window->SetActive(false);
 	numberinput_window->SetVisible(false);
 	stringview_window->SetActive(false);
 	stringview_window->SetVisible(false);
 }
 
+int Scene_Debug::GetSelectedIndexFromRange() const {
+	switch (mode) {
+		case eInterpreter:
+			return range_page * 10 + range_index + 1;
+	}
+	return range_page * 100 + range_index * 10 + 1;
+}
+
+
 void Scene_Debug::SetupUiRangeList() {
 	auto& idx = prev[mode];
 	auto vmode = GetWindowMode();
@@ -174,7 +193,7 @@ void Scene_Debug::SetupUiRangeList() {
 	range_page = idx.range_page;
 
 	var_window->SetMode(vmode, mode == eString ? strings.size() : 0);
-	var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+	UpdateDetailWindow();
 
 	range_window->SetIndex(range_index);
 }
@@ -188,7 +207,6 @@ void Scene_Debug::PushUiRangeList() {
 
 	UpdateRangeListWindow();
 	var_window->Refresh();
-
 }
 
 void Scene_Debug::PushUiVarList() {
@@ -206,7 +224,14 @@ void Scene_Debug::PushUiVarList() {
 	var_window->SetIndex(idx.range_page_index);
 
 	UpdateRangeListWindow();
-	var_window->Refresh();
+	if (mode != eInterpreter) {
+		var_window->SetVisible(true);
+		var_window->Refresh();
+	} else {
+		interpreter_window->SetVisible(true);
+		var_window->SetVisible(false);
+		interpreter_window->Refresh();
+	}
 
 }
 
@@ -245,12 +270,35 @@ void Scene_Debug::PushUiStringView() {
 	stringview_window->Refresh();
 }
 
+void Scene_Debug::PushUiInterpreterView() {
+	const bool was_range_list = (GetFrame().uimode == eUiRangeList);
+
+	Push(eUiInterpreterView);
+
+	auto& idx = prev[mode];
+
+	if (!was_range_list) {
+		SetupUiRangeList();
+	}
+
+	interpreter_window->SetVisible(true);
+	var_window->SetVisible(false);
+
+	interpreter_window->SetActive(true);
+	interpreter_window->SetIndex(idx.range_page_index);
+
+	UpdateRangeListWindow();
+	interpreter_window->Refresh();
+}
+
 
 void Scene_Debug::Pop() {
 	auto pui = GetFrame().uimode;
 
 	if (pui == eUiVarList) {
 		var_window->SetIndex(-1);
+	} else if (pui == eUiInterpreterView) {
+		interpreter_window->SetIndex(-1);
 	}
 
 	range_window->SetActive(false);
@@ -259,6 +307,8 @@ void Scene_Debug::Pop() {
 	numberinput_window->SetVisible(false);
 	stringview_window->SetActive(false);
 	stringview_window->SetVisible(false);
+	interpreter_window->SetActive(false);
+	interpreter_window->SetVisible(false);
 
 	if (stack_index == 0) {
 		Scene::Pop();
@@ -295,6 +345,12 @@ void Scene_Debug::Pop() {
 			stringview_window->SetActive(true);
 			stringview_window->SetVisible(true);
 			break;
+		case eUiInterpreterView:
+			interpreter_window->SetActive(true);
+			interpreter_window->SetIndex((GetFrame().value - 1) % 10);
+			var_window->SetVisible(false);
+			interpreter_window->SetVisible(true);
+			break;
 	}
 
 	if (stack_index == 0) {
@@ -303,14 +359,14 @@ void Scene_Debug::Pop() {
 
 	UpdateRangeListWindow();
 	var_window->Refresh();
+	interpreter_window->Refresh();
 }
 
 void Scene_Debug::vUpdate() {
 	range_window->Update();
 	if (range_index != range_window->GetIndex()){
 		range_index = range_window->GetIndex();
-		var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
-		var_window->Refresh();
+		UpdateDetailWindow();
 	}
 	var_window->Update();
 
@@ -320,6 +376,9 @@ void Scene_Debug::vUpdate() {
 	if (numberinput_window->GetActive())
 		numberinput_window->Update();
 
+	if (interpreter_window->GetActive())
+		interpreter_window->Update();
+
 	if (Input::IsTriggered(Input::CANCEL)) {
 		UpdateFrameValueFromUi();
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cancel));
@@ -489,13 +548,11 @@ void Scene_Debug::vUpdate() {
 				}
 				break;
 			case eString:
-				if (sz > 3) {
-					//TODO
-				} else if (sz > 2) {
+				if (sz  == 3) {
 					PushUiStringView();
-				} else if (sz > 1) {
+				} else if (sz == 2) {
 					PushUiVarList();
-				} else if (sz > 0) {
+				} else if (sz == 1) {
 					if (!strings_cached) {
 						strings = Main_Data::game_strings->GetLcfData();
 						strings_cached = true;
@@ -503,6 +560,19 @@ void Scene_Debug::vUpdate() {
 					PushUiRangeList();
 				}
 				break;
+			case eInterpreter:
+				if (sz == 2) {
+					PushUiInterpreterView();
+				} else if (sz == 1) {
+					if (!interpreter_states_cached) {
+						GetBackgroundInterpreters();
+						interpreter_states_cached = true;
+					}
+					PushUiRangeList();
+					interpreter_window->SetVisible(true);
+					UpdateInterpreterWindow(GetSelectedIndexFromRange());
+				}
+				break;
 			case eOpenMenu:
 				DoOpenMenu();
 				break;
@@ -516,10 +586,9 @@ void Scene_Debug::vUpdate() {
 			range_page = 0;
 		}
 		if (range_page != range_page_prev) {
-			var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+			UpdateDetailWindow();
 			UpdateRangeListWindow();
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-			var_window->Refresh();
 		}
 	} else if (range_window->GetActive() && Input::IsRepeated(Input::LEFT)) {
 		int range_page_prev = range_page;
@@ -529,10 +598,9 @@ void Scene_Debug::vUpdate() {
 			range_page = GetLastPage();
 		}
 		if (range_page != range_page_prev) {
-			var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+			UpdateDetailWindow();
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 			UpdateRangeListWindow();
-			var_window->Refresh();
 		}
 	}
 
@@ -588,6 +656,7 @@ void Scene_Debug::UpdateRangeListWindow() {
 				addItem("Call MapEvent", Scene::Find(Scene::Map) != nullptr);
 				addItem("Call BtlEvent", is_battle);
 				addItem("Strings", Player::IsPatchManiac());
+				addItem("Interpreter");
 				addItem("Open Menu", !is_battle);
 			}
 			break;
@@ -666,6 +735,37 @@ void Scene_Debug::UpdateRangeListWindow() {
 			break;
 		case eString:
 			fillRange("St");
+			break;
+		case eInterpreter:
+		{
+			int skip_items = range_page * 10;
+			int count_items = 0;
+			if (range_page == 0) {
+				addItem(fmt::format("{}Main", Game_Interpreter::GetForegroundInterpreter().GetState().wait_movement ? "(W) " : ""));
+				skip_items = 1;
+				count_items = 1;
+			}
+			for (int i = 0; i < interpreters_ev.size() && count_items < 10; i++) {
+				if (skip_items > 0) {
+					skip_items--;
+					continue;
+				}
+				int evt_id = interpreters_ev[i];
+				addItem(fmt::format("{}EV{:04d}: {}", interpreters_state_ev[i].wait_movement ? "(W) " : "", evt_id, Game_Map::GetEvent(evt_id)->GetName()));
+				count_items++;
+			}
+			for (int i = 0; i < interpreters_ce.size() && count_items < 10; i++) {
+				if (skip_items > 0) {
+					skip_items--;
+					continue;
+				}
+				int ce_id = interpreters_ce[i];
+				auto* ce = lcf::ReaderUtil::GetElement(lcf::Data::commonevents, ce_id);
+				addItem(fmt::format("{}CE{:04d}: {}", interpreters_state_ce[i].wait_movement ? "(W) " : "", ce_id, ce->name));
+				count_items++;
+			}
+		}
+		break;
 		default:
 			break;
 	}
@@ -675,6 +775,16 @@ void Scene_Debug::UpdateRangeListWindow() {
 	}
 }
 
+void Scene_Debug::UpdateDetailWindow() {
+	if (mode != eInterpreter) {
+		var_window->UpdateList(GetSelectedIndexFromRange());
+		var_window->Refresh();
+	} else {
+		UpdateInterpreterWindow(GetSelectedIndexFromRange());
+		interpreter_window->Refresh();
+	}
+}
+
 void Scene_Debug::CreateVarListWindow() {
 	std::vector<std::string> vars;
 	for (int i = 0; i < 10; i++)
@@ -685,7 +795,7 @@ void Scene_Debug::CreateVarListWindow() {
 	var_window->SetVisible(false);
 	var_window->SetIndex(-1);
 
-	var_window->UpdateList(range_page * 100 + range_index * 10 + 1);
+	var_window->UpdateList(GetSelectedIndexFromRange());
 }
 
 void Scene_Debug::CreateNumberInputWindow() {
@@ -702,6 +812,13 @@ void Scene_Debug::CreateStringViewWindow() {
 	stringview_window->SetIndex(-1);
 }
 
+void Scene_Debug::CreateInterpreterWindow() {
+	interpreter_window.reset(new Window_Interpreter(Player::menu_offset_x + range_window->GetWidth(), range_window->GetY(), 224, 176));
+	interpreter_window->SetVisible(false);
+	interpreter_window->SetIndex(-1);
+}
+
+
 int Scene_Debug::GetNumMainMenuItems() const {
 	return static_cast<int>(eLastMainMenuOption) - 1;
 }
@@ -741,6 +858,9 @@ int Scene_Debug::GetLastPage() {
 		case eString:
 			num_elements = strings.size();
 			break;
+		case eInterpreter:
+			num_elements = 1 + interpreters_ev.size() + interpreters_ce.size();
+			return (static_cast<int>(num_elements) - 1) / 10;
 		default:
 			break;
 	}
@@ -969,3 +1089,60 @@ void Scene_Debug::UpdateArrows() {
 	range_window->SetLeftArrow(show_left_arrow && arrow_visible);
 	range_window->SetRightArrow(show_right_arrow && arrow_visible);
 }
+
+void Scene_Debug::GetBackgroundInterpreters() {
+	interpreters_ev.clear();
+	interpreters_ce.clear();
+	interpreters_state_ev.clear();
+	interpreters_state_ce.clear();
+
+	if (Game_Map::GetMapId() > 0) {
+		for (auto& ev : Game_Map::GetEvents()) {
+			if (ev.GetTrigger() != lcf::rpg::EventPage::Trigger_parallel || !ev.interpreter)
+				continue;
+			interpreters_ev.emplace_back(ev.GetId());
+			interpreters_state_ev.emplace_back(ev.interpreter->GetState());
+		}
+		for (auto& ce : Game_Map::GetCommonEvents()) {
+			if (ce.IsWaitingBackgroundExecution(false)) {
+				interpreters_ce.emplace_back(ce.common_event_id);
+				interpreters_state_ce.emplace_back(ce.interpreter->GetState());
+			}
+		}
+	} else if (Game_Battle::IsBattleRunning() && Player::IsPatchManiac()) {
+		//Not implemented: battle common events
+	}
+}
+
+void Scene_Debug::UpdateInterpreterWindow(int index) {
+	lcf::rpg::SaveEventExecState state;
+	std::string first_line = "";
+	bool valid = false;
+
+	if (index == 1) {
+		state = Game_Interpreter::GetForegroundInterpreter().GetState();
+		first_line = Game_Battle::IsBattleRunning() ? "Foreground (Battle)" : "Foreground (Map)";
+		valid = true;
+	} else if (index <= interpreters_ev.size()) {
+		int evt_id = interpreters_ev[index - 1];
+		state = interpreters_state_ev[index - 1];
+		first_line = fmt::format("EV{:04d}: {}", evt_id, Game_Map::GetEvent(evt_id)->GetName());
+		valid = true;
+	} else if ((index - interpreters_ev.size()) <= interpreters_ce.size()) {
+		int ce_id = interpreters_ce[index - interpreters_ev.size() - 1];
+		state = interpreters_state_ce[index - interpreters_ev.size() - 1];
+		for (auto& ce : Game_Map::GetCommonEvents()) {
+			if (ce.common_event_id == ce_id) {
+				first_line = fmt::format("CE{:04d}: {}", ce_id, ce.GetName());
+				valid = true;
+				break;
+			}
+		}
+	}
+
+	if (valid) {
+		interpreter_window->SetStackState(index > interpreters_ev.size(), first_line, state);
+	} else if (interpreter_window->GetContents()) {
+		interpreter_window->GetContents()->Clear();
+	}
+}
diff --git a/src/scene_debug.h b/src/scene_debug.h
index c1aaf3a1c..5b93b6194 100644
--- a/src/scene_debug.h
+++ b/src/scene_debug.h
@@ -25,6 +25,7 @@
 #include "window_numberinput.h"
 #include "window_varlist.h"
 #include "window_stringview.h"
+#include "window_interpreter.h"
 
 /**
  * Scene Equip class.
@@ -70,6 +71,7 @@ class Scene_Debug : public Scene {
 		eCallMapEvent,
 		eCallBattleEvent,
 		eString,
+		eInterpreter,
 		eOpenMenu,
 		eLastMainMenuOption,
 	};
@@ -79,7 +81,8 @@ class Scene_Debug : public Scene {
 		eUiRangeList,
 		eUiVarList,
 		eUiNumberInput,
-		eUiStringView
+		eUiStringView,
+		eUiInterpreterView
 	};
 private:
 	Mode mode = eMain;
@@ -101,9 +104,16 @@ class Scene_Debug : public Scene {
 	/** Creates string view window. */
 	void CreateStringViewWindow();
 
+	/** Creates interpreter window. */
+	void CreateInterpreterWindow();
+
+
 	/** Get the last page for the current mode */
 	int GetLastPage();
 
+	/* Get the first item number for the selected range */
+	int GetSelectedIndexFromRange() const;
+
 	int GetNumMainMenuItems() const;
 
 	void DoSwitch();
@@ -128,6 +138,8 @@ class Scene_Debug : public Scene {
 	std::unique_ptr<Window_NumberInput> numberinput_window;
 	/** Windows for displaying multiline strings. */
 	std::unique_ptr<Window_StringView> stringview_window;
+	/** Displays the currently running inteprreters. */
+	std::unique_ptr<Window_Interpreter> interpreter_window;
 
 	struct StackFrame {
 		UiMode uimode = eUiMain;
@@ -149,9 +161,11 @@ class Scene_Debug : public Scene {
 	void PushUiVarList();
 	void PushUiNumberInput(int init_value, int digits, bool show_operator);
 	void PushUiStringView();
+	void PushUiInterpreterView();
 
 	Window_VarList::Mode GetWindowMode() const;
 	void UpdateFrameValueFromUi();
+	void UpdateDetailWindow();
 
 	bool IsValidMapId(int map_id) const;
 
@@ -160,6 +174,15 @@ class Scene_Debug : public Scene {
 
 	bool strings_cached = false;
 	std::vector<lcf::DBString> strings;
+
+	bool interpreter_states_cached = false;
+
+	void UpdateInterpreterWindow(int index);
+	void GetBackgroundInterpreters();
+	std::vector<int> interpreters_ev;
+	std::vector<int> interpreters_ce;
+	std::vector<lcf::rpg::SaveEventExecState> interpreters_state_ev;
+	std::vector<lcf::rpg::SaveEventExecState> interpreters_state_ce;
 };
 
 #endif
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
new file mode 100644
index 000000000..a28f868f5
--- /dev/null
+++ b/src/window_interpreter.cpp
@@ -0,0 +1,166 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Headers
+#include <vector>
+#include "window_interpreter.h"
+#include "bitmap.h"
+#include "game_map.h"
+#include "game_message.h"
+#include "game_system.h"
+#include "game_variables.h"
+#include "input.h"
+#include "player.h"
+#include "lcf/reader_util.h"
+
+namespace {
+	std::vector<std::string> CreateEmptyLines(int c) {		
+		std::vector<std::string> vars;
+		for (int i = 0; i < c; i++)
+			vars.push_back("");
+		return vars;
+	}
+}
+
+Window_Interpreter::Window_Interpreter(int ix, int iy, int iwidth, int iheight) :
+	Window_Selectable(ix, iy, iwidth, iheight) {
+	column_max = 1;
+}
+
+Window_Interpreter::~Window_Interpreter() {
+
+}
+
+void Window_Interpreter::SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state) {
+	this->interpreter_desc = interpreter_desc;
+	this->state = state;
+	this->is_ce = is_ce;
+}
+
+void Window_Interpreter::Refresh() {
+	stack_display_items.clear();
+
+	int max_cmd_count = 0;
+
+	for (int i = state.stack.size() - 1; i >= 0; i--) {
+		int evt_id = state.stack[i].event_id;
+		bool is_calling_ev_ce = false;
+
+		if (evt_id == 0 && i > 0) {
+			auto& prev_frame = state.stack[i - 1];
+			auto& com = prev_frame.commands[prev_frame.current_command - 1];
+			if (com.code == 12330) { // CallEvent
+				is_calling_ev_ce = true;
+				if (com.parameters[0] == 0) {
+					evt_id = com.parameters[1];
+				} else if (com.parameters[0] == 3 && Player::IsPatchManiac()) {
+					evt_id = Main_Data::game_variables->Get(com.parameters[1]);
+				} else if (com.parameters[0] == 4 && Player::IsPatchManiac()) {
+					evt_id = Main_Data::game_variables->GetIndirect(com.parameters[1]);
+				}
+			}
+		}
+		StackItem item = StackItem();
+		item.is_ce = is_calling_ev_ce || (i == 0 && this->is_ce);
+		item.evt_id = evt_id;
+		item.name = "";
+		item.cmd_current = state.stack[i].current_command;
+		item.cmd_count = state.stack[i].commands.size();
+
+		if (item.is_ce) {
+			auto* ce = lcf::ReaderUtil::GetElement(lcf::Data::commonevents, item.evt_id);
+			if (ce) {
+				item.name = ToString(ce->name);
+			}
+		} else {
+			auto* ev = Game_Map::GetEvent(evt_id);
+			if (ev) {
+				//TODO: map could have changed, but map_id isn't available
+				item.name = ToString(ev->GetName());
+			}
+		}
+
+		if (state.stack[i].commands.size() > max_cmd_count)
+			max_cmd_count = state.stack[i].commands.size();
+
+		stack_display_items.push_back(item);
+	}
+
+	item_max = stack_display_items.size() + lines_without_stack;
+	lines_without_stack = lines_without_stack_fixed;
+
+	if (state.wait_movement) {
+		item_max++;
+		lines_without_stack++;
+	}
+
+	digits_stackitemno = std::log10(stack_display_items.size()) + 1;
+	digits_cmdcount = std::log10(max_cmd_count) + 1;
+
+	CreateContents();
+	contents->Clear();
+	DrawDescriptionLines();
+
+	for (int i = 0; i < stack_display_items.size(); ++i) {
+		DrawStackLine(i);
+	}
+}
+
+void Window_Interpreter::Update() {
+	Window_Selectable::Update();
+}
+
+void Window_Interpreter::DrawDescriptionLines() {
+	int i = 0;
+	Rect rect = GetItemRect(i++);
+	contents->ClearRect(rect);
+
+	contents->TextDraw(rect.x, rect.y, Font::ColorDefault, interpreter_desc);
+
+	if (state.wait_movement) {
+		rect = GetItemRect(i++);
+		contents->ClearRect(rect);
+		contents->TextDraw(rect.x, rect.y, Font::ColorCritical, "[WAITING for EV movement!]");
+	}
+	
+	rect = GetItemRect(i++);
+	contents->ClearRect(rect);
+
+	contents->TextDraw(rect.x, rect.y, Font::ColorDefault, "Stack Size: ");
+	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorCritical, std::to_string(state.stack.size()), Text::AlignRight);
+}
+
+void Window_Interpreter::DrawStackLine(int index) {
+
+	Rect rect = GetItemRect(index + lines_without_stack);
+	contents->ClearRect(rect);
+
+	StackItem& item = stack_display_items[index];
+
+	contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format("[{:0" + std::to_string(digits_stackitemno) + "d}]", state.stack.size() - index));
+	contents->TextDraw(rect.x + (digits_stackitemno * 6) + 16, rect.y, Font::ColorDefault, fmt::format("{}{:04d}", item.is_ce ? "CE" : "EV", item.evt_id));
+
+	std::string name = item.name;
+	int max_length = 22;
+	max_length -= digits_stackitemno;
+	max_length -= digits_cmdcount * 2;
+	if (name.length() > max_length) {
+		name = name.substr(0, max_length - 3) + "...";
+	}
+	contents->TextDraw(rect.x + (digits_stackitemno * 6) + 56, rect.y, Font::ColorDefault, name, Text::AlignLeft);
+	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorDefault, fmt::format("{:0" + std::to_string(digits_cmdcount) + "d}/{:0" + std::to_string(digits_cmdcount) + "d}", item.cmd_current, item.cmd_count), Text::AlignRight);
+}
diff --git a/src/window_interpreter.h b/src/window_interpreter.h
new file mode 100644
index 000000000..ee307e12f
--- /dev/null
+++ b/src/window_interpreter.h
@@ -0,0 +1,57 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EP_WINDOW_INTERPRETER_H
+#define EP_WINDOW_INTERPRETER_H
+
+// Headers
+#include "window_command.h"
+#include "lcf/rpg/saveeventexecstate.h"
+
+class Window_Interpreter : public Window_Selectable {
+public:
+	Window_Interpreter(int ix, int iy, int iwidth, int iheight);
+	~Window_Interpreter() override;
+
+	void Update() override;
+
+	void SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state);
+	void Refresh();
+protected:
+	void DrawDescriptionLines();
+	void DrawStackLine(int index);
+private:
+	struct StackItem {
+		bool is_ce;
+		int evt_id;
+		std::string name;
+		int cmd_current, cmd_count;
+	};
+
+	const int lines_without_stack_fixed = 3;
+	
+	bool is_ce = false;
+	lcf::rpg::SaveEventExecState state;
+	std::string interpreter_desc;
+	int lines_without_stack = 0;
+
+	int digits_stackitemno = 0, digits_cmdcount = 0;
+	
+	std::vector<StackItem> stack_display_items;
+};
+
+#endif
diff --git a/src/window_stringview.cpp b/src/window_stringview.cpp
index 670fd0009..64e686611 100644
--- a/src/window_stringview.cpp
+++ b/src/window_stringview.cpp
@@ -63,7 +63,6 @@ void Window_StringView::Refresh() {
 
 	//compute how many digits there are needed for the line numbers
 	line_no_max_digits = std::log10(line_count) + 1;
-	line_no_tpl = fmt::format("{{:0{}d}}:", line_no_max_digits);
 
 	value = GetDisplayData(cmd_eval);
 
@@ -133,8 +132,8 @@ void Window_StringView::DrawLine(int index) {
 
 	if (!line.empty()) {
 		if (lines_numbered[index]) {
-			contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format(line_no_tpl, index + 1));
+			contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format("{:0" + std::to_string(line_no_max_digits) + "d}", index + 1));
 		}
-		contents->TextDraw(rect.x + line_no_max_digits * 8 + 8, rect.y, Font::ColorDefault, line);
+		contents->TextDraw(rect.x + line_no_max_digits * 6 + 6, rect.y, Font::ColorDefault, line);
 	}
 }
diff --git a/src/window_stringview.h b/src/window_stringview.h
index d6b502b91..e9c96d913 100644
--- a/src/window_stringview.h
+++ b/src/window_stringview.h
@@ -45,7 +45,6 @@ class Window_StringView : public Window_Selectable {
 	std::vector<bool> lines_numbered;
 
 	int line_count = 0, line_no_max_digits = 0;
-	std::string line_no_tpl = "";
 };
 
 #endif

From 0f7a0cf57313ff549e09ef49acb5d3870c722491 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 8 May 2024 20:03:56 +0200
Subject: [PATCH 080/222] Window_StringView: Fixed line numbering for
 Auto-Linebreak

---
 src/window_stringview.cpp | 13 +++++++------
 src/window_stringview.h   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/window_stringview.cpp b/src/window_stringview.cpp
index 64e686611..d676b69bc 100644
--- a/src/window_stringview.cpp
+++ b/src/window_stringview.cpp
@@ -45,7 +45,7 @@ std::string Window_StringView::GetDisplayData(bool eval_cmds) {
 
 void Window_StringView::Refresh() {
 	lines.clear();
-	lines_numbered.clear();
+	line_numbers.clear();
 	line_count = 0;
 
 	std::string value = GetDisplayData(cmd_eval);
@@ -68,13 +68,14 @@ void Window_StringView::Refresh() {
 
 	//create vector of display lines
 	pos = 0;
+	int c = 0;
 	while ((pos = value.find("\n", pos)) != std::string::npos) {
 		std::string new_line = value.substr(0, pos);
-		lines_numbered.push_back(true);
+		line_numbers.push_back(++c);
 
 		while (auto_linebreak && new_line.size() > (max_str_length - line_no_max_digits)) {
 			lines.push_back(new_line.substr(0, (max_str_length - line_no_max_digits)));
-			lines_numbered.push_back(false);
+			line_numbers.push_back(0);
 			new_line = new_line.substr((max_str_length - line_no_max_digits));
 		}
 		lines.push_back(new_line);
@@ -83,7 +84,7 @@ void Window_StringView::Refresh() {
 	}
 	if (!value.empty()) {
 		lines.push_back(value);
-		lines_numbered.push_back(true);
+		line_numbers.push_back(++c);
 	}
 
 	item_max = lines.size() + top_lines_reserved;
@@ -131,8 +132,8 @@ void Window_StringView::DrawLine(int index) {
 	std::string line = lines[index];
 
 	if (!line.empty()) {
-		if (lines_numbered[index]) {
-			contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format("{:0" + std::to_string(line_no_max_digits) + "d}", index + 1));
+		if (line_numbers[index]) {
+			contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format("{:0" + std::to_string(line_no_max_digits) + "d}", line_numbers[index]));
 		}
 		contents->TextDraw(rect.x + line_no_max_digits * 6 + 6, rect.y, Font::ColorDefault, line);
 	}
diff --git a/src/window_stringview.h b/src/window_stringview.h
index e9c96d913..ead59bc3e 100644
--- a/src/window_stringview.h
+++ b/src/window_stringview.h
@@ -42,7 +42,7 @@ class Window_StringView : public Window_Selectable {
 	std::string display_data_raw;
 
 	std::vector<std::string> lines;
-	std::vector<bool> lines_numbered;
+	std::vector<int> line_numbers;
 
 	int line_count = 0, line_no_max_digits = 0;
 };

From 4d364e0a16cf50e180438e27f3c86facb7353382 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Wed, 8 May 2024 20:54:44 +0200
Subject: [PATCH 081/222] Updated Makefile.am

---
 Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index c05af3518..71f435f61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -398,6 +398,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/window_input_settings.h \
 	src/window_item.cpp \
 	src/window_item.h \
+	src/window_interpreter.cpp \
+	src/window_interpreter.h \
 	src/window_keyboard.cpp \
 	src/window_keyboard.h \
 	src/window_menustatus.cpp \
@@ -432,6 +434,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/window_skill.h \
 	src/window_skillstatus.cpp \
 	src/window_skillstatus.h \
+	src/window_stringview.cpp \
+	src/window_stringview.h \
 	src/window_targetstatus.cpp \
 	src/window_targetstatus.h \
 	src/window_teleport.cpp \

From 635f17ad6149e0bad01160f6533e2e5097921b9d Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 9 May 2024 17:25:00 +0200
Subject: [PATCH 082/222] Use the pixel-based Game_Message::WordWrap function
 for the new stringview debug window (code assumes monospace font)

---
 src/window_stringview.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/window_stringview.cpp b/src/window_stringview.cpp
index d676b69bc..d683241a6 100644
--- a/src/window_stringview.cpp
+++ b/src/window_stringview.cpp
@@ -69,16 +69,23 @@ void Window_StringView::Refresh() {
 	//create vector of display lines
 	pos = 0;
 	int c = 0;
+	int limit = 6 * (max_str_length - line_no_max_digits);
+
 	while ((pos = value.find("\n", pos)) != std::string::npos) {
 		std::string new_line = value.substr(0, pos);
-		line_numbers.push_back(++c);
 
-		while (auto_linebreak && new_line.size() > (max_str_length - line_no_max_digits)) {
-			lines.push_back(new_line.substr(0, (max_str_length - line_no_max_digits)));
-			line_numbers.push_back(0);
-			new_line = new_line.substr((max_str_length - line_no_max_digits));
+		line_numbers.push_back(++c);
+		if (auto_linebreak) {
+			bool skipFirstNo = true;
+			Game_Message::WordWrap(new_line, limit, [&](StringView line) {
+				if (!skipFirstNo)
+					line_numbers.push_back(0);
+				skipFirstNo = false;
+				lines.push_back(std::string(line));
+			}, *Font::DefaultBitmapFont());
+		} else {
+			lines.push_back(new_line);
 		}
-		lines.push_back(new_line);
 		value = value.substr(pos + 1);
 		pos = 0;
 	}

From 20b5c2d54d76dc7aa62290698174914d2122c084 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Sun, 12 May 2024 22:43:36 +0200
Subject: [PATCH 083/222] Scene_Debug: Minor refactoring + UX improvement

---
 src/scene_debug.cpp        | 58 +++++++++++++++++++++++++++-----------
 src/scene_debug.h          |  5 +++-
 src/window_interpreter.cpp |  8 ++++++
 src/window_interpreter.h   |  1 +
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index fcdf59b57..76eda8891 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -82,7 +82,7 @@ void Scene_Debug::Start() {
 	interpreter_window->SetActive(false);
 
 	UpdateRangeListWindow();
-	var_window->Refresh();
+	RefreshDetailWindow();
 
 	strings_cached = false;
 	interpreter_states_cached = false;
@@ -184,6 +184,18 @@ int Scene_Debug::GetSelectedIndexFromRange() const {
 	return range_page * 100 + range_index * 10 + 1;
 }
 
+void Scene_Debug::RestoreRangeSelectionFromSelectedValue(int value) {
+	switch (mode) {
+		case eInterpreter:
+			range_index = value % 10;
+			range_page = value / 10;
+			break;
+		default:
+			range_index = (value % 100) / 10;
+			range_page = value / 100;
+			break;
+	}
+} 
 
 void Scene_Debug::SetupUiRangeList() {
 	auto& idx = prev[mode];
@@ -206,7 +218,7 @@ void Scene_Debug::PushUiRangeList() {
 	range_window->SetActive(true);
 
 	UpdateRangeListWindow();
-	var_window->Refresh();
+	RefreshDetailWindow();
 }
 
 void Scene_Debug::PushUiVarList() {
@@ -245,7 +257,7 @@ void Scene_Debug::PushUiNumberInput(int init_value, int digits, bool show_operat
 	numberinput_window->SetMaxDigits(digits);
 	numberinput_window->Refresh();
 
-	var_window->Refresh();
+	UpdateDetailWindow();
 	UpdateRangeListWindow();
 }
 
@@ -273,6 +285,11 @@ void Scene_Debug::PushUiStringView() {
 void Scene_Debug::PushUiInterpreterView() {
 	const bool was_range_list = (GetFrame().uimode == eUiRangeList);
 
+	if (!interpreter_window->IsValid()) {
+		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));
+		return;
+	}
+
 	Push(eUiInterpreterView);
 
 	auto& idx = prev[mode];
@@ -308,7 +325,6 @@ void Scene_Debug::Pop() {
 	stringview_window->SetActive(false);
 	stringview_window->SetVisible(false);
 	interpreter_window->SetActive(false);
-	interpreter_window->SetVisible(false);
 
 	if (stack_index == 0) {
 		Scene::Pop();
@@ -317,7 +333,8 @@ void Scene_Debug::Pop() {
 
 	--stack_index;
 
-	auto nui = GetFrame().uimode;
+	auto& frame = GetFrame();
+	auto nui = frame.uimode;
 	switch (nui) {
 		case eUiMain:
 			var_window->SetMode(Window_VarList::eNone);
@@ -328,13 +345,12 @@ void Scene_Debug::Pop() {
 			break;
 		case eUiRangeList:
 			range_window->SetActive(true);
-			range_index = (GetFrame().value % 100) / 10;
-			range_page = GetFrame().value / 100;
+			RestoreRangeSelectionFromSelectedValue(frame.value);
 			range_window->SetIndex(range_index);
 			break;
 		case eUiVarList:
 			var_window->SetActive(true);
-			var_window->SetIndex((GetFrame().value - 1) % 10);
+			var_window->SetIndex((frame.value - 1) % 10);
 			break;
 		case eUiNumberInput:
 			numberinput_window->SetNumber(GetFrame().value);
@@ -347,7 +363,7 @@ void Scene_Debug::Pop() {
 			break;
 		case eUiInterpreterView:
 			interpreter_window->SetActive(true);
-			interpreter_window->SetIndex((GetFrame().value - 1) % 10);
+			numberinput_window->SetNumber(frame.value);
 			var_window->SetVisible(false);
 			interpreter_window->SetVisible(true);
 			break;
@@ -358,8 +374,7 @@ void Scene_Debug::Pop() {
 	}
 
 	UpdateRangeListWindow();
-	var_window->Refresh();
-	interpreter_window->Refresh();
+	RefreshDetailWindow();
 }
 
 void Scene_Debug::vUpdate() {
@@ -367,6 +382,7 @@ void Scene_Debug::vUpdate() {
 	if (range_index != range_window->GetIndex()){
 		range_index = range_window->GetIndex();
 		UpdateDetailWindow();
+		RefreshDetailWindow();
 	}
 	var_window->Update();
 
@@ -387,7 +403,7 @@ void Scene_Debug::vUpdate() {
 		UpdateFrameValueFromUi();
 		if (mode == eMain) {
 			auto next_mode = static_cast<Mode>(range_window->GetIndex() + range_page * 10 + 1);
-			if (next_mode > eMain && next_mode < eLastMainMenuOption) {
+			if (next_mode > eMain && next_mode <= GetNumMainMenuItems()) {
 				if (!range_window->IsItemEnabled(range_window->GetIndex())) {
 					Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));
 				} else {
@@ -587,6 +603,7 @@ void Scene_Debug::vUpdate() {
 		}
 		if (range_page != range_page_prev) {
 			UpdateDetailWindow();
+			RefreshDetailWindow();
 			UpdateRangeListWindow();
 			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		}
@@ -599,8 +616,9 @@ void Scene_Debug::vUpdate() {
 		}
 		if (range_page != range_page_prev) {
 			UpdateDetailWindow();
-			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
+			RefreshDetailWindow();
 			UpdateRangeListWindow();
+			Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
 		}
 	}
 
@@ -778,9 +796,15 @@ void Scene_Debug::UpdateRangeListWindow() {
 void Scene_Debug::UpdateDetailWindow() {
 	if (mode != eInterpreter) {
 		var_window->UpdateList(GetSelectedIndexFromRange());
-		var_window->Refresh();
 	} else {
 		UpdateInterpreterWindow(GetSelectedIndexFromRange());
+	}
+}
+
+void Scene_Debug::RefreshDetailWindow() {
+	if (mode != eInterpreter) {
+		var_window->Refresh();
+	} else {
 		interpreter_window->Refresh();
 	}
 }
@@ -885,7 +909,7 @@ void Scene_Debug::DoSwitch() {
 		Main_Data::game_switches->Flip(sw_id);
 		Game_Map::SetNeedRefresh(true);
 
-		var_window->Refresh();
+		RefreshDetailWindow();
 	}
 }
 
@@ -1142,7 +1166,7 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 
 	if (valid) {
 		interpreter_window->SetStackState(index > interpreters_ev.size(), first_line, state);
-	} else if (interpreter_window->GetContents()) {
-		interpreter_window->GetContents()->Clear();
+	} else {
+		interpreter_window->SetStackState(0, "", {});
 	}
 }
diff --git a/src/scene_debug.h b/src/scene_debug.h
index 5b93b6194..f91b664b9 100644
--- a/src/scene_debug.h
+++ b/src/scene_debug.h
@@ -111,9 +111,11 @@ class Scene_Debug : public Scene {
 	/** Get the last page for the current mode */
 	int GetLastPage();
 
-	/* Get the first item number for the selected range */
+	/** Get the first item number for the selected range */
 	int GetSelectedIndexFromRange() const;
 
+	void RestoreRangeSelectionFromSelectedValue(int value);
+
 	int GetNumMainMenuItems() const;
 
 	void DoSwitch();
@@ -166,6 +168,7 @@ class Scene_Debug : public Scene {
 	Window_VarList::Mode GetWindowMode() const;
 	void UpdateFrameValueFromUi();
 	void UpdateDetailWindow();
+	void RefreshDetailWindow();
 
 	bool IsValidMapId(int map_id) const;
 
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index a28f868f5..48ebddf3f 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -113,6 +113,10 @@ void Window_Interpreter::Refresh() {
 
 	CreateContents();
 	contents->Clear();
+
+	if (!IsValid())
+		return;
+
 	DrawDescriptionLines();
 
 	for (int i = 0; i < stack_display_items.size(); ++i) {
@@ -120,6 +124,10 @@ void Window_Interpreter::Refresh() {
 	}
 }
 
+bool Window_Interpreter::IsValid() {
+	return !interpreter_desc.empty();
+}
+
 void Window_Interpreter::Update() {
 	Window_Selectable::Update();
 }
diff --git a/src/window_interpreter.h b/src/window_interpreter.h
index ee307e12f..fbb386da5 100644
--- a/src/window_interpreter.h
+++ b/src/window_interpreter.h
@@ -31,6 +31,7 @@ class Window_Interpreter : public Window_Selectable {
 
 	void SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state);
 	void Refresh();
+	bool IsValid();
 protected:
 	void DrawDescriptionLines();
 	void DrawStackLine(int index);

From 0ca53eafcae32ef4020c4aeae01caa6fad1df871 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Mon, 13 May 2024 12:32:39 +0200
Subject: [PATCH 084/222] Made Game_Interpreter::GetState() return a const
 reference and moved the actual logic for retrieving the save data to a new
 method "GetSaveState()"

---
 src/game_commonevent.cpp | 2 +-
 src/game_event.cpp       | 2 +-
 src/game_interpreter.cpp | 6 +++++-
 src/game_interpreter.h   | 8 +++++++-
 src/game_map.cpp         | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/game_commonevent.cpp b/src/game_commonevent.cpp
index 98a1d0b93..8a7d8d168 100644
--- a/src/game_commonevent.cpp
+++ b/src/game_commonevent.cpp
@@ -92,7 +92,7 @@ std::vector<lcf::rpg::EventCommand>& Game_CommonEvent::GetList() {
 lcf::rpg::SaveEventExecState Game_CommonEvent::GetSaveData() {
 	lcf::rpg::SaveEventExecState state;
 	if (interpreter) {
-		state = interpreter->GetState();
+		state = interpreter->GetSaveState();
 	}
 	if (GetTrigger() == lcf::rpg::EventPage::Trigger_parallel && state.stack.empty()) {
 		// RPG_RT always stores an empty stack frame for parallel events.
diff --git a/src/game_event.cpp b/src/game_event.cpp
index 858427119..52cba0887 100644
--- a/src/game_event.cpp
+++ b/src/game_event.cpp
@@ -100,7 +100,7 @@ lcf::rpg::SaveMapEvent Game_Event::GetSaveData() const {
 	lcf::rpg::SaveEventExecState state;
 	if (page && page->trigger == lcf::rpg::EventPage::Trigger_parallel) {
 		if (interpreter) {
-			state = interpreter->GetState();
+			state = interpreter->GetSaveState();
 		}
 
 		if (state.stack.empty() && page->event_commands.empty()) {
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index e3b9dd0b4..5cc35f381 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -274,7 +274,11 @@ void Game_Interpreter::KeyInputState::toSave(lcf::rpg::SaveEventExecState& save)
 }
 
 
-lcf::rpg::SaveEventExecState Game_Interpreter::GetState() const {
+const lcf::rpg::SaveEventExecState& Game_Interpreter::GetState() const {
+	return _state;
+}
+
+lcf::rpg::SaveEventExecState Game_Interpreter::GetSaveState() {
 	auto save = _state;
 	_keyinput.toSave(save);
 	return save;
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index df5f4c4e4..193386924 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -79,12 +79,18 @@ class Game_Interpreter
 	virtual bool ExecuteCommand(lcf::rpg::EventCommand const& com);
 
 
+	/**
+	 * Returns the interpreters current state information.
+	 * For saving state into a save file, use GetSaveState instead.
+	 */
+	const lcf::rpg::SaveEventExecState& GetState() const;
+
 	/**
 	 * Returns a SaveEventExecState needed for the savefile.
 	 *
 	 * @return interpreter commands stored in SaveEventCommands
 	 */
-	lcf::rpg::SaveEventExecState GetState() const;
+	lcf::rpg::SaveEventExecState GetSaveState();
 
 	/** @return Game_Character of the passed event_id */
 	Game_Character* GetCharacter(int event_id) const;
diff --git a/src/game_map.cpp b/src/game_map.cpp
index b9cbe26bf..51e7cdc01 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -387,7 +387,7 @@ void Game_Map::AddEventToVariableCache(lcf::rpg::Event& ev, int var_id) {
 }
 
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
-	save.foreground_event_execstate = interpreter->GetState();
+	save.foreground_event_execstate = interpreter->GetSaveState();
 
 	save.airship_location = GetVehicle(Game_Vehicle::Airship)->GetSaveData();
 	save.ship_location = GetVehicle(Game_Vehicle::Ship)->GetSaveData();

From 7f10d3e019f82869e9c9271bc9bd36bd7c0914d6 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Mon, 13 May 2024 14:49:33 +0200
Subject: [PATCH 085/222] Scene_Debug: Fix a small copypaste error

---
 src/scene_debug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index 76eda8891..4b7b9f8bb 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -363,7 +363,7 @@ void Scene_Debug::Pop() {
 			break;
 		case eUiInterpreterView:
 			interpreter_window->SetActive(true);
-			numberinput_window->SetNumber(frame.value);
+			interpreter_window->SetIndex(frame.value - 1);
 			var_window->SetVisible(false);
 			interpreter_window->SetVisible(true);
 			break;

From b7516a4bdc72a12f3099881418f1574bcd3a1837 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Tue, 14 May 2024 10:23:18 +0200
Subject: [PATCH 086/222] Introduce "Choices" window for Scene_Debug & refactor
 a bit to remain compatible with ScopedVars branch

---
 src/game_interpreter.h     |   2 +
 src/scene_debug.cpp        | 274 +++++++++++++++++++++++++++----------
 src/scene_debug.h          |  28 +++-
 src/window_interpreter.cpp |   7 +
 src/window_interpreter.h   |   3 +
 5 files changed, 239 insertions(+), 75 deletions(-)

diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index 193386924..c44ddc2aa 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -347,6 +347,8 @@ class Game_Interpreter
 	lcf::rpg::SaveEventExecState _state;
 	KeyInputState _keyinput;
 	AsyncOp _async_op = {};
+
+	friend class Scene_Debug;
 };
 
 inline const lcf::rpg::SaveEventExecFrame* Game_Interpreter::GetFramePtr() const {
diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index 4b7b9f8bb..c1e96138b 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -71,6 +71,7 @@ void Scene_Debug::Start() {
 	CreateRangeWindow();
 	CreateVarListWindow();
 	CreateNumberInputWindow();
+	CreateChoicesWindow();
 	CreateStringViewWindow();
 	CreateInterpreterWindow();
 
@@ -151,12 +152,16 @@ void Scene_Debug::UpdateFrameValueFromUi() {
 		case eUiNumberInput:
 			frame.value = numberinput_window->GetNumber();
 			break;
+		case eUiChoices:
+			frame.value = choices_window->GetIndex();
+			break;
 		eUiStringView:
 			frame.value = stringview_window->GetIndex();
 			break;
 		case eUiInterpreterView:
 			idx.range_page_index = interpreter_window->GetIndex();
 			frame.value = GetSelectedIndexFromRange() + interpreter_window->GetIndex();
+			state_interpreter.selected_frame = interpreter_window->GetSelectedStackFrameLine();
 			break;
 	}
 }
@@ -204,7 +209,11 @@ void Scene_Debug::SetupUiRangeList() {
 	range_index = idx.range_index;
 	range_page = idx.range_page;
 
-	var_window->SetMode(vmode, mode == eString ? strings.size() : 0);
+	//if (mode == eInterpreter && (state_interpreter.show_frame_switches || state_interpreter.show_frame_vars)) {
+	//	var_window->SetMode(state_interpreter.show_frame_switches ? Window_VarList::eFrameSwitch : Window_VarList::eFrameVariable);
+	//} else {
+		var_window->SetMode(vmode, mode == eString ? strings.size() : 0);
+	//}
 	UpdateDetailWindow();
 
 	range_window->SetIndex(range_index);
@@ -219,6 +228,10 @@ void Scene_Debug::PushUiRangeList() {
 
 	UpdateRangeListWindow();
 	RefreshDetailWindow();
+
+	if (mode == eInterpreter) {
+		interpreter_window->SetVisible(true);
+	}
 }
 
 void Scene_Debug::PushUiVarList() {
@@ -236,15 +249,7 @@ void Scene_Debug::PushUiVarList() {
 	var_window->SetIndex(idx.range_page_index);
 
 	UpdateRangeListWindow();
-	if (mode != eInterpreter) {
-		var_window->SetVisible(true);
-		var_window->Refresh();
-	} else {
-		interpreter_window->SetVisible(true);
-		var_window->SetVisible(false);
-		interpreter_window->Refresh();
-	}
-
+	var_window->Refresh();
 }
 
 void Scene_Debug::PushUiNumberInput(int init_value, int digits, bool show_operator) {
@@ -257,7 +262,25 @@ void Scene_Debug::PushUiNumberInput(int init_value, int digits, bool show_operat
 	numberinput_window->SetMaxDigits(digits);
 	numberinput_window->Refresh();
 
-	UpdateDetailWindow();
+	RefreshDetailWindow();
+	UpdateRangeListWindow();
+}
+
+void Scene_Debug::PushUiChoices(std::vector<std::string> choices, std::vector<bool> choices_enabled) {
+	Push(eUiChoices);
+
+	choices_window->ReplaceCommands(choices);
+	choices_window->SetY(Player::menu_offset_y + (choices.size() + 1) * 8 + 72);
+	choices_window->SetHeight((choices.size() + 1) * 16);
+	choices_window->SetVisible(true);
+	choices_window->SetActive(true);
+	choices_window->Refresh();
+
+	for (int i = 0; i < choices_enabled.size(); i++) {
+		choices_window->SetItemEnabled(i, choices_enabled[i]);
+	}
+
+	RefreshDetailWindow();
 	UpdateRangeListWindow();
 }
 
@@ -312,20 +335,26 @@ void Scene_Debug::PushUiInterpreterView() {
 void Scene_Debug::Pop() {
 	auto pui = GetFrame().uimode;
 
-	if (pui == eUiVarList) {
-		var_window->SetIndex(-1);
-	} else if (pui == eUiInterpreterView) {
-		interpreter_window->SetIndex(-1);
-	}
-
 	range_window->SetActive(false);
 	var_window->SetActive(false);
 	numberinput_window->SetActive(false);
 	numberinput_window->SetVisible(false);
+	choices_window->SetActive(false);
+	choices_window->SetVisible(false);
 	stringview_window->SetActive(false);
 	stringview_window->SetVisible(false);
 	interpreter_window->SetActive(false);
 
+	if (mode == eInterpreter /* && !(state_interpreter.show_frame_switches || state_interpreter.show_frame_vars) */) {
+		interpreter_window->SetIndex(-1);
+		interpreter_window->SetVisible(true);
+		var_window->SetVisible(false);
+	} else {
+		var_window->SetIndex(-1);
+		var_window->SetVisible(true);
+		interpreter_window->SetVisible(false);
+	}
+
 	if (stack_index == 0) {
 		Scene::Pop();
 		return;
@@ -338,6 +367,7 @@ void Scene_Debug::Pop() {
 	switch (nui) {
 		case eUiMain:
 			var_window->SetMode(Window_VarList::eNone);
+			interpreter_window->SetVisible(false);
 			range_index = (static_cast<int>(mode) - 1) % 10;
 			range_page = (static_cast<int>(mode) - 1) / 10;
 			range_window->SetActive(true);
@@ -353,10 +383,15 @@ void Scene_Debug::Pop() {
 			var_window->SetIndex((frame.value - 1) % 10);
 			break;
 		case eUiNumberInput:
-			numberinput_window->SetNumber(GetFrame().value);
+			numberinput_window->SetNumber(frame.value);
 			numberinput_window->SetActive(true);
 			numberinput_window->SetVisible(true);
 			break;
+		case eUiChoices:
+			choices_window->SetIndex(frame.value);
+			choices_window->SetActive(true);
+			choices_window->SetVisible(true);
+			break;
 		case eUiStringView:
 			stringview_window->SetActive(true);
 			stringview_window->SetVisible(true);
@@ -366,6 +401,8 @@ void Scene_Debug::Pop() {
 			interpreter_window->SetIndex(frame.value - 1);
 			var_window->SetVisible(false);
 			interpreter_window->SetVisible(true);
+			//state_interpreter.show_frame_switches = false;
+			//state_interpreter.show_frame_vars = false;
 			break;
 	}
 
@@ -392,6 +429,9 @@ void Scene_Debug::vUpdate() {
 	if (numberinput_window->GetActive())
 		numberinput_window->Update();
 
+	if (choices_window->GetActive())
+		choices_window->Update();
+
 	if (interpreter_window->GetActive())
 		interpreter_window->Update();
 
@@ -399,6 +439,11 @@ void Scene_Debug::vUpdate() {
 		UpdateFrameValueFromUi();
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cancel));
 		Pop();
+
+		const auto sz = GetStackSize();
+		if ((mode == eInterpreter) && sz == 4) {
+			Pop(); //skip over choices window
+		}
 	} else if (Input::IsTriggered(Input::DECISION)) {
 		UpdateFrameValueFromUi();
 		if (mode == eMain) {
@@ -564,7 +609,7 @@ void Scene_Debug::vUpdate() {
 				}
 				break;
 			case eString:
-				if (sz  == 3) {
+				if (sz == 3) {
 					PushUiStringView();
 				} else if (sz == 2) {
 					PushUiVarList();
@@ -577,11 +622,26 @@ void Scene_Debug::vUpdate() {
 				}
 				break;
 			case eInterpreter:
-				if (sz == 2) {
+				if (sz == 3) {
+					if (state_interpreter.selected_frame >= 0) {
+						/*std::vector<std::string> choices;
+						std::vector<bool> choices_enabled;
+
+						choices.push_back("FrameSwitches");
+						choices.push_back("FrameVariables");
+
+						choices_enabled.push_back(GetSelectedInterpreterFrameFromUiState().easyrpg_frame_switches.size() > 0);
+						choices_enabled.push_back(GetSelectedInterpreterFrameFromUiState().easyrpg_frame_variables.size() > 0);
+
+						PushUiChoices(choices, choices_enabled);*/
+					} else {
+						Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Buzzer));
+					}
+				} else if (sz == 2) {
 					PushUiInterpreterView();
 				} else if (sz == 1) {
 					if (!interpreter_states_cached) {
-						GetBackgroundInterpreters();
+						CacheBackgroundInterpreterStates();
 						interpreter_states_cached = true;
 					}
 					PushUiRangeList();
@@ -756,32 +816,39 @@ void Scene_Debug::UpdateRangeListWindow() {
 			break;
 		case eInterpreter:
 		{
-			int skip_items = range_page * 10;
-			int count_items = 0;
-			if (range_page == 0) {
-				addItem(fmt::format("{}Main", Game_Interpreter::GetForegroundInterpreter().GetState().wait_movement ? "(W) " : ""));
-				skip_items = 1;
-				count_items = 1;
-			}
-			for (int i = 0; i < interpreters_ev.size() && count_items < 10; i++) {
-				if (skip_items > 0) {
-					skip_items--;
-					continue;
+			//if (state_interpreter.show_frame_switches || state_interpreter.show_frame_vars) {
+			//	for (int i = 0; i < 10; i++) {
+			//		const auto st = range_page * 100 + i * 10 + 1;
+			//		addItem(fmt::format("{}[{:03d}-{:03d}]", state_interpreter.show_frame_switches ? "FSw" : "FVr", st, st + 9));
+			//	}
+			//} else {
+				int skip_items = range_page * 10;
+				int count_items = 0;
+				if (range_page == 0) {
+					addItem(fmt::format("{}Main", Game_Interpreter::GetForegroundInterpreter().GetState().wait_movement ? "(W) " : ""));
+					skip_items = 1;
+					count_items = 1;
 				}
-				int evt_id = interpreters_ev[i];
-				addItem(fmt::format("{}EV{:04d}: {}", interpreters_state_ev[i].wait_movement ? "(W) " : "", evt_id, Game_Map::GetEvent(evt_id)->GetName()));
-				count_items++;
-			}
-			for (int i = 0; i < interpreters_ce.size() && count_items < 10; i++) {
-				if (skip_items > 0) {
-					skip_items--;
-					continue;
+				for (int i = 0; i < state_interpreter.ev.size() && count_items < 10; i++) {
+					if (skip_items > 0) {
+						skip_items--;
+						continue;
+					}
+					int evt_id = state_interpreter.ev[i];
+					addItem(fmt::format("{}EV{:04d}: {}", state_interpreter.state_ev[i].wait_movement ? "(W) " : "", evt_id, Game_Map::GetEvent(evt_id)->GetName()));
+					count_items++;
 				}
-				int ce_id = interpreters_ce[i];
-				auto* ce = lcf::ReaderUtil::GetElement(lcf::Data::commonevents, ce_id);
-				addItem(fmt::format("{}CE{:04d}: {}", interpreters_state_ce[i].wait_movement ? "(W) " : "", ce_id, ce->name));
-				count_items++;
-			}
+				for (int i = 0; i < state_interpreter.ce.size() && count_items < 10; i++) {
+					if (skip_items > 0) {
+						skip_items--;
+						continue;
+					}
+					int ce_id = state_interpreter.ce[i];
+					auto* ce = lcf::ReaderUtil::GetElement(lcf::Data::commonevents, ce_id);
+					addItem(fmt::format("{}CE{:04d}: {}", state_interpreter.state_ce[i].wait_movement ? "(W) " : "", ce_id, ce->name));
+					count_items++;
+				}
+			//}
 		}
 		break;
 		default:
@@ -794,18 +861,33 @@ void Scene_Debug::UpdateRangeListWindow() {
 }
 
 void Scene_Debug::UpdateDetailWindow() {
-	if (mode != eInterpreter) {
-		var_window->UpdateList(GetSelectedIndexFromRange());
+	if (mode == eInterpreter) {
+		//if (state_interpreter.show_frame_switches || state_interpreter.show_frame_vars) {
+		//	auto & interpreter_frame = GetSelectedInterpreterFrameFromUiState();
+		//	var_window->SetInterpreterFrame(&interpreter_frame);
+		//	var_window->UpdateList(GetSelectedIndexFromRange());
+		//	
+		//	interpreter_window->SetVisible(false);
+		//	interpreter_window->SetActive(false);
+		//} else {
+			UpdateInterpreterWindow(GetSelectedIndexFromRange());
+		//}
 	} else {
-		UpdateInterpreterWindow(GetSelectedIndexFromRange());
+		var_window->UpdateList(GetSelectedIndexFromRange());
 	}
 }
 
 void Scene_Debug::RefreshDetailWindow() {
-	if (mode != eInterpreter) {
-		var_window->Refresh();
+	if (mode == eInterpreter) {
+		//if (state_interpreter.show_frame_switches || state_interpreter.show_frame_vars) {
+		//	var_window->Refresh();
+		//} else {
+			//var_window->SetInterpreterFrame(nullptr);
+			interpreter_window->Refresh();
+		//}
 	} else {
-		interpreter_window->Refresh();
+		//var_window->SetInterpreterFrame(nullptr);
+		var_window->Refresh();
 	}
 }
 
@@ -830,6 +912,19 @@ void Scene_Debug::CreateNumberInputWindow() {
 	numberinput_window->SetShowOperator(true);
 }
 
+void Scene_Debug::CreateChoicesWindow() {
+	std::vector<std::string> vars;
+	for (int i = 0; i < 2; i++)
+		vars.push_back("");
+	choices_window.reset(new Window_Command(vars));
+	choices_window->SetX(Player::menu_offset_x + 160 - choice_window_width / 2);
+	choices_window->SetY(Player::menu_offset_y + 104);
+	choices_window->SetWidth(choice_window_width);
+	choices_window->SetHeight(64);
+	choices_window->SetVisible(false);
+	choices_window->SetOpacity(255);
+}
+
 void Scene_Debug::CreateStringViewWindow() {
 	stringview_window.reset(new Window_StringView(Player::menu_offset_x + 15, Player::menu_offset_y + 16, 288, 208));
 	stringview_window->SetVisible(false);
@@ -842,7 +937,6 @@ void Scene_Debug::CreateInterpreterWindow() {
 	interpreter_window->SetIndex(-1);
 }
 
-
 int Scene_Debug::GetNumMainMenuItems() const {
 	return static_cast<int>(eLastMainMenuOption) - 1;
 }
@@ -883,8 +977,16 @@ int Scene_Debug::GetLastPage() {
 			num_elements = strings.size();
 			break;
 		case eInterpreter:
-			num_elements = 1 + interpreters_ev.size() + interpreters_ce.size();
-			return (static_cast<int>(num_elements) - 1) / 10;
+			//if (state_interpreter.show_frame_switches) {
+			//	auto & interpreter_frame = GetSelectedInterpreterFrameFromUiState();
+			//	return interpreter_frame.easyrpg_frame_switches.size();	
+			//} else if (state_interpreter.show_frame_vars) {
+			//		auto & interpreter_frame = GetSelectedInterpreterFrameFromUiState();
+			//		return interpreter_frame.easyrpg_frame_variables.size();					
+			//} else {
+				num_elements = 1 + state_interpreter.ev.size() + state_interpreter.ce.size();
+				return (static_cast<int>(num_elements) - 1) / 10;
+			//}
 		default:
 			break;
 	}
@@ -1114,23 +1216,23 @@ void Scene_Debug::UpdateArrows() {
 	range_window->SetRightArrow(show_right_arrow && arrow_visible);
 }
 
-void Scene_Debug::GetBackgroundInterpreters() {
-	interpreters_ev.clear();
-	interpreters_ce.clear();
-	interpreters_state_ev.clear();
-	interpreters_state_ce.clear();
+void Scene_Debug::CacheBackgroundInterpreterStates() {
+	state_interpreter.ev.clear();
+	state_interpreter.ce.clear();
+	state_interpreter.state_ev.clear();
+	state_interpreter.state_ce.clear();
 
 	if (Game_Map::GetMapId() > 0) {
 		for (auto& ev : Game_Map::GetEvents()) {
 			if (ev.GetTrigger() != lcf::rpg::EventPage::Trigger_parallel || !ev.interpreter)
 				continue;
-			interpreters_ev.emplace_back(ev.GetId());
-			interpreters_state_ev.emplace_back(ev.interpreter->GetState());
+			state_interpreter.ev.emplace_back(ev.GetId());
+			state_interpreter.state_ev.emplace_back(ev.interpreter->GetState());
 		}
 		for (auto& ce : Game_Map::GetCommonEvents()) {
 			if (ce.IsWaitingBackgroundExecution(false)) {
-				interpreters_ce.emplace_back(ce.common_event_id);
-				interpreters_state_ce.emplace_back(ce.interpreter->GetState());
+				state_interpreter.ce.emplace_back(ce.common_event_id);
+				state_interpreter.state_ce.emplace_back(ce.interpreter->GetState());
 			}
 		}
 	} else if (Game_Battle::IsBattleRunning() && Player::IsPatchManiac()) {
@@ -1147,14 +1249,14 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 		state = Game_Interpreter::GetForegroundInterpreter().GetState();
 		first_line = Game_Battle::IsBattleRunning() ? "Foreground (Battle)" : "Foreground (Map)";
 		valid = true;
-	} else if (index <= interpreters_ev.size()) {
-		int evt_id = interpreters_ev[index - 1];
-		state = interpreters_state_ev[index - 1];
+	} else if (index <= state_interpreter.ev.size()) {
+		int evt_id = state_interpreter.ev[index - 1];
+		state = state_interpreter.state_ev[index - 1];
 		first_line = fmt::format("EV{:04d}: {}", evt_id, Game_Map::GetEvent(evt_id)->GetName());
 		valid = true;
-	} else if ((index - interpreters_ev.size()) <= interpreters_ce.size()) {
-		int ce_id = interpreters_ce[index - interpreters_ev.size() - 1];
-		state = interpreters_state_ce[index - interpreters_ev.size() - 1];
+	} else if ((index - state_interpreter.ev.size()) <= state_interpreter.ce.size()) {
+		int ce_id = state_interpreter.ce[index - state_interpreter.ev.size() - 1];
+		state = state_interpreter.state_ce[index - state_interpreter.ev.size() - 1];
 		for (auto& ce : Game_Map::GetCommonEvents()) {
 			if (ce.common_event_id == ce_id) {
 				first_line = fmt::format("CE{:04d}: {}", ce_id, ce.GetName());
@@ -1165,8 +1267,40 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 	}
 
 	if (valid) {
-		interpreter_window->SetStackState(index > interpreters_ev.size(), first_line, state);
+		state_interpreter.selected_state = index;
+		interpreter_window->SetStackState(index > state_interpreter.ev.size(), first_line, state);
 	} else {
+		state_interpreter.selected_state = -1;
 		interpreter_window->SetStackState(0, "", {});
 	}
 }
+
+lcf::rpg::SaveEventExecFrame& Scene_Debug::GetSelectedInterpreterFrameFromUiState() const {
+	static lcf::rpg::SaveEventExecFrame empty;
+
+	if (state_interpreter.selected_state <= 0 || state_interpreter.selected_frame < 0) {
+		return empty;
+	}
+
+	int index = state_interpreter.selected_state;
+
+	if (index == 1) {
+		auto& state = Game_Interpreter::GetForegroundInterpreter()._state;
+		return state.stack[state_interpreter.selected_frame];
+	} else if (index <= state_interpreter.ev.size()) {
+		int evt_id = state_interpreter.ev[index - 1];
+		auto ev = Game_Map::GetEvent(evt_id);
+
+		auto& state = ev->interpreter->_state;
+		return state.stack[state_interpreter.selected_frame];
+	} else if ((index - state_interpreter.ev.size()) <= state_interpreter.ce.size()) {
+		int ce_id = state_interpreter.ce[index - state_interpreter.ev.size() - 1];
+		for (auto& ce : Game_Map::GetCommonEvents()) {
+			if (ce.common_event_id == ce_id) {
+				auto& state = ce.interpreter->_state;
+				return state.stack[state_interpreter.selected_frame];
+			}
+		}
+	}
+	return empty;
+}
diff --git a/src/scene_debug.h b/src/scene_debug.h
index f91b664b9..711bcc909 100644
--- a/src/scene_debug.h
+++ b/src/scene_debug.h
@@ -82,6 +82,7 @@ class Scene_Debug : public Scene {
 		eUiVarList,
 		eUiNumberInput,
 		eUiStringView,
+		eUiChoices,
 		eUiInterpreterView
 	};
 private:
@@ -101,6 +102,9 @@ class Scene_Debug : public Scene {
 	/** Creates number input window. */
 	void CreateNumberInputWindow();
 
+	/** Creates choices window. */
+	void CreateChoicesWindow();
+
 	/** Creates string view window. */
 	void CreateStringViewWindow();
 
@@ -132,12 +136,16 @@ class Scene_Debug : public Scene {
 	void DoCallBattleEvent();
 	void DoOpenMenu();
 
+	const int choice_window_width = 120;
+
 	/** Displays a range selection for mode. */
 	std::unique_ptr<Window_Command> range_window;
 	/** Displays the vars inside the current range. */
 	std::unique_ptr<Window_VarList> var_window;
 	/** Number Editor. */
 	std::unique_ptr<Window_NumberInput> numberinput_window;
+	/** Choices window. */
+	std::unique_ptr<Window_Command> choices_window;
 	/** Windows for displaying multiline strings. */
 	std::unique_ptr<Window_StringView> stringview_window;
 	/** Displays the currently running inteprreters. */
@@ -162,6 +170,7 @@ class Scene_Debug : public Scene {
 	void PushUiRangeList();
 	void PushUiVarList();
 	void PushUiNumberInput(int init_value, int digits, bool show_operator);
+	void PushUiChoices(std::vector<std::string> choices, std::vector<bool> choices_enabled);
 	void PushUiStringView();
 	void PushUiInterpreterView();
 
@@ -181,11 +190,20 @@ class Scene_Debug : public Scene {
 	bool interpreter_states_cached = false;
 
 	void UpdateInterpreterWindow(int index);
-	void GetBackgroundInterpreters();
-	std::vector<int> interpreters_ev;
-	std::vector<int> interpreters_ce;
-	std::vector<lcf::rpg::SaveEventExecState> interpreters_state_ev;
-	std::vector<lcf::rpg::SaveEventExecState> interpreters_state_ce;
+	lcf::rpg::SaveEventExecFrame& GetSelectedInterpreterFrameFromUiState() const;
+	void CacheBackgroundInterpreterStates();
+	struct {
+		std::vector<int> ev;
+		std::vector<int> ce;
+		std::vector<lcf::rpg::SaveEventExecState> state_ev;
+		std::vector<lcf::rpg::SaveEventExecState> state_ce;
+
+		// Frame-scoped data types introduced in 'ScopedVars' branch
+		// bool show_frame_switches = false;
+		// bool show_frame_vars = false;
+		int selected_state = -1;
+		int selected_frame = -1;
+	} state_interpreter;
 };
 
 #endif
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index 48ebddf3f..9109df7ac 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -172,3 +172,10 @@ void Window_Interpreter::DrawStackLine(int index) {
 	contents->TextDraw(rect.x + (digits_stackitemno * 6) + 56, rect.y, Font::ColorDefault, name, Text::AlignLeft);
 	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorDefault, fmt::format("{:0" + std::to_string(digits_cmdcount) + "d}/{:0" + std::to_string(digits_cmdcount) + "d}", item.cmd_current, item.cmd_count), Text::AlignRight);
 }
+
+int Window_Interpreter::GetSelectedStackFrameLine() {
+	if (GetIndex() < lines_without_stack) {
+		return -1;
+	}
+	return state.stack.size() - (GetIndex() - lines_without_stack) - 1;
+}
diff --git a/src/window_interpreter.h b/src/window_interpreter.h
index fbb386da5..5a665634a 100644
--- a/src/window_interpreter.h
+++ b/src/window_interpreter.h
@@ -21,6 +21,7 @@
 // Headers
 #include "window_command.h"
 #include "lcf/rpg/saveeventexecstate.h"
+#include "lcf/rpg/saveeventexecframe.h"
 
 class Window_Interpreter : public Window_Selectable {
 public:
@@ -32,6 +33,8 @@ class Window_Interpreter : public Window_Selectable {
 	void SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state);
 	void Refresh();
 	bool IsValid();
+
+	int GetSelectedStackFrameLine();
 protected:
 	void DrawDescriptionLines();
 	void DrawStackLine(int index);

From 31ba398e51a0e7de3026871b56b8709311849e55 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Tue, 14 May 2024 11:15:52 +0200
Subject: [PATCH 087/222] Interpreter window fix: window would become
 unselectable due to wrong index. just always set it to 0 on
 PushUiInterpreterView; no need to remember the index here.

---
 src/scene_debug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index c1e96138b..d48bf7cbc 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -325,7 +325,7 @@ void Scene_Debug::PushUiInterpreterView() {
 	var_window->SetVisible(false);
 
 	interpreter_window->SetActive(true);
-	interpreter_window->SetIndex(idx.range_page_index);
+	interpreter_window->SetIndex(0);
 
 	UpdateRangeListWindow();
 	interpreter_window->Refresh();

From 7d4b56e4bc3d5ae6d9c9045a46b42ea53b3fa5a0 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 15 May 2024 19:26:24 +0200
Subject: [PATCH 088/222] EasyRpg Flag: Move bmp.reset call to the correct
 location

---
 src/cache.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cache.cpp b/src/cache.cpp
index 5e55a868f..9006b07f4 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -275,11 +275,12 @@ namespace {
 						Output::Warning("Invalid image: {}/{}", s.directory, filename);
 					} else {
 						if (bmp->GetOriginalBpp() > 8) {
+							// FIXME: This HasActiveTranslation check will also load 32 bit images in the game directory when
+							// a translation is active and our API does not expose whether the asset was redirected or not.
 							if (!Player::HasEasyRpgExtensions() && !Player::IsPatchManiac() && !Tr::HasActiveTranslation()) {
 								Output::Warning("Image {}/{} has a bit depth of {} that is not supported by RPG_RT. Enable EasyRPG Extensions or Maniac Patch to load such images.", s.directory, filename, bmp->GetOriginalBpp());
+								bmp.reset();
 							}
-
-							bmp.reset();
 						}
 					}
 				}

From c160ec90f9146f9b49dbbb069895ef5df31d893c Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 20 May 2024 20:58:35 +0200
Subject: [PATCH 089/222] Add nlohmann_json to the buildsystem (required for
 Emscripten)

Is enabled for all platforms because this will be used by a JSON event command.

(also dropped rang from the license screen, we forgot to delete it earlier)
---
 .github/workflows/stable-compilation.yml |  2 +-
 CMakeLists.txt                           | 21 +++++++++++++++++++++
 Makefile.am                              |  2 ++
 README.md                                |  1 +
 configure.ac                             |  2 ++
 src/window_settings.cpp                  |  4 +++-
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stable-compilation.yml b/.github/workflows/stable-compilation.yml
index fd6d4bc71..fb0e08d85 100644
--- a/.github/workflows/stable-compilation.yml
+++ b/.github/workflows/stable-compilation.yml
@@ -42,7 +42,7 @@ jobs:
           apt-get update
           apt-get install -yqq --no-install-recommends --no-install-suggests \
             ca-certificates build-essential cmake ninja-build git \
-            libicu-dev libexpat1-dev libinih-dev \
+            libicu-dev libexpat1-dev libinih-dev nlohmann-json3-dev \
             libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
             libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
             libvorbis-dev libopusfile-dev libspeexdsp-dev \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57c27d7d..cf683dc5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -884,6 +884,21 @@ player_find_package(NAME lhasa
 	TARGET LHASA::liblhasa
 )
 
+# json support
+option(PLAYER_WITH_NLOHMANN_JSON "Support processing of JSON files" ON)
+
+set(NLOHMANN_JSON_REQUIRED "")
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+	set(NLOHMANN_JSON_REQUIRED "REQUIRED")
+endif()
+
+player_find_package(NAME nlohmann_json
+	CONDITION PLAYER_WITH_NLOHMANN_JSON
+	DEFINITION HAVE_NLOHMANN_JSON
+	TARGET nlohmann_json::nlohmann_json
+	${NLOHMANN_JSON_REQUIRED}
+)
+
 # Sound system to use
 if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	set(PLAYER_AUDIO_BACKEND "SDL2" CACHE STRING "Audio system to use. Options: SDL2 OFF")
@@ -1576,6 +1591,12 @@ else()
 	message(STATUS "LZH archive support: No")
 endif()
 
+if(TARGET nlohmann_json::nlohmann_json)
+	message(STATUS "JSON support: nlohmann_json")
+else()
+	message(STATUS "JSON support: No")
+endif()
+
 message(STATUS "")
 
 message(STATUS "Manual page: ${MANUAL_STATUS}")
diff --git a/Makefile.am b/Makefile.am
index c05af3518..c01cb0d88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -579,6 +579,7 @@ libeasyrpg_player_a_CXXFLAGS = \
 	$(FREETYPE_CFLAGS) \
 	$(HARFBUZZ_CFLAGS) \
 	$(LHASA_CFLAGS) \
+	$(NLOHMANN_JSON_CFLAGS) \
 	$(SDL_CFLAGS) \
 	$(PNG_CFLAGS) \
 	$(ZLIB_CFLAGS) \
@@ -632,6 +633,7 @@ easyrpg_player_LDADD = libeasyrpg-player.a libplayer-version.a \
 	$(FREETYPE_LIBS) \
 	$(HARFBUZZ_LIBS) \
 	$(LHASA_LIBS) \
+	$(NLOHMANN_JSON_LIBS) \
 	$(SDL_LIBS) \
 	$(PNG_LIBS) \
 	$(ZLIB_LIBS) \
diff --git a/README.md b/README.md
index e8416adc6..c1629dea9 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org
 - libxmp for tracker music support.
 - SpeexDSP or libsamplerate for proper audio resampling.
 - lhasa for LHA (.lzh) archive support.
+- nlohmann_json for processing JSON files (required when targetting Emscripten)
 
 The older SDL version 1.2 is still supported, but deprecated.
 Please do not add new platform code for this library.
diff --git a/configure.ac b/configure.ac
index 37e8fbbbc..1802c78d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,7 @@ AS_IF([test "$with_freetype" = "yes"],[
 	EP_PKG_CHECK([HARFBUZZ],[harfbuzz],[Custom Font text shaping.])
 ])
 EP_PKG_CHECK([LHASA],[liblhasa],[Support running games in lzh archives.])
+EP_PKG_CHECK([NLOHMANN_JSON],[nlohmann_json],[Support processing of JSON files.])
 
 AC_ARG_WITH([audio],[AS_HELP_STRING([--without-audio], [Disable audio support. @<:@default=on@:>@])])
 AS_IF([test "x$with_audio" != "xno"],[
@@ -228,6 +229,7 @@ if test "yes" != "$silent"; then
 	test "$with_freetype" = "yes" && \
 		echo "  -custom Font text shaping (harfbuzz): $with_harfbuzz"
 	echo "  -run games in lzh archives (lhasa):   $with_lhasa"
+	echo "  -processing of JSON files (nlohmann_json): $with_nlohmann_json"
 
 	if test "$with_audio" = "no"; then
 		echo "Audio support:               no"
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index cba597ced..2000ed262 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -361,7 +361,9 @@ void Window_Settings::RefreshLicense() {
 #ifdef HAVE_LHASA
 	AddOption(MenuItem("lhasa", "For parsing LHA (.lzh) archives", "ISC"), [](){});
 #endif
-	AddOption(MenuItem("rang", "Colors the terminal output", "Unlicense"), [](){});
+#ifdef HAVE_NLOHMANN_JSON
+	AddOption(MenuItem("nlohmann_json", "Processing of JSON files", "MIT"), [](){});
+#endif
 	AddOption(MenuItem("Baekmuk", "Korean font family", "Baekmuk"), [](){});
 	AddOption(MenuItem("Shinonome", "Japanese font family", "Public Domain"), [](){});
 	AddOption(MenuItem("ttyp0", "ttyp0 font family", "ttyp0"), [](){});

From a94d338da6ad0b4f94efebae100bd1ca4842b77b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 20 May 2024 21:28:30 +0200
Subject: [PATCH 090/222] Emscripten: Migrate from picojson to nlohmann_json

---
 .gitattributes          |    1 -
 CMakeLists.txt          |   24 +-
 Makefile.am             |    1 -
 README.md               |    3 -
 src/async_handler.cpp   |   53 +-
 src/external/picojson.h | 1204 ---------------------------------------
 src/window_settings.cpp |    1 -
 7 files changed, 37 insertions(+), 1250 deletions(-)
 delete mode 100644 src/external/picojson.h

diff --git a/.gitattributes b/.gitattributes
index cdc1f9d1a..80cf0c50e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,7 +15,6 @@ src/external/* -diff linguist-vendored
 src/midiprogram.h -diff linguist-vendored
 src/midisequencer.* -diff linguist-vendored
 src/midisynth.* -diff linguist-vendored
-src/picojson.h -diff linguist-vendored
 CMakePresets.json -diff linguist-generated
 builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
 builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf683dc5b..726cd8abb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -783,7 +783,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
 	set(PLAYER_JS_GAME_URL "games/" CACHE STRING "Game URL/directory where the web player searches for games")
 	set(PLAYER_JS_OUTPUT_NAME "easyrpg-player" CACHE STRING "Output name of the js, html and wasm files")
 	set_property(SOURCE src/async_handler.cpp APPEND PROPERTY COMPILE_DEFINITIONS "EM_GAME_URL=\"${PLAYER_JS_GAME_URL}\"")
-	target_sources(${PROJECT_NAME} PRIVATE src/external/picojson.h)
 endif()
 
 # Endianess check
@@ -885,20 +884,21 @@ player_find_package(NAME lhasa
 )
 
 # json support
-option(PLAYER_WITH_NLOHMANN_JSON "Support processing of JSON files" ON)
-
-set(NLOHMANN_JSON_REQUIRED "")
 if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-	set(NLOHMANN_JSON_REQUIRED "REQUIRED")
+	player_find_package(NAME nlohmann_json
+		DEFINITION HAVE_NLOHMANN_JSON
+		TARGET nlohmann_json::nlohmann_json
+		REQUIRED
+	)
+else()
+	option(PLAYER_WITH_NLOHMANN_JSON "Support processing of JSON files" ON)
+	player_find_package(NAME nlohmann_json
+		CONDITION PLAYER_WITH_NLOHMANN_JSON
+		DEFINITION HAVE_NLOHMANN_JSON
+		TARGET nlohmann_json::nlohmann_json
+	)
 endif()
 
-player_find_package(NAME nlohmann_json
-	CONDITION PLAYER_WITH_NLOHMANN_JSON
-	DEFINITION HAVE_NLOHMANN_JSON
-	TARGET nlohmann_json::nlohmann_json
-	${NLOHMANN_JSON_REQUIRED}
-)
-
 # Sound system to use
 if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	set(PLAYER_AUDIO_BACKEND "SDL2" CACHE STRING "Audio system to use. Options: SDL2 OFF")
diff --git a/Makefile.am b/Makefile.am
index c01cb0d88..d2990ca16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -513,7 +513,6 @@ EXTRA_DIST += \
 	bench/text.cpp \
 	bench/utils.cpp \
 	bench/variables.cpp \
-	src/external/picojson.h \
 	src/platform/3ds/audio.cpp \
 	src/platform/3ds/audio.h \
 	src/platform/3ds/clock.cpp \
diff --git a/README.md b/README.md
index c1629dea9..180008aba 100644
--- a/README.md
+++ b/README.md
@@ -97,8 +97,6 @@ EasyRPG Player makes use of the following 3rd party software:
   (Yoshio Uno), provided under the (3-clause) BSD license
 * [dr_wav] WAV audio loader and writer - Copyright (c) David Reid, provided
   under public domain or MIT-0
-* [PicoJSON] JSON parser/serializer - Copyright (c) 2009-2010 Cybozu Labs, Inc.
-  Copyright (c) 2011-2015 Kazuho Oku, provided under the (2-clause) BSD license
 
 ### 3rd party resources
 
@@ -123,7 +121,6 @@ EasyRPG Player makes use of the following 3rd party software:
 [Logo2]: resources/logo2.png
 [FMMidi]: http://unhaut.epizy.com/fmmidi
 [dr_wav]: https://github.com/mackron/dr_libs
-[PicoJSON]: https://github.com/kazuho/picojson
 [baekmuk]: https://kldp.net/baekmuk
 [Shinonome]: http://openlab.ring.gr.jp/efont/shinonome
 [ttyp0]: https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0
diff --git a/src/async_handler.cpp b/src/async_handler.cpp
index bb7fea510..51829038a 100644
--- a/src/async_handler.cpp
+++ b/src/async_handler.cpp
@@ -22,9 +22,8 @@
 #ifdef EMSCRIPTEN
 #  include <emscripten.h>
 #  include <lcf/reader_util.h>
-#  define PICOJSON_USE_LOCALE 0
-#  define PICOJSON_ASSERT(e) do { if (! (e)) assert(false && #e); } while (0)
-#  include "external/picojson.h"
+#  include <nlohmann/json.hpp>
+   using json = nlohmann::json;
 #endif
 
 #include "async_handler.h"
@@ -148,15 +147,16 @@ void AsyncHandler::CreateRequestMapping(const std::string& file) {
 		return;
 	}
 
-	picojson::value v;
-	picojson::parse(v, f);
+	json j = json::parse(f, nullptr, false);
+	if (j.is_discarded()) {
+		Output::Error("Emscripten: index.json is not a valid JSON file");
+		return;
+	}
 
-	const auto& metadata = v.get("metadata");
-	if (metadata.is<picojson::object>()) {
-		for (const auto& value : metadata.get<picojson::object>()) {
-			if (value.first == "version") {
-				index_version = (int)value.second.get<double>();
-			}
+	if (j.contains("metadata") && j["metadata"].is_object()) {
+		const auto& metadata = j["metadata"];
+		if (metadata.contains("version") && metadata["version"].is_number()) {
+			index_version = metadata["version"].get<int>();
 		}
 	}
 
@@ -164,33 +164,30 @@ void AsyncHandler::CreateRequestMapping(const std::string& file) {
 
 	if (index_version <= 1) {
 		// legacy format
-		for (const auto& value : v.get<picojson::object>()) {
-			file_mapping[value.first] = value.second.to_str();
+		for (const auto& value : j.items()) {
+			file_mapping[value.key()] = value.value().get<std::string>();
 		}
 	} else {
-		using fn = std::function<void(const picojson::object&,const std::string&)>;
-		fn parse = [&] (const picojson::object& obj, const std::string& path) {
+		using fn = std::function<void(const json&, const std::string&)>;
+		fn parse = [&] (const json& obj, const std::string& path) {
 			std::string dirname;
-			for (const auto& value : obj) {
-				if (value.first == "_dirname" && value.second.is<std::string>()) {
-					dirname = value.second.to_str();
-				}
+			if (obj.contains("_dirname") && obj["_dirname"].is_string()) {
+				dirname = obj["_dirname"].get<std::string>();
 			}
 			dirname = FileFinder::MakePath(path, dirname);
 
-			for (const auto& value : obj) {
-				const auto& second = value.second;
-				if (second.is<picojson::object>()) {
-					parse(second.get<picojson::object>(), dirname);
-				} else if (second.is<std::string>()){
-					file_mapping[FileFinder::MakePath(Utils::LowerCase(dirname), value.first)] = FileFinder::MakePath(dirname, second.to_str());
+			for (const auto& value : obj.items()) {
+				const auto& second = value.value();
+				if (second.is_object()) {
+					parse(second, dirname);
+				} else if (second.is_string()){
+					file_mapping[FileFinder::MakePath(Utils::LowerCase(dirname), value.key())] = FileFinder::MakePath(dirname, second.get<std::string>());
 				}
 			}
 		};
 
-		const auto& cache = v.get("cache");
-		if (cache.is<picojson::object>()) {
-			parse(cache.get<picojson::object>(), "");
+		if (j.contains("cache") && j["cache"].is_object()) {
+			parse(j["cache"], "");
 		}
 
 		// Create some empty DLL files. Engine & patch detection depend on them.
diff --git a/src/external/picojson.h b/src/external/picojson.h
deleted file mode 100644
index d144d8435..000000000
--- a/src/external/picojson.h
+++ /dev/null
@@ -1,1204 +0,0 @@
-/*
- * Copyright 2009-2010 Cybozu Labs, Inc.
- * Copyright 2011-2014 Kazuho Oku
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef picojson_h
-#define picojson_h
-
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cstddef>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <map>
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <utility>
-
-// for isnan/isinf
-#if __cplusplus >= 201103L
-#include <cmath>
-#else
-extern "C" {
-#ifdef _MSC_VER
-#include <float.h>
-#elif defined(__INTEL_COMPILER)
-#include <mathimf.h>
-#else
-#include <math.h>
-#endif
-}
-#endif
-
-#ifndef PICOJSON_USE_RVALUE_REFERENCE
-#if (defined(__cpp_rvalue_references) && __cpp_rvalue_references >= 200610) || (defined(_MSC_VER) && _MSC_VER >= 1600)
-#define PICOJSON_USE_RVALUE_REFERENCE 1
-#else
-#define PICOJSON_USE_RVALUE_REFERENCE 0
-#endif
-#endif // PICOJSON_USE_RVALUE_REFERENCE
-
-#ifndef PICOJSON_NOEXCEPT
-#if PICOJSON_USE_RVALUE_REFERENCE
-#define PICOJSON_NOEXCEPT noexcept
-#else
-#define PICOJSON_NOEXCEPT throw()
-#endif
-#endif
-
-// experimental support for int64_t (see README.mkdn for detail)
-#ifdef PICOJSON_USE_INT64
-#define __STDC_FORMAT_MACROS
-#include <cerrno>
-#if __cplusplus >= 201103L
-#include <cinttypes>
-#else
-extern "C" {
-#include <inttypes.h>
-}
-#endif
-#endif
-
-// to disable the use of localeconv(3), set PICOJSON_USE_LOCALE to 0
-#ifndef PICOJSON_USE_LOCALE
-#define PICOJSON_USE_LOCALE 1
-#endif
-#if PICOJSON_USE_LOCALE
-extern "C" {
-#include <locale.h>
-}
-#endif
-
-#ifndef PICOJSON_ASSERT
-#define PICOJSON_ASSERT(e)                                                                                                         \
-  do {                                                                                                                             \
-    if (!(e))                                                                                                                      \
-      throw std::runtime_error(#e);                                                                                                \
-  } while (0)
-#endif
-
-#ifdef _MSC_VER
-#define SNPRINTF _snprintf_s
-#pragma warning(push)
-#pragma warning(disable : 4244) // conversion from int to char
-#pragma warning(disable : 4127) // conditional expression is constant
-#pragma warning(disable : 4702) // unreachable code
-#pragma warning(disable : 4706) // assignment within conditional expression
-#else
-#define SNPRINTF snprintf
-#endif
-
-namespace picojson {
-
-enum {
-  null_type,
-  boolean_type,
-  number_type,
-  string_type,
-  array_type,
-  object_type
-#ifdef PICOJSON_USE_INT64
-  ,
-  int64_type
-#endif
-};
-
-enum { INDENT_WIDTH = 2, DEFAULT_MAX_DEPTHS = 100 };
-
-struct null {};
-
-class value {
-public:
-  typedef std::vector<value> array;
-  typedef std::map<std::string, value> object;
-  union _storage {
-    bool boolean_;
-    double number_;
-#ifdef PICOJSON_USE_INT64
-    int64_t int64_;
-#endif
-    std::string *string_;
-    array *array_;
-    object *object_;
-  };
-
-protected:
-  int type_;
-  _storage u_;
-
-public:
-  value();
-  value(int type, bool);
-  explicit value(bool b);
-#ifdef PICOJSON_USE_INT64
-  explicit value(int64_t i);
-#endif
-  explicit value(double n);
-  explicit value(const std::string &s);
-  explicit value(const array &a);
-  explicit value(const object &o);
-#if PICOJSON_USE_RVALUE_REFERENCE
-  explicit value(std::string &&s);
-  explicit value(array &&a);
-  explicit value(object &&o);
-#endif
-  explicit value(const char *s);
-  value(const char *s, size_t len);
-  ~value();
-  value(const value &x);
-  value &operator=(const value &x);
-#if PICOJSON_USE_RVALUE_REFERENCE
-  value(value &&x) PICOJSON_NOEXCEPT;
-  value &operator=(value &&x) PICOJSON_NOEXCEPT;
-#endif
-  void swap(value &x) PICOJSON_NOEXCEPT;
-  template <typename T> bool is() const;
-  template <typename T> const T &get() const;
-  template <typename T> T &get();
-  template <typename T> void set(const T &);
-#if PICOJSON_USE_RVALUE_REFERENCE
-  template <typename T> void set(T &&);
-#endif
-  bool evaluate_as_boolean() const;
-  const value &get(const size_t idx) const;
-  const value &get(const std::string &key) const;
-  value &get(const size_t idx);
-  value &get(const std::string &key);
-
-  bool contains(const size_t idx) const;
-  bool contains(const std::string &key) const;
-  std::string to_str() const;
-  template <typename Iter> void serialize(Iter os, bool prettify = false) const;
-  std::string serialize(bool prettify = false) const;
-
-private:
-  template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool
-  template <typename Iter> static void _indent(Iter os, int indent);
-  template <typename Iter> void _serialize(Iter os, int indent) const;
-  std::string _serialize(int indent) const;
-  void clear();
-};
-
-typedef value::array array;
-typedef value::object object;
-
-inline value::value() : type_(null_type), u_() {
-}
-
-inline value::value(int type, bool) : type_(type), u_() {
-  switch (type) {
-#define INIT(p, v)                                                                                                                 \
-  case p##type:                                                                                                                    \
-    u_.p = v;                                                                                                                      \
-    break
-    INIT(boolean_, false);
-    INIT(number_, 0.0);
-#ifdef PICOJSON_USE_INT64
-    INIT(int64_, 0);
-#endif
-    INIT(string_, new std::string());
-    INIT(array_, new array());
-    INIT(object_, new object());
-#undef INIT
-  default:
-    break;
-  }
-}
-
-inline value::value(bool b) : type_(boolean_type), u_() {
-  u_.boolean_ = b;
-}
-
-#ifdef PICOJSON_USE_INT64
-inline value::value(int64_t i) : type_(int64_type), u_() {
-  u_.int64_ = i;
-}
-#endif
-
-inline value::value(double n) : type_(number_type), u_() {
-  if (
-#ifdef _MSC_VER
-      !_finite(n)
-#elif __cplusplus >= 201103L
-      std::isnan(n) || std::isinf(n)
-#else
-      isnan(n) || isinf(n)
-#endif
-          ) {
-    // EasyRPG modification: {
-    //throw std::overflow_error("");
-    u_.number_ = std::numeric_limits<double>::quiet_NaN();
-    return;
-    // }
-  }
-  u_.number_ = n;
-}
-
-inline value::value(const std::string &s) : type_(string_type), u_() {
-  u_.string_ = new std::string(s);
-}
-
-inline value::value(const array &a) : type_(array_type), u_() {
-  u_.array_ = new array(a);
-}
-
-inline value::value(const object &o) : type_(object_type), u_() {
-  u_.object_ = new object(o);
-}
-
-#if PICOJSON_USE_RVALUE_REFERENCE
-inline value::value(std::string &&s) : type_(string_type), u_() {
-  u_.string_ = new std::string(std::move(s));
-}
-
-inline value::value(array &&a) : type_(array_type), u_() {
-  u_.array_ = new array(std::move(a));
-}
-
-inline value::value(object &&o) : type_(object_type), u_() {
-  u_.object_ = new object(std::move(o));
-}
-#endif
-
-inline value::value(const char *s) : type_(string_type), u_() {
-  u_.string_ = new std::string(s);
-}
-
-inline value::value(const char *s, size_t len) : type_(string_type), u_() {
-  u_.string_ = new std::string(s, len);
-}
-
-inline void value::clear() {
-  switch (type_) {
-#define DEINIT(p)                                                                                                                  \
-  case p##type:                                                                                                                    \
-    delete u_.p;                                                                                                                   \
-    break
-    DEINIT(string_);
-    DEINIT(array_);
-    DEINIT(object_);
-#undef DEINIT
-  default:
-    break;
-  }
-}
-
-inline value::~value() {
-  clear();
-}
-
-inline value::value(const value &x) : type_(x.type_), u_() {
-  switch (type_) {
-#define INIT(p, v)                                                                                                                 \
-  case p##type:                                                                                                                    \
-    u_.p = v;                                                                                                                      \
-    break
-    INIT(string_, new std::string(*x.u_.string_));
-    INIT(array_, new array(*x.u_.array_));
-    INIT(object_, new object(*x.u_.object_));
-#undef INIT
-  default:
-    u_ = x.u_;
-    break;
-  }
-}
-
-inline value &value::operator=(const value &x) {
-  if (this != &x) {
-    value t(x);
-    swap(t);
-  }
-  return *this;
-}
-
-#if PICOJSON_USE_RVALUE_REFERENCE
-inline value::value(value &&x) PICOJSON_NOEXCEPT : type_(null_type), u_() {
-  swap(x);
-}
-inline value &value::operator=(value &&x) PICOJSON_NOEXCEPT {
-  swap(x);
-  return *this;
-}
-#endif
-inline void value::swap(value &x) PICOJSON_NOEXCEPT {
-  std::swap(type_, x.type_);
-  std::swap(u_, x.u_);
-}
-
-#define IS(ctype, jtype)                                                                                                           \
-  template <> inline bool value::is<ctype>() const {                                                                               \
-    return type_ == jtype##_type;                                                                                                  \
-  }
-IS(null, null)
-IS(bool, boolean)
-#ifdef PICOJSON_USE_INT64
-IS(int64_t, int64)
-#endif
-IS(std::string, string)
-IS(array, array)
-IS(object, object)
-#undef IS
-template <> inline bool value::is<double>() const {
-  return type_ == number_type
-#ifdef PICOJSON_USE_INT64
-         || type_ == int64_type
-#endif
-      ;
-}
-
-#define GET(ctype, var)                                                                                                            \
-  template <> inline const ctype &value::get<ctype>() const {                                                                      \
-    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" && is<ctype>());                                           \
-    return var;                                                                                                                    \
-  }                                                                                                                                \
-  template <> inline ctype &value::get<ctype>() {                                                                                  \
-    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" && is<ctype>());                                           \
-    return var;                                                                                                                    \
-  }
-GET(bool, u_.boolean_)
-GET(std::string, *u_.string_)
-GET(array, *u_.array_)
-GET(object, *u_.object_)
-#ifdef PICOJSON_USE_INT64
-GET(double,
-    (type_ == int64_type && (const_cast<value *>(this)->type_ = number_type, (const_cast<value *>(this)->u_.number_ = u_.int64_)),
-     u_.number_))
-GET(int64_t, u_.int64_)
-#else
-GET(double, u_.number_)
-#endif
-#undef GET
-
-#define SET(ctype, jtype, setter)                                                                                                  \
-  template <> inline void value::set<ctype>(const ctype &_val) {                                                                   \
-    clear();                                                                                                                       \
-    type_ = jtype##_type;                                                                                                          \
-    setter                                                                                                                         \
-  }
-SET(bool, boolean, u_.boolean_ = _val;)
-SET(std::string, string, u_.string_ = new std::string(_val);)
-SET(array, array, u_.array_ = new array(_val);)
-SET(object, object, u_.object_ = new object(_val);)
-SET(double, number, u_.number_ = _val;)
-#ifdef PICOJSON_USE_INT64
-SET(int64_t, int64, u_.int64_ = _val;)
-#endif
-#undef SET
-
-#if PICOJSON_USE_RVALUE_REFERENCE
-#define MOVESET(ctype, jtype, setter)                                                                                              \
-  template <> inline void value::set<ctype>(ctype && _val) {                                                                       \
-    clear();                                                                                                                       \
-    type_ = jtype##_type;                                                                                                          \
-    setter                                                                                                                         \
-  }
-MOVESET(std::string, string, u_.string_ = new std::string(std::move(_val));)
-MOVESET(array, array, u_.array_ = new array(std::move(_val));)
-MOVESET(object, object, u_.object_ = new object(std::move(_val));)
-#undef MOVESET
-#endif
-
-inline bool value::evaluate_as_boolean() const {
-  switch (type_) {
-  case null_type:
-    return false;
-  case boolean_type:
-    return u_.boolean_;
-  case number_type:
-    return u_.number_ != 0;
-#ifdef PICOJSON_USE_INT64
-  case int64_type:
-    return u_.int64_ != 0;
-#endif
-  case string_type:
-    return !u_.string_->empty();
-  default:
-    return true;
-  }
-}
-
-inline const value &value::get(const size_t idx) const {
-  static value s_null;
-  PICOJSON_ASSERT(is<array>());
-  return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
-}
-
-inline value &value::get(const size_t idx) {
-  static value s_null;
-  PICOJSON_ASSERT(is<array>());
-  return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
-}
-
-inline const value &value::get(const std::string &key) const {
-  static value s_null;
-  PICOJSON_ASSERT(is<object>());
-  object::const_iterator i = u_.object_->find(key);
-  return i != u_.object_->end() ? i->second : s_null;
-}
-
-inline value &value::get(const std::string &key) {
-  static value s_null;
-  PICOJSON_ASSERT(is<object>());
-  object::iterator i = u_.object_->find(key);
-  return i != u_.object_->end() ? i->second : s_null;
-}
-
-inline bool value::contains(const size_t idx) const {
-  PICOJSON_ASSERT(is<array>());
-  return idx < u_.array_->size();
-}
-
-inline bool value::contains(const std::string &key) const {
-  PICOJSON_ASSERT(is<object>());
-  object::const_iterator i = u_.object_->find(key);
-  return i != u_.object_->end();
-}
-
-inline std::string value::to_str() const {
-  switch (type_) {
-  case null_type:
-    return "null";
-  case boolean_type:
-    return u_.boolean_ ? "true" : "false";
-#ifdef PICOJSON_USE_INT64
-  case int64_type: {
-    char buf[sizeof("-9223372036854775808")];
-    SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_);
-    return buf;
-  }
-#endif
-  case number_type: {
-    char buf[256];
-    double tmp;
-    SNPRINTF(buf, sizeof(buf), fabs(u_.number_) < (1ULL << 53) && modf(u_.number_, &tmp) == 0 ? "%.f" : "%.17g", u_.number_);
-#if PICOJSON_USE_LOCALE
-    char *decimal_point = localeconv()->decimal_point;
-    if (strcmp(decimal_point, ".") != 0) {
-      size_t decimal_point_len = strlen(decimal_point);
-      for (char *p = buf; *p != '\0'; ++p) {
-        if (strncmp(p, decimal_point, decimal_point_len) == 0) {
-          return std::string(buf, p) + "." + (p + decimal_point_len);
-        }
-      }
-    }
-#endif
-    return buf;
-  }
-  case string_type:
-    return *u_.string_;
-  case array_type:
-    return "array";
-  case object_type:
-    return "object";
-  default:
-    PICOJSON_ASSERT(0);
-#ifdef _MSC_VER
-    __assume(0);
-#endif
-  }
-  return std::string();
-}
-
-template <typename Iter> void copy(const std::string &s, Iter oi) {
-  std::copy(s.begin(), s.end(), oi);
-}
-
-template <typename Iter> struct serialize_str_char {
-  Iter oi;
-  void operator()(char c) {
-    switch (c) {
-#define MAP(val, sym)                                                                                                              \
-  case val:                                                                                                                        \
-    copy(sym, oi);                                                                                                                 \
-    break
-      MAP('"', "\\\"");
-      MAP('\\', "\\\\");
-      MAP('/', "\\/");
-      MAP('\b', "\\b");
-      MAP('\f', "\\f");
-      MAP('\n', "\\n");
-      MAP('\r', "\\r");
-      MAP('\t', "\\t");
-#undef MAP
-    default:
-      if (static_cast<unsigned char>(c) < 0x20 || c == 0x7f) {
-        char buf[7];
-        SNPRINTF(buf, sizeof(buf), "\\u%04x", c & 0xff);
-        copy(buf, buf + 6, oi);
-      } else {
-        *oi++ = c;
-      }
-      break;
-    }
-  }
-};
-
-template <typename Iter> void serialize_str(const std::string &s, Iter oi) {
-  *oi++ = '"';
-  serialize_str_char<Iter> process_char = {oi};
-  std::for_each(s.begin(), s.end(), process_char);
-  *oi++ = '"';
-}
-
-template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
-  return _serialize(oi, prettify ? 0 : -1);
-}
-
-inline std::string value::serialize(bool prettify) const {
-  return _serialize(prettify ? 0 : -1);
-}
-
-template <typename Iter> void value::_indent(Iter oi, int indent) {
-  *oi++ = '\n';
-  for (int i = 0; i < indent * INDENT_WIDTH; ++i) {
-    *oi++ = ' ';
-  }
-}
-
-template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-  switch (type_) {
-  case string_type:
-    serialize_str(*u_.string_, oi);
-    break;
-  case array_type: {
-    *oi++ = '[';
-    if (indent != -1) {
-      ++indent;
-    }
-    for (array::const_iterator i = u_.array_->begin(); i != u_.array_->end(); ++i) {
-      if (i != u_.array_->begin()) {
-        *oi++ = ',';
-      }
-      if (indent != -1) {
-        _indent(oi, indent);
-      }
-      i->_serialize(oi, indent);
-    }
-    if (indent != -1) {
-      --indent;
-      if (!u_.array_->empty()) {
-        _indent(oi, indent);
-      }
-    }
-    *oi++ = ']';
-    break;
-  }
-  case object_type: {
-    *oi++ = '{';
-    if (indent != -1) {
-      ++indent;
-    }
-    for (object::const_iterator i = u_.object_->begin(); i != u_.object_->end(); ++i) {
-      if (i != u_.object_->begin()) {
-        *oi++ = ',';
-      }
-      if (indent != -1) {
-        _indent(oi, indent);
-      }
-      serialize_str(i->first, oi);
-      *oi++ = ':';
-      if (indent != -1) {
-        *oi++ = ' ';
-      }
-      i->second._serialize(oi, indent);
-    }
-    if (indent != -1) {
-      --indent;
-      if (!u_.object_->empty()) {
-        _indent(oi, indent);
-      }
-    }
-    *oi++ = '}';
-    break;
-  }
-  default:
-    copy(to_str(), oi);
-    break;
-  }
-  if (indent == 0) {
-    *oi++ = '\n';
-  }
-}
-
-inline std::string value::_serialize(int indent) const {
-  std::string s;
-  _serialize(std::back_inserter(s), indent);
-  return s;
-}
-
-template <typename Iter> class input {
-protected:
-  Iter cur_, end_;
-  bool consumed_;
-  int line_;
-
-public:
-  input(const Iter &first, const Iter &last) : cur_(first), end_(last), consumed_(false), line_(1) {
-  }
-  int getc() {
-    if (consumed_) {
-      if (*cur_ == '\n') {
-        ++line_;
-      }
-      ++cur_;
-    }
-    if (cur_ == end_) {
-      consumed_ = false;
-      return -1;
-    }
-    consumed_ = true;
-    return *cur_ & 0xff;
-  }
-  void ungetc() {
-    consumed_ = false;
-  }
-  Iter cur() const {
-    if (consumed_) {
-      input<Iter> *self = const_cast<input<Iter> *>(this);
-      self->consumed_ = false;
-      ++self->cur_;
-    }
-    return cur_;
-  }
-  int line() const {
-    return line_;
-  }
-  void skip_ws() {
-    while (1) {
-      int ch = getc();
-      if (!(ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')) {
-        ungetc();
-        break;
-      }
-    }
-  }
-  bool expect(const int expected) {
-    skip_ws();
-    if (getc() != expected) {
-      ungetc();
-      return false;
-    }
-    return true;
-  }
-  bool match(const std::string &pattern) {
-    for (std::string::const_iterator pi(pattern.begin()); pi != pattern.end(); ++pi) {
-      if (getc() != *pi) {
-        ungetc();
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-template <typename Iter> inline int _parse_quadhex(input<Iter> &in) {
-  int uni_ch = 0, hex;
-  for (int i = 0; i < 4; i++) {
-    if ((hex = in.getc()) == -1) {
-      return -1;
-    }
-    if ('0' <= hex && hex <= '9') {
-      hex -= '0';
-    } else if ('A' <= hex && hex <= 'F') {
-      hex -= 'A' - 0xa;
-    } else if ('a' <= hex && hex <= 'f') {
-      hex -= 'a' - 0xa;
-    } else {
-      in.ungetc();
-      return -1;
-    }
-    uni_ch = uni_ch * 16 + hex;
-  }
-  return uni_ch;
-}
-
-template <typename String, typename Iter> inline bool _parse_codepoint(String &out, input<Iter> &in) {
-  int uni_ch;
-  if ((uni_ch = _parse_quadhex(in)) == -1) {
-    return false;
-  }
-  if (0xd800 <= uni_ch && uni_ch <= 0xdfff) {
-    if (0xdc00 <= uni_ch) {
-      // a second 16-bit of a surrogate pair appeared
-      return false;
-    }
-    // first 16-bit of surrogate pair, get the next one
-    if (in.getc() != '\\' || in.getc() != 'u') {
-      in.ungetc();
-      return false;
-    }
-    int second = _parse_quadhex(in);
-    if (!(0xdc00 <= second && second <= 0xdfff)) {
-      return false;
-    }
-    uni_ch = ((uni_ch - 0xd800) << 10) | ((second - 0xdc00) & 0x3ff);
-    uni_ch += 0x10000;
-  }
-  if (uni_ch < 0x80) {
-    out.push_back(static_cast<char>(uni_ch));
-  } else {
-    if (uni_ch < 0x800) {
-      out.push_back(static_cast<char>(0xc0 | (uni_ch >> 6)));
-    } else {
-      if (uni_ch < 0x10000) {
-        out.push_back(static_cast<char>(0xe0 | (uni_ch >> 12)));
-      } else {
-        out.push_back(static_cast<char>(0xf0 | (uni_ch >> 18)));
-        out.push_back(static_cast<char>(0x80 | ((uni_ch >> 12) & 0x3f)));
-      }
-      out.push_back(static_cast<char>(0x80 | ((uni_ch >> 6) & 0x3f)));
-    }
-    out.push_back(static_cast<char>(0x80 | (uni_ch & 0x3f)));
-  }
-  return true;
-}
-
-template <typename String, typename Iter> inline bool _parse_string(String &out, input<Iter> &in) {
-  while (1) {
-    int ch = in.getc();
-    if (ch < ' ') {
-      in.ungetc();
-      return false;
-    } else if (ch == '"') {
-      return true;
-    } else if (ch == '\\') {
-      if ((ch = in.getc()) == -1) {
-        return false;
-      }
-      switch (ch) {
-#define MAP(sym, val)                                                                                                              \
-  case sym:                                                                                                                        \
-    out.push_back(val);                                                                                                            \
-    break
-        MAP('"', '\"');
-        MAP('\\', '\\');
-        MAP('/', '/');
-        MAP('b', '\b');
-        MAP('f', '\f');
-        MAP('n', '\n');
-        MAP('r', '\r');
-        MAP('t', '\t');
-#undef MAP
-      case 'u':
-        if (!_parse_codepoint(out, in)) {
-          return false;
-        }
-        break;
-      default:
-        return false;
-      }
-    } else {
-      out.push_back(static_cast<char>(ch));
-    }
-  }
-  return false;
-}
-
-template <typename Context, typename Iter> inline bool _parse_array(Context &ctx, input<Iter> &in) {
-  if (!ctx.parse_array_start()) {
-    return false;
-  }
-  size_t idx = 0;
-  if (in.expect(']')) {
-    return ctx.parse_array_stop(idx);
-  }
-  do {
-    if (!ctx.parse_array_item(in, idx)) {
-      return false;
-    }
-    idx++;
-  } while (in.expect(','));
-  return in.expect(']') && ctx.parse_array_stop(idx);
-}
-
-template <typename Context, typename Iter> inline bool _parse_object(Context &ctx, input<Iter> &in) {
-  if (!ctx.parse_object_start()) {
-    return false;
-  }
-  if (in.expect('}')) {
-    return ctx.parse_object_stop();
-  }
-  do {
-    std::string key;
-    if (!in.expect('"') || !_parse_string(key, in) || !in.expect(':')) {
-      return false;
-    }
-    if (!ctx.parse_object_item(in, key)) {
-      return false;
-    }
-  } while (in.expect(','));
-  return in.expect('}') && ctx.parse_object_stop();
-}
-
-template <typename Iter> inline std::string _parse_number(input<Iter> &in) {
-  std::string num_str;
-  while (1) {
-    int ch = in.getc();
-    if (('0' <= ch && ch <= '9') || ch == '+' || ch == '-' || ch == 'e' || ch == 'E') {
-      num_str.push_back(static_cast<char>(ch));
-    } else if (ch == '.') {
-#if PICOJSON_USE_LOCALE
-      num_str += localeconv()->decimal_point;
-#else
-      num_str.push_back('.');
-#endif
-    } else {
-      in.ungetc();
-      break;
-    }
-  }
-  return num_str;
-}
-
-template <typename Context, typename Iter> inline bool _parse(Context &ctx, input<Iter> &in) {
-  in.skip_ws();
-  int ch = in.getc();
-  switch (ch) {
-#define IS(ch, text, op)                                                                                                           \
-  case ch:                                                                                                                         \
-    if (in.match(text) && op) {                                                                                                    \
-      return true;                                                                                                                 \
-    } else {                                                                                                                       \
-      return false;                                                                                                                \
-    }
-    IS('n', "ull", ctx.set_null());
-    IS('f', "alse", ctx.set_bool(false));
-    IS('t', "rue", ctx.set_bool(true));
-#undef IS
-  case '"':
-    return ctx.parse_string(in);
-  case '[':
-    return _parse_array(ctx, in);
-  case '{':
-    return _parse_object(ctx, in);
-  default:
-    if (('0' <= ch && ch <= '9') || ch == '-') {
-      double f;
-      char *endp;
-      in.ungetc();
-      std::string num_str(_parse_number(in));
-      if (num_str.empty()) {
-        return false;
-      }
-#ifdef PICOJSON_USE_INT64
-      {
-        errno = 0;
-        intmax_t ival = strtoimax(num_str.c_str(), &endp, 10);
-        if (errno == 0 && std::numeric_limits<int64_t>::min() <= ival && ival <= std::numeric_limits<int64_t>::max() &&
-            endp == num_str.c_str() + num_str.size()) {
-          ctx.set_int64(ival);
-          return true;
-        }
-      }
-#endif
-      f = strtod(num_str.c_str(), &endp);
-      if (endp == num_str.c_str() + num_str.size()) {
-        ctx.set_number(f);
-        return true;
-      }
-      return false;
-    }
-    break;
-  }
-  in.ungetc();
-  return false;
-}
-
-class deny_parse_context {
-public:
-  bool set_null() {
-    return false;
-  }
-  bool set_bool(bool) {
-    return false;
-  }
-#ifdef PICOJSON_USE_INT64
-  bool set_int64(int64_t) {
-    return false;
-  }
-#endif
-  bool set_number(double) {
-    return false;
-  }
-  template <typename Iter> bool parse_string(input<Iter> &) {
-    return false;
-  }
-  bool parse_array_start() {
-    return false;
-  }
-  template <typename Iter> bool parse_array_item(input<Iter> &, size_t) {
-    return false;
-  }
-  bool parse_array_stop(size_t) {
-    return false;
-  }
-  bool parse_object_start() {
-    return false;
-  }
-  template <typename Iter> bool parse_object_item(input<Iter> &, const std::string &) {
-    return false;
-  }
-};
-
-class default_parse_context {
-protected:
-  value *out_;
-  size_t depths_;
-
-public:
-  default_parse_context(value *out, size_t depths = DEFAULT_MAX_DEPTHS) : out_(out), depths_(depths) {
-  }
-  bool set_null() {
-    *out_ = value();
-    return true;
-  }
-  bool set_bool(bool b) {
-    *out_ = value(b);
-    return true;
-  }
-#ifdef PICOJSON_USE_INT64
-  bool set_int64(int64_t i) {
-    *out_ = value(i);
-    return true;
-  }
-#endif
-  bool set_number(double f) {
-    *out_ = value(f);
-    return true;
-  }
-  template <typename Iter> bool parse_string(input<Iter> &in) {
-    *out_ = value(string_type, false);
-    return _parse_string(out_->get<std::string>(), in);
-  }
-  bool parse_array_start() {
-    if (depths_ == 0)
-      return false;
-    --depths_;
-    *out_ = value(array_type, false);
-    return true;
-  }
-  template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
-    array &a = out_->get<array>();
-    a.push_back(value());
-    default_parse_context ctx(&a.back(), depths_);
-    return _parse(ctx, in);
-  }
-  bool parse_array_stop(size_t) {
-    ++depths_;
-    return true;
-  }
-  bool parse_object_start() {
-    if (depths_ == 0)
-      return false;
-    *out_ = value(object_type, false);
-    return true;
-  }
-  template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &key) {
-    object &o = out_->get<object>();
-    default_parse_context ctx(&o[key], depths_);
-    return _parse(ctx, in);
-  }
-  bool parse_object_stop() {
-    ++depths_;
-    return true;
-  }
-
-private:
-  default_parse_context(const default_parse_context &);
-  default_parse_context &operator=(const default_parse_context &);
-};
-
-class null_parse_context {
-protected:
-  size_t depths_;
-
-public:
-  struct dummy_str {
-    void push_back(int) {
-    }
-  };
-
-public:
-  null_parse_context(size_t depths = DEFAULT_MAX_DEPTHS) : depths_(depths) {
-  }
-  bool set_null() {
-    return true;
-  }
-  bool set_bool(bool) {
-    return true;
-  }
-#ifdef PICOJSON_USE_INT64
-  bool set_int64(int64_t) {
-    return true;
-  }
-#endif
-  bool set_number(double) {
-    return true;
-  }
-  template <typename Iter> bool parse_string(input<Iter> &in) {
-    dummy_str s;
-    return _parse_string(s, in);
-  }
-  bool parse_array_start() {
-    if (depths_ == 0)
-      return false;
-    --depths_;
-    return true;
-  }
-  template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
-    return _parse(*this, in);
-  }
-  bool parse_array_stop(size_t) {
-    ++depths_;
-    return true;
-  }
-  bool parse_object_start() {
-    if (depths_ == 0)
-      return false;
-    --depths_;
-    return true;
-  }
-  template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &) {
-    ++depths_;
-    return _parse(*this, in);
-  }
-  bool parse_object_stop() {
-    return true;
-  }
-
-private:
-  null_parse_context(const null_parse_context &);
-  null_parse_context &operator=(const null_parse_context &);
-};
-
-// obsolete, use the version below
-template <typename Iter> inline std::string parse(value &out, Iter &pos, const Iter &last) {
-  std::string err;
-  pos = parse(out, pos, last, &err);
-  return err;
-}
-
-template <typename Context, typename Iter> inline Iter _parse(Context &ctx, const Iter &first, const Iter &last, std::string *err) {
-  input<Iter> in(first, last);
-  if (!_parse(ctx, in) && err != NULL) {
-    char buf[64];
-    SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
-    *err = buf;
-    while (1) {
-      int ch = in.getc();
-      if (ch == -1 || ch == '\n') {
-        break;
-      } else if (ch >= ' ') {
-        err->push_back(static_cast<char>(ch));
-      }
-    }
-  }
-  return in.cur();
-}
-
-template <typename Iter> inline Iter parse(value &out, const Iter &first, const Iter &last, std::string *err) {
-  default_parse_context ctx(&out);
-  return _parse(ctx, first, last, err);
-}
-
-inline std::string parse(value &out, const std::string &s) {
-  std::string err;
-  parse(out, s.begin(), s.end(), &err);
-  return err;
-}
-
-inline std::string parse(value &out, std::istream &is) {
-  std::string err;
-  parse(out, std::istreambuf_iterator<char>(is.rdbuf()), std::istreambuf_iterator<char>(), &err);
-  return err;
-}
-
-template <typename T> struct last_error_t { static std::string s; };
-template <typename T> std::string last_error_t<T>::s;
-
-inline void set_last_error(const std::string &s) {
-  last_error_t<bool>::s = s;
-}
-
-inline const std::string &get_last_error() {
-  return last_error_t<bool>::s;
-}
-
-inline bool operator==(const value &x, const value &y) {
-  if (x.is<null>())
-    return y.is<null>();
-#define PICOJSON_CMP(type)                                                                                                         \
-  if (x.is<type>())                                                                                                                \
-  return y.is<type>() && x.get<type>() == y.get<type>()
-  PICOJSON_CMP(bool);
-  PICOJSON_CMP(double);
-  PICOJSON_CMP(std::string);
-  PICOJSON_CMP(array);
-  PICOJSON_CMP(object);
-#undef PICOJSON_CMP
-  PICOJSON_ASSERT(0);
-#ifdef _MSC_VER
-  __assume(0);
-#endif
-  return false;
-}
-
-inline bool operator!=(const value &x, const value &y) {
-  return !(x == y);
-}
-}
-
-#if !PICOJSON_USE_RVALUE_REFERENCE
-namespace std {
-template <> inline void swap(picojson::value &x, picojson::value &y) {
-  x.swap(y);
-}
-}
-#endif
-
-inline std::istream &operator>>(std::istream &is, picojson::value &x) {
-  picojson::set_last_error(std::string());
-  const std::string err(picojson::parse(x, is));
-  if (!err.empty()) {
-    picojson::set_last_error(err);
-    is.setstate(std::ios::failbit);
-  }
-  return is;
-}
-
-inline std::ostream &operator<<(std::ostream &os, const picojson::value &x) {
-  x.serialize(std::ostream_iterator<char>(os));
-  return os;
-}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 2000ed262..59852aee7 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -369,7 +369,6 @@ void Window_Settings::RefreshLicense() {
 	AddOption(MenuItem("ttyp0", "ttyp0 font family", "ttyp0"), [](){});
 	AddOption(MenuItem("WenQuanYi", "WenQuanYi font family (CJK)", "GPLv2+ with FE"), [](){});
 #ifdef EMSCRIPTEN
-	AddOption(MenuItem("PicoJSON", "JSON parser/serializer", "BSD"), [](){});
 	AddOption(MenuItem("Teenyicons", "Tiny minimal 1px icons", "MIT"), [](){});
 #endif
 }

From 74c1c3354a2a5f5c2d10b3145c6886d3e51e5dde Mon Sep 17 00:00:00 2001
From: XWX1 <xwx1dot@qq.com>
Date: Mon, 20 May 2024 21:07:58 +0000
Subject: [PATCH 091/222] Android App: Chinese (Simplified) translation updated

Currently translated at 100.0% (119 of 119 strings)
---
 builds/android/app/src/main/res/values-zh/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builds/android/app/src/main/res/values-zh/strings.xml b/builds/android/app/src/main/res/values-zh/strings.xml
index b9a94bc4d..b0125bb81 100644
--- a/builds/android/app/src/main/res/values-zh/strings.xml
+++ b/builds/android/app/src/main/res/values-zh/strings.xml
@@ -132,7 +132,7 @@
     <string name="scale_bilinear">按屏幕尺寸缩放并应用双线性滤波器（速度慢、质量好）</string>
     <string name="stretch">忽略纵横比（拉伸到屏幕宽度）</string>
     <string name="error_no_games_folder">\"games\" 文件夹不存在或不是文件夹。请为 EasyRPG 手动创建文件夹或选择其他位置。EasyRPG 文件夹可以在设置中更改。</string>
-    <string name="settings_resolution_widescreen">宽屏（416x240，16:9，试验性）</string>
+    <string name="settings_resolution_widescreen">宽屏（416x240，16:9，实验性）</string>
     <string name="settings_resolution_ultrawide">超宽（560x240，21:9，实验性）</string>
     <string name="watch_explanation_video">入门和添加游戏（视频指南）</string>
     <string name="error_saf_title">选择了错误的文件夹</string>
@@ -144,4 +144,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">长按</string>
     <string name="fast_forward_mode_tap">点击</string>
-</resources>
+</resources>
\ No newline at end of file

From ed9d7d78379bbe07bc687439583929ea4d3454a3 Mon Sep 17 00:00:00 2001
From: Daniel Paim de Mattos Oliveira <danzpaim@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 092/222] New translation (Portuguese) added

Android App: Portuguese (Brazil) translation updated

Currently translated at 70.5% (84 of 119 strings)
---
 .../app/src/main/res/values-pt-rBR/strings.xml  | 17 +++++++++++++++++
 .../app/src/main/res/values-pt/strings.xml      |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 builds/android/app/src/main/res/values-pt/strings.xml

diff --git a/builds/android/app/src/main/res/values-pt-rBR/strings.xml b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
index a86419809..65b10e574 100644
--- a/builds/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -90,4 +90,21 @@
     <string name="rtp_explanation">O RTP fornece ativos compartilhados usados por alguns jogos.
 \nColoque o RPG Maker 2000 RTP em \"rtp/2000\" e o RPG Maker 2003 RTP em \"rtp/2003\".
 \nPor favor, observe que habilitar o suporte RTP aumentará significativamente o tempo de carregamento inicial de um jogo.</string>
+    <string name="no_games_found_and_explanation_android_30">Jogos do RPG Maker 2000/2003 não encontrados.
+\n
+\nA pasta do EasyRPG que você selecionou contém a pasta \"games\". Use um gerenciador de arquivos para por seus games nesta pasta.
+\nGames pode ser posta em subpasta ou em arquivos ZIP.
+\n
+\nA pasta do EasyRPG pode ser mudada nas configurações.</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Coloque seus games de RPG Maker 2000 e 2003 em subpasta da pasta \"games\"
+\nJogos devem ser descomprimidos em um arquivo ZIP.
+\nArquivos no formato RAR, LZH e EXE não são suportados.
+\n
+\nRecursos opcionais (consulte as configurações):
+\n- O RTP (assets compartilhados e usados em alguns jogos) podem ser fornecidos
+\n- Um soundfont personalizado para alterar como os sons da música midi podem ser fornecidos</string>
+    <string name="launch_debug_mode">Executar no modo de depuração</string>
+    <string name="visit_website">Visite nosso website</string>
+    <string name="error_games_no_rw">A pasta \"Games\" não é legível ou gravável. Selecione um local diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
+    <string name="watch_explanation_video">Iniciando e adicionando jogos (Vídeo Explicativo)</string>
 </resources>
\ No newline at end of file
diff --git a/builds/android/app/src/main/res/values-pt/strings.xml b/builds/android/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/builds/android/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 56868aaa665885df877abba6a879257d0c43e009 Mon Sep 17 00:00:00 2001
From: AidasKar15 <aidas14karaliunas@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 093/222] Android App: Lithuanian translation updated

Currently translated at 53.7% (64 of 119 strings)

Android App: Lithuanian translation updated

Currently translated at 30.2% (36 of 119 strings)

New translation (Lithuanian) added
---
 .../app/src/main/res/values-lt/strings.xml    | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 builds/android/app/src/main/res/values-lt/strings.xml

diff --git a/builds/android/app/src/main/res/values-lt/strings.xml b/builds/android/app/src/main/res/values-lt/strings.xml
new file mode 100644
index 000000000..e3e18c5c7
--- /dev/null
+++ b/builds/android/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="autodetect">Automatiškai nustatyti regiona (Rekomenduojama)</string>
+    <string name="west_europe">Vakarų Europos</string>
+    <string name="east_europe">Vidurio/Rytų Europos</string>
+    <string name="cyrillic">Kirilica</string>
+    <string name="japan">Japonų</string>
+    <string name="korean">Korėjiečių</string>
+    <string name="chinese_simple">Kinų (Supaprastinta)</string>
+    <string name="chinese_traditional">Kinų (Tradicinė)</string>
+    <string name="greek">Graikų</string>
+    <string name="turkish">Turkų</string>
+    <string name="hebrew">Hebrajų</string>
+    <string name="arabic">Arabų</string>
+    <string name="baltic">Baltų</string>
+    <string name="thai">Tajų</string>
+    <string name="vietnamese">Vietnamiečių</string>
+    <string name="ok">Gerai</string>
+    <string name="cancel">Atšaukti</string>
+    <string name="do_want_quit">Ar tikrai norite išeiti\?</string>
+    <string name="yes">Taip</string>
+    <string name="no">Ne</string>
+    <string name="creating_dir_failed">Nepavyko sukurti $PATH katalogo</string>
+    <string name="path_not_readable">$PATH neįskaitomas</string>
+    <string name="no_games_found_and_explanation_android_30">Nepavyko rasti RPG Maker 2000/2003 žaidimų.
+\n
+\nPasirinktame EasyRPG aplanke yra aplankas „games“. Norėdami įdėti žaidimus į šį aplanką, naudokite failų tvarkyklės programą.
+\nŽaidimai gali būti sudėti į poaplankius arba ZIP archyvus.
+\n
+\n„EasyRPG“ aplanką galima pakeisti nustatymuose.</string>
+    <string name="open_games_folder">Atidarykite aplanką \"games\"</string>
+    <string name="no_external_storage">Nerasta išorinės atminties (pvz., SD kortelės)</string>
+    <string name="not_valid_game">$PATH nėra tinkamas žaidimas</string>
+    <string name="select_game_region">Pasirinkite žaidimo regioną</string>
+    <string name="change_the_layout">Pakeisti išdėstymą</string>
+    <string name="launch_debug_mode">Paleiskite derinimo režimu</string>
+    <string name="choose_layout">Pasirinkite išdėstymą</string>
+    <string name="unknown_region">Nežinomas regionas</string>
+    <string name="region_modification_failed">Nepavyko pakeisti regiono</string>
+    <string name="refresh">Atnaujinti</string>
+    <string name="change_default_mapping">Pakeiskite numatytąjį mygtukų susiejimą</string>
+    <string name="how_to_use_easy_rpg">Kaip naudotis EasyRPG Player</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Įdėkite savo RPG Maker 2000/2003 žaidimus į žaidimų aplanką „žaidimai“ pakatalogius.
+\nŽaidimai turi būti nesuspausti arba ZIP archyve.
+\nRAR, LZH ir EXE failai nepalaikomi.
+\n
+\nPasirenkamos funkcijos (žr. nustatymus):
+\n- Galima pateikti RTP (dalijamas turtas, naudojamas kai kuriuose žaidimuose).
+\n- Pasirinktinis garso šriftas, skirtas pakeisti MIDI muzikos garsų pateikimą</string>
+    <string name="visit_website">Apsilankykite mūsų svetainėje</string>
+    <string name="watch_explanation_video">Pradedant naudotis ir žaidimų pridėjimas (Vaizdo instrukcija)</string>
+    <string name="error_no_games_folder">Aplanko „žaidimai“ nėra arba jis nėra aplankas. Sukurkite jį rankiniu būdu arba pasirinkite kitą EasyRPG aplanko vietą. EasyRPG aplanką galima pakeisti nustatymuose.</string>
+    <string name="error_games_no_rw">Aplankas „žaidimai“ nėra įskaitomas ar įrašomas. Pasirinkite kitą EasyRPG aplanko vietą. „EasyRPG“ aplanką galima pakeisti nustatymuose.</string>
+    <string name="error_saf_title">Pasirinktas netinkamas aplankas</string>
+    <string name="error_saf_select_easyrpg">Sukurkite tuščią EasyRPG aplanką ir pasirinkite jį.</string>
+    <string name="error_saf_download_selected">Atsisiuntimo aplankas negali būti naudojamas kaip EasyRPG aplankas.</string>
+    <string name="error_saf_folder_not_empty">Pasirinktame aplanke yra pašalinių failų, todėl jo negalima naudoti kaip EasyRPG aplanko. Pašalinę visus aplanke esančius failus galite naudoti jį kaip EasyRPG aplanką.</string>
+    <string name="error_saf_bad_content_provider">Pasirinkto aplanko negalima naudoti kaip EasyRPG aplanko. Ši problema gali kilti dėl įvairių priežasčių, pavyzdžiui, jei pasirinkote šakninį katalogą arba saugyklos vietą debesyje.
+\n
+\n</string>
+    <string name="toggle_ui">Perjungti virtualius mygtukus</string>
+    <string name="end_game">Pabaigti žaidima</string>
+    <string name="report_bug">Panešti problema</string>
+    <string name="report_bug_msg">Ši funkcija atidarys jūsų el. pašto programą (pvz., Gmail), kad išsiųstumėte mums pranešimą apie iškilusia problema.
+\n
+\nJei nenorite siųsti laiškų arba neturite sukonfigūruotos pašto programos, galite atidaryti naują problemą adresu https://github.com/EasyRPG/Player/issues.</string>
+    <string name="report_bug_mail">Dėkojame, kad palaikote EasyRPG Player.
+\n Prie šio el. laiško buvo pridėtas žurnalo failas ir jūsų išsaugoti žaidimai.
+\n Nepašalinkite žurnalo failo! Mums reikia išsaugoto žaidimo, kuris būtų arti klaidų vietos.
+\n Papasakokite mums išsamiai, kas nutiko.
+\n
+\n</string>
+    <string name="video">Vaizdo įrašas</string>
+    <string name="audio">Garso įrašas</string>
+    <string name="input">Įvestis</string>
+    <string name="easyrpg_folders">EasyRPG aplankai</string>
+    <string name="settings">Nustatymai</string>
+    <string name="screen_size">Ekrano mastelio keitimas:</string>
+</resources>
\ No newline at end of file

From 867958a8d0610c5da0ff626a0d2fb6db4063de40 Mon Sep 17 00:00:00 2001
From: Sadver <kw2xiemg@anonaddy.me>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 094/222] Android Metadata: Czech translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: Czech translation updated

Currently translated at 100.0% (119 of 119 strings)

Android Metadata: Czech translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: Czech translation updated

Currently translated at 100.0% (119 of 119 strings)

Android App: Czech translation updated

Currently translated at 96.6% (115 of 119 strings)

Android App: Czech translation updated

Currently translated at 95.7% (114 of 119 strings)

Android App: Czech translation updated

Currently translated at 94.9% (113 of 119 strings)

Android App: Czech translation updated

Currently translated at 94.1% (112 of 119 strings)

Android App: Czech translation updated

Currently translated at 93.2% (111 of 119 strings)

Android App: Czech translation updated

Currently translated at 89.9% (107 of 119 strings)

Android App: Czech translation updated

Currently translated at 89.0% (106 of 119 strings)

Android App: Czech translation updated

Currently translated at 88.2% (105 of 119 strings)

Android App: Czech translation updated

Currently translated at 85.7% (102 of 119 strings)

Android App: Czech translation updated

Currently translated at 84.0% (100 of 119 strings)

Android App: Czech translation updated

Currently translated at 83.1% (99 of 119 strings)

Android App: Czech translation updated

Currently translated at 81.5% (97 of 119 strings)

Android App: Czech translation updated

Currently translated at 80.6% (96 of 119 strings)

Android App: Czech translation updated

Currently translated at 78.9% (94 of 119 strings)

Android App: Czech translation updated

Currently translated at 77.3% (92 of 119 strings)

Android App: Czech translation updated

Currently translated at 76.4% (91 of 119 strings)

Android App: Czech translation updated

Currently translated at 75.6% (90 of 119 strings)

Android App: Czech translation updated

Currently translated at 74.7% (89 of 119 strings)

Android App: Czech translation updated

Currently translated at 73.1% (87 of 119 strings)

Android App: Czech translation updated

Currently translated at 72.2% (86 of 119 strings)

Android App: Czech translation updated

Currently translated at 71.4% (85 of 119 strings)

Android App: Czech translation updated

Currently translated at 70.5% (84 of 119 strings)

Android App: Czech translation updated

Currently translated at 68.0% (81 of 119 strings)

Android App: Czech translation updated

Currently translated at 67.2% (80 of 119 strings)

Android App: Czech translation updated

Currently translated at 66.3% (79 of 119 strings)

Android App: Czech translation updated

Currently translated at 65.5% (78 of 119 strings)

Android App: Czech translation updated

Currently translated at 64.7% (77 of 119 strings)

Android App: Czech translation updated

Currently translated at 59.6% (71 of 119 strings)

Android App: Czech translation updated

Currently translated at 51.2% (61 of 119 strings)

Android App: Czech translation updated

Currently translated at 31.0% (37 of 119 strings)

New translation (Czech) added
---
 .../app/src/main/res/values-cs/strings.xml    | 141 ++++++++++++++++++
 .../metadata/cs-CZ/full_description.txt       |   7 +
 .../metadata/cs-CZ/short_description.txt      |   1 +
 builds/android/metadata/cs-CZ/title.txt       |   1 +
 4 files changed, 150 insertions(+)
 create mode 100644 builds/android/app/src/main/res/values-cs/strings.xml
 create mode 100644 builds/android/metadata/cs-CZ/full_description.txt
 create mode 100644 builds/android/metadata/cs-CZ/short_description.txt
 create mode 100644 builds/android/metadata/cs-CZ/title.txt

diff --git a/builds/android/app/src/main/res/values-cs/strings.xml b/builds/android/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 000000000..82b96e7c7
--- /dev/null
+++ b/builds/android/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="japan">Japonština</string>
+    <string name="korean">Korejština</string>
+    <string name="chinese_simple">Čínština (zjednodušená)</string>
+    <string name="chinese_traditional">Čínština (tradiční)</string>
+    <string name="greek">Řečtina</string>
+    <string name="turkish">Turečtina</string>
+    <string name="hebrew">Hebrejština</string>
+    <string name="arabic">Arabština</string>
+    <string name="thai">Thajština</string>
+    <string name="vietnamese">Vietnamština</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Zrušit</string>
+    <string name="do_want_quit">Opravdu chcete odejít\?</string>
+    <string name="yes">Ano</string>
+    <string name="no">Ne</string>
+    <string name="open_games_folder">Otevřít složku „games“</string>
+    <string name="refresh">Obnovit</string>
+    <string name="end_game">Ukončit hru</string>
+    <string name="report_bug">Nahlásit chybu</string>
+    <string name="audio">Zvuk</string>
+    <string name="settings">Nastavení</string>
+    <string name="enable_vibration">Povolit vibrace</string>
+    <string name="Loading">Načítání…</string>
+    <string name="delete">Odstranit</string>
+    <string name="default_layout">Výchozí</string>
+    <string name="add_a_button">Přidat tlačítko</string>
+    <string name="exit_without_saving">Odejít bez uložení</string>
+    <string name="save_and_quit">Uložit a odejít</string>
+    <string name="key_shift">Shift</string>
+    <string name="autodetect">Automaticky rozpoznat region (doporučeno)</string>
+    <string name="west_europe">Západní Evropa</string>
+    <string name="east_europe">Střední/Východní Evropa</string>
+    <string name="cyrillic">Cyrilice</string>
+    <string name="baltic">Pobaltí</string>
+    <string name="creating_dir_failed">Vytvoření adresáře $PATH selhalo</string>
+    <string name="path_not_readable">$PATH není možné přečíst</string>
+    <string name="no_games_found_and_explanation_android_30">Nenalezeny žádné hry z RPG Makeru 2000/2003.
+\n
+\nVybraná složka EasyRPG obsahuje složku „games“. Pomocí aplikace Správce souborů vložte vaše hry do této složky.
+\nHry mohou být uloženy v podsložkách nebo ZIP archívech.
+\n
+\nUmístění složky EasyRPG může být změněno v nastavení.</string>
+    <string name="no_external_storage">Nebylo nalezeno žádné externí uloziště (např. SD karta)</string>
+    <string name="not_valid_game">$PATH není platná hra</string>
+    <string name="select_game_region">Vyberte herní region</string>
+    <string name="launch_debug_mode">Spustit v debug režimu</string>
+    <string name="unknown_region">Neznámý region</string>
+    <string name="region_modification_failed">Změna regionu selhala</string>
+    <string name="change_default_mapping">Změnit výchozí rozmístění tlačítek</string>
+    <string name="how_to_use_easy_rpg">Jak používat EasyRPG Player</string>
+    <string name="visit_website">Navštivte náš web</string>
+    <string name="video">Obraz</string>
+    <string name="settings_resolution">Herní rozlišení:</string>
+    <string name="music_volume">Hlasitost hudby</string>
+    <string name="sound_volume">Hlasitost zvukových efektů</string>
+    <string name="quick_access">Rychlý přístup</string>
+    <string name="select_the_games_folder">Vyberte složku EasyRPG</string>
+    <string name="menu">Otevřít Android menu</string>
+    <string name="change_the_layout">Změnit rozhraní</string>
+    <string name="choose_layout">Vybrat rozhraní</string>
+    <string name="error_no_games_folder">Složka „games“ neexistuje nebo není složkou. Vytvořte ji prosím ručně nebo zvolte jiné umístění složky EasyRPG. Umístění složky EasyRPG lze změnit v nastavení.</string>
+    <string name="error_games_no_rw">Složka „games“ není čitelná nebo zapisovatelná. Zvolte prosím jiné umístění složky EasyRPG. Umístění složky EasyRPG lze změnit v nastavení.</string>
+    <string name="error_saf_title">Zvolena nesprávná složka</string>
+    <string name="error_saf_select_easyrpg">Vytvořte prosím prázdnou složku EasyRPG a vyberte ji.</string>
+    <string name="force_landscape_mode">Vynutit orientaci na šířku</string>
+    <string name="stretch">Ignorovat poměr stran (roztáhnout na šířku obrazovky)</string>
+    <string name="id_select_games_folder_explanation">EasyRPG Player vyžaduje vyhrazenou složku. Po stisknutí tlačítka budete vyzváni k výběru složky.
+\n
+\nPokud tuto aplikaci používáte poprvé, není k dispozici žádná složka EasyRPG. Vytvořte novou složku EasyRPG a poté ji vyberte.
+\n
+\nPokud jste tuto aplikaci používali již dříve, vyberte stávající složku EasyRPG.</string>
+    <string name="open_rtp_folder">Otevřít složku RTP</string>
+    <string name="easyrpg_folders">Složky EasyRPG</string>
+    <string name="settings_resolution_desc">Změna rozlišení může způsobit grafické chyby nebo rozbít hru. Byli jste varováni!</string>
+    <string name="edit_layout">Upravit rozhraní</string>
+    <string name="reset_button_mapping">Resetovat rozmístění tlačítek</string>
+    <string name="key_enter">Enter (Z)</string>
+    <string name="key_cancel">Zrušit (Esc a X)</string>
+    <string name="watch_explanation_video">Jak spouštět a přidávat hry (video návod)</string>
+    <string name="error_saf_folder_not_empty">Vybraná složka obsahuje jiné soubory a nelze ji použít jako složku EasyRPG. Když odstraněníte všechny soubory uvnitř této složky, můžete ji použít jako složku EasyRPG.</string>
+    <string name="edit_name">Přejmenovat</string>
+    <string name="settings_resolution_original">Původní (320 × 240, 4:3, doporučeno)</string>
+    <string name="settings_resolution_widescreen">Širokoúhlý (416 × 240, 16:9, experimentální)</string>
+    <string name="settings_resolution_ultrawide">Ultraširoký (560 × 240, 21:9, experimentální)</string>
+    <string name="key_debug_menu">Otevřít debug menu (vyžaduje debug režim)</string>
+    <string name="key_debug_walk_through_walls">Chodit skrz zdi (vyžaduje debug režim)</string>
+    <string name="enable_rtp_support">Povolit podporu RTP</string>
+    <string name="toggle_ui">Zobrazit/skrýt virtuální tlačítka</string>
+    <string name="input">Vstup</string>
+    <string name="manage_input_layouts">Spravovat vstupní rozhraní:</string>
+    <string name="input_layout_transparency">Průhlednost rozhraní:</string>
+    <string name="vibrate_when_sliding_direction">Vibrovat při změně pohybu do jiného směru</string>
+    <string name="no_read_access_on_dir">%1$s nemá přístup ke čtení</string>
+    <string name="navigation_drawer_open">Otevřít navigační menu</string>
+    <string name="navigation_drawer_close">Zavřít navigační menu</string>
+    <string name="error_saf_bad_content_provider">Vybranou složku nelze použít jako složku EasyRPG. Tento problém může nastat z různých důvodů, například pokud jste vybrali kořenový adresář nebo uložiště umístěné v cloudu.
+\n
+\n</string>
+    <string name="settings_default_soundfont">Výchozí zvuková banka</string>
+    <string name="settings_soundfont_found">Nalezené zvukové banky:</string>
+    <string name="settings_custom_soundfont">Vlastní zvuková banka:</string>
+    <string name="open_the_sound_fonts_folder">Otevřít složku se zvukovými bankami</string>
+    <string name="fast_forward_mode_hold">držet</string>
+    <string name="fast_forward">Tlačítko režimu zrychlení:</string>
+    <string name="key_fast_forward">Zrychlení</string>
+    <string name="settings_soundfont_restart_app">Po změně zvukové banky prosím opusťte a restartujte aplikaci.</string>
+    <string name="fast_forward_mode_tap">stisknout</string>
+    <string name="fast_forward_factor">Rychlost:</string>
+    <string name="error_saf_download_selected">Adresář pro stahování nemůže být použit jako složka EasyRPG.</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Vložte vaše hry z RPG Makeru 2000/2003 do podsložky „games“.
+\nHry musí být nekomprimované nebo uložené v ZIP archívu.
+\nFormáty RAR, LZH a EXE nejsou podporovány.
+\n
+\nDodatečné funkce (viz nastavení):
+\n- RTP (sdílené materiály používané některými hrami) mohou být poskytnuty
+\n- vlastní zvukové banky, které určují jak MIDI hudba zní, mohou být poskytnuty</string>
+    <string name="settings_soundfont_explanation">Vložte zvukové banky ve formátu SF2 do složky „soundfonts“. Zvukové banky určují jak MIDI hudba zní.</string>
+    <string name="horizontal_input_layout">Horizontální (vodorovné) vstupní rozhraní</string>
+    <string name="vertical_input_layout">Vertikální (svislé) vstupní rozhraní</string>
+    <string name="settings_edit_layout_explanation">Při upravování vstupního rozhraní můžete přidávat tlačítka (např. Shift).
+\nAbyste přidali tlačítko, vraťte se šipkou zpátky a vyberte „Přidat tlačítko“.</string>
+    <string name="rtp_explanation">RTP poskytuje sdílené materiály používané některými hrami.
+\nVložte RTP pro RPG Maker 2000 do „rtp/2000“ a RTP pro RPG Maker 2003 do „rtp/2003“.
+\nBuďte si prosím vědomi, že povolení RTP podpory výrazně prodlouží počáteční dobu načítání hry.</string>
+    <string name="ignore_size_settings">Ignorovat nastavenou velikost tlačítek a použít následující:</string>
+    <string name="report_bug_msg">Tato funkce otevře váš e-mailový program (např. Gmail) aby nám poslala nahlášení o chybě.
+\n
+\nPokud nám nechcete poslat e-mail nebo nemáte nastavený e-mailový program, můžete místo toho nahlásit chybu na https://github.com/EasyRPG/Player/issues.</string>
+    <string name="report_bug_mail">Děkujeme, že pomáháte EasyRPG Playeru.
+\n K tomuto e-mailu byl připojen protokol (log) a vaše uložené hry.
+\n Neodstraňujte prosím soubor protokolu! Potřebujeme uloženou hru, která je blízko místa chyby.
+\n Sdělte nám prosím podrobně, co se pokazilo.
+\n
+\n</string>
+    <string name="screen_size">Měřítko obrazovky:</string>
+    <string name="scale_nearest">Škálovat na velikost obrazovky metodou nejbližšího souseda (rychlé, špatná kvalita)</string>
+    <string name="scale_integer">Škálovat na násobek rozlišení hry (rychlé, menší obraz, dobrá kvalita)</string>
+    <string name="scale_bilinear">Škálovat na velikost obrazovky a použít bilineární filtrování (pomalé, dobrá kvalita)</string>
+</resources>
\ No newline at end of file
diff --git a/builds/android/metadata/cs-CZ/full_description.txt b/builds/android/metadata/cs-CZ/full_description.txt
new file mode 100644
index 000000000..eb2a4a7a7
--- /dev/null
+++ b/builds/android/metadata/cs-CZ/full_description.txt
@@ -0,0 +1,7 @@
+Díky EasyRPG Playeru můžete hrát hry vytvořené v RPG Makeru 2000 a RPG Makeru 2003. Novější enginy jako XP, VX, MV a MZ nejsou podporovány.
+
+EasyRPG Player není editor. Nemůžete s ním vytvařet svoje vlastní hry.
+
+Domovská stránka: https://easyrpg.org/
+
+Tato aplikace není přidružená ke společností Kadokawa Corporation.
diff --git a/builds/android/metadata/cs-CZ/short_description.txt b/builds/android/metadata/cs-CZ/short_description.txt
new file mode 100644
index 000000000..6f36470ea
--- /dev/null
+++ b/builds/android/metadata/cs-CZ/short_description.txt
@@ -0,0 +1 @@
+Zahrajte si hry z RPG Makeru 2000 a 2003 kdekoliv chcete.
diff --git a/builds/android/metadata/cs-CZ/title.txt b/builds/android/metadata/cs-CZ/title.txt
new file mode 100644
index 000000000..52681f725
--- /dev/null
+++ b/builds/android/metadata/cs-CZ/title.txt
@@ -0,0 +1 @@
+EasyRPG Player

From dbbb6f1e81f282b7d65cf8fed27c87e1f710a411 Mon Sep 17 00:00:00 2001
From: otya <ocha3052@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 095/222] Android Metadata: Japanese translation updated

Currently translated at 33.3% (1 of 3 strings)
---
 builds/android/metadata/ja-JP/full_description.txt  | 2 +-
 builds/android/metadata/ja-JP/short_description.txt | 2 +-
 builds/android/metadata/ja-JP/title.txt             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 builds/android/metadata/ja-JP/title.txt

diff --git a/builds/android/metadata/ja-JP/full_description.txt b/builds/android/metadata/ja-JP/full_description.txt
index 1ce31f94a..626836da7 100644
--- a/builds/android/metadata/ja-JP/full_description.txt
+++ b/builds/android/metadata/ja-JP/full_description.txt
@@ -5,4 +5,4 @@ EasyRPGプレイヤーは、RPGツクール2000/2003で制作されたゲーム
 更新履歴: https://blog.easyrpg.org/
 バグ報告先: https://github.com/EasyRPG/Player/issues/
 
-このアプリは、KADOKAWAと提携していません
\ No newline at end of file
+このアプリは、KADOKAWAと提携していません
diff --git a/builds/android/metadata/ja-JP/short_description.txt b/builds/android/metadata/ja-JP/short_description.txt
index bbb300ddb..79fd13e92 100644
--- a/builds/android/metadata/ja-JP/short_description.txt
+++ b/builds/android/metadata/ja-JP/short_description.txt
@@ -1 +1 @@
-EasyRPG プレイヤーで RPG ツクール 2000/2003 のゲームをどこでもプレイできます。
\ No newline at end of file
+EasyRPG プレイヤーで RPG ツクール 2000/2003 のゲームをどこでもプレイできます。
diff --git a/builds/android/metadata/ja-JP/title.txt b/builds/android/metadata/ja-JP/title.txt
new file mode 100644
index 000000000..52681f725
--- /dev/null
+++ b/builds/android/metadata/ja-JP/title.txt
@@ -0,0 +1 @@
+EasyRPG Player

From b2d40067597c8726bed47d9f1ee9fff09acdb088 Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel+easyrpg@mastergk.de>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 096/222] Android Metadata: Japanese translation updated

Currently translated at 66.6% (2 of 3 strings)

Android App: Japanese translation updated

Currently translated at 74.7% (89 of 119 strings)

Android Metadata: Chinese (Traditional) translation updated

Currently translated at 33.3% (1 of 3 strings)

Android Metadata: Indonesian translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: Russian translation updated

Currently translated at 96.6% (115 of 119 strings)

Android App: Japanese translation updated

Currently translated at 72.2% (86 of 119 strings)

Android App: Indonesian translation updated

Currently translated at 100.0% (119 of 119 strings)

Android App: Greek translation updated

Currently translated at 43.6% (52 of 119 strings)
---
 .../app/src/main/res/values-el/strings.xml    | 43 ++++++++++
 .../app/src/main/res/values-in/strings.xml    | 80 +++++++++++++------
 .../app/src/main/res/values-ja/strings.xml    |  6 +-
 .../app/src/main/res/values-ru/strings.xml    | 40 ++++++++++
 .../android/metadata/id/full_description.txt  | 10 +--
 .../android/metadata/id/short_description.txt |  2 +-
 builds/android/metadata/id/title.txt          |  2 +-
 .../metadata/ja-JP/full_description.txt       |  8 +-
 .../metadata/zh-TW/full_description.txt       |  2 +-
 .../metadata/zh-TW/short_description.txt      |  2 +-
 10 files changed, 156 insertions(+), 39 deletions(-)

diff --git a/builds/android/app/src/main/res/values-el/strings.xml b/builds/android/app/src/main/res/values-el/strings.xml
index 381f716e4..dd9817b5e 100644
--- a/builds/android/app/src/main/res/values-el/strings.xml
+++ b/builds/android/app/src/main/res/values-el/strings.xml
@@ -15,4 +15,47 @@
     <string name="exit_without_saving">Έξοδος χωρίς αποθήκευση</string>
     <!--GameBrowserAPI15-->
     <string name="menu">Άνοιγμα μενού Android</string>
+    <string name="autodetect">Αυτόματη επιλογή περιοχής (Προτεινόμενο)</string>
+    <string name="west_europe">Δυτική Ευρώπη</string>
+    <string name="east_europe">Κεντρική/Ανατολική Ευρώπη</string>
+    <string name="cyrillic">Κυριλλικά</string>
+    <string name="japan">Ιαπωνικά</string>
+    <string name="korean">Κορεάτικα</string>
+    <string name="chinese_simple">Κινέζικα (Απλοποιημένα)</string>
+    <string name="chinese_traditional">Κινέζικα (Παραδοσιακά)</string>
+    <string name="greek">Ελληνικά</string>
+    <string name="turkish">Τουρκικά</string>
+    <string name="hebrew">Εβραϊκά</string>
+    <string name="arabic">Αραβικά</string>
+    <string name="baltic">Βαλτικά</string>
+    <string name="thai">Tαϊλανδικά</string>
+    <string name="vietnamese">Βιετναμέζικα</string>
+    <string name="do_want_quit">Είσαι σίγουρος πως θέλεις να εγκαταλείψεις το παιχνίδι\?</string>
+    <string name="creating_dir_failed">Η δημιουργία του $PATH απέτυχε</string>
+    <string name="path_not_readable">Το $PATH δεν διαβάζετε</string>
+    <string name="no_external_storage">Δεν βρέθηκε κάρτα sd</string>
+    <string name="not_valid_game">Το $PATH δεν είναι σωστό παιχνιδι</string>
+    <string name="select_game_region">Διάλεξε περιοχή παιχνιδιού</string>
+    <string name="change_the_layout">Άλλαξε την διάταξη</string>
+    <string name="choose_layout">Διάλεξε μια διάταξη</string>
+    <string name="unknown_region">Άγνωστη περιοχή</string>
+    <string name="region_modification_failed">Αλλαγή περιοχής απέτυχε</string>
+    <string name="refresh">Επαναφορτωση</string>
+    <string name="change_default_mapping">Αλλαγή των αρχικών κουμπιων</string>
+    <string name="how_to_use_easy_rpg">Πως να χρησιμοποιήσετε το EasyRPG</string>
+    <string name="no_games_found_and_explanation_android_30">Δεν βρέθηκαν RPG Maker 2000/2003 παιχνιδια.
+\n
+\nΟ EasyRPG φάκελος που διάλεξες περιέχει έναν φάκελο ονόματι \"games\". Χρησιμοποίησε έναν διαχειριστή αρχείων για να βάλεις τον φάκελο του παιχνιδιού εκεί πέρα ή σε μορφή zip.
+\nΟ φάκελος EasyRPG μπορεί να αλλάξει στης ρυθμίσεις</string>
+    <string name="open_games_folder">Άνοιξε τον φάκελο \"games\"</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Τοποθετήστε τα παιχνίδια σας RPG Maker 2000/2003 σε υποκαταλόγους του φακέλου \"games\". Τα παιχνίδια πρέπει να είναι αποσυμπιεσμένα ή σε αρχείο ZIP.
+\nΤα αρχεία RAR, LZH και EXE ΔΕΝ υποστηρίζονται.
+\n
+\nΠροαιρετικά χαρακτηριστικά (Ανατρέξτε στις ρυθμίσεις):
+\n- Το RTP (κοινόχρηστα στοιχεία που χρησιμοποιούνται από ορισμένα παιχνίδια) μπορεί να παρέχεται
+\n- Μια προσαρμοσμένη γραμματοσειρά ήχου για να αλλάξετε τον τρόπο με τον οποίο μπορεί να παρέχεται ήχος μουσικής MIDI</string>
+    <string name="launch_debug_mode">Άνοιξε σε χρήση debug mode</string>
+    <string name="visit_website">Επισκεφτείτε την ιστοσελίδα μας</string>
+    <string name="error_no_games_folder">Ο φάκελος \"games\" δεν υπάρχει ή δεν είναι φάκελος. Δημιουργήστε το με μη αυτόματο τρόπο ή επιλέξτε διαφορετική θέση για το φάκελο EasyRPG. Ο φάκελος EasyRPG μπορεί να αλλάξει στις ρυθμίσεις.</string>
+    <string name="watch_explanation_video">Προετοιμασία και εφαρμογή παιχνιδιών (Οδηγός βίντεο)</string>
 </resources>
\ No newline at end of file
diff --git a/builds/android/app/src/main/res/values-in/strings.xml b/builds/android/app/src/main/res/values-in/strings.xml
index f6f0c50b7..aecbb9d29 100644
--- a/builds/android/app/src/main/res/values-in/strings.xml
+++ b/builds/android/app/src/main/res/values-in/strings.xml
@@ -5,17 +5,17 @@
     <string name="west_europe">Eropa Barat</string>
     <string name="east_europe">Eropa Tengah/Timur</string>
     <string name="cyrillic">Cyrillic</string>
-    <string name="japan">Bahasa Jepang</string>
-    <string name="korean">Bahasa Korea</string>
-    <string name="chinese_simple">Bahasa Mandarin (Disederhanakan)</string>
-    <string name="chinese_traditional">Bahasa Mandarin (Tradisional)</string>
-    <string name="greek">Bahasa Yunani</string>
-    <string name="turkish">Bahasa Turki</string>
+    <string name="japan">Jepang</string>
+    <string name="korean">Korea</string>
+    <string name="chinese_simple">Cina (Disederhanakan)</string>
+    <string name="chinese_traditional">Cina (Tradisional)</string>
+    <string name="greek">Yunani</string>
+    <string name="turkish">Turki</string>
     <string name="hebrew">Ibrani</string>
-    <string name="arabic">Bahasa Arab</string>
+    <string name="arabic">Arab</string>
     <string name="baltic">Baltik</string>
-    <string name="thai">Bahasa Thailand</string>
-    <string name="vietnamese">Bahasa Vietnam</string>
+    <string name="thai">Thailand</string>
+    <string name="vietnamese">Vietnam</string>
     <string name="ok">OKE</string>
     <string name="cancel">Batal</string>
     <string name="do_want_quit">Apa benar ingin keluar\?</string>
@@ -36,7 +36,7 @@
     <!--Ingame menu-->
     <string name="toggle_ui">Aktifkan tombol virtual</string>
     <string name="end_game">Matikan permainan</string>
-    <string name="report_bug">Laporkan kutu</string>
+    <string name="report_bug">Laporkan kejadian bug</string>
     <string name="report_bug_msg">Fungsi ini akan membuka aplikasi surel Anda (misal. Gmail) untuk mengirimkan kepada kami laporan kutu.
 \n
 \nJika Anda tidak ingin mengirimkan surel atau tidak punya aplikasi surel yang di konfigurasikan, Anda dapat membuka isu baru di https://github.com/EasyRPG/Player/issues sebagai gantinya.</string>
@@ -83,19 +83,20 @@
     <string name="navigation_drawer_open">Buka panel navigasi</string>
     <string name="navigation_drawer_close">Tutup panel navigasi</string>
     <string name="menu">Buka menu Android</string>
-    <string name="no_games_found_and_explanation_android_30">permainan RPG Maker 2000/2003 tidak ditemukan.
-\nletakkan permainan di subdirektori folder permainan.
-\nfolder EasyRPG bisa diubah melalui pengaturan.</string>
-    <string name="open_games_folder">buka folder permainan</string>
-    <string name="how_to_use_easy_rpg_explanation_android_30">letakkan permainan RPG Maker 2000/2003 di subdirektori folder permainan.
+    <string name="no_games_found_and_explanation_android_30">Game RPG Maker 2000/2003 tidak ditemukan.
+\nFolder EasyRPG yang Anda pilih berisi folder \"games\". Gunakan aplikasi file manager untuk meletakkan game mu di folder ini.
+\nGame dapat dimasukkan ke dalam subfolder atau di arsip ZIP.
+\nFolder EasyRPG bisa diubah di pengaturan.</string>
+    <string name="open_games_folder">Buka folder \"games\"</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Letakkan permainan RPG Maker 2000/2003 di subdirektori folder \"games\".
 \nPermainan harus sudah tidak terkompres.
 \nfile ZIP, RAR, LZH dan EXE TIDAK didukung.
 \n
-\nfitur opsional (silahkan lihat pengaturan):
-\n- RTP (aset bersama digunakan oleh beberapa permainan) dapat disajikan
-\n- soundfont kostum untuk mengubah bagaimana suara musik MIDI dapat disajikan</string>
-    <string name="easyrpg_folders">folder EasyRPG</string>
-    <string name="screen_size">ukuran layar:</string>
+\nFitur opsional (silahkan lihat pengaturan):
+\n- RTP (aset bersama digunakan oleh beberapa permainan) yang disediakan
+\n- File kustom soundfont untuk mengubah notasi suara musik MIDI yang disediakan</string>
+    <string name="easyrpg_folders">Folder EasyRPG</string>
+    <string name="screen_size">Ukuran Layar:</string>
     <string name="settings_custom_soundfont">Soundfont kostum:</string>
     <string name="open_the_sound_fonts_folder">buka folder Soundfont</string>
     <string name="settings_soundfont_explanation">letakkan soundfont dalam format SF2 pada folder \"soundfont\". Soundfont mengatur bagaimana suara MIDI terdengar.</string>
@@ -103,11 +104,11 @@
     <string name="settings_soundfont_found">soundfont ditemukan:</string>
     <string name="settings_default_soundfont">Soundfont bawaan</string>
     <string name="select_the_games_folder">pilih folder EasyRPG</string>
-    <string name="id_select_games_folder_explanation">untuk dapat mengunakan EasyRPG Player anda harus memilih folder.
-\nfolder ini khusus untuk EasyRPG Player.
+    <string name="id_select_games_folder_explanation">EasyRPG Player membutuhkan folder khusus. Setelah menyentuh tombol Anda diminta untuk memilih folder.
 \n
-\nJangan memilih folder yang berisi lainnya, seperti folder unduhan.
-\nPermainan RPG Maker 2000/2003 harus diletakan didalam subdirektori dalam folder ini.</string>
+\nJika Anda menggunakan aplikasi ini untuk pertama kali, tidak ada folder EasyRPG. Buat folder EasyRPG baru, lalu pilih itu.
+\n
+\nJika Anda menggunakan aplikasi ini sebelumnya, pilih folder EasyRPG yang ada.</string>
     <string name="Loading">memuat…</string>
     <string name="enable_rtp_support">nyalakan dukungan RTP</string>
     <string name="rtp_explanation">RTP menyediakan aset bersama yang digunakan oleh beberapa permainan.
@@ -115,7 +116,34 @@
 \nmohon diingat bahwa menyalakan dukungan RTP akan meningkatkan waktu saat memulai memuat permainan.</string>
     <string name="open_rtp_folder">buka folder RTP</string>
     <string name="horizontal_input_layout">tata letak masukan horisontal (luas)</string>
-    <string name="vertical_input_layout">tata letak masukan vertikal (foto)</string>
+    <string name="vertical_input_layout">tata letak masukan vertikal (portal)</string>
     <string name="settings_edit_layout_explanation">ketika mengedit tata letak masukan,tombol bisa ditambahkan (seperti tombol shift).
 \n untuk menambahkan tombol tekan tombol kembali dan pilih tambah tombol.</string>
-</resources>
+    <string name="scale_nearest">Naikkan Skala ke ukuran layar menggunakan neighbour terdekat (Cepat, kualitas buruk)</string>
+    <string name="scale_integer">Naikkan Skala ke beberapa resolusi game (Cepat, gambar lebih kecil, kualitas bagus)</string>
+    <string name="scale_bilinear">Naikkan Skala ke ukuran layar dan terapkan filter bilinear (Lambat, kualitas bagus)</string>
+    <string name="stretch">Abaikan rasio aspek (Rentangkan ke lebar layar)</string>
+    <string name="music_volume">Volume Musik</string>
+    <string name="sound_volume">Volume Efek Suara</string>
+    <string name="launch_debug_mode">Jalankan dengan mode debug</string>
+    <string name="visit_website">Kunjungi website</string>
+    <string name="error_no_games_folder">Folder \"games\" tidak ditemukan. Silahkan buat folder secara manual atau pilih lokasi berbeda dari folder EasyRPG. Folder EasyRPG bisa ubah dari pengaturan.</string>
+    <string name="error_games_no_rw">Folder \"games\" tidak dapat dibaca atau ditulis. Silakan pilih lokasi lain untuk folder EasyRPG. Folder EasyRPG dapat diubah di pengaturan.</string>
+    <string name="key_debug_walk_through_walls">Jalan tembus tembok (Diperlukan mode debug)</string>
+    <string name="key_debug_menu">Buka menu Debug (Diperlukan mode debug)</string>
+    <string name="settings_resolution">Resolusi Game:</string>
+    <string name="settings_resolution_desc">Mengubah resolusi dapat menyebabkan gangguan grafis atau merusak permainan. Anda telah diperingatkan!</string>
+    <string name="settings_resolution_original">Original (320x240, 4:3, Direkomendasikan)</string>
+    <string name="settings_resolution_widescreen">Widescreen (416x240, 16:9, Eksperimental)</string>
+    <string name="settings_resolution_ultrawide">Ultrawide (560x240, 21:9, Eksperimental)</string>
+    <string name="watch_explanation_video">Panduan pemakai dan menambahkan game (dengan video)</string>
+    <string name="error_saf_title">Folder buruk dipilih</string>
+    <string name="error_saf_select_easyrpg">Silahkan buat folder EasyRPG kosong dan pilih itu.</string>
+    <string name="error_saf_download_selected">Folder Download tidak dapat digunakan sebagai folder EasyRPG.</string>
+    <string name="error_saf_folder_not_empty">Folder yang dipilih berisi file lain dan tidak dapat digunakan sebagai folder EasyRPG. Saat Anda menghapus semua file di dalam folder, Anda dapat menggunakannya sebagai folder EasyRPG.</string>
+    <string name="error_saf_bad_content_provider">Folder yang dipilih tidak dapat digunakan sebagai folder EasyRPG. Masalah ini dapat terjadi karena berbagai alasan, misalnya jika Anda telah memilih direktori root atau lokasi penyimpanan di cloud.
+\n
+\n</string>
+    <string name="fast_forward_mode_hold">tahan</string>
+    <string name="fast_forward_mode_tap">tekan</string>
+</resources>
\ No newline at end of file
diff --git a/builds/android/app/src/main/res/values-ja/strings.xml b/builds/android/app/src/main/res/values-ja/strings.xml
index ce1bac9bc..9c9b22bfe 100644
--- a/builds/android/app/src/main/res/values-ja/strings.xml
+++ b/builds/android/app/src/main/res/values-ja/strings.xml
@@ -99,4 +99,8 @@
     <string name="error_saf_select_easyrpg">EasyRPGのアプリで使用する専用の空フォルダーを作成し、アプリ内で設定してください。</string>
     <string name="fast_forward_mode_hold">ホールド</string>
     <string name="fast_forward_mode_tap">タップ</string>
-</resources>
+    <string name="how_to_use_easy_rpg_explanation_android_30">RPG Maker 2000/2003 ゲームを「games」フォルダーのサブディレクトリに置きます。 ゲームは解凍するか、ZIP アーカイブにする必要があります。 RAR、LZH、EXE ファイルはサポートされていません。 オプション機能 (設定を参照してください): - RTP（一部のゲームで使用される共有アセット）の提供が可能 - MIDI音楽のサウンドを変更するカスタムサウンドフォントを提供可能</string>
+    <string name="launch_debug_mode">デバッグモードで起動</string>
+    <string name="error_no_games_folder">\" games \"フォルダが存在しないか、フォルダになっていません。手動で作成するか、\" EasyRPG \"フォルダの別の場所を選択してください。\" EasyRPG \"フォルダは設定で変更できます。</string>
+    <string name="error_games_no_rw">\" games \"フォルダが読み書きできません。\" EasyRPG \"フォルダは別の場所を選択してください。\" EasyRPG \"フォルダは設定で変更できます。</string>
+</resources>
\ No newline at end of file
diff --git a/builds/android/app/src/main/res/values-ru/strings.xml b/builds/android/app/src/main/res/values-ru/strings.xml
index 7969c9129..ef56bcf67 100644
--- a/builds/android/app/src/main/res/values-ru/strings.xml
+++ b/builds/android/app/src/main/res/values-ru/strings.xml
@@ -99,4 +99,44 @@
     <string name="settings_resolution_original">Изначально (320х240, 4:3, рекомендовано)</string>
     <string name="settings_resolution_widescreen">Широкоформатный (416x240, 16:9, Экспериментальный)</string>
     <string name="settings_resolution_ultrawide">Сверхшироформатный (560x240, 21:9, экспериментальный)</string>
+    <string name="open_games_folder">Открыть папку с играми (games)</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Поместите свои игры RPG Maker 2000/2003 в подкаталоги папки «games».
+\nИгры должны быть в несжатом виде или в ZIP-архиве.
+\nФайлы RAR, LZH и EXE НЕ поддерживаются.
+\n
+\nДополнительные функции (см. настройки):
+\n- Может быть предоставлен RTP (общие активы, используемые некоторыми играми).
+\n- Пользовательский звуковой шрифт для изменения того, как могут быть предоставлены звуки MIDI-музыки.</string>
+    <string name="settings_soundfont_explanation">Поместите звуковые шрифты в формате SF2 в папку «soundfonts». Soundfonts изменяют звучание MIDI-музыки.</string>
+    <string name="settings_soundfont_restart_app">Пожалуйста, закройте и перезапустите приложение после выбора soundfont.</string>
+    <string name="settings_default_soundfont">Обычный soundfount</string>
+    <string name="select_the_games_folder">Выберите папку EasyRPG</string>
+    <string name="id_select_games_folder_explanation">Для EasyRPG Player требуется отдельная папка. После нажатия на кнопку вам будет предложено выбрать папку.
+\n
+\nЕсли вы используете это приложение впервые, папки EasyRPG не будет. Создайте новую папку EasyRPG а затем выберите еë.
+\n
+\nЕсли вы использовали это приложение раньше, выберите существующую папку EasyRPG.</string>
+    <string name="Loading">Загрузка…</string>
+    <string name="enable_rtp_support">Включить поддержку RTP</string>
+    <string name="rtp_explanation">RTP предоставляет общие активы, используемые некоторыми играми.
+\nПоместите RPG Maker 2000 RTP в «rtp/2000», а RPG Maker 2003 RTP в «rtp/2003».
+\nОбратите внимание, что включение поддержки RTP значительно увеличит время загрузки игры.</string>
+    <string name="open_rtp_folder">Откройте папку RTP</string>
+    <string name="horizontal_input_layout">Горизонтальный (альбомный) интерфейс ввода</string>
+    <string name="vertical_input_layout">Вертикальный (книжный) интерфейс ввода</string>
+    <string name="scale_nearest">Масштабирование до размера экрана с использованием ближайших пикселей (быстро, плохое качество)</string>
+    <string name="scale_integer">Масштабирование до кратного разрешению игры (быстро, изображение меньшего размера, хорошее качество)</string>
+    <string name="music_volume">Громкость музыки</string>
+    <string name="sound_volume">Громкость музыкальных эффектов</string>
+    <string name="error_no_games_folder">Папка \"games\" не существует или не является папкой. Пожалуйста, создайте его вручную или выберите другое место для папки EasyRPG. Папку EasyRPG можно изменить в настройках.</string>
+    <string name="watch_explanation_video">Начало работы и добавление игр (видеогайд)</string>
+    <string name="error_saf_title">Плохой выбор папки</string>
+    <string name="error_saf_select_easyrpg">Пожалуйста, создайте пустую папку EasyRPG и выберите ее.</string>
+    <string name="error_saf_download_selected">Папка Download не может использоваться как папка EasyRPG.</string>
+    <string name="error_saf_folder_not_empty">Выбранная папка содержит другие файлы и не может использоваться в качестве папки EasyRPG. Когда вы удалите все файлы внутри папки, вы сможете использовать ее как папку EasyRPG.</string>
+    <string name="error_saf_bad_content_provider">Выбранную папку нельзя использовать в качестве папки EasyRPG. Эта проблема может возникнуть по разным причинам, например, если вы выбрали корневой каталог или место хранения в облаке.
+\n
+\n</string>
+    <string name="fast_forward_mode_hold">Удерживать</string>
+    <string name="fast_forward_mode_tap">Нажимать</string>
 </resources>
\ No newline at end of file
diff --git a/builds/android/metadata/id/full_description.txt b/builds/android/metadata/id/full_description.txt
index 0b5462dcd..44a4a11dd 100644
--- a/builds/android/metadata/id/full_description.txt
+++ b/builds/android/metadata/id/full_description.txt
@@ -1,7 +1,7 @@
-EasyRPG Player adalah aplikasi yang mengizinkan kalian untuk bermain permainan yang dibuat dengan RPG Maker 2000 dan RPG Maker 2003 (RPG engine versi terbaru seperti XP, VX, VX Ace dan MV tidak di dukung).
+Dengan EasyRPG Player, Anda dapat memainkan game yang dibuat dengan RPG Maker 2000 dan RPG Maker 2003. Mesin yang lebih baru seperti XP, VX, MV, dan MZ tidak didukung.
 
-Halaman Situs: https://easyrpg.org/
-Daftar Perubahan: https://blog.easyrpg.org/
-Pelaporan Kutu: https://github.com/EasyRPG/Player/issues/
+EasyRPG Player bukan editor. Anda tidak dapat membuat game sendiri dengannya.
 
-Aplikasi ini tidak berafiliasi dengan Kadokawa Corporation.
\ No newline at end of file
+Homepage: https://easyrpg.org/
+
+Aplikasi ini tidak berafiliasi dengan Kadokawa Corporation.
diff --git a/builds/android/metadata/id/short_description.txt b/builds/android/metadata/id/short_description.txt
index 4f5a06964..bb31364f5 100644
--- a/builds/android/metadata/id/short_description.txt
+++ b/builds/android/metadata/id/short_description.txt
@@ -1 +1 @@
-Mainkan game RPG Maker 2000 & 2003 kalian dimana saja dengan EasyRPG Player.
\ No newline at end of file
+Mainkan game RPG Maker 2000 & 2003 kalian dimana saja.
diff --git a/builds/android/metadata/id/title.txt b/builds/android/metadata/id/title.txt
index 70636ba80..52681f725 100644
--- a/builds/android/metadata/id/title.txt
+++ b/builds/android/metadata/id/title.txt
@@ -1 +1 @@
-EasyRPG untuk RPG Maker 2000
\ No newline at end of file
+EasyRPG Player
diff --git a/builds/android/metadata/ja-JP/full_description.txt b/builds/android/metadata/ja-JP/full_description.txt
index 626836da7..0668b28e3 100644
--- a/builds/android/metadata/ja-JP/full_description.txt
+++ b/builds/android/metadata/ja-JP/full_description.txt
@@ -1,8 +1,10 @@
-EasyRPGプレイヤーは、RPGツクール2000/2003で制作されたゲームを遊ぶためのアプリです。
-（現在のところ、RPGツクールXP/VX/VX Ace/MVは非対応です。）
+EasyRPG Playerは、RPGツクール2000/2003で制作されたゲームを遊ぶためのアプリです。
+（現在のところ、RPGツクールXP/VX/VX Ace/MV/MZは非対応です。）
+
+EasyRPG Playerはエディターではありません。このソフトを使ってゲームを作ることはできません。
 
 公式サイト: https://easyrpg.org/
 更新履歴: https://blog.easyrpg.org/
 バグ報告先: https://github.com/EasyRPG/Player/issues/
 
-このアプリは、KADOKAWAと提携していません
+このアプリは、KADOKAWAと提携していません。
diff --git a/builds/android/metadata/zh-TW/full_description.txt b/builds/android/metadata/zh-TW/full_description.txt
index 489732e56..bcbc60f36 100644
--- a/builds/android/metadata/zh-TW/full_description.txt
+++ b/builds/android/metadata/zh-TW/full_description.txt
@@ -4,4 +4,4 @@ EasyRPG Player 是個可以玩用 RPG Maker 2000 和 RPG Maker 2003 做的遊戲
 更新紀錄：https://blog.easyrpg.org/
 錯誤回報：https://github.com/EasyRPG/Player/issues/
 
-本 App 與 Kadokawa Corporation 沒有關連。
\ No newline at end of file
+本 App 與 Kadokawa Corporation 沒有關連。
diff --git a/builds/android/metadata/zh-TW/short_description.txt b/builds/android/metadata/zh-TW/short_description.txt
index ba65db5d7..da16bafe4 100644
--- a/builds/android/metadata/zh-TW/short_description.txt
+++ b/builds/android/metadata/zh-TW/short_description.txt
@@ -1 +1 @@
-無論何時何地，用 EasyRPG Player 玩你的 RPG Maker 2000 和 2003 遊戲。
\ No newline at end of file
+在任何地方玩你的 RPG Maker 2000 和 2003 遊戲。

From be9d3f345d409f748665fd840e1b530b02dfeb7f Mon Sep 17 00:00:00 2001
From: crazep <wdyocmwyh@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 097/222] Android App: Portuguese (Brazil) translation updated

Currently translated at 84.0% (100 of 119 strings)
---
 .../src/main/res/values-pt-rBR/strings.xml    | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/builds/android/app/src/main/res/values-pt-rBR/strings.xml b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
index 65b10e574..4fb501a72 100644
--- a/builds/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -53,8 +53,8 @@
     <string name="settings">Configurações</string>
     <string name="enable_vibration">Habilitar vibrações</string>
     <string name="vibrate_when_sliding_direction">Vibrar ao deslizar em outra direção</string>
-    <string name="input_layout_transparency">Transparência do layout de entrada</string>
-    <string name="ignore_size_settings">Ignorar configurações do tamanho dos botões e usar isso para todos botões</string>
+    <string name="input_layout_transparency">Transparência do layout de entrada:</string>
+    <string name="ignore_size_settings">Ignorar configurações do tamanho dos botões e usar isso para todos botões:</string>
     <string name="no_read_access_on_dir">Sem acesso de leitura em %1$s</string>
     <string name="quick_access">Acesso rápido</string>
     <string name="force_landscape_mode">Forçar modo de orientação Paisagem</string>
@@ -83,7 +83,7 @@
     <string name="navigation_drawer_open">Abrir menu</string>
     <string name="navigation_drawer_close">Fechar menu</string>
     <string name="menu">Abrir menu Android</string>
-    <string name="open_games_folder">Abrir a pasta de jogos</string>
+    <string name="open_games_folder">Abrir a pasta de jogos (games)</string>
     <string name="screen_size">Tamanho da tela:</string>
     <string name="Loading">Carregando…</string>
     <string name="enable_rtp_support">Ativar suporte ao RTP</string>
@@ -96,15 +96,34 @@
 \nGames pode ser posta em subpasta ou em arquivos ZIP.
 \n
 \nA pasta do EasyRPG pode ser mudada nas configurações.</string>
-    <string name="how_to_use_easy_rpg_explanation_android_30">Coloque seus games de RPG Maker 2000 e 2003 em subpasta da pasta \"games\"
+    <string name="how_to_use_easy_rpg_explanation_android_30">Coloque seus jogos de RPG Maker 2000 e 2003 em subpasta da pasta \"games\".
 \nJogos devem ser descomprimidos em um arquivo ZIP.
 \nArquivos no formato RAR, LZH e EXE não são suportados.
 \n
 \nRecursos opcionais (consulte as configurações):
-\n- O RTP (assets compartilhados e usados em alguns jogos) podem ser fornecidos
-\n- Um soundfont personalizado para alterar como os sons da música midi podem ser fornecidos</string>
+\n- O RTP (assets compartilhados e usados em alguns jogos) podem ser fornecidos.
+\n- Um soundfont personalizado para alterar como os sons da música MIDI podem ser fornecidos</string>
     <string name="launch_debug_mode">Executar no modo de depuração</string>
     <string name="visit_website">Visite nosso website</string>
     <string name="error_games_no_rw">A pasta \"Games\" não é legível ou gravável. Selecione um local diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
     <string name="watch_explanation_video">Iniciando e adicionando jogos (Vídeo Explicativo)</string>
+    <string name="easyrpg_folders">Pastas EasyRPG</string>
+    <string name="open_the_sound_fonts_folder">Abra a pasta de soundfonts</string>
+    <string name="settings_soundfont_restart_app">Por favor, saia e reinicie o aplicativo após selecionar a soundfont.</string>
+    <string name="settings_soundfont_found">Soundfonts encontrados;):</string>
+    <string name="settings_default_soundfont">Soundfont padrão</string>
+    <string name="id_select_games_folder_explanation">O EasyRPG Player requer uma pasta única. Após tocar no botão, você será perguntado para selecionar uma pasta.
+\n
+\nSe você está usando este aplicativo pela primeira vez, não existe a pasta EasyRPG. Crie uma nova pasta EasyRPG e então selecione.
+\n
+\nSe você já usou este aplicativo antes, selecione a pasta EasyRPG existente.</string>
+    <string name="open_rtp_folder">Abra a pasta de RTP</string>
+    <string name="music_volume">Volume da música</string>
+    <string name="sound_volume">Volume do efeito sonoro</string>
+    <string name="error_no_games_folder">A pasta de jogos (games) não existe ou não é uma pasta. Por favor, crie manualmente ou selecione uma localização diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
+    <string name="settings_resolution">Resolução do jogo:</string>
+    <string name="settings_resolution_original">Original (320x240, 4:3, Recomendado)</string>
+    <string name="error_saf_select_easyrpg">Por favor, crie uma pasta EasyRPG vazia e selecione.</string>
+    <string name="error_saf_download_selected">A pasta de Download não pode ser usada para a pasta de EasyRPG.</string>
+    <string name="error_saf_folder_not_empty">A pasta selecionada contém outros arquivos e não pode ser usada para a pasta EasyRPG. Quando você remover todos os arquivos de dentro da pasta, você poderá utilizar como a pasta EasyRPG.</string>
 </resources>
\ No newline at end of file

From 4847e49bde2cdb01745bbb92d27ea6dce5312d9e Mon Sep 17 00:00:00 2001
From: Carbonara <malicecarbonara@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 098/222] Android Metadata: French translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: French translation updated

Currently translated at 100.0% (119 of 119 strings)

Android App: French translation updated

Currently translated at 100.0% (119 of 119 strings)
---
 .../app/src/main/res/values-fr/strings.xml       | 16 ++++++++--------
 .../android/metadata/fr-FR/full_description.txt  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builds/android/app/src/main/res/values-fr/strings.xml b/builds/android/app/src/main/res/values-fr/strings.xml
index 8e8a75ba0..13fdc8716 100644
--- a/builds/android/app/src/main/res/values-fr/strings.xml
+++ b/builds/android/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <string name="report_bug">Signaler un bug</string>
     <string name="report_bug_msg">Cette fonctionnalité va ouvrir votre application d\'e-mail (ex. Gmail) pour nous envoyer un rapport de bug.
 \n
-\nSi vous ne voulez pas nous envoyer un e-mail ou que vous n\'avez pas d\'application d\'e-mail configurée vous pouvez ouvrir une nouvelle issue à https://github.com/EasyRPG/Player/issues à la place.</string>
+\nSi vous ne voulez pas nous envoyer un e-mail ou que vous n\'avez pas d\'application d\'e-mail configurée, vous pouvez ouvrir une nouvelle issue à https ://github.com/EasyRPG/Player/issues à la place.</string>
     <string name="report_bug_mail">Merci d\'aider EasyRPG Player.
 \nUn fichier de log et vos sauvegardes ont été placés en pièce jointe de cet e-mail.
 \nVeuillez ne pas supprimer le fichier de log ! Nous avons besoin d\'une sauvegarde qui est proche du lieu de votre bug pour pouvoir le reproduire facilement.
@@ -61,7 +61,7 @@
     <!--InputLayout Managing-->
     <string name="manage_input_layouts">Gérer l\'agencement des boutons :</string>
     <string name="edit_name">Changer le nom</string>
-    <string name="edit_layout">Changer l\'agencement</string>
+    <string name="edit_layout">Modifier l\'agencement</string>
     <string name="delete">Supprimer</string>
     <string name="default_layout">Par défaut</string>
     <!--ButtonMapping Activity-->
@@ -90,8 +90,8 @@
 \nLes jeux doivent être décompressés ou dans une archive ZIP.
 \nLes fichiers RAR, LZH et EXE ne sont PAS supportés.
 \n
-\nFonctionnalités optionnelles (Veuillez vous référer aux paramètres) :
-\n- Le RTP (assets partagés utilisés par certains jeux) peut être fourni
+\nFonctionnalités optionnelles (Veuillez vous référer aux paramètres) :
+\n- Le RTP (ressources partagées utilisées par certains jeux) peut être fourni
 \n- Un soundfont personnalisé pour altérer comment sonnent les musiques MIDI peut être fourni</string>
     <string name="easyrpg_folders">Dossiers EasyRPG</string>
     <string name="screen_size">Agrandissement de l\'écran :</string>
@@ -102,9 +102,9 @@
     <string name="settings_soundfont_found">Soundfonts trouvés :</string>
     <string name="settings_default_soundfont">Soundfont par défaut</string>
     <string name="select_the_games_folder">Choisir le dossier d\'EasyRPG</string>
-    <string name="id_select_games_folder_explanation">EasyRPG Player a besoin d\'un dossier dédié. Après avoir appuyé sur le bouton vous serez demandé de sélectionner un dossier.
+    <string name="id_select_games_folder_explanation">EasyRPG Player a besoin d\'un dossier dédié. Après avoir appuyé sur le bouton, vous serez demandé de sélectionner un dossier.
 \n
-\nSi vous utilisez cette application pour la première fois, il n\'y a pas de dossier EasyRPG. Créez un nouveau dossier EasyRPG et sélectionnez-le.
+\nSi vous utilisez cette application pour la première fois, il ne devrait pas y avoir de dossier EasyRPG. Créez donc un nouveau dossier EasyRPG puis sélectionnez-le.
 \n
 \nSi vous avez utilisé cette application auparavant, veuillez sélectionner le dossier EasyRPG existant.</string>
     <string name="Loading">Chargement…</string>
@@ -116,7 +116,7 @@
     <string name="horizontal_input_layout">Agencement horizontal (paysage) des contrôles</string>
     <string name="vertical_input_layout">Agencement vertical (portrait) des contrôles</string>
     <string name="settings_edit_layout_explanation">Lorsque vous éditez un agencement des boutons, des boutons peuvent être ajoutés (ex. un bouton Maj).
-\n Pour ajouter un bouton appuyez sur le bouton retour et choisissez Ajouter un bouton.</string>
+\n Pour ajouter un bouton, appuyez sur le bouton retour et choisissez Ajouter un bouton.</string>
     <string name="scale_nearest">Agrandir à la taille de l\'écran en utilisant l\'agrandissement le plus proche (Rapide, mauvaise qualité)</string>
     <string name="scale_integer">Agrandir à un multiple de la résolution du jeu (Rapide, petite image, bonne qualité)</string>
     <string name="scale_bilinear">Agrandir à la taille de l\'écran et appliquer un filtre bilinéaire (Lent, bonne qualité)</string>
@@ -125,7 +125,7 @@
     <string name="sound_volume">Volume des effets sonores</string>
     <string name="launch_debug_mode">Démarrer en mode de débogage</string>
     <string name="visit_website">Visiter notre site web</string>
-    <string name="error_no_games_folder">Le dossier « games » n\'existe pas ou n\'est pas un dossier. Veuillez le créer manuellement ou sélectionner un lieu différent pour le dossier d\'EasyRPG. Le dossier d\'EasyRPG peut être changé dans les paramètres.</string>
+    <string name="error_no_games_folder">Le dossier « games » n\'existe pas ou n\'est pas un dossier. Veuillez le créer manuellement ou sélectionner un emplacement différent pour le dossier d\'EasyRPG. Le dossier d\'EasyRPG peut être changé dans les paramètres.</string>
     <string name="error_games_no_rw">Le dossier « games » n\'a pas pu être lu ou n\'a pas pu être écrit. Veuillez sélectionner un emplacement différent pour le dossier d\'EasyRPG. Le dossier d\'EasyRPG peut être changé dans les paramètres.</string>
     <string name="key_debug_walk_through_walls">Marcher à travers les murs (Nécessite le mode de débogage)</string>
     <string name="key_debug_menu">Ouvrir le menu de débogage (Nécessite le mode de débogage)</string>
diff --git a/builds/android/metadata/fr-FR/full_description.txt b/builds/android/metadata/fr-FR/full_description.txt
index e377bf2f2..15603e2dd 100644
--- a/builds/android/metadata/fr-FR/full_description.txt
+++ b/builds/android/metadata/fr-FR/full_description.txt
@@ -1,7 +1,7 @@
-Avec EasyRPG Player vous pouvez jouer à des jeux créés avec RPG Maker 2000 et RPG Maker 2003. Les moteurs de jeu plus récents tels que XP, VX, MV et MZ ne sont pas supportés.
+Avec EasyRPG Player, vous pouvez jouer à des jeux créés avec RPG Maker 2000 et RPG Maker 2003. Les moteurs de jeu plus récents tels que XP, VX, MV et MZ ne sont pas supportés.
 
 EasyRPG Player n'est pas un éditeur. Vous ne pouvez pas créer vos propres jeux avec.
 
-Site web : https://easyrpg.org/
+Site web : https ://easyrpg.org/
 
 Cette application n'est pas affiliée à Kadokawa Corporation.

From a79b65e9b3451f93b592257aef81e29916462b2d Mon Sep 17 00:00:00 2001
From: Daniel Paim de Mattos Oliveira <danzpaim@gmail.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 099/222] Android App: Portuguese (Brazil) translation updated

Currently translated at 99.1% (118 of 119 strings)

Android Metadata: Portuguese (Brazil) translation updated

Currently translated at 66.6% (2 of 3 strings)

Android App: Portuguese (Brazil) translation updated

Currently translated at 95.7% (114 of 119 strings)

Android App: Portuguese (Brazil) translation updated

Currently translated at 94.9% (113 of 119 strings)
---
 .../src/main/res/values-pt-rBR/strings.xml    | 37 +++++++++++++++----
 .../metadata/pt-BR/full_description.txt       |  2 +-
 .../metadata/pt-BR/short_description.txt      |  2 +-
 builds/android/metadata/pt-BR/title.txt       |  2 +-
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/builds/android/app/src/main/res/values-pt-rBR/strings.xml b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
index 4fb501a72..9aee5e545 100644
--- a/builds/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -26,17 +26,17 @@
     <string name="no_external_storage">Mídia externa não encontrada (Ex. cartão SD)</string>
     <string name="not_valid_game">$PATH não é um jogo válido</string>
     <string name="select_game_region">Escolha a região do jogo</string>
-    <string name="change_the_layout">Mudar layout</string>
-    <string name="choose_layout">Escolha layout</string>
+    <string name="change_the_layout">Mudar leiaute</string>
+    <string name="choose_layout">Escolha leiaute</string>
     <string name="unknown_region">Região desconhecida</string>
     <string name="region_modification_failed">Falha ao tentar mudar região</string>
     <string name="refresh">Atualizar</string>
     <string name="change_default_mapping">Reconfigurar botões</string>
-    <string name="how_to_use_easy_rpg">Como usar o EasyRPG player</string>
+    <string name="how_to_use_easy_rpg">Como usar o interpretador EasyRPG</string>
     <!--Ingame menu-->
     <string name="toggle_ui">Alternar botões virtuais</string>
     <string name="end_game">Finalizar Jogo</string>
-    <string name="report_bug">Reportar erro</string>
+    <string name="report_bug">Relatar erro</string>
     <string name="report_bug_msg">Esta função irá abrir seu programa de e-mail (ex. Gmail) para nos enviar um relatório de bug.
 \n
 \nSe você não quiser enviar um e-mail ou não tem um programa de e-mail configurado você pode abrir um novo relatório em https://github.com/EasyRPG/Player/issues .</string>
@@ -67,12 +67,12 @@
     <!--InputLayout Managing-->
     <string name="manage_input_layouts">Gerenciar layouts de entrada:</string>
     <string name="edit_name">Editar nome</string>
-    <string name="edit_layout">Editar layout</string>
-    <string name="delete">Deletar</string>
+    <string name="edit_layout">Editar leiaute</string>
+    <string name="delete">Apagar</string>
     <string name="default_layout">Padrão</string>
     <!--ButtonMapping Activity-->
     <string name="add_a_button">Adicionar botão</string>
-    <string name="reset_button_mapping">Resetar mapeamento de botões</string>
+    <string name="reset_button_mapping">Redefinir mapeamento de botões</string>
     <string name="exit_without_saving">Sair sem salvar</string>
     <string name="save_and_quit">Salvar e sair</string>
     <string name="key_enter">Enter (Z)</string>
@@ -110,7 +110,7 @@
     <string name="easyrpg_folders">Pastas EasyRPG</string>
     <string name="open_the_sound_fonts_folder">Abra a pasta de soundfonts</string>
     <string name="settings_soundfont_restart_app">Por favor, saia e reinicie o aplicativo após selecionar a soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts encontrados;):</string>
+    <string name="settings_soundfont_found">Soundfonts encontrados:</string>
     <string name="settings_default_soundfont">Soundfont padrão</string>
     <string name="id_select_games_folder_explanation">O EasyRPG Player requer uma pasta única. Após tocar no botão, você será perguntado para selecionar uma pasta.
 \n
@@ -126,4 +126,25 @@
     <string name="error_saf_select_easyrpg">Por favor, crie uma pasta EasyRPG vazia e selecione.</string>
     <string name="error_saf_download_selected">A pasta de Download não pode ser usada para a pasta de EasyRPG.</string>
     <string name="error_saf_folder_not_empty">A pasta selecionada contém outros arquivos e não pode ser usada para a pasta EasyRPG. Quando você remover todos os arquivos de dentro da pasta, você poderá utilizar como a pasta EasyRPG.</string>
+    <string name="error_saf_bad_content_provider">A pasta selecionada não pode ser usada como pasta do EasyRPG. Este problema pode ocorrer por várias razões, por exemplo se você selecionou o diretório raíz ou localização armazenada na nuvem.
+\n
+\n</string>
+    <string name="settings_custom_soundfont">Soundfont personalizada:</string>
+    <string name="scale_bilinear">Redimensionar para o tamanho da tela e aplicar um filtro bilinear(Lento, boa qualidade)</string>
+    <string name="settings_resolution_desc">Alterar a resolução pode causar falhas gráficas ou interromper o jogo. Você foi avisado!</string>
+    <string name="select_the_games_folder">Selecionar a pasta EasyRPG</string>
+    <string name="vertical_input_layout">Leiaute de entrada vertical (Retrato)</string>
+    <string name="error_saf_title">Pasta ruim selecionada</string>
+    <string name="key_debug_menu">Abrir menu de debug (requer modo de debug)</string>
+    <string name="scale_integer">"Redimensionar para um  múltiplo da resolução do jogo (Rápido, imagem menor, boa qualidade)"</string>
+    <string name="settings_soundfont_explanation">"Colocar soundfonts no formato SF2 na pasta \"soundfonts\". Soundfonts altera como as músicas em  formato MIDI reproduzem o som."</string>
+    <string name="key_debug_walk_through_walls">Atravessar paredes (Requer modo de debug)</string>
+    <string name="horizontal_input_layout">Leiaute de entrada horizontal (Paisagem)</string>
+    <string name="stretch">"Ignorar proporção  (esticar até a largura da tela)"</string>
+    <string name="settings_edit_layout_explanation">Ao editar o leiaute de entrada, botões poder ser adicionados(ex. botão Shift).
+\nPara adicionar um botão, pressione o botão voltar e selecione adicionar botão.</string>
+    <string name="settings_resolution_widescreen">Panorâmico (416x240, 16:9, Experimental)</string>
+    <string name="settings_resolution_ultrawide">Ultrapanorâmico (560x240, 21:9, Experimental)</string>
+    <string name="fast_forward_mode_tap">tocar</string>
+    <string name="fast_forward_mode_hold">manter</string>
 </resources>
\ No newline at end of file
diff --git a/builds/android/metadata/pt-BR/full_description.txt b/builds/android/metadata/pt-BR/full_description.txt
index 142a18852..248ddcded 100644
--- a/builds/android/metadata/pt-BR/full_description.txt
+++ b/builds/android/metadata/pt-BR/full_description.txt
@@ -4,4 +4,4 @@ Página inicial: https://easyrpg.org/
 Changelog (novidades/mudanças): https://blog.easyrpg.org/
 Reportar Erros/Bugs: https://github.com/EasyRPG/Player/issues/
 
-Este aplicativo não é afiliado com a Kadokawa Corporation.
\ No newline at end of file
+Este aplicativo não é afiliado com a Kadokawa Corporation.
diff --git a/builds/android/metadata/pt-BR/short_description.txt b/builds/android/metadata/pt-BR/short_description.txt
index 6c530029a..ab7d8a56a 100644
--- a/builds/android/metadata/pt-BR/short_description.txt
+++ b/builds/android/metadata/pt-BR/short_description.txt
@@ -1 +1 @@
-Jogue qualquer jogo de RPG Maker 2000 e 2003 com o EasyRPG Player.
\ No newline at end of file
+Jogue qualquer jogo de RPG Maker 2000 e 2003 com o reprodutor EasyRPG.
diff --git a/builds/android/metadata/pt-BR/title.txt b/builds/android/metadata/pt-BR/title.txt
index 3fa319f6f..ba1b02a6d 100644
--- a/builds/android/metadata/pt-BR/title.txt
+++ b/builds/android/metadata/pt-BR/title.txt
@@ -1 +1 @@
-EasyRPG para RPG Maker 2000
\ No newline at end of file
+Reprodutor EasyRPG

From cae5405984844196c2dca30f5e59f337f1fc197d Mon Sep 17 00:00:00 2001
From: Jesse5800 <zhengnobita2589@163.com>
Date: Mon, 20 May 2024 21:07:59 +0000
Subject: [PATCH 100/222] Android Metadata: Chinese (Traditional) translation
 updated

Currently translated at 100.0% (3 of 3 strings)

Android Metadata: Chinese (Simplified) translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: Chinese (Traditional) translation updated

Currently translated at 100.0% (119 of 119 strings)
---
 .../src/main/res/values-zh-rTW/strings.xml    | 65 ++++++++++++++++---
 .../metadata/zh-CN/full_description.txt       |  4 +-
 .../metadata/zh-CN/short_description.txt      |  2 +-
 builds/android/metadata/zh-CN/title.txt       |  1 +
 .../metadata/zh-TW/full_description.txt       |  2 +-
 builds/android/metadata/zh-TW/title.txt       |  1 +
 6 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 builds/android/metadata/zh-CN/title.txt
 create mode 100644 builds/android/metadata/zh-TW/title.txt

diff --git a/builds/android/app/src/main/res/values-zh-rTW/strings.xml b/builds/android/app/src/main/res/values-zh-rTW/strings.xml
index 0e56c2ef8..931091f69 100644
--- a/builds/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/builds/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -18,7 +18,7 @@
     <string name="vietnamese">越南語</string>
     <string name="ok">完成</string>
     <string name="cancel">取消</string>
-    <string name="do_want_quit">確定要退出？</string>
+    <string name="do_want_quit">確定要退出嗎？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="creating_dir_failed">建立 $PATH 路徑失敗</string>
@@ -36,12 +36,12 @@
     <!--Ingame menu-->
     <string name="toggle_ui">隱藏 / 顯示虛擬按鈕</string>
     <string name="end_game">結束遊戲</string>
-    <string name="report_bug">回報問題</string>
-    <string name="report_bug_msg">這將會開啟您的 e-mail 程式 (如Gmail) 來寄錯誤回報給我們。
+    <string name="report_bug">報告問題</string>
+    <string name="report_bug_msg">這將會開啟您的 E-mail 程式 (如Gmail) 來將錯誤報告給我們。
 \n
-\n如果不想要寄信或是沒有可用的 e-mail 程式的話，可以到 https://github.com/EasyRPG/Player/issues 來開一個新的 issue。</string>
+\n如果不想發送E-mail或是沒有可用的 E-mail 程式的話，可以到 https://github.com/EasyRPG/Player/issues 來開啟一個新的 Issue。</string>
     <string name="report_bug_mail">謝謝您支持 EasyRPG Player。
-\n 一個紀錄 (logfile) 以及您的存檔已經附加到此 e-mail 上。
+\n 一個紀錄 (logfile) 以及您的存檔已經附加到此 E-mail 上。
 \n 請不要移除它們！我們需要存檔以便知道是在遊戲中何處出錯。
 \n 請詳細地告訴我們發生了什麼事。
 \n
@@ -83,11 +83,15 @@
     <string name="navigation_drawer_open">開啟側邊欄</string>
     <string name="navigation_drawer_close">關閉側邊欄</string>
     <string name="menu">開啟 Android 選單</string>
-    <string name="no_games_found_and_explanation_android_30">沒有找到 RPG Maker 2000/2003 的遊戲。請將它們放在遊戲資料夾下的子目錄內。
-\nEasyRPG 的資料夾可以在設定裡變更。</string>
-    <string name="open_games_folder">開啟遊戲資料夾</string>
+    <string name="no_games_found_and_explanation_android_30">沒有找到基於RPG Maker 2000/2003 的遊戲。
+\n
+\n您選擇的EasyRPG資料夾下有一個「games」資料夾。使用一個檔案管理器來向這個資料夾添加遊戲。
+\n遊戲可以放在子目錄下，也可以讀取使用ZIP壓縮檔案壓縮的遊戲。
+\n
+\nEasyRPG資料夾的位置可以在設定中變更。</string>
+    <string name="open_games_folder">開啟「games」資料夾</string>
     <string name="easyrpg_folders">EasyRPG 資料夾</string>
-    <string name="screen_size">螢幕大小：</string>
+    <string name="screen_size">遊戲分辨率大小：</string>
     <string name="select_the_games_folder">選取 EasyRPG 資料夾</string>
     <string name="id_select_games_folder_explanation">使用 EasyRPG Player 必須先選取一個資料夾。
 \n這個資料夾應該要是只給 EasyRPG Player 使用的。
@@ -104,4 +108,45 @@
     <string name="vertical_input_layout">縱向按鍵配置方案</string>
     <string name="settings_edit_layout_explanation">編輯按鍵配置方案時可以新增如 Shift 鈕的按鈕。
 \n要新增一個按鈕，點擊「返回」鍵後選擇「新增按鈕」。</string>
-</resources>
+    <string name="settings_soundfont_restart_app">當你選擇了一個音樂聲庫以後，請退出並重新啟動應用程式。</string>
+    <string name="settings_resolution_widescreen">寬屏（416x240，16:9比例，實驗性）</string>
+    <string name="error_saf_folder_not_empty">選擇的資料夾裡面包括了其他的檔案，不能用作EasyRPG的默認資料夾。當你移除了裡面的其他檔案時，就可以使用這個資料夾了。</string>
+    <string name="open_the_sound_fonts_folder">打開音樂聲庫資料夾</string>
+    <string name="error_saf_bad_content_provider">所選資料夾不能用作EasyRPG資料夾。 此問題可能由於各種原因而發生，例如，如果您選擇了根目錄或者是一個雲盤中的位置。
+\n
+\n</string>
+    <string name="sound_volume">音效音量</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">將你的RPG Maker 2000/2003遊戲放在「games」資料夾的子目錄下。
+\n
+\n你需要解壓你的遊戲，或者確保遊戲被打包在ZIP壓縮檔案裡面。
+\n不支持RAR壓縮文件，LZH文件，還有EXE可執行文件。
+\n
+\n可選的功能（請參考設定）：
+\n-可以選擇提供RTP（某些遊戲所需的共享檔案包）。
+\n-自定義音樂聲庫，以決定MIDI音樂的播放效果。</string>
+    <string name="settings_soundfont_found">已找到的音樂聲庫：</string>
+    <string name="visit_website">瀏覽我們的網站</string>
+    <string name="settings_custom_soundfont">自定義音樂聲庫（MIDI）：</string>
+    <string name="scale_bilinear">縮放到荧幕大小並應用雙線性濾波器（慢，效果好）</string>
+    <string name="settings_resolution_desc">切換遊戲的分辨率可能導致圖像錯誤或者使得遊戲崩潰，特此警告！</string>
+    <string name="scale_nearest">通過拉伸畫面來達到屏幕大小（快，效果差）</string>
+    <string name="settings_resolution">遊戲分辨率：</string>
+    <string name="launch_debug_mode">以測試模式啟動</string>
+    <string name="watch_explanation_video">開始上手並添加遊戲（視頻教程）</string>
+    <string name="error_saf_download_selected">「Download」資料夾不能被用作EasyRPG的默認資料夾。</string>
+    <string name="error_saf_select_easyrpg">請創建一個空的資料夾並且選擇它，以作為EasyRPG的默認目錄。</string>
+    <string name="error_saf_title">指定了無效的資料夾</string>
+    <string name="music_volume">音樂音量</string>
+    <string name="settings_resolution_original">正常（320x240，4:3比例，默認）</string>
+    <string name="key_debug_menu">打開測試菜單（需要測試模式）</string>
+    <string name="settings_resolution_ultrawide">超寬屏（560x240，21:9，實驗性）</string>
+    <string name="scale_integer">通過放大到遊戲分辨率大小的倍數來適應屏幕（快，更小的畫面，效果好）</string>
+    <string name="settings_soundfont_explanation">將SF2格式的音樂聲庫檔案放置在「soundfonts」資料夾下。音樂聲庫決定MIDI音樂的播放效果。</string>
+    <string name="fast_forward_mode_tap">點擊</string>
+    <string name="settings_default_soundfont">默認音樂聲庫</string>
+    <string name="fast_forward_mode_hold">按住</string>
+    <string name="key_debug_walk_through_walls">穿過牆壁（需要測試模式）</string>
+    <string name="error_games_no_rw">無法對「games」資料夾進行讀寫操作。請為EasyRPG提供另一個位置作為默認資料夾。可以在設定中對EasyRPG的默認資料夾進行更改。</string>
+    <string name="stretch">忽略縱橫比（拉伸到荧幕寬度）</string>
+    <string name="error_no_games_folder">「games」資料夾不存在或者不是資料夾。 請手動創建或為EasyRPG資料夾選擇其他位置。 EasyRPG的默認資料夾可以在設定中更改。</string>
+</resources>
\ No newline at end of file
diff --git a/builds/android/metadata/zh-CN/full_description.txt b/builds/android/metadata/zh-CN/full_description.txt
index a659eda18..0320e27a5 100644
--- a/builds/android/metadata/zh-CN/full_description.txt
+++ b/builds/android/metadata/zh-CN/full_description.txt
@@ -1,7 +1,7 @@
-EasyRPG Player可以游玩使用RPG Maker 2000和RPG Maker 2003制作的游戏（不支持新的RPG引擎，例如XP、VX、VX Ace和MV。）
+EasyRPG Player可以用于游玩使用RPG Maker 2000和RPG Maker 2003制作的游戏（不支持更新的RPG Maker 引擎，例如XP、VX、VX Ace和MV、MZ。）
 
 主页: https://easyrpg.org/
 更新日志: https://blog.easyrpg.org/
 报告bug: https://github.com/EasyRPG/Player/issues/
 
-此应用不隶属于Kadokawa公司。
\ No newline at end of file
+此应用不隶属于Kadokawa公司。
diff --git a/builds/android/metadata/zh-CN/short_description.txt b/builds/android/metadata/zh-CN/short_description.txt
index 290d6c0a8..f3439cdb6 100644
--- a/builds/android/metadata/zh-CN/short_description.txt
+++ b/builds/android/metadata/zh-CN/short_description.txt
@@ -1 +1 @@
-在任何地方使用EasyRPG Player游玩你的RPG Maker 2000或2003游戏。
\ No newline at end of file
+在任何地方游玩你的RPG Maker 2000或2003游戏。
diff --git a/builds/android/metadata/zh-CN/title.txt b/builds/android/metadata/zh-CN/title.txt
new file mode 100644
index 000000000..52681f725
--- /dev/null
+++ b/builds/android/metadata/zh-CN/title.txt
@@ -0,0 +1 @@
+EasyRPG Player
diff --git a/builds/android/metadata/zh-TW/full_description.txt b/builds/android/metadata/zh-TW/full_description.txt
index bcbc60f36..2c5194bd3 100644
--- a/builds/android/metadata/zh-TW/full_description.txt
+++ b/builds/android/metadata/zh-TW/full_description.txt
@@ -1,4 +1,4 @@
-EasyRPG Player 是個可以玩用 RPG Maker 2000 和 RPG Maker 2003 做的遊戲的程式 (不支援 XP、VX、VX Ace、MV 等其他較新的 RPG Maker 版本)。
+EasyRPG Player 是個可以玩用 RPG Maker 2000 和 RPG Maker 2003 做的遊戲的程式 (不支援 XP、VX、VX Ace、MV 、MZ等其他較新的 RPG Maker 版本)。
 
 官網：https://easyrpg.org/
 更新紀錄：https://blog.easyrpg.org/
diff --git a/builds/android/metadata/zh-TW/title.txt b/builds/android/metadata/zh-TW/title.txt
new file mode 100644
index 000000000..52681f725
--- /dev/null
+++ b/builds/android/metadata/zh-TW/title.txt
@@ -0,0 +1 @@
+EasyRPG Player

From 6cd5613cfe5e615c43bc006e066c8a45a0e5ffb0 Mon Sep 17 00:00:00 2001
From: pissolato <rodrigopissolato@gmail.com>
Date: Mon, 20 May 2024 21:08:00 +0000
Subject: [PATCH 101/222] Android App: Portuguese translation updated

Currently translated at 54.6% (65 of 119 strings)
---
 .../app/src/main/res/values-pt/strings.xml    | 80 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/builds/android/app/src/main/res/values-pt/strings.xml b/builds/android/app/src/main/res/values-pt/strings.xml
index a6b3daec9..8edca2976 100644
--- a/builds/android/app/src/main/res/values-pt/strings.xml
+++ b/builds/android/app/src/main/res/values-pt/strings.xml
@@ -1,2 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="baltic">Báltico</string>
+    <string name="choose_layout">Escolha um layout</string>
+    <string name="error_saf_folder_not_empty">A pasta selecionada contém outros arquivos e não pode ser usada como pasta EasyRPG. Ao remover todos os arquivos dentro da pasta, você pode usá-lo como a pasta EasyRPG.</string>
+    <string name="error_saf_bad_content_provider">A pasta selecionada não pode ser usada como pasta EasyRPG. Este problema pode ocorrer por vários motivos, por exemplo, se você selecionou o diretório raiz ou um local de armazenamento na nuvem.
+\n
+\n</string>
+    <string name="korean">Coreano</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Coloque seus jogos do RPG Maker 2000/2003 em subdiretórios da pasta \"games\".
+\nOs jogos devem estar descompactados ou em um arquivo ZIP.
+\nArquivos RAR, LZH e EXE NÃO são suportados.
+\n
+\nRecursos opcionais (consulte as configurações):
+\n- O RTP (ativos compartilhados usados por alguns jogos) pode ser fornecido
+\n- Uma fonte de som personalizada para alterar a forma como os sons musicais MIDI podem ser fornecidos</string>
+    <string name="no_external_storage">Nenhum armazenamento externo (por exemplo, cartão SD) encontrado</string>
+    <string name="visit_website">Visite nosso site</string>
+    <string name="chinese_simple">Chinês (Simplificado)</string>
+    <string name="turkish">Turco</string>
+    <string name="select_game_region">Selecione a região do jogo</string>
+    <string name="chinese_traditional">Chinês (Tradicional)</string>
+    <string name="hebrew">Hebraico</string>
+    <string name="no">Não</string>
+    <string name="creating_dir_failed">Falha na criação do diretório $PATH</string>
+    <string name="japan">japonês</string>
+    <string name="arabic">Árabe</string>
+    <string name="region_modification_failed">Falha ao alterar região</string>
+    <string name="screen_size">Dimensionamento da tela:</string>
+    <string name="change_default_mapping">Alterar o mapeamento de botão padrão</string>
+    <string name="greek">Grego</string>
+    <string name="report_bug_mail">Obrigado por apoiar o EasyRPG Player.
+\nUm arquivo de log e seus savegames foram anexados a este e-mail.
+\nPor favor, não remova o arquivo de log! Precisamos de um savegame que esteja fechado para o local do bug.
+\nPor favor, conte-nos em detalhes o que deu errado.
+\n
+\n</string>
+    <string name="yes">Sim</string>
+    <string name="launch_debug_mode">Iniciar em modo de depuração</string>
+    <string name="watch_explanation_video">Introdução e adição de jogos (Guia de vídeo)</string>
+    <string name="input">Entrada</string>
+    <string name="not_valid_game">$PATH não é um jogo válido</string>
+    <string name="how_to_use_easy_rpg">Como usar o EasyRPG Player</string>
+    <string name="error_saf_download_selected">A pasta Download não pode ser usada como pasta EasyRPG.</string>
+    <string name="ok">OK</string>
+    <string name="toggle_ui">Alternar botões virtuais</string>
+    <string name="cyrillic">Cirílico</string>
+    <string name="error_saf_select_easyrpg">Crie uma pasta EasyRPG vazia e selecione-a.</string>
+    <string name="error_saf_title">Pasta inválida selecionada</string>
+    <string name="autodetect">Região de detecção automática (recomendado)</string>
+    <string name="end_game">Fim do jogo</string>
+    <string name="cancel">Cancelar</string>
+    <string name="refresh">Atualizar</string>
+    <string name="west_europe">Europa ocidental</string>
+    <string name="east_europe">Europa Central/Oriental</string>
+    <string name="force_landscape_mode">Forçar orientação horizontal</string>
+    <string name="no_games_found_and_explanation_android_30">Nenhum jogo de RPG Maker 2000/2003 encontrado.
+\n
+\nA pasta EasyRPG que você selecionou contém uma pasta “jogos”. Use um aplicativo gerenciador de arquivos para colocar seus jogos nesta pasta.
+\nOs jogos podem ser colocados em subpastas ou em arquivos ZIP.
+\n
+\nA pasta EasyRPG pode ser alterada nas configurações.</string>
+    <string name="video">Vídeo</string>
+    <string name="easyrpg_folders">Pastas EasyRPG</string>
+    <string name="report_bug">Reportar um erro</string>
+    <string name="settings">Configurações</string>
+    <string name="report_bug_msg">Esta função abrirá seu programa de e-mail (por exemplo, Gmail) para nos enviar o relatório de bug.
+\n
+\nSe não quiser enviar um e-mail ou não tiver um programa de e-mail configurado, você pode abrir um novo problema em https://github.com/EasyRPG/Player/issues.</string>
+    <string name="error_games_no_rw">A pasta “games” não é legível ou gravável. Selecione um local diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
+    <string name="unknown_region">Região desconhecida</string>
+    <string name="path_not_readable">$PATH não legível</string>
+    <string name="vietnamese">Vietnamita</string>
+    <string name="thai">Tailandês</string>
+    <string name="error_no_games_folder">A pasta “games” não existe ou não é uma pasta. Crie-o manualmente ou selecione um local diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
+    <string name="open_games_folder">Abra a \"pasta jogos (games)\"</string>
+    <string name="do_want_quit">Você realmente quer sair?</string>
+    <string name="audio">Áudio</string>
+    <string name="change_the_layout">Alterar o layout</string>
+</resources>
\ No newline at end of file

From a96c96af135ab65b0e89807242da6c9d97e5d8c3 Mon Sep 17 00:00:00 2001
From: lemtom <lemmens.tom11@gmail.com>
Date: Mon, 20 May 2024 21:08:00 +0000
Subject: [PATCH 102/222] Android Metadata: Dutch translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: Dutch translation updated

Currently translated at 100.0% (119 of 119 strings)

New translation (Dutch) added
---
 .../app/src/main/res/values-nl/strings.xml    | 141 ++++++++++++++++++
 .../metadata/nl-NL/full_description.txt       |   7 +
 .../metadata/nl-NL/short_description.txt      |   1 +
 builds/android/metadata/nl-NL/title.txt       |   1 +
 4 files changed, 150 insertions(+)
 create mode 100644 builds/android/app/src/main/res/values-nl/strings.xml
 create mode 100644 builds/android/metadata/nl-NL/full_description.txt
 create mode 100644 builds/android/metadata/nl-NL/short_description.txt
 create mode 100644 builds/android/metadata/nl-NL/title.txt

diff --git a/builds/android/app/src/main/res/values-nl/strings.xml b/builds/android/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..6d2a2704b
--- /dev/null
+++ b/builds/android/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="settings_soundfont_restart_app">Sluit de app af en start deze opnieuw nadat u een soundfont heeft geselecteerd.</string>
+    <string name="baltic">Baltisch</string>
+    <string name="settings_resolution_widescreen">Breedbeeld (416x240, 16:9, Experimenteel)</string>
+    <string name="choose_layout">Kies een lay-out</string>
+    <string name="error_saf_folder_not_empty">De geselecteerde folder bevat andere bestanden en kan niet worden gebruikt als de EasyRPG-folder. Wanneer u alle bestanden in de folder verwijdert, kunt u deze gebruiken als de EasyRPG-folder.</string>
+    <string name="exit_without_saving">Afsluiten zonder op te slaan</string>
+    <string name="open_the_sound_fonts_folder">Op de soundfonts-folder</string>
+    <string name="vibrate_when_sliding_direction">Trillen tijdens het glijden naar een andere richting</string>
+    <string name="error_saf_bad_content_provider">De geselecteerde folder kan niet worden gebruikt als de EasyRPG-folder. Dit probleem kan verschillende oorzaken hebben, bijvoorbeeld als u de hoofdfolder of een opslaglocatie in de cloud heeft geselecteerd.
+\n
+\n</string>
+    <string name="sound_volume">Geluidseffectvolume</string>
+    <string name="korean">Koreaans</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Plaats uw RPG Maker 2000/2003-spellen in submappen van de spellenfolder (games).
+\nSpellen moeten ongecomprimeerd zijn of in een ZIP-archief staan.
+\nRAR-, LZH- en EXE-bestanden worden NIET ondersteund.
+\n
+\nOptionele functies (zie de instellingen):
+\n- De RTP (gedeelde middelen die door sommige spellen worden gebruikt) kan worden verstrekt
+\n- Een aangepast soundfont om te wijzigen hoe MIDI-muziekgeluiden kunnen worden verstrekt</string>
+    <string name="no_external_storage">Geen externe opslag (bv. SD-kaart) gevonden</string>
+    <string name="settings_soundfont_found">Soundfonts gevonden:</string>
+    <string name="visit_website">Bezoek onze website</string>
+    <string name="id_select_games_folder_explanation">EasyRPG Player vereist een speciale folder. Nadat u de knop heeft aangeraakt, wordt u gevraagd een folder te selecteren.
+\n
+\nAls u deze app voor de eerste keer gebruikt, is er geen EasyRPG-folder. Maak een nieuwe EasyRPG-folder en selecteer deze.
+\n
+\nAls u deze app eerder gebruikt heeft, selecteer dan de bestaande EasyRPG-folder.</string>
+    <string name="add_a_button">Knop toevoegen</string>
+    <string name="open_rtp_folder">Open de RTP-folder</string>
+    <string name="edit_layout">Lay-out bewerken</string>
+    <string name="manage_input_layouts">Invoerlay-outs beheren:</string>
+    <string name="no_read_access_on_dir">Geen leestoegang op %1$s</string>
+    <string name="settings_custom_soundfont">Aangepast soundfont:</string>
+    <string name="chinese_simple">Chinees (Vereenvoudigd)</string>
+    <string name="rtp_explanation">De RTP biedt gedeelde middelen die door sommige spellen worden gebruikt.
+\nZet de RPG Maker 2000 RTP in \"rtp/2000\" en de RPG Maker 2003 RTP in \"rtp/2003\".
+\nHoud er rekening mee dat het inschakelen van RTP-ondersteuning de initiële laadtijd van een spel aanzienlijk zal verlengen.</string>
+    <string name="turkish">Turks</string>
+    <string name="select_game_region">Selecteer spelregio</string>
+    <string name="chinese_traditional">Chinees (Traditioneel)</string>
+    <string name="scale_bilinear">Schaal naar schermgrootte en pas een bilineaire filter toe (Langzaam, goede kwaliteit)</string>
+    <string name="input_layout_transparency">Transparantie van de invoerlay-out:</string>
+    <string name="hebrew">Hebreeuws</string>
+    <string name="settings_resolution_desc">Het wijzigen van de resolutie kan grafische storingen veroorzaken of het spel kapot maken. U bent gewaarschuwd!</string>
+    <string name="no">Nee</string>
+    <string name="creating_dir_failed">Het maken van de $PATH-map is mislukt</string>
+    <string name="japan">Japans</string>
+    <string name="select_the_games_folder">Selecteer de EasyRPG-folder</string>
+    <string name="arabic">Arabisch</string>
+    <string name="scale_nearest">Schalen naar schermgrootte met behulp van de dichtstbijzijnde buur (Snel, slechte kwaliteit)</string>
+    <string name="fast_forward">Knopmodus voor vooruitspoelen:</string>
+    <string name="settings_resolution">Spelresolutie:</string>
+    <string name="region_modification_failed">Regio veranderen mislukt</string>
+    <string name="navigation_drawer_close">Navigatielade sluiten</string>
+    <string name="settings_edit_layout_explanation">Bij het bewerken van een invoerlay-out kunnen knoppen worden toegevoegd (bijvoorbeeld een Shift-knop).
+\n Om een knop toe te voegen, drukt u op de terugknop en selecteert u \"Knop toevoegen\".</string>
+    <string name="screen_size">Schermschalen:</string>
+    <string name="navigation_drawer_open">Navigatielade openen</string>
+    <string name="Loading">Laden…</string>
+    <string name="change_default_mapping">Wijzig de standaard knoptoewijzing</string>
+    <string name="greek">Grieks</string>
+    <string name="report_bug_mail">Bedankt voor uw ondersteuning van EasyRPG Player.
+\n Een logbestand en uw bewaarde spellen zijn aan deze e-mail toegevoegd.
+\n Verwijder het logbestand niet! We hebben een bewaard spel nodig dat zich dicht bij de foutlocatie bevindt.
+\n Vertel ons alstublieft in detail wat er mis is gegaan.
+\n
+\n</string>
+    <string name="fast_forward_factor">Snelheidsvermenigvuldiger:</string>
+    <string name="yes">Ja</string>
+    <string name="vertical_input_layout">Verticale (staande) invoerlay-out</string>
+    <string name="launch_debug_mode">Start in foutopsporingsmodus</string>
+    <string name="watch_explanation_video">Aan de slag en spellen toevoegen (videogids)</string>
+    <string name="delete">Verwijderen</string>
+    <string name="input">Invoer</string>
+    <string name="not_valid_game">$PATH is geen geldig spel</string>
+    <string name="how_to_use_easy_rpg">Hoe EasyRPG Player gebruiken</string>
+    <string name="menu">Android-menu openen</string>
+    <string name="error_saf_download_selected">De downloadfolder kan niet worden gebruikt als de EasyRPG-folder.</string>
+    <string name="ok">OK</string>
+    <string name="toggle_ui">Schakel virtuele knoppen in of uit</string>
+    <string name="cyrillic">Cyrillisch</string>
+    <string name="key_enter">Bevestigen (Enter en Z)</string>
+    <string name="quick_access">Snelle toegang</string>
+    <string name="error_saf_select_easyrpg">Maak een lege EasyRPG-folder en selecteer deze.</string>
+    <string name="error_saf_title">Slechte folder geselecteerd</string>
+    <string name="autodetect">Regio automatisch detecteren (Aanbevolen)</string>
+    <string name="music_volume">Muziekvolume</string>
+    <string name="key_shift">Shift</string>
+    <string name="settings_resolution_original">Oorspronkelijk (320 x 240, 4:3, Aanbevolen)</string>
+    <string name="key_cancel">Annuleren (ESC en X)</string>
+    <string name="end_game">Beëindig spel</string>
+    <string name="key_fast_forward">Vooruitspoelen</string>
+    <string name="ignore_size_settings">Negeer de knopgrootte-instellingen en gebruik in plaats daarvan dit:</string>
+    <string name="key_debug_menu">Open foutopsporingsmenu (Vereist foutopsporingsmodus)</string>
+    <string name="enable_rtp_support">Schakel RTP-ondersteuning in</string>
+    <string name="cancel">Annuleren</string>
+    <string name="refresh">Verversen</string>
+    <string name="west_europe">West-Europees</string>
+    <string name="east_europe">Centraal/Oost-Europees</string>
+    <string name="settings_resolution_ultrawide">Ultrabreed (560x240, 21:9, Experimenteel)</string>
+    <string name="scale_integer">Schaal naar een veelvoud van de spelresolutie (Snel, kleiner beeld, goede kwaliteit)</string>
+    <string name="edit_name">Naam bewerken</string>
+    <string name="force_landscape_mode">Forceer landschapsoriëntatie</string>
+    <string name="no_games_found_and_explanation_android_30">Geen RPG Maker 2000/2003-games gevonden.
+\n
+\nDe EasyRPG-map die u heeft geselecteerd, bevat een spellenfolder (games). Gebruik een bestandsbeheer-app om uw spellen in deze map te plaatsen.
+\nSpellen kunnen in submappen of in ZIP-archieven worden geplaatst.
+\n
+\nDe EasyRPG-map kan worden gewijzigd in de instellingen.</string>
+    <string name="settings_soundfont_explanation">Zet soundfonts in SF2-formaat in de folder \"soundfonts\". Soundfonts veranderen hoe MIDI-muziek klinkt.</string>
+    <string name="video">Video</string>
+    <string name="save_and_quit">Opslaan en afsluiten</string>
+    <string name="easyrpg_folders">EasyRPG-folders</string>
+    <string name="report_bug">Meld een fout</string>
+    <string name="fast_forward_mode_tap">tik</string>
+    <string name="settings_default_soundfont">Standaard soundfont</string>
+    <string name="settings">Instellingen</string>
+    <string name="fast_forward_mode_hold">vasthouden</string>
+    <string name="report_bug_msg">Deze functie opent uw e-mailprogramma (bv. Gmail) om ons de foutmelding te sturen.
+\n
+\nAls u geen e-mail wilt verzenden of geen e-mailprogramma hebt geconfigureerd, kunt u in plaats daarvan een nieuwe probleemmelding aanmaken op https://github.com/EasyRPG/Player/issues.</string>
+    <string name="key_debug_walk_through_walls">Loop door muren (Vereist foutopsporingsmodus)</string>
+    <string name="error_games_no_rw">De spellenfolder (games) is niet leesbaar of beschrijfbaar. Selecteer een andere locatie voor de EasyRPG-folder. De EasyRPG-folder kan worden gewijzigd in de instellingen.</string>
+    <string name="unknown_region">Onbekende regio</string>
+    <string name="path_not_readable">$PATH niet leesbaar</string>
+    <string name="vietnamese">Vietnamees</string>
+    <string name="horizontal_input_layout">Horizontale (liggende) invoerlay-out</string>
+    <string name="thai">Thais</string>
+    <string name="stretch">Negeer de beeldverhouding (Uitrekken tot de breedte van het scherm)</string>
+    <string name="reset_button_mapping">Knoptoewijzing opnieuw instellen</string>
+    <string name="error_no_games_folder">De spellenfolder (games) bestaat niet of is geen folder. Maak het handmatig aan of selecteer een andere locatie voor de EasyRPG-folder. De EasyRPG-folder kan worden gewijzigd in de instellingen.</string>
+    <string name="open_games_folder">Open de spellenfolder (games)</string>
+    <string name="do_want_quit">Wilt u echt stoppen?</string>
+    <string name="default_layout">Standaard</string>
+    <string name="audio">Audio</string>
+    <string name="change_the_layout">Verander de lay-out</string>
+    <string name="enable_vibration">Trillingen inschakelen</string>
+</resources>
\ No newline at end of file
diff --git a/builds/android/metadata/nl-NL/full_description.txt b/builds/android/metadata/nl-NL/full_description.txt
new file mode 100644
index 000000000..04f7f3058
--- /dev/null
+++ b/builds/android/metadata/nl-NL/full_description.txt
@@ -0,0 +1,7 @@
+Met EasyRPG Player kun je spellen spelen die gemaakt zijn met RPG Maker 2000 en RPG Maker 2003. Nieuwere engines zoals XP, VX, MV en MZ worden niet ondersteund.
+
+EasyRPG Player is geen editor. Je kunt er geen eigen spellen mee maken.
+
+Startpagina: https://easyrpg.org/
+
+Deze app is niet verbonden aan Kadokawa Corporation.
diff --git a/builds/android/metadata/nl-NL/short_description.txt b/builds/android/metadata/nl-NL/short_description.txt
new file mode 100644
index 000000000..1af51d029
--- /dev/null
+++ b/builds/android/metadata/nl-NL/short_description.txt
@@ -0,0 +1 @@
+Speel uw RPG Maker 2000 en 2003-spellen overal.
diff --git a/builds/android/metadata/nl-NL/title.txt b/builds/android/metadata/nl-NL/title.txt
new file mode 100644
index 000000000..52681f725
--- /dev/null
+++ b/builds/android/metadata/nl-NL/title.txt
@@ -0,0 +1 @@
+EasyRPG Player

From f7a1c1051f9c9b2c46f1880aed3d356782c3f48f Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel+easyrpg@mastergk.de>
Date: Mon, 20 May 2024 21:08:00 +0000
Subject: [PATCH 103/222] Android Metadata: Portuguese (Brazil) translation
 updated

Currently translated at 66.6% (2 of 3 strings)

Android Metadata: French translation updated

Currently translated at 100.0% (3 of 3 strings)

Android App: French translation updated

Currently translated at 100.0% (119 of 119 strings)
---
 builds/android/app/src/main/res/values-fr/strings.xml | 2 +-
 builds/android/metadata/fr-FR/full_description.txt    | 2 +-
 builds/android/metadata/pt-BR/short_description.txt   | 2 +-
 builds/android/metadata/pt-BR/title.txt               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/android/app/src/main/res/values-fr/strings.xml b/builds/android/app/src/main/res/values-fr/strings.xml
index 13fdc8716..cbfda10e1 100644
--- a/builds/android/app/src/main/res/values-fr/strings.xml
+++ b/builds/android/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <string name="report_bug">Signaler un bug</string>
     <string name="report_bug_msg">Cette fonctionnalité va ouvrir votre application d\'e-mail (ex. Gmail) pour nous envoyer un rapport de bug.
 \n
-\nSi vous ne voulez pas nous envoyer un e-mail ou que vous n\'avez pas d\'application d\'e-mail configurée, vous pouvez ouvrir une nouvelle issue à https ://github.com/EasyRPG/Player/issues à la place.</string>
+\nSi vous ne voulez pas nous envoyer un e-mail ou que vous n\'avez pas d\'application d\'e-mail configurée, vous pouvez ouvrir une nouvelle issue à https://github.com/EasyRPG/Player/issues à la place.</string>
     <string name="report_bug_mail">Merci d\'aider EasyRPG Player.
 \nUn fichier de log et vos sauvegardes ont été placés en pièce jointe de cet e-mail.
 \nVeuillez ne pas supprimer le fichier de log ! Nous avons besoin d\'une sauvegarde qui est proche du lieu de votre bug pour pouvoir le reproduire facilement.
diff --git a/builds/android/metadata/fr-FR/full_description.txt b/builds/android/metadata/fr-FR/full_description.txt
index 15603e2dd..2441bfefb 100644
--- a/builds/android/metadata/fr-FR/full_description.txt
+++ b/builds/android/metadata/fr-FR/full_description.txt
@@ -2,6 +2,6 @@ Avec EasyRPG Player, vous pouvez jouer à des jeux créés avec RPG Maker 2000 e
 
 EasyRPG Player n'est pas un éditeur. Vous ne pouvez pas créer vos propres jeux avec.
 
-Site web : https ://easyrpg.org/
+Site web : https://easyrpg.org/
 
 Cette application n'est pas affiliée à Kadokawa Corporation.
diff --git a/builds/android/metadata/pt-BR/short_description.txt b/builds/android/metadata/pt-BR/short_description.txt
index ab7d8a56a..1eeed16d4 100644
--- a/builds/android/metadata/pt-BR/short_description.txt
+++ b/builds/android/metadata/pt-BR/short_description.txt
@@ -1 +1 @@
-Jogue qualquer jogo de RPG Maker 2000 e 2003 com o reprodutor EasyRPG.
+Jogue qualquer jogo de RPG Maker 2000 e 2003.
diff --git a/builds/android/metadata/pt-BR/title.txt b/builds/android/metadata/pt-BR/title.txt
index ba1b02a6d..52681f725 100644
--- a/builds/android/metadata/pt-BR/title.txt
+++ b/builds/android/metadata/pt-BR/title.txt
@@ -1 +1 @@
-Reprodutor EasyRPG
+EasyRPG Player

From e8c213876a828cd112f9c3211e60e9aeacb5446a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 00:15:37 +0100
Subject: [PATCH 104/222] MidiOut: Support volume settings

Fix #3083
---
 src/audio_decoder_midi.cpp | 22 ++++++++++++++++++----
 src/audio_decoder_midi.h   |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/audio_decoder_midi.cpp b/src/audio_decoder_midi.cpp
index 2ba0cff6f..6ff38c07d 100644
--- a/src/audio_decoder_midi.cpp
+++ b/src/audio_decoder_midi.cpp
@@ -17,6 +17,7 @@
 
 #include <array>
 #include <algorithm>
+#include "audio.h"
 #include "audio_decoder_midi.h"
 #include "midisequencer.h"
 #include "output.h"
@@ -142,6 +143,7 @@ bool AudioDecoderMidi::Open(Filesystem_Stream::InputStream stream) {
 		error_message = "Midi: Error reading file";
 		return false;
 	}
+
 	seq->rewind();
 	tempo.clear();
 	tempo.emplace_back(this, midi_default_tempo);
@@ -171,7 +173,7 @@ void AudioDecoderMidi::Pause() {
 void AudioDecoderMidi::Resume() {
 	paused = false;
 	for (int i = 0; i < 16; i++) {
-		uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume));
+		uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume * global_volume));
 		mididec->SendMidiMessage(msg);
 	}
 }
@@ -192,7 +194,7 @@ void AudioDecoderMidi::SetVolume(int new_volume) {
 
 	volume = static_cast<float>(new_volume) / 100.0f;
 	for (int i = 0; i < 16; i++) {
-		uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume));
+		uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume * global_volume));
 		mididec->SendMidiMessage(msg);
 	}
 
@@ -256,7 +258,7 @@ void AudioDecoderMidi::Update(std::chrono::microseconds delta) {
 			log_volume = AdjustVolume(volume * 100.0f);
 		}
 		for (int i = 0; i < 16; i++) {
-			uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume));
+			uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume * global_volume));
 			mididec->SendMidiMessage(msg);
 		}
 		last_fade_mtime = mtime;
@@ -265,12 +267,24 @@ void AudioDecoderMidi::Update(std::chrono::microseconds delta) {
 }
 
 void AudioDecoderMidi::UpdateMidi(std::chrono::microseconds delta) {
+	// Only called when MidiOut is used
+
 	if (paused) {
 		return;
 	}
 
 	mtime += std::chrono::microseconds(static_cast<int>(delta.count() * pitch / 100));
+
+	if (Audio().BGM_GetGlobalVolume() / 100.0f != global_volume) {
+		global_volume = Audio().BGM_GetGlobalVolume() / 100.0f;
+		for (int i = 0; i < 16; i++) {
+			uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume * global_volume));
+			mididec->SendMidiMessage(msg);
+		}
+	}
+
 	Update(delta);
+
 	seq->play(mtime, this);
 
 	if (IsFinished() && looping) {
@@ -380,7 +394,7 @@ void AudioDecoderMidi::midi_message(int, uint_least32_t message) {
 		// Adjust channel volume
 		channel_volumes[channel] = value2;
 		// Send the modified volume to midiout
-		message = midimsg_volume(channel, static_cast<uint8_t>(value2 * volume));
+		message = midimsg_volume(channel, static_cast<uint8_t>(value2 * volume * global_volume));
 	}
 	if (midimsg_validate(message)) {
 		mididec->SendMidiMessage(message);
diff --git a/src/audio_decoder_midi.h b/src/audio_decoder_midi.h
index b72e456dc..0fa96f8ad 100644
--- a/src/audio_decoder_midi.h
+++ b/src/audio_decoder_midi.h
@@ -176,6 +176,7 @@ class AudioDecoderMidi final : public AudioDecoderBase, public midisequencer::ou
 	float pitch = 1.0f;
 	bool paused = false;
 	float volume = 0.0f;
+	float global_volume = 1.0f; // only used by midiout
 	float log_volume = 0.0f; // as used by RPG_RT, for Midi decoder without event support
 	bool loops_to_end = false;
 

From a0635e48388e74dea04e016d0b47fb78bdeffbc1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 01:01:12 +0100
Subject: [PATCH 105/222] FluidLite: Use upstream target name

Show FluidLite in settings instead of FluidSynth
---
 CMakeLists.txt                           |  4 ++--
 builds/cmake/Modules/FindFluidLite.cmake |  8 ++++----
 src/game_config.h                        | 10 ++++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57c27d7d..f720ae045 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1052,7 +1052,7 @@ if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii|a
 		player_find_package(NAME FluidLite
 			CONDITION PLAYER_WITH_FLUIDLITE
 			DEFINITION HAVE_FLUIDLITE
-			TARGET FluidLite::fluidlite)
+			TARGET "fluidlite::fluidlite;fluidlite::fluidlite-static")
 	endif()
 
 	# xmp (lite)
@@ -1506,7 +1506,7 @@ if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii)$
 	if(TARGET FluidSynth::libfluidsynth)
 		list(APPEND MIDI_LIBS "FluidSynth")
 	endif()
-	if(TARGET FluidLite::fluidlite)
+	if(TARGET fluidlite::fluidlite OR TARGET fluidlite::fluidlite-static)
 		list(APPEND MIDI_LIBS "FluidLite")
 	endif()
 	if(TARGET WildMidi::libwildmidi OR TARGET WildMidi::libwildmidi-static)
diff --git a/builds/cmake/Modules/FindFluidLite.cmake b/builds/cmake/Modules/FindFluidLite.cmake
index df9b7e09f..dbee65c07 100644
--- a/builds/cmake/Modules/FindFluidLite.cmake
+++ b/builds/cmake/Modules/FindFluidLite.cmake
@@ -9,7 +9,7 @@
 #
 # This module defines the following :prop_tgt:`IMPORTED` targets:
 #
-# ``FluidLite::fluidlite``
+# ``fluidlite::fluidlite``
 #   The ``FluidLite`` library, if found.
 #
 # Result Variables
@@ -53,9 +53,9 @@ if(FLUIDLITE_FOUND)
 		set(FLUIDLITE_LIBRARIES ${FLUIDLITE_LIBRARIES})
 	endif()
 
-	if(NOT TARGET FluidLite::fluidlite)
-		add_library(FluidLite::fluidlite UNKNOWN IMPORTED)
-		set_target_properties(FluidLite::fluidlite PROPERTIES
+	if(NOT TARGET fluidlite::fluidlite)
+		add_library(fluidlite::fluidlite UNKNOWN IMPORTED)
+		set_target_properties(fluidlite::fluidlite PROPERTIES
 			INTERFACE_INCLUDE_DIRECTORIES "${FLUIDLITE_INCLUDE_DIRS}"
 			IMPORTED_LOCATION "${FLUIDLITE_LIBRARY}")
 	endif()
diff --git a/src/game_config.h b/src/game_config.h
index 092116bca..7d35dc0a4 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -57,6 +57,12 @@ enum class StartupLogos {
 	All
 };
 
+#ifdef HAVE_FLUIDLITE
+#define EP_FLUID_NAME "FluidLite"
+#else
+#define EP_FLUID_NAME "FluidSynth"
+#endif
+
 struct Game_ConfigPlayer {
 	StringConfigParam autobattle_algo{ "", "", "", "", "" };
 	StringConfigParam enemyai_algo{ "", "", "", "", "" };
@@ -108,11 +114,11 @@ struct Game_ConfigVideo {
 struct Game_ConfigAudio {
 	RangeConfigParam<int> music_volume{ "BGM Volume", "Volume of the background music", "Audio", "MusicVolume", 100, 0, 100 };
 	RangeConfigParam<int> sound_volume{ "SFX Volume", "Volume of the sound effects", "Audio", "SoundVolume", 100, 0, 100 };
-	BoolConfigParam fluidsynth_midi { "Fluidsynth (SF2)", "Play MIDI using SF2 soundfonts", "Audio", "Fluidsynth", true };
+	BoolConfigParam fluidsynth_midi { EP_FLUID_NAME " (SF2)", "Play MIDI using SF2 soundfonts", "Audio", "Fluidsynth", true };
 	BoolConfigParam wildmidi_midi { "WildMidi (GUS)", "Play MIDI using GUS patches", "Audio", "WildMidi", true };
 	BoolConfigParam native_midi { "Native MIDI", "Play MIDI through the operating system ", "Audio", "NativeMidi", true };
 	LockedConfigParam<std::string> fmmidi_midi { "FmMidi", "Play MIDI using the built-in MIDI synthesizer", "[Always ON]" };
-	PathConfigParam soundfont { "Soundfont", "Soundfont to use for Fluidsynth", "Audio", "Soundfont", "" };
+	PathConfigParam soundfont { "Soundfont", "Soundfont to use for " EP_FLUID_NAME, "Audio", "Soundfont", "" };
 
 	void Hide();
 };

From 20ffb14c5997ea734f7185e8a8005a780f04a97d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 12 Mar 2024 01:02:35 +0100
Subject: [PATCH 106/222] Settings: Reset font size of bottom help window and
 font settings when game is changed

---
 src/player.cpp         | 2 ++
 src/scene_settings.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/player.cpp b/src/player.cpp
index f64122b78..60e461257 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1053,6 +1053,7 @@ void Player::LoadFonts() {
 #ifdef HAVE_FREETYPE
 	// Look for bundled fonts
 	auto gothic = FileFinder::OpenFont("Font");
+	player_config.font1.SetLocked(false);
 	if (gothic) {
 		auto ft = Font::CreateFtFont(std::move(gothic), 12, false, false);
 		player_config.font1.SetLocked(ft != nullptr);
@@ -1062,6 +1063,7 @@ void Player::LoadFonts() {
 	}
 
 	auto mincho = FileFinder::OpenFont("Font2");
+	player_config.font2.SetLocked(false);
 	if (mincho) {
 		auto ft = Font::CreateFtFont(std::move(mincho), 12, false, false);
 		player_config.font2.SetLocked(ft != nullptr);
diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index 8ca612a73..e4ec2a50f 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -236,6 +236,7 @@ void Scene_Settings::vUpdate() {
 			return;
 		}
 
+		help_window2->SetFont(nullptr);
 		options_window->Pop();
 		SetMode(options_window->GetMode());
 		if (mode == Window_Settings::eNone) {

From a6f224d0909505a324cd1a54616cf75ffe1ca9e6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 13 Mar 2024 00:30:05 +0100
Subject: [PATCH 107/222] Settings: The font size can now be altered directly
 with left/right while a font is selected.

Add cursor animation option to Window class.
---
 src/scene_settings.cpp  | 28 ++++++++++++++++++++++++----
 src/scene_settings.h    |  2 ++
 src/window.cpp          | 22 +++++++++++++++-------
 src/window.h            | 15 +++++++++++++--
 src/window_settings.cpp | 20 ++++++++++++++++++--
 5 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index e4ec2a50f..03fdcc001 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -149,6 +149,7 @@ void Scene_Settings::SetMode(Window_Settings::UiMode new_mode) {
 	about_window->SetVisible(false);
 
 	picker_window.reset();
+	font_size_window.reset();
 
 	switch (mode) {
 		case Window_Settings::eNone:
@@ -461,20 +462,38 @@ void Scene_Settings::UpdateFont(bool mincho) {
 
 	auto& last_index = options_window->GetFrame().scratch;
 
+	if (font_size_window) {
+		font_size_window->SetY(options_window->GetY() + options_window->GetCursorRect().y);
+		font_size_window->Update();
+	}
+
 	int index = options_window->GetIndex();
 	if (last_index == index) {
-		UpdateOptions();
-		return;
+		if (index == 0 || !help_window2->GetFont() || help_window2->GetFont()->GetCurrentStyle().size == options_window->font_size.Get()) {
+			// Same index or font size did not change
+			UpdateOptions();
+			return;
+		}
 	}
 	last_index = index;
 
+	if (!font_size_window) {
+		font_size_window = std::make_unique<Window_Help>(options_window->GetRightX(), 0, 32, 32);
+		font_size_window->SetLeftArrow(true);
+		font_size_window->SetRightArrow(true);
+		font_size_window->SetAnimateArrows(true);
+	}
+
+	font_size_window->SetVisible(false);
+	font_size_window->SetText(std::to_string(options_window->font_size.Get()));
+
 	if (index == 0) {
 		// Built-In font
 		help_window2->Clear();
 		help_window2->SetFont(Font::DefaultBitmapFont(mincho));
 		help_window2->SetVisible(true);
-	} else if (index >= options_window->GetRowMax() - 3) {
-		// Size, sample or browse
+	} else if (index >= options_window->GetRowMax() - 2) {
+		// Sample or browse
 		help_window2->Clear();
 		help_window2->SetFont(nullptr);
 		help_window2->SetVisible(true);
@@ -486,6 +505,7 @@ void Scene_Settings::UpdateFont(bool mincho) {
 				help_window2->Clear();
 				help_window2->SetFont(font);
 				help_window2->SetVisible(true);
+				font_size_window->SetVisible(true);
 			} else {
 				auto& opt = options_window->GetCurrentOption();
 				opt.action = nullptr;
diff --git a/src/scene_settings.h b/src/scene_settings.h
index ce2143bc2..6919f6cc9 100644
--- a/src/scene_settings.h
+++ b/src/scene_settings.h
@@ -24,6 +24,7 @@
 #include "window_command.h"
 #include "window_command_horizontal.h"
 #include "window_about.h"
+#include "window_help.h"
 #include "window_selectable.h"
 #include "window_settings.h"
 #include "window_input_settings.h"
@@ -82,6 +83,7 @@ class Scene_Settings : public Scene {
 	std::unique_ptr<Window_Command_Horizontal> input_mode_window;
 	std::unique_ptr<Window_Command> picker_window;
 	std::unique_ptr<Window_NumberInput> number_window;
+	std::unique_ptr<Window_Help> font_size_window;
 
 	std::unique_ptr<Sprite> title;
 	FileRequestBinding request_id;
diff --git a/src/window.cpp b/src/window.cpp
index 6da69f037..810e7f580 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -25,7 +25,7 @@
 #include "bitmap.h"
 #include "drawable_mgr.h"
 
-constexpr int pause_animation_frames = 20;
+constexpr int arrow_animation_frames = 20;
 
 Window::Window(Drawable::Flags flags): Drawable(Priority_Window, flags)
 {
@@ -146,22 +146,30 @@ void Window::Draw(Bitmap& dst) {
 		}
 	}
 
-	if ((pause && pause_frame < pause_animation_frames && animation_frames <= 0) || down_arrow) {
+	auto show_arrow = [&](bool which) {
+		if (!which || !animate_arrows) {
+			return which;
+		}
+
+		return (arrow_animation_frame < arrow_animation_frames) && animation_frames <= 0;
+	};
+
+	if ((pause && arrow_animation_frame < arrow_animation_frames && animation_frames <= 0) || show_arrow(down_arrow)) {
 		Rect src_rect(40, 16, 16, 8);
 		dst.Blit(x + width / 2 - 8, y + height - 8, *windowskin, src_rect, 255);
 	}
 
-	if (up_arrow) {
+	if (show_arrow(up_arrow)) {
 		Rect src_rect(40, 8, 16, 8);
 		dst.Blit(x + width / 2 - 8, y, *windowskin, src_rect, 255);
 	}
 
-	if (right_arrow) {
+	if (show_arrow(right_arrow)) {
 		Rect src_rect(40, 16, 16, 8);
 		dst.RotateZoomOpacityBlit(x + width - 8, y + height / 2 - 8, 16, 0, *windowskin, src_rect, -M_PI / 2, 1.0, 1.0, 255);
 	}
 
-	if (left_arrow) {
+	if (show_arrow(left_arrow)) {
 		Rect src_rect(40, 8, 16, 8);
 		dst.RotateZoomOpacityBlit(x, y + height / 2 - 8, 16, 0, *windowskin, src_rect, -M_PI / 2, 1.0, 1.0, 255);
 	}
@@ -302,8 +310,8 @@ void Window::Update() {
 	if (active) {
 		cursor_frame += 1;
 		if (cursor_frame > 20) cursor_frame = 0;
-		if (pause) {
-			pause_frame = (pause_frame + 1) % (pause_animation_frames * 2);
+		if (pause || animate_arrows) {
+			arrow_animation_frame = (arrow_animation_frame + 1) % (arrow_animation_frames * 2);
 		}
 	}
 
diff --git a/src/window.h b/src/window.h
index abefad8f5..3f9700f36 100644
--- a/src/window.h
+++ b/src/window.h
@@ -54,6 +54,8 @@ class Window : public Drawable {
 	void SetLeftArrow(bool nleft_arrow);
 	bool GetRightArrow() const;
 	void SetRightArrow(bool nright_arrow);
+	bool GetAnimateArrows() const;
+	void SetAnimateArrows(bool nanimate_arrows);
 	int GetX() const;
 	void SetX(int nx);
 	int GetY() const;
@@ -104,6 +106,7 @@ class Window : public Drawable {
 	bool down_arrow = false;
 	bool left_arrow = false;
 	bool right_arrow = false;
+	bool animate_arrows = false;
 	int x = 0;
 	int y = 0;
 	int width = 0;
@@ -132,7 +135,7 @@ class Window : public Drawable {
 	bool pause = false;
 
 	int cursor_frame = 0;
-	int pause_frame = 0;
+	int arrow_animation_frame = 0;
 	int animation_frames = 0;
 	double animation_count = 0.0;
 	double animation_increment = 0.0;
@@ -185,7 +188,7 @@ inline bool Window::GetPause() const {
 
 inline void Window::SetPause(bool npause) {
 	pause = npause;
-	pause_frame = 0;
+	arrow_animation_frame = 0;
 }
 
 inline bool Window::GetUpArrow() const {
@@ -220,6 +223,14 @@ inline void Window::SetRightArrow(bool nright_arrow) {
 	right_arrow = nright_arrow;
 }
 
+inline bool Window::GetAnimateArrows() const {
+	return animate_arrows;
+}
+
+inline void Window::SetAnimateArrows(bool nanimate_arrows) {
+	animate_arrows = nanimate_arrows;
+}
+
 inline int Window::GetX() const {
 	return x;
 }
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 4ec87e65f..decf01f81 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -455,6 +455,22 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 
 		if (item.second.type == DirectoryTree::FileType::Regular && is_font) {
 			AddOption(MenuItem(item.second.name, "Use this font", StringView(font_lower).ends_with(item.first) ? "[x]" : ""), [=, &cfg, &setting]() mutable {
+				if (Input::IsTriggered(Input::LEFT) || Input::IsRepeated(Input::LEFT)) {
+					if (font_size.Get() == font_size.GetMin()) {
+						font_size.Set(font_size.GetMax());
+					} else {
+						font_size.Set(font_size.Get() - 1);
+					}
+					return;
+				} else if (Input::IsTriggered(Input::RIGHT) || Input::IsRepeated(Input::RIGHT)) {
+					if (font_size.Get() == font_size.GetMax()) {
+						font_size.Set(font_size.GetMin());
+					} else {
+						font_size.Set(font_size.Get() + 1);
+					}
+					return;
+				}
+
 				auto is = fs.OpenInputStream(item.second.name);
 				if (is) {
 					auto font = Font::CreateFtFont(std::move(is), font_size.Get(), false, false);
@@ -471,9 +487,9 @@ void Window_Settings::RefreshEngineFont(bool mincho) {
 		}
 	}
 
-	AddOption(font_size, [this]() mutable {
+	/*AddOption(font_size, [this]() mutable {
 		font_size.Set(GetCurrentOption().current_value);
-	});
+	});*/
 
 	AddOption(sample_text, [this]() {
 		sample_text.Set(static_cast<SampleText>(GetCurrentOption().current_value));

From c787b974c3110e3db27004d6b21c50ab928a128a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 26 Mar 2024 03:00:56 +0100
Subject: [PATCH 108/222] Audio: Add Api to get the shared Midi Out Instance

Solves errors and lag in the audio settings when the device is opened multiple times
---
 src/audio.h                                | 10 ++++++++++
 src/audio_generic.cpp                      | 23 +++++++++++++---------
 src/audio_generic.h                        |  2 ++
 src/platform/linux/midiout_device_alsa.cpp |  3 ++-
 src/window_settings.cpp                    |  3 ++-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/audio.h b/src/audio.h
index 7449034ab..7a9013799 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -20,6 +20,7 @@
 
 // Headers
 #include <string>
+#include "audio_generic_midiout.h"
 #include "filesystem_stream.h"
 #include "audio_secache.h"
 #include "game_config.h"
@@ -39,6 +40,15 @@ struct AudioInterface {
 
 	virtual void vGetConfig(Game_ConfigAudio& cfg) const = 0;
 
+	/**
+	 * Instantiates and returns the Native Midi Out device.
+	 * The Midi Out device is usually an exclusive resource.
+	 * Implementing classes should only create one Midi Out and return the
+	 * shared instance.
+	 * @return Native Midi Out Device or nullptr on error
+	 */
+	virtual GenericAudioMidiOut* CreateAndGetMidiOut() { return nullptr; }
+
 	/**
 	 * Update audio. Must be called each frame.
 	 */
diff --git a/src/audio_generic.cpp b/src/audio_generic.cpp
index cd45e13db..0b46fc7c4 100644
--- a/src/audio_generic.cpp
+++ b/src/audio_generic.cpp
@@ -198,6 +198,19 @@ void GenericAudio::Update() {
 	// no-op, handled by the Decode function called through a thread
 }
 
+GenericAudioMidiOut* GenericAudio::CreateAndGetMidiOut() {
+	if (!midi_thread) {
+		midi_thread = std::make_unique<GenericAudioMidiOut>();
+		std::string status_message;
+		if (midi_thread->IsInitialized(status_message)) {
+			midi_thread->StartThread();
+		} else {
+			midi_thread.reset();
+		}
+	}
+	return midi_thread.get();
+}
+
 void GenericAudio::SetFormat(int frequency, AudioDecoder::Format format, int channels) {
 	output_format.frequency = frequency;
 	output_format.format = format;
@@ -222,15 +235,7 @@ bool GenericAudio::PlayOnChannel(BgmChannel& chan, Filesystem_Stream::InputStrea
 		bool wildmidi = Audio().GetWildMidiEnabled() && MidiDecoder::CreateWildMidi(true);
 
 		if (!fluidsynth && !wildmidi && Audio().GetNativeMidiEnabled()) {
-			if (!midi_thread) {
-				midi_thread = std::make_unique<GenericAudioMidiOut>();
-				std::string status_message;
-				if (midi_thread->IsInitialized(status_message)) {
-					midi_thread->StartThread();
-				} else {
-					midi_thread.reset();
-				}
-			}
+			CreateAndGetMidiOut();
 
 			if (midi_thread) {
 				midi_thread->LockMutex();
diff --git a/src/audio_generic.h b/src/audio_generic.h
index 04755a2c7..ab1ab3cf5 100644
--- a/src/audio_generic.h
+++ b/src/audio_generic.h
@@ -61,6 +61,8 @@ class GenericAudio : public AudioInterface {
 
 	void vGetConfig(Game_ConfigAudio&) const override {}
 
+	GenericAudioMidiOut* CreateAndGetMidiOut() override;
+
 	void SetFormat(int frequency, AudioDecoder::Format format, int channels);
 
 	virtual void LockMutex() const = 0;
diff --git a/src/platform/linux/midiout_device_alsa.cpp b/src/platform/linux/midiout_device_alsa.cpp
index 9ed75b590..d17bae9da 100644
--- a/src/platform/linux/midiout_device_alsa.cpp
+++ b/src/platform/linux/midiout_device_alsa.cpp
@@ -79,7 +79,8 @@ AlsaMidiOutDevice::AlsaMidiOutDevice(std::string& status_message) {
 		return;
 	}
 
-	Output::Debug("ALSA MIDI: Using client {}:{}:{}", dst_client, dst_port_name, dst_port);
+	status_message = fmt::format("ALSA MIDI: Using client {}:{}:{}", dst_client, dst_port_name, dst_port);
+	Output::DebugStr(status_message);
 
 	status = snd_seq_create_simple_port(midi_out, "Harmony",
 		SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_APPLICATION);
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index decf01f81..e603f83b4 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -327,7 +327,8 @@ void Window_Settings::RefreshAudioMidi() {
 
 	if (cfg.native_midi.IsOptionVisible()) {
 		AddOption(cfg.native_midi, []() { Audio().SetNativeMidiEnabled(Audio().GetConfig().native_midi.Toggle()); });
-		if (!GenericAudioMidiOut().IsInitialized(GetFrame().options.back().help2)) {
+		auto midi_out = Audio().CreateAndGetMidiOut();
+		if (!midi_out || !midi_out->IsInitialized(GetFrame().options.back().help2)) {
 			GetFrame().options.back().text += " [Not working]";
 			GetFrame().options.back().color = Font::ColorKnockout;
 		} else if (cfg.native_midi.Get() && !used) {

From 000f53455d5b811dd70b3c6a4d0a230794f526b5 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 27 Mar 2024 14:31:35 +0100
Subject: [PATCH 109/222] Config: Namespace all the enums to reduce global
 scope pollution

---
 src/baseui.cpp               |  2 +-
 src/baseui.h                 |  4 +--
 src/exe_reader.cpp           |  4 +--
 src/game_config.cpp          |  2 +-
 src/game_config.h            | 54 +++++++++++++++++++-----------------
 src/platform/psvita/ui.cpp   |  8 +++---
 src/platform/psvita/ui.h     |  4 +--
 src/platform/sdl/sdl2_ui.cpp |  8 +++---
 src/platform/sdl/sdl2_ui.h   |  2 +-
 src/scene_logo.cpp           |  2 +-
 src/scene_title.cpp          |  6 ++--
 src/window_settings.cpp      |  6 ++--
 12 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/src/baseui.cpp b/src/baseui.cpp
index cc09be92f..fb1367bb3 100644
--- a/src/baseui.cpp
+++ b/src/baseui.cpp
@@ -68,7 +68,7 @@ void BaseUi::CleanDisplay() {
 	main_surface->Clear();
 }
 
-void BaseUi::SetGameResolution(GameResolution resolution) {
+void BaseUi::SetGameResolution(ConfigEnum::GameResolution resolution) {
 	vcfg.game_resolution.Set(resolution);
 }
 
diff --git a/src/baseui.h b/src/baseui.h
index 3ebc01be9..c5a4656a9 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -215,7 +215,7 @@ class BaseUi {
 	void SetFrameLimit(int fps_limit);
 
 	/** Sets the scaling mode of the window */
-	virtual void SetScalingMode(ScalingMode) {};
+	virtual void SetScalingMode(ConfigEnum::ScalingMode) {};
 
 	/**
 	 * Sets the game resolution settings.
@@ -224,7 +224,7 @@ class BaseUi {
 	 *
 	 * @param resolution new resolution
 	 */
-	void SetGameResolution(GameResolution resolution);
+	void SetGameResolution(ConfigEnum::GameResolution resolution);
 
 	/**
 	 * Opens the specified URL through the operating system.
diff --git a/src/exe_reader.cpp b/src/exe_reader.cpp
index 921d91f5e..efb2ab6e2 100644
--- a/src/exe_reader.cpp
+++ b/src/exe_reader.cpp
@@ -185,7 +185,7 @@ std::vector<std::vector<uint8_t>> EXEReader::GetLogos() {
 		return {};
 	}
 
-	if (Player::player_config.show_startup_logos.Get() == StartupLogos::None) {
+	if (Player::player_config.show_startup_logos.Get() == ConfigEnum::StartupLogos::None) {
 		return {};
 	}
 
@@ -199,7 +199,7 @@ std::vector<std::vector<uint8_t>> EXEReader::GetLogos() {
 			uint16_t xyz_logos = std::min<uint16_t>(GetU16(xyz_base + 0x0C), 9);
 			uint32_t xyz_logo_base = xyz_base + 0x10;
 
-			bool only_custom_logos = (Player::player_config.show_startup_logos.Get() == StartupLogos::Custom);
+			bool only_custom_logos = (Player::player_config.show_startup_logos.Get() == ConfigEnum::StartupLogos::Custom);
 			std::string res_name = "LOGOX";
 
 			for (int i = 0; i <= xyz_logos; ++i) {
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 043cc70d1..48131dcdc 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -86,7 +86,7 @@ Game_Config Game_Config::Create(CmdlineParser& cp) {
 	Game_Config cfg;
 
 #if USE_SDL >= 2
-	cfg.video.scaling_mode.Set(ScalingMode::Bilinear);
+	cfg.video.scaling_mode.Set(ConfigEnum::ScalingMode::Bilinear);
 #endif
 
 	cp.Rewind();
diff --git a/src/game_config.h b/src/game_config.h
index 7d35dc0a4..e1fc7cec9 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -33,28 +33,30 @@
 
 class CmdlineParser;
 
-enum class ScalingMode {
-	/** Nearest neighbour to fit screen */
-	Nearest,
-	/** Like NN but only scales to integers */
-	Integer,
-	/** Integer followed by Bilinear downscale to fit screen */
-	Bilinear,
-};
-
-enum class GameResolution {
-	/** 320x240 */
-	Original,
-	/** 416x240 */
-	Widescreen,
-	/** 560x240 */
-	Ultrawide
-};
-
-enum class StartupLogos {
-	None,
-	Custom,
-	All
+namespace ConfigEnum {
+	enum class ScalingMode {
+		/** Nearest neighbour to fit screen */
+		Nearest,
+		/** Like NN but only scales to integers */
+		Integer,
+		/** Integer followed by Bilinear downscale to fit screen */
+		Bilinear,
+	};
+
+	enum class GameResolution {
+		/** 320x240 */
+		Original,
+		/** 416x240 */
+		Widescreen,
+		/** 560x240 */
+		Ultrawide
+	};
+
+	enum class StartupLogos {
+		None,
+		Custom,
+		All
+	};
 };
 
 #ifdef HAVE_FLUIDLITE
@@ -69,8 +71,8 @@ struct Game_ConfigPlayer {
 	BoolConfigParam settings_autosave{ "Save settings on exit", "Automatically save the settings on exit", "Player", "SettingsAutosave", false };
 	BoolConfigParam settings_in_title{ "Show settings on title screen", "Display settings menu item on the title screen", "Player", "SettingsInTitle", false };
 	BoolConfigParam settings_in_menu{ "Show settings in menu", "Display settings menu item on the menu screen", "Player", "SettingsInMenu", false };
-	EnumConfigParam<StartupLogos, 3> show_startup_logos{
-		"Startup Logos", "Logos that are displayed on startup", "Player", "StartupLogos", StartupLogos::Custom,
+	EnumConfigParam<ConfigEnum::StartupLogos, 3> show_startup_logos{
+		"Startup Logos", "Logos that are displayed on startup", "Player", "StartupLogos", ConfigEnum::StartupLogos::Custom,
 		Utils::MakeSvArray("None", "Custom", "All"),
 		Utils::MakeSvArray("none", "custom", "all"),
 		Utils::MakeSvArray("Do not show any additional logos", "Show custom logos bundled with the game", "Show all logos, including the original from RPG Maker")};
@@ -90,14 +92,14 @@ struct Game_ConfigVideo {
 	BoolConfigParam fps_render_window{ "Show FPS in Window", "Show FPS inside the window when in window mode", "Video", "FpsRenderWindow", false };
 	RangeConfigParam<int> fps_limit{ "Frame Limiter", "Toggle the frames per second limit (Recommended: 60)", "Video", "FpsLimit", DEFAULT_FPS, 0, 99999 };
 	ConfigParam<int> window_zoom{ "Window Zoom", "Toggle the window zoom level", "Video", "WindowZoom", 2 };
-	EnumConfigParam<ScalingMode, 3> scaling_mode{ "Scaling method", "How the output is scaled", "Video", "ScalingMode", ScalingMode::Nearest,
+	EnumConfigParam<ConfigEnum::ScalingMode, 3> scaling_mode{ "Scaling method", "How the output is scaled", "Video", "ScalingMode", ConfigEnum::ScalingMode::Nearest,
 		Utils::MakeSvArray("Nearest", "Integer", "Bilinear"),
 		Utils::MakeSvArray("nearest", "integer", "bilinear"),
 		Utils::MakeSvArray("Scale to screen size (Causes scaling artifacts)", "Scale to multiple of the game resolution", "Like Nearest, but output is blurred to avoid artifacts")};
 	BoolConfigParam stretch{ "Stretch", "Stretch to the width of the window/screen", "Video", "Stretch", false };
 	BoolConfigParam pause_when_focus_lost{ "Pause when focus lost", "Pause the program when it is in the background", "Video", "PauseWhenFocusLost", true };
 	BoolConfigParam touch_ui{ "Touch Ui", "Display the touch ui", "Video", "TouchUi", true };
-	EnumConfigParam<GameResolution, 3> game_resolution{ "Resolution", "Game resolution. Changes require a restart.", "Video", "GameResolution", GameResolution::Original,
+	EnumConfigParam<ConfigEnum::GameResolution, 3> game_resolution{ "Resolution", "Game resolution. Changes require a restart.", "Video", "GameResolution", ConfigEnum::GameResolution::Original,
 		Utils::MakeSvArray("Original (Recommended)", "Widescreen (Experimental)", "Ultrawide (Experimental)"),
 		Utils::MakeSvArray("original", "widescreen", "ultrawide"),
 		Utils::MakeSvArray("The default resolution (320x240, 4:3)", "Can cause glitches (416x240, 16:9)", "Can cause glitches (560x240, 21:9)")};
diff --git a/src/platform/psvita/ui.cpp b/src/platform/psvita/ui.cpp
index 7fad14ba7..397186bfa 100644
--- a/src/platform/psvita/ui.cpp
+++ b/src/platform/psvita/ui.cpp
@@ -97,7 +97,7 @@ static int renderThread(unsigned int args, void* arg){
 			vita2d_draw_texture(touch_texture, 0, 0);
 		}
 
-		if (vcfg_ref->scaling_mode.Get() == ScalingMode::Nearest) {
+		if (vcfg_ref->scaling_mode.Get() == ConfigEnum::ScalingMode::Nearest) {
 			if (!vcfg_ref->stretch.Get()) {
 				// 725x544 (scaled)
 				vita2d_draw_texture_scale(gpu_texture, 117, 0, 2.266, 2.266);
@@ -105,7 +105,7 @@ static int renderThread(unsigned int args, void* arg){
 				// 960x544 (full-stretched)
 				vita2d_draw_texture_scale(gpu_texture, 0, 0, 3, 2.266);
 			}
-		} else if (vcfg_ref->scaling_mode.Get() == ScalingMode::Integer) {
+		} else if (vcfg_ref->scaling_mode.Get() == ConfigEnum::ScalingMode::Integer) {
 			if (!vcfg_ref->stretch.Get()) {
 				// 640x480 (doubled)
 				vita2d_draw_texture_scale(gpu_texture, 160, 32, 2.0, 2.0);
@@ -271,7 +271,7 @@ void Psp2Ui::UpdateDisplay() {
 	sceKernelSignalSema(GPU_Mutex, 1);
 }
 
-void Psp2Ui::SetScalingMode(ScalingMode mode) {
+void Psp2Ui::SetScalingMode(ConfigEnum::ScalingMode mode) {
 	vcfg.scaling_mode.Set(mode);
 }
 
@@ -295,7 +295,7 @@ void Psp2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.vsync.SetOptionVisible(true);
 	cfg.fps_limit.SetOptionVisible(true);
 	cfg.scaling_mode.SetOptionVisible(true);
-	cfg.scaling_mode.RemoveFromValidSet(ScalingMode::Bilinear);
+	cfg.scaling_mode.RemoveFromValidSet(ConfigEnum::ScalingMode::Bilinear);
 	cfg.stretch.SetOptionVisible(true);
 	cfg.touch_ui.SetOptionVisible(!is_pstv);
 
diff --git a/src/platform/psvita/ui.h b/src/platform/psvita/ui.h
index 9174a1065..5f5fc59f4 100644
--- a/src/platform/psvita/ui.h
+++ b/src/platform/psvita/ui.h
@@ -50,14 +50,14 @@ class Psp2Ui final : public BaseUi {
 	/** @{ */
 	void UpdateDisplay() override;
 	void ProcessEvents() override;
-	void SetScalingMode(ScalingMode) override;
+	void SetScalingMode(ConfigEnum::ScalingMode) override;
 	void ToggleStretch() override;
 	void ToggleTouchUi() override;
 	void ToggleVsync() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
 
 #ifdef SUPPORT_AUDIO
-	AudioInterface& GetAudio();
+	AudioInterface& GetAudio() override;
 #endif
 	/** @} */
 
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 67b2f63c6..364aa161a 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -542,7 +542,7 @@ void Sdl2Ui::ProcessEvents() {
 	}
 }
 
-void Sdl2Ui::SetScalingMode(ScalingMode mode) {
+void Sdl2Ui::SetScalingMode(ConfigEnum::ScalingMode mode) {
 	window.size_changed = true;
 	vcfg.scaling_mode.Set(mode);
 }
@@ -589,7 +589,7 @@ void Sdl2Ui::UpdateDisplay() {
 			}
 		};
 
-		if (vcfg.scaling_mode.Get() == ScalingMode::Integer) {
+		if (vcfg.scaling_mode.Get() == ConfigEnum::ScalingMode::Integer) {
 			// Integer division on purpose
 			if (want_aspect > real_aspect) {
 				window.scale = static_cast<float>(window.width / main_surface->width());
@@ -634,7 +634,7 @@ void Sdl2Ui::UpdateDisplay() {
 			SDL_RenderSetViewport(sdl_renderer, &viewport);
 		}
 
-		if (vcfg.scaling_mode.Get() == ScalingMode::Bilinear && window.scale > 0.f) {
+		if (vcfg.scaling_mode.Get() == ConfigEnum::ScalingMode::Bilinear && window.scale > 0.f) {
 			if (sdl_texture_scaled) {
 				SDL_DestroyTexture(sdl_texture_scaled);
 			}
@@ -649,7 +649,7 @@ void Sdl2Ui::UpdateDisplay() {
 	}
 
 	SDL_RenderClear(sdl_renderer);
-	if (vcfg.scaling_mode.Get() == ScalingMode::Bilinear && window.scale > 0.f) {
+	if (vcfg.scaling_mode.Get() == ConfigEnum::ScalingMode::Bilinear && window.scale > 0.f) {
 		// Render game texture on the scaled texture
 		SDL_SetRenderTarget(sdl_renderer, sdl_texture_scaled);
 		SDL_RenderClear(sdl_renderer);
diff --git a/src/platform/sdl/sdl2_ui.h b/src/platform/sdl/sdl2_ui.h
index cfa28769c..89b9aaad7 100644
--- a/src/platform/sdl/sdl2_ui.h
+++ b/src/platform/sdl/sdl2_ui.h
@@ -66,7 +66,7 @@ class Sdl2Ui final : public BaseUi {
 	void SetTitle(const std::string &title) override;
 	bool ShowCursor(bool flag) override;
 	void ProcessEvents() override;
-	void SetScalingMode(ScalingMode) override;
+	void SetScalingMode(ConfigEnum::ScalingMode) override;
 	void ToggleStretch() override;
 	void ToggleVsync() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
diff --git a/src/scene_logo.cpp b/src/scene_logo.cpp
index dc6188ccf..e63cc454c 100644
--- a/src/scene_logo.cpp
+++ b/src/scene_logo.cpp
@@ -213,7 +213,7 @@ void Scene_Logo::DrawTextOnLogo(bool verbose) {
 }
 
 std::vector<std::vector<uint8_t>> Scene_Logo::LoadLogos() {
-	if (Player::player_config.show_startup_logos.Get() == StartupLogos::None) {
+	if (Player::player_config.show_startup_logos.Get() == ConfigEnum::StartupLogos::None) {
 		return {};
 	}
 
diff --git a/src/scene_title.cpp b/src/scene_title.cpp
index bd23305a0..4dc5280a5 100644
--- a/src/scene_title.cpp
+++ b/src/scene_title.cpp
@@ -56,14 +56,14 @@ void Scene_Title::Start() {
 		Player::ChangeResolution(Player::screen_width, Player::screen_height);
 	} else {
 		switch (DisplayUi->GetConfig().game_resolution.Get()) {
-			case GameResolution::Original:
+			case ConfigEnum::GameResolution::Original:
 				Player::ChangeResolution(SCREEN_TARGET_WIDTH, SCREEN_TARGET_HEIGHT);
 				break;
-			case GameResolution::Widescreen:
+			case ConfigEnum::GameResolution::Widescreen:
 				Player::ChangeResolution(416, SCREEN_TARGET_HEIGHT);
 				Player::game_config.fake_resolution.Set(true);
 				break;
-			case GameResolution::Ultrawide:
+			case ConfigEnum::GameResolution::Ultrawide:
 				Player::ChangeResolution(560, SCREEN_TARGET_HEIGHT);
 				Player::game_config.fake_resolution.Set(true);
 				break;
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index e603f83b4..81c7cfb6b 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -281,10 +281,10 @@ void Window_Settings::RefreshVideo() {
 	AddOption(cfg.show_fps, [](){ DisplayUi->ToggleShowFps(); });
 	AddOption(cfg.fps_render_window, [](){ DisplayUi->ToggleShowFpsOnTitle(); });
 	AddOption(cfg.stretch, []() { DisplayUi->ToggleStretch(); });
-	AddOption(cfg.scaling_mode, [this](){ DisplayUi->SetScalingMode(static_cast<ScalingMode>(GetCurrentOption().current_value)); });
+	AddOption(cfg.scaling_mode, [this](){ DisplayUi->SetScalingMode(static_cast<ConfigEnum::ScalingMode>(GetCurrentOption().current_value)); });
 	AddOption(cfg.pause_when_focus_lost, [cfg]() mutable { DisplayUi->SetPauseWhenFocusLost(cfg.pause_when_focus_lost.Toggle()); });
 	AddOption(cfg.touch_ui, [](){ DisplayUi->ToggleTouchUi(); });
-	AddOption(cfg.game_resolution, [this]() { DisplayUi->SetGameResolution(static_cast<GameResolution>(GetCurrentOption().current_value)); });
+	AddOption(cfg.game_resolution, [this]() { DisplayUi->SetGameResolution(static_cast<ConfigEnum::GameResolution>(GetCurrentOption().current_value)); });
 }
 
 void Window_Settings::RefreshAudio() {
@@ -415,7 +415,7 @@ void Window_Settings::RefreshEngine() {
 		GetFrame().options.back().text += " [In use]";
 	}
 
-	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<StartupLogos>(GetCurrentOption().current_value)); });
+	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<ConfigEnum::StartupLogos>(GetCurrentOption().current_value)); });
 	AddOption(cfg.settings_autosave, [&cfg](){ cfg.settings_autosave.Toggle(); });
 	AddOption(cfg.settings_in_title, [&cfg](){ cfg.settings_in_title.Toggle(); });
 	AddOption(cfg.settings_in_menu, [&cfg](){ cfg.settings_in_menu.Toggle(); });

From 1f36f779628d3dc2dcdc2df2da3265ace515c3a6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 27 Mar 2024 15:15:11 +0100
Subject: [PATCH 110/222] Config: Unify FPS show settings.

The options are now:
- OFF (Do not show)
- ON (in titlebar when windowed, inside when fullscreen)
- Overlay (show always inside the window)

Last option is disabled when fullscreen option is disabled.
---
 resources/unix/bash-completion/easyrpg-player |  2 +-
 resources/unix/easyrpg-player.6.adoc          |  6 ++--
 src/baseui.cpp                                |  7 ++---
 src/baseui.h                                  | 31 +++++++++++++------
 src/game_config.cpp                           | 20 ++++++------
 src/game_config.h                             | 16 ++++++++--
 src/platform/sdl/sdl2_ui.cpp                  |  2 --
 src/player.cpp                                |  7 +++--
 src/window_settings.cpp                       |  3 +-
 9 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/resources/unix/bash-completion/easyrpg-player b/resources/unix/bash-completion/easyrpg-player
index 6203cac77..470cff85c 100644
--- a/resources/unix/bash-completion/easyrpg-player
+++ b/resources/unix/bash-completion/easyrpg-player
@@ -14,7 +14,7 @@ _easyrpg-player ()
 
   # all possible options
   ouropts='--autobattle-algo --battle-test --disable-audio --disable-rtp \
-           --encoding --enemyai-algo --engine --fps-limit --fps-render-window --fullscreen -h --help \
+           --encoding --enemyai-algo --engine --fps-limit --fullscreen -h --help \
            --hide-title --load-game-id --new-game --no-vsync --project-path --rtp-path --record-input \
            --replay-input --save-path --seed --show-fps --start-map-id --start-party --no-log-color \
            --start-position --test-play --window -v --version'
diff --git a/resources/unix/easyrpg-player.6.adoc b/resources/unix/easyrpg-player.6.adoc
index a7166d61c..27c45b6fe 100644
--- a/resources/unix/easyrpg-player.6.adoc
+++ b/resources/unix/easyrpg-player.6.adoc
@@ -198,8 +198,10 @@ NOTE: When using the game browser all games will share the same save directory!
    - 'bilinear'   - Like 'nearest' but apply a bilinear filter to avoid the
                     artifacts.
 *--show-fps*::
-  Enable display of the frames per second counter. Can be disabled with
-  *--no-show-fps*.
+  Enable display of the frames per second counter. When in windowed mode it is
+  shown inside the window. When in fullscreen mode it is shown in the titlebar.
+  Use *--fps-render-window* to always show the counter inside the window. Can be
+  disabled with *--no-show-fps*.
 
 *--stretch*::
   Ignore the aspect ratio and stretch video output to the entire width of the
diff --git a/src/baseui.cpp b/src/baseui.cpp
index fb1367bb3..482d9d02c 100644
--- a/src/baseui.cpp
+++ b/src/baseui.cpp
@@ -85,11 +85,8 @@ Game_ConfigVideo BaseUi::GetConfig() const {
 	cfg.window_width.Set(metrics.width);
 	cfg.window_height.Set(metrics.height);
 
-	if (cfg.fullscreen.IsOptionVisible()) {
-		cfg.fps_render_window.SetLocked(cfg.fullscreen.Get());
-		if (cfg.fps_render_window.IsLocked()) {
-			cfg.fps_render_window.SetDescription("This options requires to be in windowed mode");
-		}
+	if (!cfg.fullscreen.IsOptionVisible()) {
+		cfg.fps.RemoveFromValidSet(ConfigEnum::ShowFps::Overlay);
 	}
 
 	if (cfg.vsync.IsOptionVisible()
diff --git a/src/baseui.h b/src/baseui.h
index c5a4656a9..622f14ff8 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -188,11 +188,11 @@ class BaseUi {
 	/** @return true if we should render the fps counter to the title bar */
 	bool ShowFpsOnTitle() const;
 
-	/** Toggle whether we should show fps */
+	/** Toggle between showing FPS or not showing FPS */
 	void ToggleShowFps();
 
-	/** Toggle whether we should show fps on the titlebar */
-	void ToggleShowFpsOnTitle();
+	/** Whether we should show fps */
+	void SetShowFps(ConfigEnum::ShowFps fps);
 
 	/**
 	 * Set whether the program pauses the execution when the program focus is lost.
@@ -292,7 +292,7 @@ class BaseUi {
 	/** Touch inputs for up to five finger */
 	std::array<Input::TouchInput, 5> touch_input;
 
-	/** */
+	/** State of the 5 fingers (true touched, false not) */
 	std::array<bool, 5> finger_input;
 
 	/** Color for display background. */
@@ -309,6 +309,9 @@ class BaseUi {
 
 	/** Ui manages frame rate externally */
 	bool external_frame_rate = false;
+
+	/** Used by the F2 toggle: Remembers which configuration (ON or Overlay) was used */
+	ConfigEnum::ShowFps original_fps_show_state = ConfigEnum::ShowFps::OFF;
 };
 
 /** Global DisplayUi variable. */
@@ -377,19 +380,29 @@ inline std::array<Input::TouchInput, 5>& BaseUi::GetTouchInput() {
 }
 
 inline bool BaseUi::RenderFps() const {
-	return vcfg.show_fps.Get() && (IsFullscreen() || vcfg.fps_render_window.Get());
+	return vcfg.fps.Get() == ConfigEnum::ShowFps::Overlay || (IsFullscreen() && vcfg.fps.Get() == ConfigEnum::ShowFps::ON);
 }
 
 inline bool BaseUi::ShowFpsOnTitle() const {
-	return vcfg.show_fps.Get();
+	return vcfg.fps.Get() == ConfigEnum::ShowFps::ON;
 }
 
 inline void BaseUi::ToggleShowFps() {
-	vcfg.show_fps.Toggle();
+	if (vcfg.fps.Get() != ConfigEnum::ShowFps::OFF) {
+		original_fps_show_state = vcfg.fps.Get();
+		vcfg.fps.Set(ConfigEnum::ShowFps::OFF);
+	} else {
+		if (original_fps_show_state == ConfigEnum::ShowFps::OFF) {
+			vcfg.fps.Set(ConfigEnum::ShowFps::ON);
+		} else {
+			vcfg.fps.Set(original_fps_show_state);
+		}
+	}
 }
 
-inline void BaseUi::ToggleShowFpsOnTitle() {
-	vcfg.fps_render_window.Toggle();
+inline void BaseUi::SetShowFps(ConfigEnum::ShowFps fps) {
+	vcfg.fps.Set(fps);
+	original_fps_show_state = fps;
 }
 
 inline void BaseUi::SetPauseWhenFocusLost(bool value) {
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 48131dcdc..5e502ec38 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -55,12 +55,10 @@ void Game_ConfigVideo::Hide() {
 
 	// Always enabled by default:
 	// - renderer (name of the renderer)
-	// - show_fps (Rendering of FPS, engine feature)
 
 	vsync.SetOptionVisible(false);
 	fullscreen.SetOptionVisible(false);
 	fps_limit.SetOptionVisible(false);
-	fps_render_window.SetOptionVisible(false);
 	window_zoom.SetOptionVisible(false);
 	scaling_mode.SetOptionVisible(false);
 	stretch.SetOptionVisible(false);
@@ -297,12 +295,16 @@ void Game_Config::LoadFromArgs(CmdlineParser& cp) {
 			video.fps_limit.Set(0);
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, {"--show-fps", "--no-show-fps"})) {
-			video.show_fps.Set(arg.ArgIsOn());
+		if (cp.ParseNext(arg, 0, "--show-fps")) {
+			video.fps.Set(ConfigEnum::ShowFps::ON);
 			continue;
 		}
-		if (cp.ParseNext(arg, 0, {"--fps-render-window", "--no-fps-render-window"})) {
-			video.fps_render_window.Set(arg.ArgIsOn());
+		if (cp.ParseNext(arg, 0, "--no-show-fps")) {
+			video.fps.Set(ConfigEnum::ShowFps::OFF);
+			continue;
+		}
+		if (cp.ParseNext(arg, 0, "--fps-render-window")) {
+			video.fps.Set(ConfigEnum::ShowFps::Overlay);
 			continue;
 		}
 		if (cp.ParseNext(arg, 0, "--pause-focus-lost")) {
@@ -427,8 +429,7 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
 	/** VIDEO SECTION */
 	video.vsync.FromIni(ini);
 	video.fullscreen.FromIni(ini);
-	video.show_fps.FromIni(ini);
-	video.fps_render_window.FromIni(ini);
+	video.fps.FromIni(ini);
 	video.fps_limit.FromIni(ini);
 	video.window_zoom.FromIni(ini);
 	video.scaling_mode.FromIni(ini);
@@ -518,8 +519,7 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
 	os << "[Video]\n";
 	video.vsync.ToIni(os);
 	video.fullscreen.ToIni(os);
-	video.show_fps.ToIni(os);
-	video.fps_render_window.ToIni(os);
+	video.fps.ToIni(os);
 	video.fps_limit.ToIni(os);
 	video.window_zoom.ToIni(os);
 	video.scaling_mode.ToIni(os);
diff --git a/src/game_config.h b/src/game_config.h
index e1fc7cec9..770bed531 100644
--- a/src/game_config.h
+++ b/src/game_config.h
@@ -57,6 +57,15 @@ namespace ConfigEnum {
 		Custom,
 		All
 	};
+
+	enum class ShowFps {
+		/** Do not show */
+		OFF,
+		/** When windowed: Title bar, fullscreen: Overlay */
+		ON,
+		/** Always overlay */
+		Overlay
+	};
 };
 
 #ifdef HAVE_FLUIDLITE
@@ -88,8 +97,11 @@ struct Game_ConfigVideo {
 	LockedConfigParam<std::string> renderer{ "Renderer", "The rendering engine", "auto" };
 	BoolConfigParam vsync{ "V-Sync", "Toggle V-Sync mode (Recommended: ON)", "Video", "Vsync", true };
 	BoolConfigParam fullscreen{ "Fullscreen", "Toggle between fullscreen and window mode", "Video", "Fullscreen", true };
-	BoolConfigParam show_fps{ "Show FPS", "Toggle display of the FPS counter", "Video", "ShowFps", false };
-	BoolConfigParam fps_render_window{ "Show FPS in Window", "Show FPS inside the window when in window mode", "Video", "FpsRenderWindow", false };
+	EnumConfigParam<ConfigEnum::ShowFps, 3> fps{
+		"FPS counter", "How to display the FPS counter", "Video", "Fps", ConfigEnum::ShowFps::OFF,
+		Utils::MakeSvArray("[OFF]", "[ON]", "Overlay"),
+		Utils::MakeSvArray("off", "on", "overlay"),
+		Utils::MakeSvArray("Do not show the FPS counter", "Show the FPS counter", "Always show the FPS counter inside the window")};
 	RangeConfigParam<int> fps_limit{ "Frame Limiter", "Toggle the frames per second limit (Recommended: 60)", "Video", "FpsLimit", DEFAULT_FPS, 0, 99999 };
 	ConfigParam<int> window_zoom{ "Window Zoom", "Toggle the window zoom level", "Video", "WindowZoom", 2 };
 	EnumConfigParam<ConfigEnum::ScalingMode, 3> scaling_mode{ "Scaling method", "How the output is scaled", "Video", "ScalingMode", ConfigEnum::ScalingMode::Nearest,
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 364aa161a..d3449a815 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -1225,7 +1225,6 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 #endif
 	cfg.fullscreen.SetOptionVisible(true);
 	cfg.fps_limit.SetOptionVisible(true);
-	cfg.fps_render_window.SetOptionVisible(true);
 #if defined(SUPPORT_ZOOM) && !defined(__ANDROID__)
 	// An initial zoom level is needed on Android however changing it looks awful
 	cfg.window_zoom.SetOptionVisible(true);
@@ -1243,7 +1242,6 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	// Fullscreen is handled by the browser
 	cfg.fullscreen.SetOptionVisible(false);
 	cfg.fps_limit.SetOptionVisible(false);
-	cfg.fps_render_window.SetOptionVisible(false);
 	cfg.window_zoom.SetOptionVisible(false);
 	// Toggling this freezes the web player
 	cfg.vsync.SetOptionVisible(false);
diff --git a/src/player.cpp b/src/player.cpp
index 60e461257..1c2faefe1 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1439,9 +1439,6 @@ Video options:
  --fps-limit          In combination with --no-vsync sets a custom frames per
                       second limit. The default is 60 FPS. Use --no-fps-limit
                       to run with unlimited frames per second.
- --fps-render-window  Render the frames per second counter in both fullscreen
-                      and windowed mode.
-                      Disable with --no-fps-render-window.
  --fullscreen         Start in fullscreen mode.
  --game-resolution R  Force a different game resolution. This is experimental
                       and can cause glitches or break games!
@@ -1459,6 +1456,10 @@ Video options:
                        bilinear - Like nearest, but applies a bilinear filter to
                                   avoid artifacts.
  --show-fps           Enable display of the frames per second counter.
+                      When in windowed mode it is shown inside the window.
+                      When in fullscreen mode it is shown in the titlebar.
+                      Use --fps-render-window to always show the counter inside
+                      the window.
                       Disable with --no-show-fps.
  --stretch            Ignore the aspect ratio and stretch video output to the
                       entire width of the screen.
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 81c7cfb6b..cbe8a3007 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -276,10 +276,9 @@ void Window_Settings::RefreshVideo() {
 	AddOption(cfg.renderer,	[](){});
 	AddOption(cfg.fullscreen, [](){ DisplayUi->ToggleFullscreen(); });
 	AddOption(cfg.window_zoom, [](){ DisplayUi->ToggleZoom(); });
+	AddOption(cfg.fps, [this](){ DisplayUi->SetShowFps(static_cast<ConfigEnum::ShowFps>(GetCurrentOption().current_value)); });
 	AddOption(cfg.vsync, [](){ DisplayUi->ToggleVsync(); });
 	AddOption(cfg.fps_limit, [this](){ DisplayUi->SetFrameLimit(GetCurrentOption().current_value); });
-	AddOption(cfg.show_fps, [](){ DisplayUi->ToggleShowFps(); });
-	AddOption(cfg.fps_render_window, [](){ DisplayUi->ToggleShowFpsOnTitle(); });
 	AddOption(cfg.stretch, []() { DisplayUi->ToggleStretch(); });
 	AddOption(cfg.scaling_mode, [this](){ DisplayUi->SetScalingMode(static_cast<ConfigEnum::ScalingMode>(GetCurrentOption().current_value)); });
 	AddOption(cfg.pause_when_focus_lost, [cfg]() mutable { DisplayUi->SetPauseWhenFocusLost(cfg.pause_when_focus_lost.Toggle()); });

From 2bd7bc5e5b7c89a492399e117c38ff27ad0c9dd0 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 17 Apr 2024 22:56:25 +0200
Subject: [PATCH 111/222] Font: Unify the rendering functions for shaped and
 non-shaped fonts

---
 src/font.cpp | 85 ++++++++++++++++++----------------------------------
 src/font.h   |  3 ++
 2 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index 8495bc4c8..8076f7a0a 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -729,13 +729,39 @@ Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, in
 	}
 
 	auto gret = vRender(glyph);
-	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
+
+	if (EP_UNLIKELY(!RenderImpl(dest, x, y, sys, color, gret))) {
+		return {};
+	}
+
+	gret.advance.x += current_style.letter_spacing;
+
+	return gret.advance;
+}
+
+Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, int color, const Font::ShapeRet& shape) const {
+	if (shape.not_found) {
+		return Render(dest, x, y, sys, color, shape.code);
+	}
+
+	auto gret = vRenderShaped(shape.code);
+
+	if (EP_UNLIKELY(!RenderImpl(dest, x, y, sys, color, gret))) {
 		return {};
 	}
 
+	Point advance = { shape.advance.x + current_style.letter_spacing, shape.advance.y };
+	return advance;
+}
+
+bool Font::RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys, int color, const GlyphRet& gret) const {
+	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
+		return false;
+	}
+
 	auto rect = Rect(x, y, gret.bitmap->width(), gret.bitmap->height());
 	if (EP_UNLIKELY(rect.width == 0)) {
-		return {};
+		return false;
 	}
 
 	rect.x += gret.offset.x;
@@ -776,60 +802,7 @@ Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, in
 		dest.Blit(rect.x, rect.y, *gret.bitmap, gret.bitmap->GetRect(), Opacity::Opaque());
 	}
 
-	gret.advance.x += current_style.letter_spacing;
-
-	return gret.advance;
-}
-
-Point Font::Render(Bitmap& dest, int const x, int const y, const Bitmap& sys, int color, const Font::ShapeRet& shape) const {
-	if (shape.not_found) {
-		return Render(dest, x, y, sys, color, shape.code);
-	}
-
-	auto gret = vRenderShaped(shape.code);
-	if (EP_UNLIKELY(gret.bitmap == nullptr)) {
-		return {};
-	}
-
-	auto rect = Rect(x, y, gret.bitmap->width(), gret.bitmap->height());
-	if (EP_UNLIKELY(rect.width == 0)) {
-		return {};
-	}
-
-	rect.x += shape.offset.x + gret.offset.x;
-	rect.y -= shape.offset.y + gret.offset.y;
-
-	unsigned src_x;
-	unsigned src_y;
-
-	if (color != ColorShadow) {
-		if (!gret.has_color && current_style.draw_shadow) {
-			auto shadow_rect = Rect(rect.x + 1, rect.y + 1, rect.width, rect.height);
-			dest.MaskedBlit(shadow_rect, *gret.bitmap, 0, 0, sys, 16, 32);
-		}
-
-		src_x = color % 10 * 16 + 2;
-		src_y = color / 10 * 16 + 48 + 16 - 12 - shape.offset.y - gret.offset.y;
-
-		// When the glyph is large the system graphic color mask will be outside the rectangle
-		// Move the mask slightly up to avoid this
-		int offset = gret.bitmap->height() - shape.offset.y - gret.offset.y;
-		if (offset > 12) {
-			src_y -= offset - 12;
-		}
-	} else {
-		src_x = 16;
-		src_y = 32;
-	}
-
-	if (!gret.has_color) {
-		dest.MaskedBlit(rect, *gret.bitmap, 0, 0, sys, src_x, src_y);
-	} else {
-		dest.Blit(rect.x, rect.y, *gret.bitmap, gret.bitmap->GetRect(), Opacity::Opaque());
-	}
-
-	Point advance = { shape.advance.x + current_style.letter_spacing, shape.advance.y };
-	return advance;
+	return true;
 }
 
 Point Font::Render(Bitmap& dest, int x, int y, Color const& color, char32_t glyph) const {
diff --git a/src/font.h b/src/font.h
index e563d62ef..e3daaf1fa 100644
--- a/src/font.h
+++ b/src/font.h
@@ -262,6 +262,9 @@ class Font {
 	Style original_style;
 	Style current_style;
 	FontRef fallback_font;
+
+private:
+	bool RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys, int color, const GlyphRet& gret) const;
 };
 
 #endif

From f16cc6b1239fa27cca7faedef32029b3278a0b4c Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 18 Apr 2024 00:04:16 +0200
Subject: [PATCH 112/222] Font: Resize the mask when the glyph is too large

The mask looks brighter than in Maniac Patch but at least it does not look corrupted anymore.
---
 src/font.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index 8076f7a0a..605cbf308 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -764,13 +764,65 @@ bool Font::RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys,
 		return false;
 	}
 
+	// Drawing position of the glyph
 	rect.x += gret.offset.x;
 	rect.y -= gret.offset.y;
 
-	unsigned src_x;
-	unsigned src_y;
+	unsigned src_x = 0;
+	unsigned src_y = 0;
+
+	int glyph_height = gret.bitmap->height() - gret.offset.y;
+
+	// Adjust how the mask is applied depending on the glyph size to prevent that
+	// pixels from outside of the mask color are read
+	// When <= 12: Will work fine
+	// When <= 16: Slightly adjusted (see ~20 lines below)
+	if (glyph_height > 16) {
+		// Too large for the existing mask: Resize the masks (slow)
+		// The mask is too small and the system graphic must be resized
+		// This is usually an exception and requires a custom font
+		const Rect shadow_color_rect = { 16, 32, 16, 16 };
+		const Rect mask_color_rect = { color % 10 * 16, color / 10 * 16 + 48, 16, 16 };
+		auto sys_large = Bitmap::Create(current_style.size * 2, current_style.size, false);
+		double zoom = current_style.size / 16.0;
+		// Left half of the image is the shadow, right half the mask
+		if (color != ColorShadow && current_style.draw_shadow) {
+			sys_large->ZoomOpacityBlit(0, 0, 0, 0, sys, shadow_color_rect, zoom, zoom, Opacity::Opaque());
+		}
+		if (!gret.has_color) {
+			sys_large->ZoomOpacityBlit(current_style.size, 0, 0, 0, sys, mask_color_rect, zoom, zoom, Opacity::Opaque());
+		}
+
+		if (color != ColorShadow) {
+			// First draw the shadow, offset by one
+			if (!gret.has_color && current_style.draw_shadow) {
+				auto shadow_rect = Rect(rect.x + 1, rect.y + 1, rect.width, rect.height);
+				dest.MaskedBlit(shadow_rect, *gret.bitmap, 0, 0, *sys_large, 0, 0);
+			}
+
+			src_x = current_style.size;
+			src_y -= gret.offset.y;
+		}
+
+		if (!gret.has_color) {
+			if (current_style.draw_gradient) {
+				dest.MaskedBlit(rect, *gret.bitmap, 0, 0, *sys_large, src_x, src_y);
+			} else {
+				auto col = sys.GetColorAt(current_style.color_offset.x + src_x, current_style.color_offset.y + src_y);
+				auto col_bm = Bitmap::Create(gret.bitmap->width(), gret.bitmap->height(), col);
+				dest.MaskedBlit(rect, *gret.bitmap, 0, 0, *col_bm, 0, 0);
+			}
+		} else {
+			// Color glyphs, emojis etc.
+			dest.Blit(rect.x, rect.y, *gret.bitmap, gret.bitmap->GetRect(), Opacity::Opaque());
+		}
+
+		return true;
+	}
 
+	// Glyph fits in the mask
 	if (color != ColorShadow) {
+		// First draw the shadow, offset by one
 		if (!gret.has_color && current_style.draw_shadow) {
 			auto shadow_rect = Rect(rect.x + 1, rect.y + 1, rect.width, rect.height);
 			dest.MaskedBlit(shadow_rect, *gret.bitmap, 0, 0, sys, 16, 32);
@@ -779,6 +831,7 @@ bool Font::RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys,
 		src_x = color % 10 * 16 + 2;
 		src_y = color / 10 * 16 + 48 + 16 - 12 - gret.offset.y;
 	} else {
+		// When the color is the shadow color do not render twice
 		src_x = 16;
 		src_y = 32;
 	}
@@ -787,9 +840,9 @@ bool Font::RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys,
 		if (current_style.draw_gradient) {
 			// When the glyph is large the system graphic color mask will be outside the rectangle
 			// Move the mask slightly up to avoid this
-			int offset = gret.bitmap->height() - gret.offset.y;
-			if (offset > 12) {
-				src_y -= offset - 12;
+ 			if (glyph_height > 12) {
+				// Slightly too large -> Apply an offset
+				src_y -= glyph_height - 12;
 			}
 
 			dest.MaskedBlit(rect, *gret.bitmap, 0, 0, sys, src_x, src_y);
@@ -799,6 +852,7 @@ bool Font::RenderImpl(Bitmap& dest, int const x, int const y, const Bitmap& sys,
 			dest.MaskedBlit(rect, *gret.bitmap, 0, 0, *col_bm, 0, 0);
 		}
 	} else {
+		// Color glyphs, emojis etc.
 		dest.Blit(rect.x, rect.y, *gret.bitmap, gret.bitmap->GetRect(), Opacity::Opaque());
 	}
 

From b8fa21cd4820a995e329b3e2964c38e9152eed82 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 19 Apr 2024 12:10:41 +0200
Subject: [PATCH 113/222] Do transparent blitting of the system graphic frame

Fix #2961
---
 src/game_windows.cpp | 2 ++
 src/window.cpp       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game_windows.cpp b/src/game_windows.cpp
index de678dc21..2a3850722 100644
--- a/src/game_windows.cpp
+++ b/src/game_windows.cpp
@@ -355,6 +355,8 @@ void Game_Windows::Window_User::Refresh(bool& async_wait) {
 	window->SetVisible(false);
 
 	BitmapRef system;
+	// FIXME: Transparency setting is currently not applied to the system graphic
+	// Disabling transparency breaks the rendering of the system graphic
 	if (!data.system_name.empty()) {
 		system = Cache::System(data.system_name);
 	} else {
diff --git a/src/window.cpp b/src/window.cpp
index 810e7f580..6fc4dcba4 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -178,7 +178,7 @@ void Window::Draw(Bitmap& dst) {
 void Window::RefreshBackground() {
 	background_needs_refresh = false;
 
-	BitmapRef bitmap = Bitmap::Create(width, height, false);
+	BitmapRef bitmap = Bitmap::Create(width, height);
 
 	if (stretch) {
 		bitmap->StretchBlit(*windowskin, Rect(0, 0, 32, 32), 255);

From 0fd4a053ca156da2cdf83e4304ee42525de08d4e Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 13 May 2024 19:24:16 +0200
Subject: [PATCH 114/222] MIDI: Only call seq->play in the Update function.
 Otherwise can cause a race condition and silence the track.

Fix #3186
---
 src/audio_decoder_midi.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/audio_decoder_midi.cpp b/src/audio_decoder_midi.cpp
index 6ff38c07d..cc40a639b 100644
--- a/src/audio_decoder_midi.cpp
+++ b/src/audio_decoder_midi.cpp
@@ -148,7 +148,6 @@ bool AudioDecoderMidi::Open(Filesystem_Stream::InputStream stream) {
 	tempo.clear();
 	tempo.emplace_back(this, midi_default_tempo);
 	mtime = seq->get_start_skipping_silence();
-	seq->play(mtime, this);
 
 	if (!mididec->SupportsMidiMessages()) {
 		if (!mididec->Open(file_buffer)) {

From 914abbb1771b6fa84a82021aec00b6eef3551620 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 13 May 2024 19:31:01 +0200
Subject: [PATCH 115/222] Unlock the font settings when returning to the Game
 Browser

---
 src/font.cpp   | 5 ++++-
 src/player.cpp | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index 605cbf308..29ee2e220 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -662,7 +662,7 @@ void Font::ResetDefault() {
 	SetDefault(nullptr, false);
 
 #ifdef HAVE_FREETYPE
-	const auto& cfg = Player::player_config;
+	auto& cfg = Player::player_config;
 	if (!cfg.font1.Get().empty()) {
 		auto is = FileFinder::Root().OpenInputStream(cfg.font1.Get());
 		SetDefault(CreateFtFont(std::move(is), cfg.font1_size.Get(), false, false), false);
@@ -672,6 +672,9 @@ void Font::ResetDefault() {
 		auto is = FileFinder::Root().OpenInputStream(cfg.font2.Get());
 		SetDefault(CreateFtFont(std::move(is), cfg.font2_size.Get(), false, false), true);
 	}
+
+	cfg.font1.SetLocked(false);
+	cfg.font2.SetLocked(false);
 #endif
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index 1c2faefe1..a795f34e8 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1053,7 +1053,6 @@ void Player::LoadFonts() {
 #ifdef HAVE_FREETYPE
 	// Look for bundled fonts
 	auto gothic = FileFinder::OpenFont("Font");
-	player_config.font1.SetLocked(false);
 	if (gothic) {
 		auto ft = Font::CreateFtFont(std::move(gothic), 12, false, false);
 		player_config.font1.SetLocked(ft != nullptr);
@@ -1063,7 +1062,6 @@ void Player::LoadFonts() {
 	}
 
 	auto mincho = FileFinder::OpenFont("Font2");
-	player_config.font2.SetLocked(false);
 	if (mincho) {
 		auto ft = Font::CreateFtFont(std::move(mincho), 12, false, false);
 		player_config.font2.SetLocked(ft != nullptr);

From 7f6f3810bc227401f82a7b3533910b1d68c732b7 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 21 May 2024 22:25:16 +0200
Subject: [PATCH 116/222] Audio Generic: memset was not clearing all the data
 (works on bytes, not floats)

Use std::fill now which is not this error prone.

Solves audio glitches ("pop") when having no BGM (or MidiOut) and a sound effect ends.
---
 src/audio_generic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_generic.cpp b/src/audio_generic.cpp
index 0b46fc7c4..6985cd0dc 100644
--- a/src/audio_generic.cpp
+++ b/src/audio_generic.cpp
@@ -307,7 +307,7 @@ void GenericAudio::Decode(uint8_t* output_buffer, int buffer_length) {
 	if (scrap_buffer.size() != scrap_buffer_size) {
 		scrap_buffer.resize(scrap_buffer_size);
 	}
-	memset(mixer_buffer.data(), '\0', mixer_buffer.size());
+	std::fill(mixer_buffer.begin(), mixer_buffer.end(), '\0');
 
 	for (unsigned i = 0; i < nr_of_bgm_channels + nr_of_se_channels; i++) {
 		int read_bytes = 0;

From 57cddd13d8ca154fa6d64c98557115f4aa76546b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 21 May 2024 22:27:14 +0200
Subject: [PATCH 117/222] Settings: Do not play Decision SE twice

---
 src/scene_settings.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
index 03fdcc001..bd5563f99 100644
--- a/src/scene_settings.cpp
+++ b/src/scene_settings.cpp
@@ -313,7 +313,6 @@ void Scene_Settings::UpdateMain() {
 	);
 
 	if (Input::IsTriggered(Input::DECISION)) {
-		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Game_System::SFX_Decision));
 		auto idx = main_window->GetIndex();
 
 		if (main_window->IsItemEnabled(idx)) {

From 8a18a8c12cbe08fba874de3543c8e424ea978aed Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:39:24 +0200
Subject: [PATCH 118/222] Android: Hardcode the read only strings

Reduces confusion in Weblate due to the Read only strings.
---
 .../player/game_browser/GameBrowserHelper.java     | 14 +++++++-------
 builds/android/app/src/main/res/values/strings.xml |  7 -------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
index e20b51837..322e37451 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
@@ -242,31 +242,31 @@ public static void showErrorMessage(Context context, SafError error) {
                 break;
             case BAD_CONTENT_PROVIDER_CREATE:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_create);
+                errorMsg += "File creation failed.";
                 break;
             case BAD_CONTENT_PROVIDER_READ:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_read);
+                errorMsg += "Read operation failed.";
                 break;
             case BAD_CONTENT_PROVIDER_WRITE:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_write);
+                errorMsg += "Write operation failed.";
                 break;
             case BAD_CONTENT_PROVIDER_DELETE:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_delete);
+                errorMsg += "File deletion failed.";
                 break;
             case BAD_CONTENT_PROVIDER_FILENAME_IGNORED:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_filename_ignored);
+                errorMsg += "Provided filename ignored.";
                 break;
             case BAD_CONTENT_PROVIDER_BASE_FOLDER_NOT_FOUND:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_base_folder_not_found);
+                errorMsg += "Selected folder not found.";
                 break;
             case BAD_CONTENT_PROVIDER_FILE_ACCESS:
                 errorMsg = context.getString(R.string.error_saf_bad_content_provider);
-                errorMsg += context.getString(R.string.error_saf_bad_content_provider_file_access);
+                errorMsg += "A file was successfully created but cannot be accessed.";
                 break;
             case FOLDER_NOT_ALMOST_EMPTY:
                 errorMsg = context.getString(R.string.error_saf_folder_not_empty);
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index e12a3a213..fc7ba497e 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -47,13 +47,6 @@
     <string name="error_saf_download_selected">The Download folder cannot be used as the EasyRPG folder.</string>
     <string name="error_saf_folder_not_empty">The selected folder contains other files and cannot be used as the EasyRPG folder. When you remove all files inside the folder you can use it as the EasyRPG folder.</string>
     <string name="error_saf_bad_content_provider">The selected folder cannot be used as the EasyRPG folder. This problem can occur for various reasons, for example if you have selected the root directory or a storage location in the cloud.\n\n</string>
-    <string name="error_saf_bad_content_provider_create" translatable="false">File creation failed.</string>
-    <string name="error_saf_bad_content_provider_read" translatable="false">Read operation failed.</string>
-    <string name="error_saf_bad_content_provider_write" translatable="false">Write operation failed.</string>
-    <string name="error_saf_bad_content_provider_delete" translatable="false">File deletion failed.</string>
-    <string name="error_saf_bad_content_provider_filename_ignored" translatable="false">Provided filename ignored.</string>
-    <string name="error_saf_bad_content_provider_base_folder_not_found" translatable="false">Selected folder not found.</string>
-    <string name="error_saf_bad_content_provider_file_access" translatable="false">A file was successfully created but cannot be accessed.</string>
 
     <!--Ingame menu-->
     <string name="toggle_ui">Toggle virtual buttons</string>

From f24639f44f92b0adae84524d6660ed7874588338 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:40:40 +0200
Subject: [PATCH 119/222] Android: Remove FastForward button by default

Can be added in the Layout editor.
---
 .../java/org/easyrpg/player/button_mapping/InputLayout.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/button_mapping/InputLayout.java b/builds/android/app/src/main/java/org/easyrpg/player/button_mapping/InputLayout.java
index 15b4412d1..d6fcff175 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/button_mapping/InputLayout.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/button_mapping/InputLayout.java
@@ -79,7 +79,6 @@ public String toStringForSave(Activity activity) {
     private static LinkedList<VirtualButton> getDefaultHorizontalButtonList(Activity activity) {
         LinkedList<VirtualButton> l = new LinkedList<>();
         l.add(new MenuButton(activity, 0.01, 0.01, 90));
-        l.add(VirtualButton.Create(activity, VirtualButton.KEY_FAST_FORWARD, 0.9, 0.01, 90));
         l.add(new VirtualCross(activity, 0.01, 0.4, 100));
         l.add(VirtualButton.Create(activity, VirtualButton.ENTER, 0.80, 0.55, 100));
         l.add(VirtualButton.Create(activity, VirtualButton.CANCEL, 0.90, 0.45, 100));
@@ -90,7 +89,6 @@ private static LinkedList<VirtualButton> getDefaultHorizontalButtonList(Activity
     private static LinkedList<VirtualButton> getDefaultVerticalButtonList(Activity activity) {
         LinkedList<VirtualButton> l = new LinkedList<>();
         l.add(new MenuButton(activity, 0.01, 0.5, 90));
-        l.add(VirtualButton.Create(activity, VirtualButton.KEY_FAST_FORWARD, 0.70, 0.5, 90));
         l.add(new VirtualCross(activity, 0.05, 0.65, 100));
         l.add(VirtualButton.Create(activity, VirtualButton.ENTER, 0.60, 0.75, 100));
         l.add(VirtualButton.Create(activity, VirtualButton.CANCEL, 0.70, 0.65, 100));

From c76ea074c26da12bb01c44b280d461c2a519c560 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:41:59 +0200
Subject: [PATCH 120/222] FileFinder: Add a helper function to recursively find
 a game

To be used by the Android GameBrowser
---
 src/filefinder.cpp | 29 +++++++++++++++++++++++++++++
 src/filefinder.h   |  9 +++++++++
 src/utils.h        |  1 -
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/filefinder.cpp b/src/filefinder.cpp
index e78ae5805..31fbad16d 100644
--- a/src/filefinder.cpp
+++ b/src/filefinder.cpp
@@ -35,6 +35,7 @@
 #include "system.h"
 #include "options.h"
 #include "utils.h"
+#include "directory_tree.h"
 #include "filefinder.h"
 #include "filefinder_rtp.h"
 #include "filesystem.h"
@@ -531,3 +532,31 @@ void FileFinder::DumpFilesystem(FilesystemView fs) {
 		cur_fs = cur_fs.GetOwner().GetParent();
 	}
 }
+
+FilesystemView FileFinder::FindGameRecursive(FilesystemView fs, int recursion_limit) {
+	if (!fs || recursion_limit == 0) {
+		return {};
+	}
+
+	if (IsValidProject(fs)) {
+		return fs;
+	}
+
+	auto entries = fs.ListDirectory();
+
+	for (auto& [name_lower, entry]: *entries) {
+		if (entry.type == DirectoryTree::FileType::Directory) {
+			auto fs_ret = FindGameRecursive(fs.Subtree(entry.name), recursion_limit - 1);
+			if (fs_ret) {
+				return fs_ret;
+			}
+		} else if (entry.type == DirectoryTree::FileType::Regular && IsSupportedArchiveExtension(entry.name)) {
+			auto fs_ret = FindGameRecursive(fs.Create(entry.name));
+			if (fs_ret) {
+				return fs_ret;
+			}
+		}
+	}
+
+	return {};
+}
diff --git a/src/filefinder.h b/src/filefinder.h
index 3bd774afc..f747355eb 100644
--- a/src/filefinder.h
+++ b/src/filefinder.h
@@ -353,6 +353,15 @@ namespace FileFinder {
 	 * @param fs Filesystem to use
 	 */
 	void DumpFilesystem(FilesystemView fs);
+
+	/**
+	 * Searches recursively for a game directory.
+	 *
+	 * @param fs Filesystem where the search starts
+	 * @param recursion_limit Recursion depth
+	 * @return View of the game directory when found
+	 */
+	FilesystemView FindGameRecursive(FilesystemView fs, int recursion_limit = 3);
 } // namespace FileFinder
 
 template<typename T>
diff --git a/src/utils.h b/src/utils.h
index 53bd82349..014021330 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -25,7 +25,6 @@
 #include <sstream>
 #include <vector>
 #include <random>
-#include "system.h"
 #include "string_view.h"
 #include "span.h"
 

From af01610912338456209549e7c636584b5f4be2d6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:42:21 +0200
Subject: [PATCH 121/222] Android: Fix Saf Write test

---
 builds/android/app/src/main/java/org/easyrpg/player/Helper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
index 41acd3c00..37bc969ee 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
@@ -178,7 +178,7 @@ public static GameBrowserHelper.SafError testContentProvider(Context context, Ur
                 return GameBrowserHelper.SafError.BAD_CONTENT_PROVIDER_READ;
             }
 
-            try (ParcelFileDescriptor fd = context.getContentResolver().openFileDescriptor(testFile.getUri(), "r")) {
+            try (ParcelFileDescriptor fd = context.getContentResolver().openFileDescriptor(testFile.getUri(), "w")) {
             } catch (IOException | IllegalArgumentException e) {
                 return GameBrowserHelper.SafError.BAD_CONTENT_PROVIDER_WRITE;
             }

From 59ac1ce90f665f6afadebef72a935a712d495162 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:51:43 +0200
Subject: [PATCH 122/222] Android: Refactor Player Filesystem API

The JNIEnv-Pointer is now set from the outside.
Makes it possible to call these functions without having SDL initialized.

Remove DeleteLocalRef, as these references are garbage collected automatically when the function returns.
---
 CMakeLists.txt                                |  3 +-
 .../player/player/EasyRpgPlayerActivity.java  |  6 +--
 src/platform/android/android.cpp              |  5 ++
 src/platform/android/android.h                |  6 ++-
 src/platform/android/filesystem_apk.cpp       | 10 ++--
 src/platform/android/filesystem_saf.cpp       | 54 +++++--------------
 src/platform/sdl/main.cpp                     |  5 ++
 7 files changed, 37 insertions(+), 52 deletions(-)
 create mode 100644 src/platform/android/android.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac41b7dad..69e1cdd57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -573,7 +573,6 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	endif()
 
 	if(ANDROID)
-		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/android/app/src/gamebrowser)
 		set(PLAYER_BUILD_EXECUTABLE OFF)
 	endif()
 
@@ -1347,6 +1346,7 @@ else() # library
 		endif()
 	elseif(ANDROID AND ${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 		add_library(easyrpg_android
+			src/platform/android/android.cpp
 			src/platform/android/android.h
 			src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
 			src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h
@@ -1357,6 +1357,7 @@ else() # library
 			src/platform/sdl/main.cpp)
 		target_link_libraries(easyrpg_android ${PROJECT_NAME})
 		set_target_properties(easyrpg_android PROPERTIES DEBUG_POSTFIX "")
+		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/android/app/src/gamebrowser)
 		set(PLAYER_TEST_LIBRARIES "easyrpg_android")
 	else()
 		message(FATAL_ERROR "Unsupported library target platform ${PLAYER_TARGET_PLATFORM}")
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
index 50a269321..c50c4ab40 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
@@ -364,7 +364,7 @@ public String getRtpPath() {
         return "";
     }
 
-    public SafFile getHandleForPath(String path) {
+    public static SafFile getHandleForPath(String path) {
         return SafFile.fromPath(getContext(), path);
     }
 
@@ -420,8 +420,8 @@ public void updateScreenPosition() {
      *
      * @return asset manager
      */
-    public AssetManager getAssetManager() {
-        return getAssets();
+    public static AssetManager getAssetManager() {
+        return getContext().getAssets();
     }
 
     /**
diff --git a/src/platform/android/android.cpp b/src/platform/android/android.cpp
new file mode 100644
index 000000000..27b32f4d3
--- /dev/null
+++ b/src/platform/android/android.cpp
@@ -0,0 +1,5 @@
+#include "android.h"
+
+JNIEnv* EpAndroid::env = nullptr;
+std::function<void()> EpAndroid::android_fn;
+std::mutex EpAndroid::android_mutex;
diff --git a/src/platform/android/android.h b/src/platform/android/android.h
index c20a0588e..c13396177 100644
--- a/src/platform/android/android.h
+++ b/src/platform/android/android.h
@@ -20,10 +20,12 @@
 
 #include <mutex>
 #include <functional>
+#include <jni.h>
 
 namespace EpAndroid {
-	inline std::function<void()> android_fn;
-	inline std::mutex android_mutex;
+	extern JNIEnv* env;
+	extern std::function<void()> android_fn;
+	extern std::mutex android_mutex;
 
 	inline void invoke() {
 		if (!android_fn) {
diff --git a/src/platform/android/filesystem_apk.cpp b/src/platform/android/filesystem_apk.cpp
index dd4df38f5..9f13dbb35 100644
--- a/src/platform/android/filesystem_apk.cpp
+++ b/src/platform/android/filesystem_apk.cpp
@@ -18,16 +18,16 @@
 #include "filesystem_apk.h"
 #include "filefinder.h"
 #include "output.h"
+#include "android.h"
 
 #include <jni.h>
 #include <SDL_system.h>
 
 ApkFilesystem::ApkFilesystem() : Filesystem("", FilesystemView()) {
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
-	jobject sdl_activity = (jobject)SDL_AndroidGetActivity();
-	jclass cls = env->GetObjectClass(sdl_activity);
-	jmethodID jni_getAssetManager = env->GetMethodID(cls, "getAssetManager", "()Landroid/content/res/AssetManager;");
-	jobject asset_manager = (jobject)env->CallObjectMethod(sdl_activity, jni_getAssetManager);
+	JNIEnv* env = EpAndroid::env;
+	jclass cls = env->FindClass("org/easyrpg/player/player/EasyRpgPlayerActivity");
+	jmethodID jni_getAssetManager = env->GetStaticMethodID(cls, "getAssetManager", "()Landroid/content/res/AssetManager;");
+	jobject asset_manager = (jobject)env->CallStaticObjectMethod(cls, jni_getAssetManager);
 	mgr = AAssetManager_fromJava(env, asset_manager);
 }
 
diff --git a/src/platform/android/filesystem_saf.cpp b/src/platform/android/filesystem_saf.cpp
index 30febb5c2..63403e459 100644
--- a/src/platform/android/filesystem_saf.cpp
+++ b/src/platform/android/filesystem_saf.cpp
@@ -18,6 +18,7 @@
 #include "filesystem_saf.h"
 #include "filefinder.h"
 #include "output.h"
+#include "android.h"
 
 #include <unistd.h>
 #include <SDL_system.h>
@@ -25,16 +26,11 @@
 static jobject get_jni_handle(const SafFilesystem* fs, StringView path) {
 	std::string combined_path = FileFinder::MakePath(fs->GetPath(), path);
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
-	jobject sdl_activity = (jobject)SDL_AndroidGetActivity();
-	jclass cls = env->GetObjectClass(sdl_activity);
-	jmethodID jni_getFilesystemForPath = env->GetMethodID(cls, "getHandleForPath", "(Ljava/lang/String;)Lorg/easyrpg/player/player/SafFile;");
+	JNIEnv* env = EpAndroid::env;
+	jclass cls = env->FindClass("org/easyrpg/player/player/EasyRpgPlayerActivity");
+	jmethodID jni_getFilesystemForPath = env->GetStaticMethodID(cls, "getHandleForPath", "(Ljava/lang/String;)Lorg/easyrpg/player/player/SafFile;");
 	jstring jpath = env->NewStringUTF(combined_path.c_str());
-	jobject obj_res = env->CallObjectMethod(sdl_activity, jni_getFilesystemForPath, jpath);
-
-	env->DeleteLocalRef(jpath);
-	env->DeleteLocalRef(cls);
-	env->DeleteLocalRef(sdl_activity);
+	jobject obj_res = env->CallStaticObjectMethod(cls, jni_getFilesystemForPath, jpath);
 
 	return obj_res;
 }
@@ -49,14 +45,11 @@ bool SafFilesystem::IsFile(StringView path) const {
 		return false;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "isFile", "()Z");
 	jboolean res = env->CallBooleanMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	return res > 0;
 }
 
@@ -66,14 +59,11 @@ bool SafFilesystem::IsDirectory(StringView dir, bool) const {
 		return false;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "isDirectory", "()Z");
 	jboolean res = env->CallBooleanMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	return res > 0;
 }
 
@@ -83,14 +73,11 @@ bool SafFilesystem::Exists(StringView filename) const {
 		return false;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "exists", "()Z");
 	jboolean res = env->CallBooleanMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	return res > 0;
 }
 
@@ -100,14 +87,11 @@ int64_t SafFilesystem::GetFilesize(StringView path) const {
 		return -1;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "getFilesize", "()J");
 	jlong res = env->CallLongMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	return static_cast<int64_t>(res);
 }
 
@@ -159,14 +143,11 @@ std::streambuf* SafFilesystem::CreateInputStreambuffer(StringView path, std::ios
 		return nullptr;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "createInputFileDescriptor", "()I");
 	jint fd = env->CallIntMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	if (fd < 0) {
 		return nullptr;
 	}
@@ -238,15 +219,12 @@ std::streambuf* SafFilesystem::CreateOutputStreambuffer(StringView path, std::io
 		return nullptr;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "createOutputFileDescriptor", "(Z)I");
 	jboolean append = static_cast<uint8_t>(((mode & std::ios_base::app) == std::ios_base::app) ? 1u : 0u);
 	jint fd = env->CallIntMethod(obj, jni_method, append);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	if (fd < 0) {
 		return nullptr;
 	}
@@ -260,14 +238,11 @@ bool SafFilesystem::GetDirectoryContent(StringView path, std::vector<DirectoryTr
 		return false;
 	}
 
-	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	JNIEnv* env = EpAndroid::env;
 	jclass cls = env->GetObjectClass(obj);
 	jmethodID jni_method = env->GetMethodID(cls, "getDirectoryContent", "()Lorg/easyrpg/player/player/DirectoryTree;");
 	jobject directory_tree = env->CallObjectMethod(obj, jni_method);
 
-	env->DeleteLocalRef(obj);
-	env->DeleteLocalRef(cls);
-
 	if (!directory_tree) {
 		return false;
 	}
@@ -286,14 +261,11 @@ bool SafFilesystem::GetDirectoryContent(StringView path, std::vector<DirectoryTr
 		jstring elem = reinterpret_cast<jstring>(env->GetObjectArrayElement(names_arr, static_cast<jsize>(i)));
 		const char* str = env->GetStringUTFChars(elem, nullptr);
 		entries.emplace_back(str, types[i] == 0 ? DirectoryTree::FileType::Regular : DirectoryTree::FileType::Directory);
+		// These are explicitly deleted, otherwise this garbabge collects after the loop
 		env->ReleaseStringUTFChars(elem, str);
 		env->DeleteLocalRef(elem);
 	}
 
-	env->DeleteLocalRef(cls_directory_tree);
-	env->DeleteLocalRef(names_arr);
-	env->DeleteLocalRef(types_arr);
-
 	return true;
 }
 
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index 2183c87c9..9924e4746 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -30,6 +30,7 @@
 #  include <shellapi.h>
 #elif defined(__ANDROID__)
 #  include <android/log.h>
+#  include "platform/android/android.h"
 #elif defined(__WIIU__)
 #  include <coreinit/debug.h>
 #endif
@@ -83,6 +84,10 @@ extern "C" int main(int argc, char* argv[]) {
 	Output::SetLogCallback(LogCallback);
 #endif
 
+#if defined(__ANDROID__)
+	EpAndroid::env = (JNIEnv*)SDL_AndroidGetJNIEnv();
+#endif
+
 	Player::Init(std::move(args));
 	Player::Run();
 

From 346506809a87e70075761ac22cde6417899e4709 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:56:52 +0200
Subject: [PATCH 123/222] Android: Use native FileFinder for the game detection
 of the GameBrowser.

Allows to drop most of the Java scanning code and makes maintanance easier.
---
 .../app/src/gamebrowser/CMakeLists.txt        |   5 +-
 ...asyrpg_player_game_browser_GameScanner.cpp | 119 +++---
 ..._easyrpg_player_game_browser_GameScanner.h |   9 +-
 .../org/easyrpg/player/game_browser/Game.java | 102 +++--
 .../game_browser/GameBrowserActivity.java     |   4 +-
 .../game_browser/GameBrowserHelper.java       |  95 ++---
 .../player/game_browser/GameScanner.java      | 356 +-----------------
 7 files changed, 165 insertions(+), 525 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/CMakeLists.txt b/builds/android/app/src/gamebrowser/CMakeLists.txt
index d578ec7b9..3782405e8 100644
--- a/builds/android/app/src/gamebrowser/CMakeLists.txt
+++ b/builds/android/app/src/gamebrowser/CMakeLists.txt
@@ -7,8 +7,9 @@ add_library(gamebrowser
 	org_easyrpg_player_game_browser_GameScanner.h
 )
 
-find_package(PNG REQUIRED)
-target_link_libraries(gamebrowser PNG::PNG)
+set_target_properties(gamebrowser PROPERTIES DEBUG_POSTFIX "")
+
+target_link_libraries(gamebrowser easyrpg_android)
 
 if(BUILD_SHARED_LIBS)
 	set_property(TARGET gamebrowser PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index 6a61c6e5a..c1cc150cc 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -31,41 +31,11 @@
 #include <vector>
 #include <array>
 
-class FdStreamBufIn : public std::streambuf {
-public:
-	FdStreamBufIn(int fd) : std::streambuf(), fd(fd) {
-		setg(buffer.data(), buffer.data() + buffer.size(), buffer.data() + buffer.size());
-	}
-
-	~FdStreamBufIn() override {
-		close(fd);
-	}
-
-	int underflow() override {
-		ssize_t res = read(fd, buffer.data(), buffer.size());
-		if (res <= 0) {
-			return traits_type::eof();
-		}
-		setg(buffer.data(), buffer.data(), buffer.data() + res);
-		return traits_type::to_int_type(*gptr());
-	}
-
-private:
-	int fd = 0;
-	std::array<char, 4096> buffer;
-};
 
-class BufferStreamBufIn : public std::streambuf {
-public:
-	BufferStreamBufIn(char* buffer, jsize size) : std::streambuf(), buffer(buffer), size(size) {
-		setg(buffer, buffer, buffer + size);
-	}
-
-private:
-	char* buffer;
-	jsize size;
-	jsize index = 0;
-};
+#include "filefinder.h"
+#include "utils.h"
+#include "string_view.h"
+#include "platform/android/android.h"
 
 // via https://stackoverflow.com/q/1821806
 static void custom_png_write_func(png_structp  png_ptr, png_bytep data, png_size_t length) {
@@ -73,30 +43,6 @@ static void custom_png_write_func(png_structp  png_ptr, png_bytep data, png_size
 	p->insert(p->end(), data, data + length);
 }
 
-jbyteArray readXyz(JNIEnv *env, std::istream& stream);
-
-extern "C"
-JNIEXPORT jbyteArray JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_decodeXYZbuffer(
-		JNIEnv *env, jclass, jbyteArray buffer) {
-	jbyte* elements = env->GetByteArrayElements(buffer, nullptr);
-	jsize size = env->GetArrayLength(buffer);
-
-	std::istream stream(new BufferStreamBufIn(reinterpret_cast<char*>(elements), size));
-	jbyteArray array = readXyz(env, stream);
-
-	env->ReleaseByteArrayElements(buffer, elements, 0);
-
-	return array;
-}
-
-extern "C"
-JNIEXPORT jbyteArray JNICALL Java_org_easyrpg_player_game_1browser_GameScanner_decodeXYZfd
-  (JNIEnv * env, jclass, jint fd) {
-	std::istream stream(new FdStreamBufIn(fd));
-	return readXyz(env, stream);
-}
-
 jbyteArray readXyz(JNIEnv *env, std::istream& stream) {
 	char header[4];
 
@@ -214,3 +160,60 @@ jbyteArray readXyz(JNIEnv *env, std::istream& stream) {
 
 	return result;
 }
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_org_easyrpg_player_game_1browser_GameScanner_findGame(JNIEnv *env, jclass clazz,
+															 jstring path) {
+	EpAndroid::env = env;
+
+	const char* cpath = env->GetStringUTFChars(path, nullptr);
+	std::string spath(cpath);
+	env->ReleaseStringUTFChars(path, cpath);
+
+	auto fs = FileFinder::FindGameRecursive(FileFinder::Root().Create(spath));
+	if (!fs) {
+		return nullptr;
+	}
+
+	std::string save_path;
+	if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
+		save_path = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
+
+		// compatibility with Java code
+		size_t ext = save_path.find('.');
+		if (ext != std::string::npos) {
+			save_path = save_path.substr(0, ext);
+		}
+	}
+
+	jbyteArray title_image = nullptr;
+
+	auto title = fs.Subtree("Title");
+	if (title) {
+		for (auto& [name, entry]: *title.ListDirectory()) {
+			if (entry.type == DirectoryTree::FileType::Regular) {
+				if (StringView(name).ends_with(".xyz")) {
+					auto is = title.OpenInputStream(entry.name);
+					title_image = readXyz(env, is);
+				} else if (StringView(name).ends_with(".png") || StringView(name).ends_with(".bmp")) {
+					auto is = title.OpenInputStream(entry.name);
+					auto vec = Utils::ReadStream(is);
+
+					title_image = env->NewByteArray(vec.size());
+					env->SetByteArrayRegion(title_image, 0, vec.size(), reinterpret_cast<jbyte*>(vec.data()));
+				}
+			}
+		}
+	}
+
+	jclass game_class = env->FindClass("org/easyrpg/player/game_browser/Game");
+
+	jmethodID constructor = env->GetMethodID(game_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
+
+	jstring game_path = env->NewStringUTF(("content://" + FileFinder::GetFullFilesystemPath(fs)).c_str());
+	jstring save_pat = env->NewStringUTF(save_path.c_str());
+	jobject game_object = env->NewObject(game_class, constructor, game_path, save_pat, title_image);
+
+	return game_object;
+}
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
index 893b67271..3743cc199 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
@@ -8,12 +8,9 @@
 extern "C" {
 #endif
 
-JNIEXPORT jbyteArray JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_decodeXYZfd(JNIEnv *env, jclass clazz, jint fd);
-
-JNIEXPORT jbyteArray JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_decodeXYZbuffer(JNIEnv *env, jclass clazz,
-																  jbyteArray buffer);
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_org_easyrpg_player_game_1browser_GameScanner_findGame(JNIEnv *env, jclass clazz, jstring path);
 
 #ifdef __cplusplus
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
index a408e495a..f0ce84457 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
@@ -5,6 +5,7 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Base64;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
@@ -15,28 +16,43 @@
 
 public class Game implements Comparable<Game> {
     final static char escapeCode = '\u0001';
-	private final String title;
+	private String title;
     private final String gameFolderPath;
     private String savePath;
 	private boolean isFavorite;
-    private final DocumentFile gameFolder;
     private Bitmap titleScreen;
-    /** Path to the game folder inside of the zip */
-    private String zipInnerPath;
-
-	private Game(DocumentFile gameFolder) {
-		this.gameFolder = gameFolder;
-	    this.title = gameFolder.getName();
-        Uri folderURI = gameFolder.getUri();
-	    this.gameFolderPath = folderURI.toString();
+    private boolean standalone = false;
+
+	private Game(String gameFolderPath) {
+        int encoded_slash_pos = gameFolderPath.lastIndexOf("%2F");
+        if (encoded_slash_pos == -1) {
+            // Should not happen because the game is in a subdirectory
+            Log.e("EasyRPG", "Strange Uri " + gameFolderPath);
+        }
+        int slash_pos = gameFolderPath.indexOf("/", encoded_slash_pos);
+
+        // A file is provided when a / is after the encoded / (%2F)
+        if (slash_pos > -1) {
+            // Extract the filename and properly encode it
+            this.title = gameFolderPath.substring(slash_pos + 1);
+        } else {
+            this.title = gameFolderPath.substring(encoded_slash_pos + 3);
+        }
+
+        int dot_pos = this.title.indexOf(".");
+        if (dot_pos > -1) {
+            this.title = this.title.substring(0, dot_pos);
+        }
+
+        this.gameFolderPath = gameFolderPath;
         this.savePath = gameFolderPath;
 
         this.isFavorite = isFavoriteFromSettings();
 	}
 
-	public Game(DocumentFile gameFolder, Bitmap titleScreen) {
-	    this(gameFolder);
-        this.titleScreen = titleScreen;
+	public Game(String gameFolderPath, byte[] titleScreen) {
+	    this(gameFolderPath);
+        this.titleScreen = BitmapFactory.decodeByteArray(titleScreen, 0, titleScreen.length);;
     }
 
     /**
@@ -49,26 +65,22 @@ public Game(String gameFolder, String saveFolder) {
         this.title = "Standalone";
         this.gameFolderPath = gameFolder;
         this.savePath = saveFolder;
-        this.gameFolder = null;
         this.isFavorite = false;
+        this.standalone = true;
     }
 
-    private Game(DocumentFile gameFolder, String pathInZip, Bitmap titleScreen) {
-        this(gameFolder, titleScreen);
-        zipInnerPath = pathInZip;
-    }
-
-    public static Game fromZip(DocumentFile gameFolder, String pathInZip, String saveFolder, Bitmap titleScreen) {
-        Game game = new Game(gameFolder, pathInZip, titleScreen);
+    private Game(String gameFolderPath, String saveFolder, byte[] titleScreen) {
+        this(gameFolderPath, titleScreen);
         // is only relative here, launchGame will put this in the "saves" directory
-        game.setSavePath(saveFolder);
-        return game;
+        if (!saveFolder.isEmpty()) {
+            savePath = saveFolder;
+        }
     }
 
     public static Game fromCacheEntry(Context context, String cache) {
         String[] entries = cache.split(String.valueOf(escapeCode));
 
-        if (entries.length != 5) {
+        if (entries.length != 3) {
             return null;
         }
 
@@ -78,24 +90,12 @@ public static Game fromCacheEntry(Context context, String cache) {
             return null;
         }
 
-        boolean isZip = Boolean.parseBoolean(entries[2]);
-        String zipInnerPath = null;
-
-        if (isZip) {
-            zipInnerPath = entries[3];
-        }
-
-        Bitmap titleScreen = null;
-        if (!entries[4].equals("null")) {
-            byte[] decodedByte = Base64.decode(entries[4], 0);
-            titleScreen = BitmapFactory.decodeByteArray(decodedByte, 0, decodedByte.length);
+        byte[] titleScreen = null;
+        if (!entries[2].equals("null")) {
+            titleScreen = Base64.decode(entries[2], 0);
         }
 
-        if (isZip) {
-            return fromZip(gameFolder, zipInnerPath, savePath, titleScreen);
-        } else {
-            return new Game(gameFolder, titleScreen);
-        }
+        return new Game(entries[1], savePath, titleScreen);
     }
 
 	public String getTitle() {
@@ -162,13 +162,7 @@ public String toCacheEntry() {
         sb.append(savePath);
         sb.append(escapeCode);
 
-        sb.append(gameFolder.getUri());
-        sb.append(escapeCode);
-
-        sb.append(isZipArchive());
-        sb.append(escapeCode);
-
-        sb.append(zipInnerPath);
+        sb.append(gameFolderPath);
         sb.append(escapeCode);
 
         if (titleScreen != null) {
@@ -183,23 +177,11 @@ public String toCacheEntry() {
         return sb.toString();
     }
 
-    public DocumentFile getGameFolder() {
-        return gameFolder;
-    }
-
     public Bitmap getTitleScreen() {
         return titleScreen;
     }
 
     public Boolean isStandalone() {
-        return gameFolder == null;
-    }
-
-    public Boolean isZipArchive() {
-        return zipInnerPath != null;
-    }
-
-    public String getZipInnerPath() {
-        return zipInnerPath;
+        return standalone;
     }
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
index 7f9d2514e..f62324416 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
@@ -57,10 +57,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (!libraryLoaded) {
             try {
+                System.loadLibrary("easyrpg_android");
                 System.loadLibrary("gamebrowser");
                 libraryLoaded = true;
             } catch (UnsatisfiedLinkError e) {
-                Log.e("EasyRPG Player", "Couldn't load libgamebrowser. XYZ parsing will be unavailable: " + e.getMessage());
+                Log.e("EasyRPG Player", "Couldn't load libgamebrowser: " + e.getMessage());
+		        throw e;
             }
         }
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
index 322e37451..47347ce52 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
@@ -50,74 +50,53 @@ public static void launchGame(Context context, Game game) {
     public static void launchGame(Context context, Game game, boolean debugMode) {
         String path = game.getGameFolderPath();
 
-        // Test again in case somebody messed with the file system
-        boolean valid = game.isStandalone() ||
-            (game.isZipArchive() && game.getGameFolder().canRead()) ||
-            (game.getGameFolder().isDirectory() && game.getGameFolder().canRead());
-
-        if (valid) {
-            Intent intent = new Intent(context, EasyRpgPlayerActivity.class);
-            ArrayList<String> args = new ArrayList<>();
-
-            // Command line passed via intent "command_line"
-            String savePath;
-
-            if (game.isZipArchive()) {
-                // Create the redirected save folder
-                DocumentFile saveFolder = Helper.createFolderInSave(context, game.getSavePath());
-
-                args.add("--project-path");
-                args.add(path + "/" + game.getZipInnerPath());
-
-                // In error case the native code will try to put a save folder next to the zip
-                if (saveFolder != null) {
-                    savePath = saveFolder.getUri().toString();
-                    args.add("--save-path");
-                    args.add(savePath);
-                } else {
-                    savePath = path;
-                }
-            } else {
-                args.add("--project-path");
-                args.add(path);
+        Intent intent = new Intent(context, EasyRpgPlayerActivity.class);
+        ArrayList<String> args = new ArrayList<>();
+
+        // Command line passed via intent "command_line"
+        args.add("--project-path");
+        args.add(path);
+
+        String savePath = path;
+        if (!game.getSavePath().isEmpty()) {
+            DocumentFile saveFolder = Helper.createFolderInSave(context, game.getSavePath());
 
-                savePath = game.getSavePath();
+            // In error case the native code will try to put a save folder next to the zip
+            if (saveFolder != null) {
+                savePath = saveFolder.getUri().toString();
                 args.add("--save-path");
                 args.add(savePath);
             }
+        }
 
-            Encoding enc = game.getEncoding();
-            if (enc.getIndex() > 0) {
-                // 0 = Auto, in that case let the Player figure it out
-                args.add("--encoding");
-                args.add(enc.getRegionCode());
-            }
+        Encoding enc = game.getEncoding();
+        if (enc.getIndex() > 0) {
+            // 0 = Auto, in that case let the Player figure it out
+            args.add("--encoding");
+            args.add(enc.getRegionCode());
+        }
 
-            args.add("--config-path");
-            args.add(context.getExternalFilesDir(null).getAbsolutePath());
+        args.add("--config-path");
+        args.add(context.getExternalFilesDir(null).getAbsolutePath());
 
-            // Soundfont
-            Uri soundfontUri = SettingsManager.getSoundFountFileURI(context);
-            if (soundfontUri != null) {
-                args.add("--soundfont");
-                args.add(soundfontUri.toString());
-            }
+        // Soundfont
+        Uri soundfontUri = SettingsManager.getSoundFountFileURI(context);
+        if (soundfontUri != null) {
+            args.add("--soundfont");
+            args.add(soundfontUri.toString());
+        }
 
-            if (debugMode) {
-                args.add("--test-play");
-            }
+        if (debugMode) {
+            args.add("--test-play");
+        }
 
-            intent.putExtra(EasyRpgPlayerActivity.TAG_SAVE_PATH, savePath);
-            intent.putExtra(EasyRpgPlayerActivity.TAG_COMMAND_LINE, args.toArray(new String[0]));
-            intent.putExtra(EasyRpgPlayerActivity.TAG_STANDALONE, game.isStandalone());
+        intent.putExtra(EasyRpgPlayerActivity.TAG_SAVE_PATH, savePath);
+        intent.putExtra(EasyRpgPlayerActivity.TAG_COMMAND_LINE, args.toArray(new String[0]));
+        intent.putExtra(EasyRpgPlayerActivity.TAG_STANDALONE, game.isStandalone());
 
-            Log.i("EasyRPG", "Start EasyRPG Player with following arguments : " + args);
-            Log.i("EasyRPG", "The RTP folder is : " + SettingsManager.getRTPFolderURI(context));
-            context.startActivity(intent);
-        } else {
-            String msg = context.getString(R.string.not_valid_game).replace("$PATH", game.getTitle());
-            Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
-        }
+        Log.i("EasyRPG", "Start EasyRPG Player with following arguments : " + args);
+        Log.i("EasyRPG", "The RTP folder is : " + SettingsManager.getRTPFolderURI(context));
+        context.startActivity(intent);
     }
 
     public static void openSettingsActivity(Context context) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
index f10e6be13..7242e21d7 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
@@ -16,6 +16,7 @@
 import org.easyrpg.player.Helper;
 import org.easyrpg.player.R;
 import org.easyrpg.player.settings.SettingsManager;
+import org.libsdl.app.SDL;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -51,7 +52,7 @@ private GameScanner() {
         this.errorList = new ArrayList<>();
     }
 
-    public static GameScanner getInstance(Context context) {
+    public static GameScanner getInstance(Activity activity) {
         // Singleton pattern
         if (GameScanner.instance == null) {
             synchronized(GameScanner.class) {
@@ -62,12 +63,14 @@ public static GameScanner getInstance(Context context) {
         }
 
         //Scan the folder
-        instance.scanGames(context);
+        instance.scanGames(activity);
 
         return instance;
     }
 
-    private void scanGames(Context context){
+    private void scanGames(Activity activity){
+        Context context = activity.getApplicationContext();
+
         gameList.clear();
         errorList.clear();
 
@@ -118,7 +121,7 @@ private void scanGames(Context context){
         }
 
         // Scan the games folder
-        scanFolderRecursive(context, gamesFolder.getUri(), GAME_SCANNING_DEPTH);
+        scanRootFolder(activity, gamesFolder.getUri());
 
         // If the scan brings nothing in this folder : we notify the errorList
         if (gameList.size() <= 0) {
@@ -148,289 +151,27 @@ private int scanFolderHash(Context context, Uri folderURI) {
         return sb.toString().hashCode();
     }
 
-    private void scanFolderRecursive(Context context, Uri folderURI, int depth) {
-        if (depth > 0) {
+    private void scanRootFolder(Activity activity, Uri folderURI) {
+        Context context = activity.getApplicationContext();
+        SDL.setContext(context);
+
             for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
                 String fileDocumentID = array[0];
-                String fileDocumentType = array[1];
 
                 String name = Helper.getFileNameFromDocumentID(fileDocumentID);
-                if (name.equals("")) {
+            if (name.isEmpty()) {
                     continue;
                 }
+
                 if (!name.startsWith(".")) {
-                    boolean isDirectory = Helper.isDirectoryFromMimeType(fileDocumentType);
-                    if (isDirectory) {
-                        // Is the file/folder a RPG Maker game?
                         Uri fileURI = Helper.getURIFromDocumentID(folderURI, fileDocumentID);
-                        Game game = isAGame(context, fileURI);
-                        if (game != null) {
-                            gameList.add(game);
-                        }
-                        else if (depth > 1) {
-                            // Not a RPG2k Game but a directory -> recurse
-                            // (We don't check if it's a directory or if its readable  because of slow
-                            // Android SAF calls and scanFolder(...) already check that)
-                            scanFolderRecursive(context, fileURI, depth - 1);
-                        }
-                    } else {
-                        String nameLower = name.toLowerCase(Locale.ROOT);
-                        if (nameLower.endsWith(".zip") || nameLower.endsWith(".easyrpg")) {
-                            Uri fileURI = Helper.getURIFromDocumentID(folderURI, fileDocumentID);
-                            Game game = isAGameZipped(context, fileURI, true);
+                Game game = findGame(fileURI.toString());
+
                             if (game != null) {
                                 gameList.add(game);
                             }
                         }
                     }
-                }
-            }
-        }
-    }
-
-    /** Return a game if "folder" is a game folder, or return null.
-     *  This method is designed to reduce the number of sys calls */
-    public static Game isAGame(Context context, Uri uri) {
-        Game game = null;
-        Uri titleFolderURI = null;
-
-        // Create a lookup by extension as we go, in case we are dealing with non-standard extensions.
-        int rpgRtCount = 0;
-        boolean databaseFound = false;
-        boolean treemapFound = false;
-        boolean isARpgGame = false;
-
-        for (String filePath : Helper.listChildrenDocumentID(context, uri)) {
-            String fileName = Helper.getFileNameFromDocumentID(filePath);
-            String fileNameLower = fileName.toLowerCase(Locale.ROOT);
-
-            if (!databaseFound && fileName.equals(DATABASE_NAME)) {
-                databaseFound = true;
-            } else if (!treemapFound && fileName.equals(TREEMAP_NAME)) {
-                treemapFound = true;
-            }
-            // Count non-standard files.
-            // NOTE: Do not put this in the 'else' statement, since only 1 extension may be non-standard and we want to count both.
-            // We might be dealing with a non-standard extension.
-            // Show it, and let the C++ code sort out which file is which.
-            if (fileNameLower.startsWith("rpg_rt.")) {
-                if (!(fileName.equals(INI_FILE) || fileName.equals(EXE_FILE))) {
-                    rpgRtCount += 1;
-                }
-            }
-
-            if ((databaseFound && treemapFound) || rpgRtCount == 2) {
-                isARpgGame = true;
-            }
-
-            // If we encounter a Title folder, we keep it for the title screen
-            // We do that here in order to avoid syscalls
-            if (fileNameLower.equals("title")) {
-                titleFolderURI = DocumentsContract.buildDocumentUriUsingTree(uri, filePath);
-            }
-        }
-
-        if (isARpgGame) {
-            Bitmap titleScreen = GameScanner.extractTitleScreenImage(context, titleFolderURI);
-            game = new Game(Helper.getFileFromURI(context, uri), titleScreen);
-        }
-
-        return game;
-    }
-
-    static class ZipFoundStats {
-        int rpgRtCount = 0;
-        boolean databaseFound = false;
-        boolean treemapFound = false;
-        boolean isARpgGame = false;
-        byte[] titleImage = null;
-
-        ZipFoundStats() {
-        }
-    }
-
-    /** Return a game if "folder" is a game folder, or return null.
-     *  This method is designed to reduce the number of sys calls */
-    public static Game isAGameZipped(Context context, Uri zipUri, boolean unicode) {
-        ContentResolver resolver = context.getContentResolver();
-
-        // Create a lookup by extension as we go, in case we are dealing with non-standard extensions.
-        Map<String, ZipFoundStats> games = new HashMap<>();
-
-        try (InputStream zipIStream = resolver.openInputStream(zipUri)) {
-            ZipInputStream zipStream;
-            if (unicode) {
-                zipStream = new ZipInputStream(zipIStream);
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                // arbitrary encoding that does not crash
-                zipStream = new ZipInputStream(zipIStream, StandardCharsets.ISO_8859_1);
-            } else {
-                return null;
-            }
-
-            ZipEntry entry;
-
-            while ((entry = zipStream.getNextEntry()) != null) {
-                if (entry.isDirectory()) {
-                    continue;
-                }
-
-                String fullPath = entry.getName();
-                String fileName;
-
-                if (fullPath.isEmpty()) {
-                    continue;
-                }
-
-                int slash = fullPath.lastIndexOf('/');
-                if (slash == -1) {
-                    slash = fullPath.lastIndexOf('\\');
-                }
-
-                if (slash == -1) {
-                    fileName = fullPath;
-                } else if (slash == fullPath.length() - 1) {
-                    continue;
-                } else {
-                    fileName = fullPath.substring(slash + 1);
-                }
-
-                String fileNameLower = fileName.toLowerCase(Locale.ROOT);
-
-                String gameDirectory;
-                if (slash <= 0) {
-                    gameDirectory = "";
-                } else {
-                    gameDirectory = fullPath.substring(0, slash);
-                }
-
-                String gameDirectoryLower = gameDirectory.toLowerCase(Locale.ROOT);
-                if (gameDirectoryLower.endsWith("/title") || gameDirectoryLower.endsWith("\\title")) {
-                    // Check for a title image
-                    ZipFoundStats stats = games.get(gameDirectory.substring(0, gameDirectory.length() - "/title".length()));
-
-                    if (stats != null) {
-                        if (fileNameLower.endsWith(".xyz") || fileNameLower.endsWith(".png") || fileNameLower.endsWith(".bmp")) {
-                            int count;
-                            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-                                byte[] buffer = new byte[16 * 1024];
-                                while ((count = zipStream.read(buffer)) != -1)
-                                    out.write(buffer, 0, count);
-                                stats.titleImage = out.toByteArray();
-                                if (stats.isARpgGame) {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    continue;
-                }
-
-                ZipFoundStats stats = games.get(gameDirectory);
-
-                if (stats == null) {
-                    stats = new ZipFoundStats();
-                    games.put(gameDirectory, stats);
-                }
-
-                if (!stats.databaseFound && fileNameLower.equals(DATABASE_NAME)) {
-                    stats.databaseFound = true;
-                } else if (!stats.treemapFound && fileNameLower.equalsIgnoreCase(TREEMAP_NAME)) {
-                    stats.treemapFound = true;
-                }
-
-                // Count non-standard files.
-                // NOTE: Do not put this in the 'else' statement, since only 1 extension may be non-standard and we want to count both.
-                // We might be dealing with a non-standard extension.
-                // Show it, and let the C++ code sort out which file is which.
-                if (fileNameLower.startsWith("rpg_rt.")) {
-                    if (!(fileNameLower.equals(INI_FILE) || fileNameLower.equals(EXE_FILE))) {
-                        stats.rpgRtCount += 1;
-                    }
-                }
-
-                if ((stats.databaseFound && stats.treemapFound) || stats.rpgRtCount == 2) {
-                    stats.isARpgGame = true;
-                    if (stats.titleImage != null) {
-                        break;
-                    }
-                }
-            }
-        } catch (IOException e) {
-            return null;
-        } catch (IllegalArgumentException e) {
-            if (unicode && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                return isAGameZipped(context, zipUri, false);
-            }
-            return null;
-        }
-
-        for (Map.Entry<String, ZipFoundStats> entry : games.entrySet()) {
-            if (entry.getValue().isARpgGame) {
-                String name = new File(zipUri.getPath()).getName();
-                String saveFolder = name.substring(0, name.lastIndexOf("."));
-                Bitmap titleScreen = extractTitleScreenImage(context, entry.getValue().titleImage);
-                String key = entry.getKey();
-                if (!unicode) {
-                    // FIXME: This will launch the built-in Game Browser when the ZIP archive contains more than one folder in the root
-                    // But the game can be at least launched this way.
-                    key = "";
-                }
-                return Game.fromZip(Helper.getFileFromURI(context, zipUri), key, saveFolder, titleScreen);
-            }
-        }
-
-        return null;
-    }
-
-    /** The VERY SLOW way of testing if a folder is a RPG2k Game. (contains DATABASE_NAME and TREEMAP_NAME)
-     *  <!> It shouldn't be use unless Google forces the use of DocumentFile over ContentResolver
-     * @param dir The directory to test
-     * @return true if RPG2k game
-     */
-    @Deprecated
-    public static boolean isAGameSlowWay(DocumentFile dir) {
-        if (!dir.isDirectory() || !dir.canRead()) {
-            return false;
-        }
-
-        boolean databaseFound = false;
-        boolean treemapFound = false;
-
-        // Create a lookup by extension as we go, in case we are dealing with non-standard extensions.
-        int rpgRtCount = 0;
-
-        for (DocumentFile entry : dir.listFiles()) {
-            if (entry.isFile() && entry.canRead()) {
-                String entryName = entry.getName();
-                if (entryName == null) {
-                    continue;
-                }
-
-                if (!databaseFound && entryName.equalsIgnoreCase(DATABASE_NAME)) {
-                    databaseFound = true;
-                } else if (!treemapFound && entryName.equalsIgnoreCase(TREEMAP_NAME)) {
-                    treemapFound = true;
-                }
-
-                // Count non-standard files.
-                // NOTE: Do not put this in the 'else' statement, since only 1 extension may be non-standard and we want to count both.
-                if (entryName.toLowerCase().startsWith("rpg_rt.")) {
-                    if (!(entryName.equalsIgnoreCase(INI_FILE) || entryName.equalsIgnoreCase(EXE_FILE))) {
-                        rpgRtCount += 1;
-                    }
-                }
-
-                if (databaseFound && treemapFound) {
-                    return true;
-                }
-            }
-        }
-
-        // We might be dealing with a non-standard extension.
-        // Show it, and let the C++ code sort out which file is which.
-        return rpgRtCount == 2;
     }
 
     public List<Game> getGameList() {
@@ -445,70 +186,5 @@ public boolean hasError() {
         return !errorList.isEmpty();
     }
 
-    /** Return the game title screen, in a dumb way following last Enterbrain conventions */
-    public static Bitmap extractTitleScreenImage(Context context, byte[] titleScreenBuffer) {
-        if (titleScreenBuffer == null) {
-            return null;
-        }
-
-        Bitmap bmp = BitmapFactory.decodeByteArray(titleScreenBuffer, 0, titleScreenBuffer.length);
-
-        if (bmp == null) {
-            byte[] xyz = decodeXYZbuffer(titleScreenBuffer);
-            if (xyz == null) {
-                return null;
-            }
-            return BitmapFactory.decodeByteArray(xyz, 0, xyz.length);
-        }
-
-        return bmp;
-    }
-
-    /** Return the game title screen, in a dumb way following last Enterbrain conventions */
-    public static Bitmap extractTitleScreenImage(Context context, Uri titleScreenFolderURI) {
-        try {
-            // Retrieve the Title folder, containing titles screens
-            DocumentFile titleFolder = Helper.getFileFromURI(context, titleScreenFolderURI);
-
-            if (titleFolder != null && titleFolder.isDirectory()) {
-
-                // Display the first image found in the Title folder
-                for (String fileID : Helper.listChildrenDocumentID(context, titleScreenFolderURI)) {
-                    String fileName = Helper.getFileNameFromDocumentID(fileID).toLowerCase().trim();
-
-                    if (!fileName.startsWith(".")) {
-                        if (fileName.endsWith("png") || fileName.endsWith("bmp")) {
-                            Uri imageUri = Helper.getURIFromDocumentID(titleScreenFolderURI, fileID);
-                            return MediaStore.Images.Media.getBitmap(context.getContentResolver(), imageUri);
-                        }
-                        else if (fileName.endsWith("xyz")) {
-                            Uri imageUri = Helper.getURIFromDocumentID(titleScreenFolderURI, fileID);
-                            Bitmap b = MediaStore.Images.Media.getBitmap(context.getContentResolver(), imageUri);
-                            if (b == null && GameBrowserActivity.libraryLoaded) {
-                                // Check for XYZ
-                                try (ParcelFileDescriptor fd = context.getContentResolver().openFileDescriptor(imageUri, "r")) {
-                                    byte[] xyz = decodeXYZfd(fd.detachFd());
-                                    if (xyz == null) {
-                                        return null;
-                                    }
-                                    return BitmapFactory.decodeByteArray(xyz, 0, xyz.length);
-                                } catch (IOException e) {
-                                    return null;
-                                }
-                            }
-                            return b;
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            Log.e("EasyRPG", e.getMessage());
-        }
-
-        return null;
-    }
-
-    private static native byte[] decodeXYZfd(int fd);
-
-    private static native byte[] decodeXYZbuffer(byte[] buffer);
+    private static native Game findGame(String path);
 }

From 9c99c324dc578fbd59553afd74061f99ca418234 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 12:57:27 +0200
Subject: [PATCH 124/222] Android: Add progress information to the scanning
 process

---
 .../player/game_browser/GameScanner.java      | 43 +++++++++++++------
 .../app/src/main/res/layout/loading_panel.xml | 23 ++++++++--
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
index 7242e21d7..3371e2397 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
@@ -1,5 +1,6 @@
 package org.easyrpg.player.game_browser;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,6 +11,7 @@
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.util.Log;
+import android.widget.TextView;
 
 import androidx.documentfile.provider.DocumentFile;
 
@@ -155,23 +157,38 @@ private void scanRootFolder(Activity activity, Uri folderURI) {
         Context context = activity.getApplicationContext();
         SDL.setContext(context);
 
-            for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
-                String fileDocumentID = array[0];
+        final ArrayList<String> names = new ArrayList<>();
+        final ArrayList<Uri> fileURIs = new ArrayList<>();
 
-                String name = Helper.getFileNameFromDocumentID(fileDocumentID);
+        for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
+            String fileDocumentID = array[0];
+
+            String name = Helper.getFileNameFromDocumentID(fileDocumentID);
             if (name.isEmpty()) {
-                    continue;
-                }
+                continue;
+            }
+
+            if (!name.startsWith(".")) {
+                Uri fileURI = Helper.getURIFromDocumentID(folderURI, fileDocumentID);
+                names.add(name);
+                fileURIs.add(fileURI);
+            }
+        }
+
+        for (int i = 0; i < names.size(); ++i) {
+            final String name = names.get(i);
+            final int j = i;
+            activity.runOnUiThread(() -> {
+                TextView myTextView = activity.findViewById(R.id.progressText);
+                myTextView.setText(String.format("%s (%d/%d)", name, j + 1, names.size()));
+            });
 
-                if (!name.startsWith(".")) {
-                        Uri fileURI = Helper.getURIFromDocumentID(folderURI, fileDocumentID);
-                Game game = findGame(fileURI.toString());
+            Game game = findGame(fileURIs.get(i).toString());
 
-                            if (game != null) {
-                                gameList.add(game);
-                            }
-                        }
-                    }
+            if (game != null) {
+                gameList.add(game);
+            }
+        }
     }
 
     public List<Game> getGameList() {
diff --git a/builds/android/app/src/main/res/layout/loading_panel.xml b/builds/android/app/src/main/res/layout/loading_panel.xml
index ccfd9190b..370541bab 100644
--- a/builds/android/app/src/main/res/layout/loading_panel.xml
+++ b/builds/android/app/src/main/res/layout/loading_panel.xml
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:padding="10dp"
+    tools:context=".InitActivity"
+    android:orientation="vertical"
+    android:gravity="center">
+<ProgressBar
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-
-    android:layout_centerInParent="true"
+/>
+<TextView
+    android:id="@+id/progressText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text=""
+    android:textSize="25sp"
+    android:gravity="center"
     />
+</LinearLayout>

From 404e6ba6bcedaf78e9e75366a09a683664790c35 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 23 May 2024 13:38:13 +0200
Subject: [PATCH 125/222] Implemented SaveEventExecFrame fields
 "maniac_event_id" (not reset on map change) & "maniac_event_page_id" +
 extended interpreter debug view

---
 src/game_interpreter.cpp   | 15 ++++++++++-----
 src/game_interpreter.h     |  3 ++-
 src/window_interpreter.cpp | 39 +++++++++++++++++++++++++++++++++-----
 src/window_interpreter.h   |  5 ++---
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 5cc35f381..e62a2d729 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -102,7 +102,8 @@ bool Game_Interpreter::IsRunning() const {
 void Game_Interpreter::Push(
 	std::vector<lcf::rpg::EventCommand> _list,
 	int event_id,
-	bool started_by_decision_key
+	bool started_by_decision_key,
+	int event_page_id
 ) {
 	if (_list.empty()) {
 		return;
@@ -118,6 +119,10 @@ void Game_Interpreter::Push(
 	frame.current_command = 0;
 	frame.triggered_by_decision_key = started_by_decision_key;
 	frame.event_id = event_id;
+	if (Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) {
+		frame.maniac_event_id = event_id;
+		frame.maniac_event_page_id = event_page_id;
+	}
 
 	if (_state.stack.empty() && main_flag && !Game_Battle::IsBattleRunning()) {
 		Main_Data::game_system->ClearMessageFace();
@@ -526,11 +531,11 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 
 // Setup Starting Event
 void Game_Interpreter::Push(Game_Event* ev) {
-	Push(ev->GetList(), ev->GetId(), ev->WasStartedByDecisionKey());
+	Push(ev->GetList(), ev->GetId(), ev->WasStartedByDecisionKey(), ev->GetActivePage() ? ev->GetActivePage()->ID : 0);
 }
 
 void Game_Interpreter::Push(Game_Event* ev, const lcf::rpg::EventPage* page, bool triggered_by_decision_key) {
-	Push(page->event_commands, ev->GetId(), triggered_by_decision_key);
+	Push(page->event_commands, ev->GetId(), triggered_by_decision_key, page->ID);
 }
 
 void Game_Interpreter::Push(Game_CommonEvent* ev) {
@@ -4001,7 +4006,7 @@ bool Game_Interpreter::CommandCallEvent(lcf::rpg::EventCommand const& com) { //
 		return true;
 	}
 
-	Push(page->event_commands, event->GetId(), false);
+	Push(page->event_commands, event->GetId(), false, page->ID);
 
 	return true;
 }
@@ -5109,7 +5114,7 @@ bool Game_Interpreter::CommandManiacCallCommand(lcf::rpg::EventCommand const& co
 
 	// Our implementation pushes a new frame containing the command instead of invoking it directly.
 	// This is incompatible to Maniacs but has a better compatibility with our code.
-	Push({ cmd }, GetCurrentEventId(), false);
+	Push({ cmd }, GetCurrentEventId(), false); //FIXME: add some new flag, so the interpreter debug view (window_interpreter) can differentiate this frame from normal ones
 
 	return true;
 }
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index c44ddc2aa..731aadf5c 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -66,7 +66,8 @@ class Game_Interpreter
 	void Push(
 			std::vector<lcf::rpg::EventCommand> _list,
 			int _event_id,
-			bool started_by_decision_key = false
+			bool started_by_decision_key = false,
+			int event_page_id = 0
 	);
 	void Push(Game_Event* ev);
 	void Push(Game_Event* ev, const lcf::rpg::EventPage* page, bool triggered_by_decision_key);
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index 9109df7ac..9b7f7ad8f 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -54,12 +54,21 @@ void Window_Interpreter::SetStackState(bool is_ce, std::string interpreter_desc,
 void Window_Interpreter::Refresh() {
 	stack_display_items.clear();
 
-	int max_cmd_count = 0;
+	int max_cmd_count = 0, max_evt_id = 10, max_page_id = 0;
 
 	for (int i = state.stack.size() - 1; i >= 0; i--) {
 		int evt_id = state.stack[i].event_id;
+		int page_id = 0;
+		if ((Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) && state.stack[i].maniac_event_id > 0) {
+			evt_id = state.stack[i].maniac_event_id;
+			page_id = state.stack[i].maniac_event_page_id;
+		}
+		if (evt_id == 0 && i == 0)
+			evt_id = display_item.owner_evt_id;
+
 		bool is_calling_ev_ce = false;
 
+		//FIXME: There are some currently unimplemented SaveEventExecFrame fields introduced via the ManiacPatch which should be used to properly get event state information
 		if (evt_id == 0 && i > 0) {
 			auto& prev_frame = state.stack[i - 1];
 			auto& com = prev_frame.commands[prev_frame.current_command - 1];
@@ -74,9 +83,16 @@ void Window_Interpreter::Refresh() {
 				}
 			}
 		}
+		if (evt_id > max_evt_id)
+			max_evt_id = evt_id;
+
+		if (page_id > max_page_id)
+			max_page_id = page_id;
+
 		StackItem item = StackItem();
 		item.is_ce = is_calling_ev_ce || (i == 0 && this->is_ce);
 		item.evt_id = evt_id;
+		item.page_id = page_id;
 		item.name = "";
 		item.cmd_current = state.stack[i].current_command;
 		item.cmd_count = state.stack[i].commands.size();
@@ -89,7 +105,7 @@ void Window_Interpreter::Refresh() {
 		} else {
 			auto* ev = Game_Map::GetEvent(evt_id);
 			if (ev) {
-				//TODO: map could have changed, but map_id isn't available
+				//FIXME: map could have changed, but map_id isn't available
 				item.name = ToString(ev->GetName());
 			}
 		}
@@ -109,8 +125,14 @@ void Window_Interpreter::Refresh() {
 	}
 
 	digits_stackitemno = std::log10(stack_display_items.size()) + 1;
+	digits_evt_id = max_evt_id == 0 ? 2 : std::log10(max_evt_id) + 1;
+	digits_page_id = max_page_id == 0 ? 0 : std::log10(max_page_id) + 1;
 	digits_cmdcount = std::log10(max_cmd_count) + 1;
 
+	digits_evt_combined_id = digits_evt_id + 3;
+	if (digits_page_id > 0)
+		digits_evt_combined_id += digits_page_id + 2;
+
 	CreateContents();
 	contents->Clear();
 
@@ -160,16 +182,23 @@ void Window_Interpreter::DrawStackLine(int index) {
 	StackItem& item = stack_display_items[index];
 
 	contents->TextDraw(rect.x, rect.y, Font::ColorDisabled, fmt::format("[{:0" + std::to_string(digits_stackitemno) + "d}]", state.stack.size() - index));
-	contents->TextDraw(rect.x + (digits_stackitemno * 6) + 16, rect.y, Font::ColorDefault, fmt::format("{}{:04d}", item.is_ce ? "CE" : "EV", item.evt_id));
+	if (item.is_ce) {
+		contents->TextDraw(rect.x + (digits_stackitemno * 6) + 16, rect.y, Font::ColorDefault, fmt::format("CE{:0" + std::to_string(digits_evt_id) + "d}", item.evt_id));
+	} else if (item.page_id > 0) {
+		contents->TextDraw(rect.x + (digits_stackitemno * 6) + 16, rect.y, Font::ColorDefault, fmt::format("EV{:0" + std::to_string(digits_evt_id) + "d}[{:0" + std::to_string(digits_page_id) + "d}]", item.evt_id, item.page_id));
+	} else {
+		contents->TextDraw(rect.x + (digits_stackitemno * 6) + 16, rect.y, Font::ColorDefault, fmt::format("EV{:0" + std::to_string(digits_evt_id) + "d}", item.evt_id));
+	}
 
 	std::string name = item.name;
-	int max_length = 22;
+	int max_length = 28;
 	max_length -= digits_stackitemno;
+	max_length -= digits_evt_combined_id;
 	max_length -= digits_cmdcount * 2;
 	if (name.length() > max_length) {
 		name = name.substr(0, max_length - 3) + "...";
 	}
-	contents->TextDraw(rect.x + (digits_stackitemno * 6) + 56, rect.y, Font::ColorDefault, name, Text::AlignLeft);
+	contents->TextDraw(rect.x + ((digits_stackitemno + digits_evt_combined_id) * 6) + 16, rect.y, Font::ColorDefault, name, Text::AlignLeft);
 	contents->TextDraw(GetWidth() - 16, rect.y, Font::ColorDefault, fmt::format("{:0" + std::to_string(digits_cmdcount) + "d}/{:0" + std::to_string(digits_cmdcount) + "d}", item.cmd_current, item.cmd_count), Text::AlignRight);
 }
 
diff --git a/src/window_interpreter.h b/src/window_interpreter.h
index 5a665634a..690eec59f 100644
--- a/src/window_interpreter.h
+++ b/src/window_interpreter.h
@@ -41,7 +41,7 @@ class Window_Interpreter : public Window_Selectable {
 private:
 	struct StackItem {
 		bool is_ce;
-		int evt_id;
+		int evt_id, page_id;
 		std::string name;
 		int cmd_current, cmd_count;
 	};
@@ -53,8 +53,7 @@ class Window_Interpreter : public Window_Selectable {
 	std::string interpreter_desc;
 	int lines_without_stack = 0;
 
-	int digits_stackitemno = 0, digits_cmdcount = 0;
-	
+	int digits_stackitemno = 0, digits_evt_id = 0, digits_page_id = 0, digits_evt_combined_id = 0, digits_cmdcount = 0;
 	std::vector<StackItem> stack_display_items;
 };
 

From f77bd4f5a77d8536c8c3336846bce3cd144f706b Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 23 May 2024 13:40:54 +0200
Subject: [PATCH 126/222] Window_Interpreter fixes:

- Base frame for CommonEvent interpreters was always shown with Id '0'
- Encountering a "CallEvent" command while traversing up the stack, always set the flag "is_calling_ev_ce", even if it was a map event
---
 src/scene_debug.cpp        |  8 +++++---
 src/window_interpreter.cpp | 15 ++++++++-------
 src/window_interpreter.h   | 12 +++++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/scene_debug.cpp b/src/scene_debug.cpp
index d48bf7cbc..ff301be55 100644
--- a/src/scene_debug.cpp
+++ b/src/scene_debug.cpp
@@ -1244,13 +1244,14 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 	lcf::rpg::SaveEventExecState state;
 	std::string first_line = "";
 	bool valid = false;
+	int evt_id = 0;
 
 	if (index == 1) {
 		state = Game_Interpreter::GetForegroundInterpreter().GetState();
 		first_line = Game_Battle::IsBattleRunning() ? "Foreground (Battle)" : "Foreground (Map)";
 		valid = true;
 	} else if (index <= state_interpreter.ev.size()) {
-		int evt_id = state_interpreter.ev[index - 1];
+		evt_id = state_interpreter.ev[index - 1];
 		state = state_interpreter.state_ev[index - 1];
 		first_line = fmt::format("EV{:04d}: {}", evt_id, Game_Map::GetEvent(evt_id)->GetName());
 		valid = true;
@@ -1260,6 +1261,7 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 		for (auto& ce : Game_Map::GetCommonEvents()) {
 			if (ce.common_event_id == ce_id) {
 				first_line = fmt::format("CE{:04d}: {}", ce_id, ce.GetName());
+				evt_id = ce_id;
 				valid = true;
 				break;
 			}
@@ -1268,10 +1270,10 @@ void Scene_Debug::UpdateInterpreterWindow(int index) {
 
 	if (valid) {
 		state_interpreter.selected_state = index;
-		interpreter_window->SetStackState(index > state_interpreter.ev.size(), first_line, state);
+		interpreter_window->SetStackState(index > state_interpreter.ev.size(), evt_id, first_line, state);
 	} else {
 		state_interpreter.selected_state = -1;
-		interpreter_window->SetStackState(0, "", {});
+		interpreter_window->SetStackState(0, 0, "", {});
 	}
 }
 
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index 9b7f7ad8f..350ed3f15 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -45,10 +45,9 @@ Window_Interpreter::~Window_Interpreter() {
 
 }
 
-void Window_Interpreter::SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state) {
-	this->interpreter_desc = interpreter_desc;
+void Window_Interpreter::SetStackState(bool is_ce, int owner_evt_id, std::string interpreter_desc, lcf::rpg::SaveEventExecState state) {
+	this->display_item = { is_ce, owner_evt_id, interpreter_desc };
 	this->state = state;
-	this->is_ce = is_ce;
 }
 
 void Window_Interpreter::Refresh() {
@@ -73,12 +72,14 @@ void Window_Interpreter::Refresh() {
 			auto& prev_frame = state.stack[i - 1];
 			auto& com = prev_frame.commands[prev_frame.current_command - 1];
 			if (com.code == 12330) { // CallEvent
-				is_calling_ev_ce = true;
 				if (com.parameters[0] == 0) {
+					is_calling_ev_ce = true;
 					evt_id = com.parameters[1];
 				} else if (com.parameters[0] == 3 && Player::IsPatchManiac()) {
+					is_calling_ev_ce = true;
 					evt_id = Main_Data::game_variables->Get(com.parameters[1]);
 				} else if (com.parameters[0] == 4 && Player::IsPatchManiac()) {
+					is_calling_ev_ce = true;
 					evt_id = Main_Data::game_variables->GetIndirect(com.parameters[1]);
 				}
 			}
@@ -90,7 +91,7 @@ void Window_Interpreter::Refresh() {
 			max_page_id = page_id;
 
 		StackItem item = StackItem();
-		item.is_ce = is_calling_ev_ce || (i == 0 && this->is_ce);
+		item.is_ce = is_calling_ev_ce || (i == 0 && this->display_item.is_ce);
 		item.evt_id = evt_id;
 		item.page_id = page_id;
 		item.name = "";
@@ -147,7 +148,7 @@ void Window_Interpreter::Refresh() {
 }
 
 bool Window_Interpreter::IsValid() {
-	return !interpreter_desc.empty();
+	return !display_item.desc.empty();
 }
 
 void Window_Interpreter::Update() {
@@ -159,7 +160,7 @@ void Window_Interpreter::DrawDescriptionLines() {
 	Rect rect = GetItemRect(i++);
 	contents->ClearRect(rect);
 
-	contents->TextDraw(rect.x, rect.y, Font::ColorDefault, interpreter_desc);
+	contents->TextDraw(rect.x, rect.y, Font::ColorDefault, display_item.desc);
 
 	if (state.wait_movement) {
 		rect = GetItemRect(i++);
diff --git a/src/window_interpreter.h b/src/window_interpreter.h
index 690eec59f..69fd1b087 100644
--- a/src/window_interpreter.h
+++ b/src/window_interpreter.h
@@ -30,7 +30,7 @@ class Window_Interpreter : public Window_Selectable {
 
 	void Update() override;
 
-	void SetStackState(bool is_ce, std::string interpreter_desc, lcf::rpg::SaveEventExecState state);
+	void SetStackState(bool is_ce, int owner_evt_id, std::string interpreter_desc, lcf::rpg::SaveEventExecState state);
 	void Refresh();
 	bool IsValid();
 
@@ -39,6 +39,12 @@ class Window_Interpreter : public Window_Selectable {
 	void DrawDescriptionLines();
 	void DrawStackLine(int index);
 private:
+	struct InterpDisplayItem {
+		bool is_ce;
+		int owner_evt_id;
+		std::string desc;
+	};
+
 	struct StackItem {
 		bool is_ce;
 		int evt_id, page_id;
@@ -48,12 +54,12 @@ class Window_Interpreter : public Window_Selectable {
 
 	const int lines_without_stack_fixed = 3;
 	
-	bool is_ce = false;
 	lcf::rpg::SaveEventExecState state;
-	std::string interpreter_desc;
 	int lines_without_stack = 0;
 
 	int digits_stackitemno = 0, digits_evt_id = 0, digits_page_id = 0, digits_evt_combined_id = 0, digits_cmdcount = 0;
+
+	InterpDisplayItem display_item;
 	std::vector<StackItem> stack_display_items;
 };
 

From a0ecb8d0313e5eeb50eb1d30fa36fa03e31204eb Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 23 May 2024 14:14:19 +0200
Subject: [PATCH 127/222] Remove patch-flag checks for debugging info

---
 src/game_interpreter.cpp   | 6 ++----
 src/window_interpreter.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index e62a2d729..fea52ac90 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -119,10 +119,8 @@ void Game_Interpreter::Push(
 	frame.current_command = 0;
 	frame.triggered_by_decision_key = started_by_decision_key;
 	frame.event_id = event_id;
-	if (Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) {
-		frame.maniac_event_id = event_id;
-		frame.maniac_event_page_id = event_page_id;
-	}
+	frame.maniac_event_id = event_id;
+	frame.maniac_event_page_id = event_page_id;
 
 	if (_state.stack.empty() && main_flag && !Game_Battle::IsBattleRunning()) {
 		Main_Data::game_system->ClearMessageFace();
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index 350ed3f15..338eb6f81 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -58,7 +58,7 @@ void Window_Interpreter::Refresh() {
 	for (int i = state.stack.size() - 1; i >= 0; i--) {
 		int evt_id = state.stack[i].event_id;
 		int page_id = 0;
-		if ((Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) && state.stack[i].maniac_event_id > 0) {
+		if (state.stack[i].maniac_event_id > 0) {
 			evt_id = state.stack[i].maniac_event_id;
 			page_id = state.stack[i].maniac_event_page_id;
 		}

From a2c0565995ad8945a7e127b4b3600302ff54677d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 15:22:55 +0200
Subject: [PATCH 128/222] ZipFs: Reuse the initial stream (LzhFs already does
 this)

---
 src/filesystem_zip.cpp | 28 ++++++++++++++--------------
 src/filesystem_zip.h   |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/filesystem_zip.cpp b/src/filesystem_zip.cpp
index b436a71e9..68e593510 100644
--- a/src/filesystem_zip.cpp
+++ b/src/filesystem_zip.cpp
@@ -54,8 +54,8 @@ static std::string normalize_path(StringView path) {
 
 ZipFilesystem::ZipFilesystem(std::string base_path, FilesystemView parent_fs, StringView enc) :
 	Filesystem(base_path, parent_fs) {
-	auto zipfile = parent_fs.OpenInputStream(GetPath());
-	if (!zipfile) {
+	zip_is = parent_fs.OpenInputStream(GetPath());
+	if (!zip_is) {
 		return;
 	}
 
@@ -70,18 +70,18 @@ ZipFilesystem::ZipFilesystem(std::string base_path, FilesystemView parent_fs, St
 	bool is_utf8;
 
 	encoding = ToString(enc);
-	if (!FindCentralDirectory(zipfile, central_directory_offset, central_directory_size, central_directory_entries)) {
+	if (!FindCentralDirectory(zip_is, central_directory_offset, central_directory_size, central_directory_entries)) {
 		Output::Debug("ZipFS: {} is not a valid archive", GetPath());
 		return;
 	}
 
 	if (encoding.empty()) {
-		zipfile.seekg(central_directory_offset);
+		zip_is.seekg(central_directory_offset);
 		std::stringstream filename_guess;
 
 		// Guess the encoding first
 		int items = 0;
-		while (ReadCentralDirectoryEntry(zipfile, filepath, entry, is_utf8)) {
+		while (ReadCentralDirectoryEntry(zip_is, filepath, entry, is_utf8)) {
 			// Only consider Non-ASCII & Non-UTF8 for encoding detection
 			// Skip directories, files already contain the paths
 			if (is_utf8 || filepath.back() == '/' || Utils::StringIsAscii(filepath)) {
@@ -124,13 +124,13 @@ ZipFilesystem::ZipFilesystem(std::string base_path, FilesystemView parent_fs, St
 	}
 	bool enc_is_utf8 = encoding == "UTF-8";
 
-	zipfile.clear();
-	zipfile.seekg(central_directory_offset);
+	zip_is.clear();
+	zip_is.seekg(central_directory_offset);
 
 	lcf::Encoder detected_encoder(encoding);
 	lcf::Encoder cp437_encoder("437");
 	std::vector<std::string> paths;
-	while (ReadCentralDirectoryEntry(zipfile, filepath, entry, is_utf8)) {
+	while (ReadCentralDirectoryEntry(zip_is, filepath, entry, is_utf8)) {
 		if (is_utf8 || enc_is_utf8 || Utils::StringIsAscii(filepath)) {
 			// No reencoding necessary
 			filepath_cp437.clear();
@@ -358,11 +358,11 @@ std::streambuf* ZipFilesystem::CreateInputStreambuffer(StringView path, std::ios
 	std::string path_normalized = normalize_path(path);
 	auto central_entry = Find(path);
 	if (central_entry && !central_entry->is_directory) {
-		auto zip_file = GetParent().OpenInputStream(GetPath());
-		zip_file.seekg(central_entry->fileoffset);
+		zip_is.clear();
+		zip_is.seekg(central_entry->fileoffset);
 		StorageMethod method;
 		ZipEntry local_entry = {};
-		if (ReadLocalHeader(zip_file, method, local_entry)) {
+		if (ReadLocalHeader(zip_is, method, local_entry)) {
 			if (central_entry->compressed_size != local_entry.compressed_size) {
 				if (local_entry.compressed_size == 0) {
 					local_entry.compressed_size = central_entry->compressed_size;
@@ -386,15 +386,15 @@ std::streambuf* ZipFilesystem::CreateInputStreambuffer(StringView path, std::ios
 				return nullptr;
 			}
 
-			zip_file.seekg(central_entry->fileoffset + local_entry.fileoffset);
+			zip_is.seekg(central_entry->fileoffset + local_entry.fileoffset);
 			if (method == StorageMethod::Plain) {
 				auto data = std::vector<uint8_t>(local_entry.uncompressed_size);
-				zip_file.read(reinterpret_cast<char*>(data.data()), data.size());
+				zip_is.read(reinterpret_cast<char*>(data.data()), data.size());
 				return new Filesystem_Stream::InputMemoryStreamBuf(std::move(data));
 			} else if (method == StorageMethod::Deflate) {
 				std::vector<uint8_t> comp_buf;
 				comp_buf.resize(local_entry.compressed_size);
-				zip_file.read(reinterpret_cast<char*>(comp_buf.data()), comp_buf.size());
+				zip_is.read(reinterpret_cast<char*>(comp_buf.data()), comp_buf.size());
 				auto dec_buf = std::vector<uint8_t>(local_entry.uncompressed_size);
 				z_stream zlib_stream = {};
 				zlib_stream.next_in = reinterpret_cast<Bytef*>(comp_buf.data());
diff --git a/src/filesystem_zip.h b/src/filesystem_zip.h
index c5e5a2c71..a613fc8af 100644
--- a/src/filesystem_zip.h
+++ b/src/filesystem_zip.h
@@ -70,6 +70,7 @@ class ZipFilesystem : public Filesystem {
 	std::vector<std::pair<std::string, ZipEntry>> zip_entries;
 	std::vector<std::pair<std::string, ZipEntry>> zip_entries_cp437;
 	std::string encoding;
+	mutable Filesystem_Stream::InputStream zip_is;
 	mutable std::vector<char> filename_buffer;
 };
 

From cc33823b0d6a7e9444aff0f8321b595f4145ec54 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 15:23:53 +0200
Subject: [PATCH 129/222] Android: Multiple games are now found in
 subdirectories

This also allows stuff like multiple games in a single zip, zip inside zip etc.
---
 ...asyrpg_player_game_browser_GameScanner.cpp | 99 +++++++++++--------
 ..._easyrpg_player_game_browser_GameScanner.h |  2 +-
 .../org/easyrpg/player/game_browser/Game.java | 23 +++--
 .../player/game_browser/GameScanner.java      | 17 ++--
 src/filefinder.cpp                            | 41 ++++----
 src/filefinder.h                              |  7 +-
 6 files changed, 112 insertions(+), 77 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index c1cc150cc..88263c85b 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -163,57 +163,78 @@ jbyteArray readXyz(JNIEnv *env, std::istream& stream) {
 
 extern "C"
 JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGame(JNIEnv *env, jclass clazz,
-															 jstring path) {
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz,
+															 jstring jpath) {
 	EpAndroid::env = env;
 
-	const char* cpath = env->GetStringUTFChars(path, nullptr);
-	std::string spath(cpath);
-	env->ReleaseStringUTFChars(path, cpath);
+	const char* path = env->GetStringUTFChars(jpath, nullptr);
+	std::string spath(path);
+	env->ReleaseStringUTFChars(jpath, path);
 
-	auto fs = FileFinder::FindGameRecursive(FileFinder::Root().Create(spath));
-	if (!fs) {
-		return nullptr;
+	std::vector<FilesystemView> fs_list = FileFinder::FindGames(FileFinder::Root().Create(spath));
+
+	jclass jgame_class = env->FindClass("org/easyrpg/player/game_browser/Game");
+	jobjectArray jgame_array = env->NewObjectArray(fs_list.size(), jgame_class, nullptr);
+
+	if (fs_list.empty()) {
+		return jgame_array;
 	}
 
-	std::string save_path;
-	if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
-		save_path = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
+	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
+
+	for (size_t i = 0; i < fs_list.size(); ++i) {
+		auto& fs = fs_list[i];
+
+		std::string save_path;
+		if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
+			// Is an archive and needs a redirected save path
+			save_path = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
 
-		// compatibility with Java code
-		size_t ext = save_path.find('.');
-		if (ext != std::string::npos) {
-			save_path = save_path.substr(0, ext);
+			// compatibility with original GameScanner Java code (everything after the extension dot is removed)
+			size_t ext = save_path.find('.');
+			if (ext != std::string::npos) {
+				save_path = save_path.substr(0, ext);
+			}
 		}
-	}
 
-	jbyteArray title_image = nullptr;
-
-	auto title = fs.Subtree("Title");
-	if (title) {
-		for (auto& [name, entry]: *title.ListDirectory()) {
-			if (entry.type == DirectoryTree::FileType::Regular) {
-				if (StringView(name).ends_with(".xyz")) {
-					auto is = title.OpenInputStream(entry.name);
-					title_image = readXyz(env, is);
-				} else if (StringView(name).ends_with(".png") || StringView(name).ends_with(".bmp")) {
-					auto is = title.OpenInputStream(entry.name);
-					auto vec = Utils::ReadStream(is);
-
-					title_image = env->NewByteArray(vec.size());
-					env->SetByteArrayRegion(title_image, 0, vec.size(), reinterpret_cast<jbyte*>(vec.data()));
+		// Very simple title graphic search: The first image in "Title" is used
+		auto title = fs.Subtree("Title");
+		jbyteArray title_image = nullptr;
+		if (title) {
+			for (auto &[name, entry]: *title.ListDirectory()) {
+				if (entry.type == DirectoryTree::FileType::Regular) {
+					if (StringView(name).ends_with(".xyz")) {
+						auto is = title.OpenInputStream(entry.name);
+						title_image = readXyz(env, is);
+					} else if (StringView(name).ends_with(".png") ||
+							   StringView(name).ends_with(".bmp")) {
+						auto is = title.OpenInputStream(entry.name);
+						if (!is) {
+							// When opening of the image fails it is an unsupported archive format
+							// Skip this game
+							continue;
+						}
+
+						auto vec = Utils::ReadStream(is);
+
+						title_image = env->NewByteArray(vec.size());
+						env->SetByteArrayRegion(title_image, 0, vec.size(),
+												reinterpret_cast<jbyte *>(vec.data()));
+					}
 				}
 			}
 		}
-	}
 
-	jclass game_class = env->FindClass("org/easyrpg/player/game_browser/Game");
+		// Create an instance of "Game"
+		jstring jgame_path = env->NewStringUTF(
+				("content://" + FileFinder::GetFullFilesystemPath(fs)).c_str());
+		jstring jsave_path = env->NewStringUTF(save_path.c_str());
+		jobject jgame_object = env->NewObject(jgame_class, jgame_constructor, jgame_path, jsave_path, title_image);
 
-	jmethodID constructor = env->GetMethodID(game_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
-
-	jstring game_path = env->NewStringUTF(("content://" + FileFinder::GetFullFilesystemPath(fs)).c_str());
-	jstring save_pat = env->NewStringUTF(save_path.c_str());
-	jobject game_object = env->NewObject(game_class, constructor, game_path, save_pat, title_image);
+		env->SetObjectArrayElement(jgame_array, i, jgame_object);
+	}
 
-	return game_object;
+	// Some fields of the Array can be NULL when a game was skipped due to an error
+	// This is sanitized on the Java site
+	return jgame_array;
 }
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
index 3743cc199..861fe4dbf 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
@@ -10,7 +10,7 @@ extern "C" {
 
 extern "C"
 JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGame(JNIEnv *env, jclass clazz, jstring path);
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path);
 
 #ifdef __cplusplus
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
index f0ce84457..b16506535 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
@@ -16,23 +16,27 @@
 
 public class Game implements Comparable<Game> {
     final static char escapeCode = '\u0001';
+    /** The title shown in the Game Browser */
 	private String title;
+    /** Path to the game folder (forwarded via --project-path */
     private final String gameFolderPath;
+    /** Relative path to the save directory, made absolute by launchGame (forwarded via --save-path) */
     private String savePath;
+    /** Whether the game was tagged as a favourite */
 	private boolean isFavorite;
-    private Bitmap titleScreen;
+    /** Title image shown in the Game Browser */
+    private Bitmap titleScreen = null;
+    /** Game is launched from the APK via standalone mode */
     private boolean standalone = false;
 
 	private Game(String gameFolderPath) {
+        // For simplicity the gameFolderPath is an URI that is parsed
+        // Similar to the SafFile code
         int encoded_slash_pos = gameFolderPath.lastIndexOf("%2F");
-        if (encoded_slash_pos == -1) {
-            // Should not happen because the game is in a subdirectory
-            Log.e("EasyRPG", "Strange Uri " + gameFolderPath);
-        }
-        int slash_pos = gameFolderPath.indexOf("/", encoded_slash_pos);
+        int slash_pos = gameFolderPath.lastIndexOf("/");
 
         // A file is provided when a / is after the encoded / (%2F)
-        if (slash_pos > -1) {
+        if (slash_pos > -1 && slash_pos > encoded_slash_pos) {
             // Extract the filename and properly encode it
             this.title = gameFolderPath.substring(slash_pos + 1);
         } else {
@@ -41,6 +45,7 @@ private Game(String gameFolderPath) {
 
         int dot_pos = this.title.indexOf(".");
         if (dot_pos > -1) {
+            // Strip of the file extension
             this.title = this.title.substring(0, dot_pos);
         }
 
@@ -52,7 +57,9 @@ private Game(String gameFolderPath) {
 
 	public Game(String gameFolderPath, byte[] titleScreen) {
 	    this(gameFolderPath);
-        this.titleScreen = BitmapFactory.decodeByteArray(titleScreen, 0, titleScreen.length);;
+        if (titleScreen != null) {
+            this.titleScreen = BitmapFactory.decodeByteArray(titleScreen, 0, titleScreen.length);
+        };
     }
 
     /**
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
index 3371e2397..8c24eee87 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
@@ -112,7 +112,7 @@ private void scanGames(Activity activity){
                 }
             }
 
-            if (gameList.size() > 0) {
+            if (!gameList.isEmpty()) {
                 Log.i("EasyRPG", gameList.size() + " game(s) found in cache.");
 
                 return;
@@ -160,6 +160,7 @@ private void scanRootFolder(Activity activity, Uri folderURI) {
         final ArrayList<String> names = new ArrayList<>();
         final ArrayList<Uri> fileURIs = new ArrayList<>();
 
+        // Precalculate how many folders are to be scanned
         for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
             String fileDocumentID = array[0];
 
@@ -175,18 +176,22 @@ private void scanRootFolder(Activity activity, Uri folderURI) {
             }
         }
 
+        // Scan all the folders and show the current scanning progress
         for (int i = 0; i < names.size(); ++i) {
-            final String name = names.get(i);
+            final String name = names.get(i); // only "final" variables can be passed to lambdas
             final int j = i;
             activity.runOnUiThread(() -> {
+                // Update Ui progress
                 TextView myTextView = activity.findViewById(R.id.progressText);
                 myTextView.setText(String.format("%s (%d/%d)", name, j + 1, names.size()));
             });
 
-            Game game = findGame(fileURIs.get(i).toString());
+            Game[] candidates = findGames(fileURIs.get(i).toString());
 
-            if (game != null) {
-                gameList.add(game);
+            for (Game candidate: candidates) {
+                if (candidate != null) {
+                    gameList.add(candidate);
+                }
             }
         }
     }
@@ -203,5 +208,5 @@ public boolean hasError() {
         return !errorList.isEmpty();
     }
 
-    private static native Game findGame(String path);
+    private static native Game[] findGames(String path);
 }
diff --git a/src/filefinder.cpp b/src/filefinder.cpp
index 31fbad16d..9c893d6b2 100644
--- a/src/filefinder.cpp
+++ b/src/filefinder.cpp
@@ -533,30 +533,31 @@ void FileFinder::DumpFilesystem(FilesystemView fs) {
 	}
 }
 
-FilesystemView FileFinder::FindGameRecursive(FilesystemView fs, int recursion_limit) {
-	if (!fs || recursion_limit == 0) {
-		return {};
-	}
+std::vector<FilesystemView> FileFinder::FindGames(FilesystemView fs, int recursion_limit, int game_limit) {
+	std::vector<FilesystemView> games;
 
-	if (IsValidProject(fs)) {
-		return fs;
-	}
+	std::function<void(FilesystemView, int)> find_recursive = [&](FilesystemView subfs, int rec_limit) -> void {
+		if (!subfs || rec_limit == 0 || games.size() >= game_limit) {
+			return;
+		}
+
+		if (IsValidProject(subfs)) {
+			games.push_back(subfs);
+			return;
+		}
 
-	auto entries = fs.ListDirectory();
+		auto entries = subfs.ListDirectory();
 
-	for (auto& [name_lower, entry]: *entries) {
-		if (entry.type == DirectoryTree::FileType::Directory) {
-			auto fs_ret = FindGameRecursive(fs.Subtree(entry.name), recursion_limit - 1);
-			if (fs_ret) {
-				return fs_ret;
-			}
-		} else if (entry.type == DirectoryTree::FileType::Regular && IsSupportedArchiveExtension(entry.name)) {
-			auto fs_ret = FindGameRecursive(fs.Create(entry.name));
-			if (fs_ret) {
-				return fs_ret;
+		for (auto& [name_lower, entry]: *entries) {
+			if (entry.type == DirectoryTree::FileType::Directory) {
+				find_recursive(subfs.Subtree(entry.name), rec_limit - 1);
+			} else if (entry.type == DirectoryTree::FileType::Regular && IsSupportedArchiveExtension(entry.name)) {
+				find_recursive(fs.Create(entry.name), rec_limit - 1);
 			}
 		}
-	}
+	};
+
+	find_recursive(fs, recursion_limit);
 
-	return {};
+	return games;
 }
diff --git a/src/filefinder.h b/src/filefinder.h
index f747355eb..0aa5eccda 100644
--- a/src/filefinder.h
+++ b/src/filefinder.h
@@ -355,13 +355,14 @@ namespace FileFinder {
 	void DumpFilesystem(FilesystemView fs);
 
 	/**
-	 * Searches recursively for a game directory.
+	 * Searches recursively for game directories.
 	 *
 	 * @param fs Filesystem where the search starts
 	 * @param recursion_limit Recursion depth
-	 * @return View of the game directory when found
+	 * @param game_limit Abort the search when this amount of games was found.
+	 * @return Vector of views to the found game directories
 	 */
-	FilesystemView FindGameRecursive(FilesystemView fs, int recursion_limit = 3);
+	std::vector<FilesystemView> FindGames(FilesystemView fs, int recursion_limit = 3, int game_limit = 5);
 } // namespace FileFinder
 
 template<typename T>

From 440f32b25c24f330fbc2f67d682cbe8762cf40d1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 15:35:20 +0200
Subject: [PATCH 130/222] Android: Sync the FF-Multiplier setting with the INI
 setting

---
 .../player/player/EasyRpgPlayerActivity.java  |  3 ---
 .../org/easyrpg/player/settings/IniFile.java  |  2 ++
 .../easyrpg/player/settings/SettingsEnum.java |  4 ++--
 .../settings/SettingsInputActivity.java       |  6 ++---
 .../player/settings/SettingsManager.java      | 24 ++++++++++---------
 .../res/layout/activity_settings_inputs.xml   |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
index c50c4ab40..be416e152 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
@@ -153,9 +153,6 @@ public void onDrawerStateChanged(int newState) {
         mLayout.addView(surface);
         updateScreenPosition();
 
-        // Set speed multiplier
-        setFastForwardMultiplier(SettingsManager.getFastForwardMultiplier());
-
         showInputLayout();
     }
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
index 9276bfde5..35648fdcb 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
@@ -10,6 +10,7 @@ public class IniFile {
 
     public SectionView video;
     public SectionView audio;
+    public SectionView input;
     public SectionView engine;
 
     public IniFile(File iniFile) {
@@ -28,6 +29,7 @@ public IniFile(File iniFile) {
 
         video = new SectionView("Video");
         audio = new SectionView("Audio");
+        input = new SectionView("Input");
         engine = new SectionView("Engine");
     }
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
index 5735bb6e4..d86951835 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
@@ -17,13 +17,13 @@ enum SettingsEnum {
     CACHE_GAMES("PREF_CACHE_GAMES"),
     FORCED_LANDSCAPE("PREF_FORCED_LANDSCAPE"),
     FAST_FORWARD_MODE("FAST_FORWARD_MODE"),
-    FAST_FORWARD_MULTIPLIER("FAST_FORWARD_MULTIPLIER"),
     INPUT_LAYOUT_HORIZONTAL("INPUT_LAYOUT_HORIZONTAL"),
     INPUT_LAYOUT_VERTICAL("INPUT_LAYOUT_VERTICAL"),
     MUSIC_VOLUME("MusicVolume"),
     SOUND_VOLUME("SoundVolume"),
     STRETCH("Stretch"),
-    GAME_RESOLUTION("GameResolution")
+    GAME_RESOLUTION("GameResolution"),
+    SPEED_MODIFIER_A("SpeedModifierA")
     ;
 
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsInputActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsInputActivity.java
index 006977f20..924c3b4d6 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsInputActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsInputActivity.java
@@ -76,13 +76,13 @@ public void onNothingSelected(AdapterView<?> adapterView) {
         });
 
         fastForwardMultiplierSeekBar = findViewById(R.id.settings_fast_forward_multiplier);
-        fastForwardMultiplierSeekBar.setProgress(SettingsManager.getFastForwardMultiplier() - 2);
+        fastForwardMultiplierSeekBar.setProgress(SettingsManager.getSpeedModifierA() - 2);
         fastForwardMultiplierSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
 
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
-                // The seekbar has values 0-8, we want 2-10
-                SettingsManager.setFastForwardMultiplier(seekBar.getProgress() + 2);
+                // The seekbar has values 0-98, we want 2-100
+                SettingsManager.setSpeedModifierA(seekBar.getProgress() + 2);
             }
 
             @Override
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index fdcf39857..1e0f4d634 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -37,6 +37,7 @@ public class SettingsManager {
     private static int imageSize, gameResolution;
     private static int layoutTransparency, layoutSize, fastForwardMode, fastForwardMultiplier;
     private static int musicVolume, soundVolume;
+    private static int speedModifierA;
     private static InputLayout inputLayoutHorizontal, inputLayoutVertical;
     // Note: don't store DocumentFile as they can be nullify with a change of context
     private static Uri easyRPGFolderURI, soundFountFileURI;
@@ -76,11 +77,12 @@ private static void loadSettings(Context context) {
         forcedLandscape = sharedPref.getBoolean(FORCED_LANDSCAPE.toString(), false);
         stretch = configIni.video.getBoolean(STRETCH.toString(), false);
         fastForwardMode = sharedPref.getInt(FAST_FORWARD_MODE.toString(), FAST_FORWARD_MODE_TAP);
-        fastForwardMultiplier = sharedPref.getInt(FAST_FORWARD_MULTIPLIER.toString(), 3);
 
         musicVolume = configIni.audio.getInteger(MUSIC_VOLUME.toString(), 100);
         soundVolume = configIni.audio.getInteger(SOUND_VOLUME.toString(), 100);
 
+        speedModifierA = configIni.input.getInteger(SPEED_MODIFIER_A.toString(), 3);
+
         favoriteGamesList = new HashSet<>(sharedPref.getStringSet(FAVORITE_GAMES.toString(), new HashSet<>()));
 
         gamesCacheHash = sharedPref.getInt(CACHE_GAMES_HASH.toString(), 0);
@@ -197,16 +199,6 @@ public static void setFastForwardMode(int i) {
         editor.commit();
     }
 
-    public static int getFastForwardMultiplier() {
-        return fastForwardMultiplier;
-    }
-
-    public static void setFastForwardMultiplier(int i) {
-        fastForwardMultiplier = i;
-        editor.putInt(SettingsEnum.FAST_FORWARD_MULTIPLIER.toString(), i);
-        editor.commit();
-    }
-
     public static boolean isVibrateWhenSlidingDirectionEnabled() {
         return vibrateWhenSlidingDirectionEnabled;
     }
@@ -398,4 +390,14 @@ public static void setGameEncoding(Game game, Encoding encoding) {
         editor.putString(game.getTitle() + "_Encoding", encoding.getRegionCode());
         editor.commit();
     }
+
+    public static int getSpeedModifierA() {
+        return speedModifierA;
+    }
+
+    public static void setSpeedModifierA(int speedModifierA) {
+        SettingsManager.speedModifierA = speedModifierA;
+        configIni.input.set(SPEED_MODIFIER_A.toString(), speedModifierA);
+        configIni.save();
+    }
 }
diff --git a/builds/android/app/src/main/res/layout/activity_settings_inputs.xml b/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
index 9035d58f8..29a6007cf 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
@@ -63,7 +63,7 @@
                 android:id="@+id/settings_fast_forward_multiplier"
                 android:layout_width="180dp"
                 android:layout_height="wrap_content"
-                android:max="8"
+                android:max="98"
                 android:progress="1"
                 android:layout_alignParentEnd="true"
                 android:layout_below="@id/settings_fast_forward"

From 623cba0f368b524817ad2f631bb4548b8c4410f7 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 15:50:46 +0200
Subject: [PATCH 131/222] Android: Update translations to mention LZH support
 and lack of 7z-support

---
 builds/android/app/src/main/res/values-ca/strings.xml | 8 ++++----
 builds/android/app/src/main/res/values-de/strings.xml | 6 +++---
 builds/android/app/src/main/res/values-es/strings.xml | 8 ++++----
 builds/android/app/src/main/res/values-fr/strings.xml | 8 ++++----
 builds/android/app/src/main/res/values-in/strings.xml | 8 ++++----
 builds/android/app/src/main/res/values-it/strings.xml | 5 +++--
 builds/android/app/src/main/res/values-pl/strings.xml | 6 +++---
 builds/android/app/src/main/res/values-zh/strings.xml | 8 ++++----
 builds/android/app/src/main/res/values/strings.xml    | 4 ++--
 9 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/builds/android/app/src/main/res/values-ca/strings.xml b/builds/android/app/src/main/res/values-ca/strings.xml
index 95755889b..3207614ba 100644
--- a/builds/android/app/src/main/res/values-ca/strings.xml
+++ b/builds/android/app/src/main/res/values-ca/strings.xml
@@ -86,13 +86,13 @@
     <string name="no_games_found_and_explanation_android_30">No s\'han trobat jocs de RPG Maker 2000/2003.
 \n
 \nLa carpeta de EasyRPG que has seleccionat conté una carpeta \"games\". Fes servir una aplicació de gestió de fitxers per posar els jocs en aquesta carpeta.
-\nEls jocs es poden posar encarpetes o en arxius ZIP.
+\nEls jocs es poden posar encarpetes o en arxius ZIP/LZH.
 \n
 \nLa carpeta EasyRPG es pot canviar a la configuració.</string>
     <string name="open_games_folder">Obre la carpeta de jocs (\"games\")</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Col·loca els jocs de RPG Maker 2000/2003 a subcarpetes de la carpeta de jocs (\"games\").
-\nEls jocs han de ser descomprimits o en un arxiu ZIP.
-\nEls fitxers RAR, LZH i EXE NO estan suportats.
+\nEls jocs han de ser descomprimits o en un arxiu ZIP/LZH.
+\nEls fitxers RAR, 7z i EXE NO estan suportats.
 \n
 \nCaracterístiques opcionals (disponibles a la configuració):
 \n- Es pot afegir el RTP (arxius comuns usats per alguns jocs)
@@ -148,4 +148,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">mantenir</string>
     <string name="fast_forward_mode_tap">tocar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-de/strings.xml b/builds/android/app/src/main/res/values-de/strings.xml
index 506b6b803..72b705100 100644
--- a/builds/android/app/src/main/res/values-de/strings.xml
+++ b/builds/android/app/src/main/res/values-de/strings.xml
@@ -86,13 +86,13 @@
     <string name="no_games_found_and_explanation_android_30">Es wurden keine RPG Maker 2000/2003-Spiele gefunden.
 \n
 \nDer von dir ausgewählte EasyRPG-Ordner enthält einen Spiele-Ordner (games). Verwende die Datei-App deines Systems um Spiele in diesem Ordner abzulegen.
-\nSpiele können in Ordnern oder ZIP-Archiven sein.
+\nSpiele können in Ordnern oder ZIP/LZH-Archiven sein.
 \n
 \nDu kannst den Pfad zum EasyRPG-Ordner in den Einstellungen ändern.</string>
     <string name="open_games_folder">Den Spiele-Ordner (games) öffnen</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">RPG Maker 2000/2003-Spiele müssen im Unterverzeichnis \"games\" platziert werden.
-\nDie Spiele müssen entpackt sein oder in einem ZIP-Archiv vorliegen.
-\nRAR, LZH und EXE-Dateien werden NICHT unterstützt.
+\nDie Spiele müssen entpackt sein oder in einem ZIP/LZH-Archiv vorliegen.
+\nRAR-, 7z- und EXE-Dateien werden NICHT unterstützt.
 \n
 \nOptionale Funktionen (wirf einen Blick in die Einstellungen):
 \n- Das RTP (dies sind von einigen Spielen verwendete, gemeinsame Assets) kann bereitgestellt werden
diff --git a/builds/android/app/src/main/res/values-es/strings.xml b/builds/android/app/src/main/res/values-es/strings.xml
index f4da43cba..4b30824bc 100644
--- a/builds/android/app/src/main/res/values-es/strings.xml
+++ b/builds/android/app/src/main/res/values-es/strings.xml
@@ -86,13 +86,13 @@
     <string name="no_games_found_and_explanation_android_30">No se han encontrado juegos de RPG Maker 2000/2003.
 \n
 \nLa carpeta de EasyRPG que has seleccionado contiene una carpeta \"games\". Utiliza una aplicación de gestión de ficheros para poner los juegos en esta carpeta.
-\nLos juegos se pueden colocar en subcarpetas o en archivos ZIP.
+\nLos juegos se pueden colocar en subcarpetas o en archivos ZIP/LZH.
 \n
 \nLa carpeta de EasyRPG se puede cambiar en la configuración.</string>
     <string name="open_games_folder">Abrir la carpeta de juegos (\"games\")</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Coloca los juegos de RPG Maker 2000/2003 en subcarpetas de la carpeta \"games\".
-\nLos juegos tienen que estar descomprimidos o en un archivo ZIP.
-\nLos archivos RAR, LZH y EXE NO están soportados.
+\nLos juegos tienen que estar descomprimidos o en un archivo ZIP/LZH.
+\nLos archivos RAR, 7z y EXE NO están soportados.
 \n
 \nCaracterísticas opcionales (disponibles en la configuración):
 \n- Se puede agregar el RTP (archivos comunes usados por algunos juegos)
@@ -148,4 +148,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">mantener</string>
     <string name="fast_forward_mode_tap">tocar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-fr/strings.xml b/builds/android/app/src/main/res/values-fr/strings.xml
index cbfda10e1..cc1a5d09f 100644
--- a/builds/android/app/src/main/res/values-fr/strings.xml
+++ b/builds/android/app/src/main/res/values-fr/strings.xml
@@ -82,13 +82,13 @@
     <string name="no_games_found_and_explanation_android_30">Aucun jeu RPG Maker 2000/2003 n\'a été trouvé.
 \n
 \nLe dossier EasyRPG que vous avez sélectionné contient un dossier pour les jeux (games). Utiliser une application de gestionnaire de fichiers pour mettre vos jeux dans ce dossier.
-\nLes jeux peuvent être placés dans des sous-répertoires ou dans des archives ZIP.
+\nLes jeux peuvent être placés dans des sous-répertoires ou dans des archives ZIP/LZH.
 \n
 \nLe dossier d\'EasyRPG peut être changé dans les paramètres.</string>
     <string name="open_games_folder">Ouvrir le dossier « games »</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Mettez vos jeux RPG Maker 2000/2003 dans les sous-répertoires du dossier « games ».
-\nLes jeux doivent être décompressés ou dans une archive ZIP.
-\nLes fichiers RAR, LZH et EXE ne sont PAS supportés.
+\nLes jeux doivent être décompressés ou dans une archive ZIP/LZH.
+\nLes fichiers RAR, 7z et EXE ne sont PAS supportés.
 \n
 \nFonctionnalités optionnelles (Veuillez vous référer aux paramètres) :
 \n- Le RTP (ressources partagées utilisées par certains jeux) peut être fourni
@@ -144,4 +144,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">maintenir</string>
     <string name="fast_forward_mode_tap">appuyer</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-in/strings.xml b/builds/android/app/src/main/res/values-in/strings.xml
index aecbb9d29..82b74d4a5 100644
--- a/builds/android/app/src/main/res/values-in/strings.xml
+++ b/builds/android/app/src/main/res/values-in/strings.xml
@@ -85,12 +85,12 @@
     <string name="menu">Buka menu Android</string>
     <string name="no_games_found_and_explanation_android_30">Game RPG Maker 2000/2003 tidak ditemukan.
 \nFolder EasyRPG yang Anda pilih berisi folder \"games\". Gunakan aplikasi file manager untuk meletakkan game mu di folder ini.
-\nGame dapat dimasukkan ke dalam subfolder atau di arsip ZIP.
+\nGame dapat dimasukkan ke dalam subfolder atau di arsip ZIP/LZH.
 \nFolder EasyRPG bisa diubah di pengaturan.</string>
     <string name="open_games_folder">Buka folder \"games\"</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Letakkan permainan RPG Maker 2000/2003 di subdirektori folder \"games\".
-\nPermainan harus sudah tidak terkompres.
-\nfile ZIP, RAR, LZH dan EXE TIDAK didukung.
+\nPermainan harus sudah tidak terkompres atau dalam arsip ZIP/LZH.
+\nfile RAR, 7z dan EXE TIDAK didukung.
 \n
 \nFitur opsional (silahkan lihat pengaturan):
 \n- RTP (aset bersama digunakan oleh beberapa permainan) yang disediakan
@@ -146,4 +146,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">tahan</string>
     <string name="fast_forward_mode_tap">tekan</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-it/strings.xml b/builds/android/app/src/main/res/values-it/strings.xml
index e695594b7..695d96be0 100644
--- a/builds/android/app/src/main/res/values-it/strings.xml
+++ b/builds/android/app/src/main/res/values-it/strings.xml
@@ -84,10 +84,11 @@
     <string name="navigation_drawer_close">Chiudi menù di navigazione</string>
     <string name="menu">Apri Menù Android</string>
     <string name="no_games_found_and_explanation_android_30">Non sono stati trovati giochi creati con RPG Maker 2000/2003. Mettili nella sottosezione della cartella giochi.
-\nI giochi posso essere in cartelle o in archivi ZIP. La cartella di EasyRPG può essere modificata direttamente dalle Impostazioni.</string>
+\nI giochi posso essere in cartelle o in archivi ZIP/LZH. La cartella di EasyRPG può essere modificata direttamente dalle Impostazioni.</string>
     <string name="open_games_folder">Apri la cartella dei giochi</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Inserisci i giochi creati con RPG Maker 2000/2003 nella sottosezione della cartella dei giochi.
-\nI giochi possono essere in cartelle o in formato ZIP.
+\nI giochi possono essere in cartelle o in un archivio ZIP/LZH.
+\nI file RAR, 7z ed EXE NON sono supportati
 \n
 \nFunzioni opzionali (Attivabili dalle Impostazioni):
 \n- Il RPT (assets usati da altri giochi) possono essere utilizzati
diff --git a/builds/android/app/src/main/res/values-pl/strings.xml b/builds/android/app/src/main/res/values-pl/strings.xml
index 929e38176..50c399f21 100644
--- a/builds/android/app/src/main/res/values-pl/strings.xml
+++ b/builds/android/app/src/main/res/values-pl/strings.xml
@@ -84,11 +84,11 @@
     <string name="navigation_drawer_close">Zamknij menu nawigacji</string>
     <string name="menu">Otwórz menu Androida</string>
     <string name="no_games_found_and_explanation_android_30">Nie znaleziono gier RPG Maker 2000/2003. Umieść je w podkatalogach folderu gier.
-\nGry mogą być w osobnych katalogach lub w archiwach ZIP. Folder EasyRPG można zmienić w ustawieniach.</string>
+\nGry mogą być w osobnych katalogach lub w archiwach ZIP/LZH. Folder EasyRPG można zmienić w ustawieniach.</string>
     <string name="open_games_folder">Otwórz folder gier</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">Umieść swoje gry RPG Maker 2000/2003 w podkatalogach folderu gier.
-\nGry muszą być nieskompresowane bądź spakowane w archiwum ZIP.
-\nPliki RAR, LZH i EXE NIE są obsługiwane.
+\nGry muszą być nieskompresowane bądź spakowane w archiwum ZIP/LZH.
+\nPliki RAR, 7t i EXE NIE są obsługiwane.
 \n
 \nFunkcje opcjonalne (zapoznaj się z ustawieniami):
 \n- RTP (współdzielone zasoby używane przez niektóre gry) mogą być dostarczone
diff --git a/builds/android/app/src/main/res/values-zh/strings.xml b/builds/android/app/src/main/res/values-zh/strings.xml
index b0125bb81..a1f691595 100644
--- a/builds/android/app/src/main/res/values-zh/strings.xml
+++ b/builds/android/app/src/main/res/values-zh/strings.xml
@@ -109,12 +109,12 @@
     <string name="no_games_found_and_explanation_android_30">找不到 RPG Maker 2000/2003 游戏。
 \n
 \n您选择的 EasyRPG 文件夹包含一个 \"games\" 文件夹。使用文件管理器应用程序将您的游戏放在此文件夹中。
-\n游戏可以放在子文件夹或 ZIP 档案中。
+\n游戏可以放在子文件夹或 ZIP/LZH 档案中。
 \n
 \nEasyRPG 文件夹可以在设置中更改。</string>
     <string name="how_to_use_easy_rpg_explanation_android_30">将您的 RPG Maker 2000/200 3游戏放在“游戏”文件夹的子目录中。
-\n游戏必须解压缩或保存在 ZIP 档案中。
-\n不支持 RAR、LZH 和 EXE 文件。
+\n游戏必须解压缩或保存在 ZIP/LZH 档案中。
+\n不支持 RAR、7z 和 EXE 文件。
 \n
 \n可选功能（请参阅设置）：
 \n-RTP（一些游戏所使用的共享素材）
@@ -144,4 +144,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">长按</string>
     <string name="fast_forward_mode_tap">点击</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index fc7ba497e..6d92b8777 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="no">No</string>
     <string name="creating_dir_failed">Creating $PATH directory failed</string>
     <string name="path_not_readable">$PATH not readable</string>
-    <string name="no_games_found_and_explanation_android_30">No RPG Maker 2000/2003 games found.\n\nThe EasyRPG folder you selected contains a \"games\" folder. Use a file manager app to put your games in this folder.\nGames can be put in subfolders or in ZIP archives.\n\nThe EasyRPG folder can be changed in the settings.</string>
+    <string name="no_games_found_and_explanation_android_30">No RPG Maker 2000/2003 games found.\n\nThe EasyRPG folder you selected contains a \"games\" folder. Use a file manager app to put your games in this folder.\nGames can be put in subfolders or in ZIP/LZH archives.\n\nThe EasyRPG folder can be changed in the settings.</string>
     <string name="open_games_folder">Open the \"games\" folder</string>
     <string name="no_external_storage">No external storage (e.g. SD card) found</string>
     <string name="not_valid_game">$PATH is not a valid game</string>
@@ -37,7 +37,7 @@
     <string name="refresh">Refresh</string>
     <string name="change_default_mapping">Change the default button mapping</string>
     <string name="how_to_use_easy_rpg">How to use EasyRPG Player</string>
-    <string name="how_to_use_easy_rpg_explanation_android_30">Put your RPG Maker 2000/2003 games in subdirectories of the \"games\" folder.\nGames have to be uncompressed or in a ZIP archive.\nRAR, LZH and EXE files are NOT supported.\n\nOptional features (Please refer to the settings):\n- The RTP (shared assets used by some games) can be provided\n- A custom soundfont to alter how MIDI music sounds can be provided</string>
+    <string name="how_to_use_easy_rpg_explanation_android_30">Put your RPG Maker 2000/2003 games in subdirectories of the \"games\" folder.\nGames have to be uncompressed or in a ZIP/LZH archive.\nRAR, 7z and EXE files are NOT supported.\n\nOptional features (Please refer to the settings):\n- The RTP (shared assets used by some games) can be provided\n- A custom soundfont to alter how MIDI music sounds can be provided</string>
     <string name="visit_website">Visit our website</string>
     <string name="watch_explanation_video">Getting started and adding games (Video Guide)</string>
     <string name="error_no_games_folder">The \"games\" folder does not exist or is not a folder. Please create it manually or select a different location for the EasyRPG folder. The EasyRPG folder can be changed in the settings.</string>

From e229a20eafbda50875101352d6cadeb666915e06 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 20:32:49 +0200
Subject: [PATCH 132/222] Android: Pass in the title through JNI, cleanup

---
 ...asyrpg_player_game_browser_GameScanner.cpp |  46 +++--
 ..._easyrpg_player_game_browser_GameScanner.h |   2 +-
 .../main/java/org/easyrpg/player/Helper.java  |  28 ++-
 .../java/org/easyrpg/player/InitActivity.java |   3 +-
 .../org/easyrpg/player/game_browser/Game.java | 160 +++++++-----------
 .../game_browser/GameBrowserActivity.java     |   2 +-
 .../game_browser/GameBrowserHelper.java       |   3 +-
 .../player/game_browser/GameScanner.java      |  28 +--
 .../settings/SettingsAudioActivity.java       |   6 +-
 .../player/settings/SettingsManager.java      |   2 +-
 10 files changed, 122 insertions(+), 158 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index 88263c85b..1cf15c8f6 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -163,15 +163,15 @@ jbyteArray readXyz(JNIEnv *env, std::istream& stream) {
 
 extern "C"
 JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz,
-															 jstring jpath) {
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring jpath, jstring jmain_dir_name) {
 	EpAndroid::env = env;
 
 	const char* path = env->GetStringUTFChars(jpath, nullptr);
 	std::string spath(path);
 	env->ReleaseStringUTFChars(jpath, path);
 
-	std::vector<FilesystemView> fs_list = FileFinder::FindGames(FileFinder::Root().Create(spath));
+	auto root = FileFinder::Root().Create(spath);
+	std::vector<FilesystemView> fs_list = FileFinder::FindGames(root);
 
 	jclass jgame_class = env->FindClass("org/easyrpg/player/game_browser/Game");
 	jobjectArray jgame_array = env->NewObjectArray(fs_list.size(), jgame_class, nullptr);
@@ -180,15 +180,34 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 		return jgame_array;
 	}
 
-	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
+	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[B)V");
+
+	bool game_in_main_dir = false;
+	if (fs_list.size() == 1) {
+		if (FileFinder::GetFullFilesystemPath(root) == FileFinder::GetFullFilesystemPath(fs_list[0])) {
+			game_in_main_dir = true;
+		}
+	}
 
 	for (size_t i = 0; i < fs_list.size(); ++i) {
 		auto& fs = fs_list[i];
 
+		std::string full_path = FileFinder::GetFullFilesystemPath(fs);
+		std::string title;
+		if (game_in_main_dir) {
+			// The main dir is URI encoded, the human readable name is in jmain_dir_name
+			const char* main_dir_name = env->GetStringUTFChars(jmain_dir_name, nullptr);
+			title = main_dir_name;
+			env->ReleaseStringUTFChars(jmain_dir_name, main_dir_name);
+		} else {
+			// In all other cases the folder name is "clean" and can be used
+			title = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
+		}
+
 		std::string save_path;
 		if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
 			// Is an archive and needs a redirected save path
-			save_path = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
+			save_path = title;
 
 			// compatibility with original GameScanner Java code (everything after the extension dot is removed)
 			size_t ext = save_path.find('.');
@@ -198,17 +217,17 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 		}
 
 		// Very simple title graphic search: The first image in "Title" is used
-		auto title = fs.Subtree("Title");
+		auto title_fs = fs.Subtree("Title");
 		jbyteArray title_image = nullptr;
-		if (title) {
-			for (auto &[name, entry]: *title.ListDirectory()) {
+		if (title_fs) {
+			for (auto &[name, entry]: *title_fs.ListDirectory()) {
 				if (entry.type == DirectoryTree::FileType::Regular) {
 					if (StringView(name).ends_with(".xyz")) {
-						auto is = title.OpenInputStream(entry.name);
+						auto is = title_fs.OpenInputStream(entry.name);
 						title_image = readXyz(env, is);
 					} else if (StringView(name).ends_with(".png") ||
 							   StringView(name).ends_with(".bmp")) {
-						auto is = title.OpenInputStream(entry.name);
+						auto is = title_fs.OpenInputStream(entry.name);
 						if (!is) {
 							// When opening of the image fails it is an unsupported archive format
 							// Skip this game
@@ -216,7 +235,6 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 						}
 
 						auto vec = Utils::ReadStream(is);
-
 						title_image = env->NewByteArray(vec.size());
 						env->SetByteArrayRegion(title_image, 0, vec.size(),
 												reinterpret_cast<jbyte *>(vec.data()));
@@ -226,10 +244,10 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 		}
 
 		// Create an instance of "Game"
-		jstring jgame_path = env->NewStringUTF(
-				("content://" + FileFinder::GetFullFilesystemPath(fs)).c_str());
+		jstring jgame_path = env->NewStringUTF(("content://" + full_path).c_str());
 		jstring jsave_path = env->NewStringUTF(save_path.c_str());
-		jobject jgame_object = env->NewObject(jgame_class, jgame_constructor, jgame_path, jsave_path, title_image);
+		jstring jtitle = env->NewStringUTF(title.c_str());
+		jobject jgame_object = env->NewObject(jgame_class, jgame_constructor, jgame_path, jsave_path, jtitle, title_image);
 
 		env->SetObjectArrayElement(jgame_array, i, jgame_object);
 	}
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
index 861fe4dbf..95e56ade0 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
@@ -10,7 +10,7 @@ extern "C" {
 
 extern "C"
 JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path);
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path, jstring jmain_dir_name);
 
 #ifdef __cplusplus
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
index 37bc969ee..7a49df8e9 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
@@ -29,7 +29,6 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 public class Helper {
 	/**
@@ -215,17 +214,21 @@ public static List<String> listChildrenDocumentID(Context context, Uri folderUri
         return filesList;
     }
 
-    /** List files (with DOCUMENT_ID and MIME_TYPE) in the folder pointed by "folderURI" */
-    public static List<String[]> listChildrenDocumentIDAndType(Context context, Uri folderUri){
+    /**
+     * List files in the folder pointed by "folderURI"
+     * @return Array of Document ID, mimeType, display name (filename)
+     */
+    public static List<String[]> listChildrenDocuments(Context context, Uri folderUri){
         final ContentResolver resolver = context.getContentResolver();
         final Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(folderUri, DocumentsContract.getDocumentId(folderUri));
         List<String[]> filesList = new ArrayList<>();
         try {
-            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_MIME_TYPE }, null, null, null);
+            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_MIME_TYPE, DocumentsContract.Document.COLUMN_DISPLAY_NAME }, null, null, null);
             while (c.moveToNext()) {
                 String documentID = c.getString(0);
                 String mimeType = c.getString(1);
-                filesList.add(new String[] {documentID, mimeType});
+                String fileName = c.getString(2);
+                filesList.add(new String[] {documentID, mimeType, fileName});
             }
             c.close();
         } catch (Exception e) {
@@ -238,10 +241,10 @@ public static Uri findFileUri(Context context, Uri folderUri, String fileNameToF
         final ContentResolver resolver = context.getContentResolver();
         final Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(folderUri, DocumentsContract.getDocumentId(folderUri));
         try {
-            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID }, null, null, null);
+            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_DISPLAY_NAME }, null, null, null);
             while (c.moveToNext()) {
                 String documentID = c.getString(0);
-                String fileName = getFileNameFromDocumentID(documentID);
+                String fileName = c.getString(1);
                 if (fileName.equals(fileNameToFind)) {
                     Uri uri = DocumentsContract.buildDocumentUriUsingTree(folderUri, documentID);
                     c.close();
@@ -261,10 +264,10 @@ public static List<Uri> findFileUriWithRegex(Context context, Uri folderUri, Str
         final ContentResolver resolver = context.getContentResolver();
         final Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(folderUri, DocumentsContract.getDocumentId(folderUri));
         try {
-            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID }, null, null, null);
+            Cursor c = resolver.query(childrenUri, new String[] { DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_DISPLAY_NAME }, null, null, null);
             while (c.moveToNext()) {
                 String documentID = c.getString(0);
-                String fileName = getFileNameFromDocumentID(documentID);
+                String fileName = c.getString(1);
                 if (fileName.matches(regex)) {
                     Uri uri = DocumentsContract.buildDocumentUriUsingTree(folderUri, documentID);
                     uriList.add(uri);
@@ -282,13 +285,6 @@ public static DocumentFile findFile(Context context, Uri folderUri, String fileN
         return getFileFromURI(context, uri);
     }
 
-    public static String getFileNameFromDocumentID(String documentID) {
-        if (documentID != null) {
-            return documentID.substring(documentID.lastIndexOf('/') + 1);
-        }
-        return "";
-    }
-
     public static DocumentFile getFileFromURI (Context context, Uri fileURI) {
         try {
             return DocumentFile.fromTreeUri(context, fileURI);
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
index 2f4966681..9a8d95202 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
@@ -125,7 +125,8 @@ private void startGameStandalone() {
             String saveDir = getExternalFilesDir(null).getAbsolutePath() + "/Save";
             new File(saveDir).mkdirs();
 
-            Game project = new Game(gameDir, saveDir);
+            Game project = new Game(gameDir, saveDir, "", null);
+            project.setStandalone(true);
             GameBrowserHelper.launchGame(this, project);
             finish();
         }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
index b16506535..ff836836e 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
@@ -17,77 +17,39 @@
 public class Game implements Comparable<Game> {
     final static char escapeCode = '\u0001';
     /** The title shown in the Game Browser */
-	private String title;
+    private String title;
     /** Path to the game folder (forwarded via --project-path */
     private final String gameFolderPath;
     /** Relative path to the save directory, made absolute by launchGame (forwarded via --save-path) */
-    private String savePath;
+    private String savePath = "";
     /** Whether the game was tagged as a favourite */
-	private boolean isFavorite;
+    private boolean isFavorite;
     /** Title image shown in the Game Browser */
     private Bitmap titleScreen = null;
     /** Game is launched from the APK via standalone mode */
     private boolean standalone = false;
 
-	private Game(String gameFolderPath) {
-        // For simplicity the gameFolderPath is an URI that is parsed
-        // Similar to the SafFile code
-        int encoded_slash_pos = gameFolderPath.lastIndexOf("%2F");
-        int slash_pos = gameFolderPath.lastIndexOf("/");
-
-        // A file is provided when a / is after the encoded / (%2F)
-        if (slash_pos > -1 && slash_pos > encoded_slash_pos) {
-            // Extract the filename and properly encode it
-            this.title = gameFolderPath.substring(slash_pos + 1);
-        } else {
-            this.title = gameFolderPath.substring(encoded_slash_pos + 3);
-        }
+    public Game(String gameFolderPath, String saveFolder, String title, byte[] titleScreen) {
+        this.gameFolderPath = gameFolderPath;
 
-        int dot_pos = this.title.indexOf(".");
-        if (dot_pos > -1) {
-            // Strip of the file extension
-            this.title = this.title.substring(0, dot_pos);
+        // is only relative here, launchGame will put this in the "saves" directory
+        if (!saveFolder.isEmpty()) {
+            savePath = saveFolder;
         }
 
-        this.gameFolderPath = gameFolderPath;
-        this.savePath = gameFolderPath;
+        this.title = title;
 
-        this.isFavorite = isFavoriteFromSettings();
-	}
-
-	public Game(String gameFolderPath, byte[] titleScreen) {
-	    this(gameFolderPath);
         if (titleScreen != null) {
             this.titleScreen = BitmapFactory.decodeByteArray(titleScreen, 0, titleScreen.length);
         };
-    }
 
-    /**
-     * Constructor for standalone mode
-     *
-     * @param gameFolder
-     * @param saveFolder
-     */
-    public Game(String gameFolder, String saveFolder) {
-        this.title = "Standalone";
-        this.gameFolderPath = gameFolder;
-        this.savePath = saveFolder;
-        this.isFavorite = false;
-        this.standalone = true;
-    }
-
-    private Game(String gameFolderPath, String saveFolder, byte[] titleScreen) {
-        this(gameFolderPath, titleScreen);
-        // is only relative here, launchGame will put this in the "saves" directory
-        if (!saveFolder.isEmpty()) {
-            savePath = saveFolder;
-        }
+        this.isFavorite = isFavoriteFromSettings();
     }
 
     public static Game fromCacheEntry(Context context, String cache) {
         String[] entries = cache.split(String.valueOf(escapeCode));
 
-        if (entries.length != 3) {
+        if (entries.length != 4) {
             return null;
         }
 
@@ -97,65 +59,67 @@ public static Game fromCacheEntry(Context context, String cache) {
             return null;
         }
 
+        String title = entries[2];
+
         byte[] titleScreen = null;
-        if (!entries[2].equals("null")) {
-            titleScreen = Base64.decode(entries[2], 0);
+        if (!entries[3].equals("null")) {
+            titleScreen = Base64.decode(entries[3], 0);
         }
 
-        return new Game(entries[1], savePath, titleScreen);
+        return new Game(entries[1], savePath, title, titleScreen);
     }
 
-	public String getTitle() {
-		return title;
-	}
+    public String getTitle() {
+        return title;
+    }
 
-	public String getGameFolderPath() {
-		return gameFolderPath;
-	}
+    public String getGameFolderPath() {
+        return gameFolderPath;
+    }
 
-	public String getSavePath() {
-		return savePath;
-	}
+    public String getSavePath() {
+        return savePath;
+    }
 
     public void setSavePath(String path) {
         savePath = path;
     }
 
-	public boolean isFavorite() {
-		return isFavorite;
-	}
-
-	public void setFavorite(boolean isFavorite) {
-		this.isFavorite = isFavorite;
-		if(isFavorite){
-			SettingsManager.addFavoriteGame(this);
-		} else {
-			SettingsManager.removeAFavoriteGame(this);
-		}
-	}
-
-	private boolean isFavoriteFromSettings() {
-		return SettingsManager.getFavoriteGamesList().contains(this.title);
-	}
-
-	@Override
-	public int compareTo(Game game) {
-		if (this.isFavorite() && !game.isFavorite()) {
-			return -1;
-		}
-		if (!this.isFavorite() && game.isFavorite()) {
-			return 1;
-		}
-		return this.title.compareTo(game.title);
-	}
-
-	public Encoding getEncoding() {
+    public boolean isFavorite() {
+        return isFavorite;
+    }
+
+    public void setFavorite(boolean isFavorite) {
+        this.isFavorite = isFavorite;
+        if(isFavorite){
+            SettingsManager.addFavoriteGame(this);
+        } else {
+            SettingsManager.removeAFavoriteGame(this);
+        }
+    }
+
+    private boolean isFavoriteFromSettings() {
+        return SettingsManager.getFavoriteGamesList().contains(this.gameFolderPath);
+    }
+
+    @Override
+    public int compareTo(Game game) {
+        if (this.isFavorite() && !game.isFavorite()) {
+            return -1;
+        }
+        if (!this.isFavorite() && game.isFavorite()) {
+            return 1;
+        }
+        return this.title.compareTo(game.title);
+    }
+
+    public Encoding getEncoding() {
         return SettingsManager.getGameEncoding(this);
-	}
+    }
 
-	public void setEncoding(Encoding encoding) {
+    public void setEncoding(Encoding encoding) {
         SettingsManager.setGameEncoding(this, encoding);
-	}
+    }
 
     @NonNull
     @Override
@@ -166,11 +130,13 @@ public String toString() {
     public String toCacheEntry() {
         StringBuilder sb = new StringBuilder();
 
+        // Cache structure: savePath | gameFolderPath | title | titleScreen
         sb.append(savePath);
         sb.append(escapeCode);
-
         sb.append(gameFolderPath);
         sb.append(escapeCode);
+        sb.append(title);
+        sb.append(escapeCode);
 
         if (titleScreen != null) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -188,7 +154,11 @@ public Bitmap getTitleScreen() {
         return titleScreen;
     }
 
-    public Boolean isStandalone() {
+    public boolean isStandalone() {
         return standalone;
     }
+
+    public void setStandalone(boolean standalone) {
+        this.standalone = standalone;
+    }
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
index f62324416..5e55c4752 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 libraryLoaded = true;
             } catch (UnsatisfiedLinkError e) {
                 Log.e("EasyRPG Player", "Couldn't load libgamebrowser: " + e.getMessage());
-		        throw e;
+                throw e;
             }
         }
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
index 47347ce52..e8f20f56c 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
@@ -8,7 +8,6 @@
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.widget.Toast;
 
 import androidx.documentfile.provider.DocumentFile;
 
@@ -178,7 +177,7 @@ public static SafError dealAfterFolderSelected(Activity activity, int requestCod
                 return SafError.BAD_CONTENT_PROVIDER_BASE_FOLDER_NOT_FOUND;
             }
 
-            List<String[]> items = Helper.listChildrenDocumentIDAndType(activity, folder.getUri());
+            List<String[]> items = Helper.listChildrenDocuments(activity, folder.getUri());
             int item_count = 0;
             for (String[] item: items) {
                 if (item[0] == null || Helper.isDirectoryFromMimeType(item[1]) || item[0].endsWith(".nomedia")) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
index 8c24eee87..628089d84 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
@@ -1,15 +1,8 @@
 package org.easyrpg.player.game_browser;
 
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.Build;
-import android.os.ParcelFileDescriptor;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.widget.TextView;
 
@@ -20,21 +13,10 @@
 import org.easyrpg.player.settings.SettingsManager;
 import org.libsdl.app.SDL;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 public class GameScanner {
     // We use a singleton pattern to allow further optimizations
@@ -145,7 +127,7 @@ private void scanGames(Activity activity){
     private int scanFolderHash(Context context, Uri folderURI) {
         StringBuilder sb = new StringBuilder();
 
-        for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
+        for (String[] array : Helper.listChildrenDocuments(context, folderURI)) {
             sb.append(array[0]);
             sb.append(array[1]);
         }
@@ -161,10 +143,10 @@ private void scanRootFolder(Activity activity, Uri folderURI) {
         final ArrayList<Uri> fileURIs = new ArrayList<>();
 
         // Precalculate how many folders are to be scanned
-        for (String[] array : Helper.listChildrenDocumentIDAndType(context, folderURI)) {
+        for (String[] array : Helper.listChildrenDocuments(context, folderURI)) {
             String fileDocumentID = array[0];
+            String name = array[2];
 
-            String name = Helper.getFileNameFromDocumentID(fileDocumentID);
             if (name.isEmpty()) {
                 continue;
             }
@@ -186,7 +168,7 @@ private void scanRootFolder(Activity activity, Uri folderURI) {
                 myTextView.setText(String.format("%s (%d/%d)", name, j + 1, names.size()));
             });
 
-            Game[] candidates = findGames(fileURIs.get(i).toString());
+            Game[] candidates = findGames(fileURIs.get(i).toString(), names.get(i));
 
             for (Game candidate: candidates) {
                 if (candidate != null) {
@@ -208,5 +190,5 @@ public boolean hasError() {
         return !errorList.isEmpty();
     }
 
-    private static native Game[] findGames(String path);
+    private static native Game[] findGames(String path, String mainFolderName);
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
index 1fed83876..17baef7c3 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
@@ -7,7 +7,6 @@
 import android.provider.DocumentsContract;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -15,7 +14,6 @@
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.documentfile.provider.DocumentFile;
 
 import org.easyrpg.player.Helper;
@@ -90,13 +88,13 @@ private List<SoundfontItemList> scanAvailableSoundfonts(){
 
         Uri soundFontsFolder = SettingsManager.getSoundFontsFolderURI(this);
         if (soundFontsFolder != null) {
-            for (String[] array : Helper.listChildrenDocumentIDAndType(this, soundFontsFolder)) {
+            for (String[] array : Helper.listChildrenDocuments(this, soundFontsFolder)) {
                 String fileDocumentID = array[0];
                 String fileDocumentType = array[1];
+                String name = array[2];
 
                 // Is it a soundfont file ?
                 boolean isDirectory = Helper.isDirectoryFromMimeType(fileDocumentType);
-                String name = Helper.getFileNameFromDocumentID(fileDocumentID);
                 if (!isDirectory && name.toLowerCase().endsWith(".sf2")) {
                     DocumentFile soundFontFile = Helper.getFileFromDocumentID(this, soundFontsFolder, fileDocumentID);
                     if (soundFontFile != null) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index 1e0f4d634..fd72040c6 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -105,7 +105,7 @@ public static Set<String> getFavoriteGamesList() {
 
     public static void addFavoriteGame(Game game) {
         // Update user's preferences
-        favoriteGamesList.add(game.getTitle());
+        favoriteGamesList.add(game.getGameFolderPath());
 
         setFavoriteGamesList(favoriteGamesList);
     }

From 1e2bd02af1b57690e8b8f5b90f7d6be4578e3356 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 23 May 2024 21:17:03 +0200
Subject: [PATCH 133/222] Android: Try to load the title image in three ways

1. If only one title image: Use this one
2. By parsing the database
3. By taking the first image in the title folder

This approach is surprisingly fast and the caching skips the scan after the first time.
---
 ...asyrpg_player_game_browser_GameScanner.cpp | 99 +++++++++++++++----
 1 file changed, 80 insertions(+), 19 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index 1cf15c8f6..92f0f27bb 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -31,12 +31,15 @@
 #include <vector>
 #include <array>
 
-
 #include "filefinder.h"
 #include "utils.h"
 #include "string_view.h"
 #include "platform/android/android.h"
 
+#include <lcf/ldb/reader.h>
+#include <lcf/reader_util.h>
+#include <lcf/encoder.h>
+
 // via https://stackoverflow.com/q/1821806
 static void custom_png_write_func(png_structp  png_ptr, png_bytep data, png_size_t length) {
 	std::vector<uint8_t> *p = reinterpret_cast<std::vector<uint8_t>*>(png_get_io_ptr(png_ptr));
@@ -216,28 +219,86 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 			}
 		}
 
-		// Very simple title graphic search: The first image in "Title" is used
-		auto title_fs = fs.Subtree("Title");
+		/// Obtaining of the title image:
+		// 1. When the title directory contains only one image: Load it
+		// 2. Attempt to fetch it from the database
+		// 3. If this fails grab the first from the title folder
 		jbyteArray title_image = nullptr;
+
+		auto load_image = [&](Filesystem_Stream::InputStream& stream) {
+			if (!stream) {
+				return;
+			}
+
+			if (stream.GetName().ends_with(".xyz")) {
+				title_image = readXyz(env, stream);
+			} else if (stream.GetName().ends_with(".png") || stream.GetName().ends_with(".bmp")) {
+				auto vec = Utils::ReadStream(stream);
+				title_image = env->NewByteArray(vec.size());
+				env->SetByteArrayRegion(title_image, 0, vec.size(), reinterpret_cast<jbyte *>(vec.data()));
+			}
+		};
+
+		// 1. When the title directory contains only one image: Load it
+		auto title_fs = fs.Subtree("Title");
 		if (title_fs) {
-			for (auto &[name, entry]: *title_fs.ListDirectory()) {
-				if (entry.type == DirectoryTree::FileType::Regular) {
-					if (StringView(name).ends_with(".xyz")) {
-						auto is = title_fs.OpenInputStream(entry.name);
-						title_image = readXyz(env, is);
-					} else if (StringView(name).ends_with(".png") ||
-							   StringView(name).ends_with(".bmp")) {
-						auto is = title_fs.OpenInputStream(entry.name);
-						if (!is) {
-							// When opening of the image fails it is an unsupported archive format
-							// Skip this game
-							continue;
+			auto& content = *title_fs.ListDirectory();
+			if (content.size() == 1 && content[0].second.type == DirectoryTree::FileType::Regular) {
+				auto is = title_fs.OpenInputStream(content[0].second.name);
+				if (!is) {
+					// When opening of the image fails it is in an unsupported archive format
+					// Skip this game
+					continue;
+				}
+				load_image(is);
+			}
+		}
+
+		// 2. Attempt to fetch it from the database
+		if (!title_image) {
+			std::string db_file = fs.FindFile("RPG_RT.ldb");
+			if (!db_file.empty()) {
+				// This can fail when the database file is renamed, is not an error condition
+				auto is = fs.OpenInputStream(db_file);
+				if (!is) {
+					// When opening of the db fails it is in an unsupported archive format
+					// Skip this game
+					continue;
+				} else {
+					auto db = lcf::LDB_Reader::Load(is);
+					if (!db) {
+						// Database corrupted? Skip
+						continue;
+					}
+
+					if (!db->system.title_name.empty()) {
+						auto encodings = lcf::ReaderUtil::DetectEncodings(*db);
+						for (auto &enc: encodings) {
+							lcf::Encoder encoder(enc);
+							if (encoder.IsOk()) {
+								std::string title_name = lcf::ToString(db->system.title_name);
+								encoder.Encode(title_name);
+								auto title_is = fs.OpenFile("Title", title_name, FileFinder::IMG_TYPES);
+								// Title image was found -> Load it
+								load_image(title_is);
+							}
 						}
+					}
+				}
+			}
+		}
 
-						auto vec = Utils::ReadStream(is);
-						title_image = env->NewByteArray(vec.size());
-						env->SetByteArrayRegion(title_image, 0, vec.size(),
-												reinterpret_cast<jbyte *>(vec.data()));
+		// 3. Simply grab the first from the title folder
+		if (!title_image) {
+			// No image loaded yet: Grab the first from the title folder
+			if (title_fs) {
+				for (auto &[name, entry]: *title_fs.ListDirectory()) {
+					if (entry.type == DirectoryTree::FileType::Regular) {
+						auto is = title_fs.OpenInputStream(entry.name);
+						load_image(is);
+						if (title_image) {
+							break;
+						}
 					}
 				}
 			}

From f4c8c7a5e814f2937e78849dc1c1934f10177a6b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 15:41:36 +0200
Subject: [PATCH 134/222] Android: Fetch the game name from the INI

The title is then reencoded based on the users encoding setting.
---
 ...asyrpg_player_game_browser_GameScanner.cpp | 123 ++++++++++++++----
 ..._easyrpg_player_game_browser_GameScanner.h |   4 +-
 .../java/org/easyrpg/player/InitActivity.java |   2 +-
 .../org/easyrpg/player/game_browser/Game.java | 121 +++++++++++------
 .../game_browser/GameBrowserActivity.java     |   5 +-
 .../player/game_browser/GameScanner.java      |   1 +
 .../player/settings/SettingsManager.java      |   8 +-
 7 files changed, 193 insertions(+), 71 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index 92f0f27bb..2b3f300e4 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -39,6 +39,7 @@
 #include <lcf/ldb/reader.h>
 #include <lcf/reader_util.h>
 #include <lcf/encoder.h>
+#include <lcf/inireader.h>
 
 // via https://stackoverflow.com/q/1821806
 static void custom_png_write_func(png_structp  png_ptr, png_bytep data, png_size_t length) {
@@ -164,15 +165,23 @@ jbyteArray readXyz(JNIEnv *env, std::istream& stream) {
 	return result;
 }
 
+std::string jstring_to_string(JNIEnv* env, jstring j_str) {
+	if (!j_str) {
+		return {};
+	}
+	const char* chars = env->GetStringUTFChars(j_str, NULL);
+	std::string str(chars);
+	env->ReleaseStringUTFChars(j_str, chars);
+	return str;
+}
+
 extern "C"
 JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring jpath, jstring jmain_dir_name) {
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass, jstring jpath, jstring jmain_dir_name) {
 	EpAndroid::env = env;
 
-	const char* path = env->GetStringUTFChars(jpath, nullptr);
-	std::string spath(path);
-	env->ReleaseStringUTFChars(jpath, path);
-
+	// jpath is the SAF path to the game, is converted to FilesystemView "root"
+	std::string spath = jstring_to_string(env, jpath);
 	auto root = FileFinder::Root().Create(spath);
 	std::vector<FilesystemView> fs_list = FileFinder::FindGames(root);
 
@@ -180,10 +189,11 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 	jobjectArray jgame_array = env->NewObjectArray(fs_list.size(), jgame_class, nullptr);
 
 	if (fs_list.empty()) {
+		// No games found
 		return jgame_array;
 	}
 
-	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[B)V");
+	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
 
 	bool game_in_main_dir = false;
 	if (fs_list.size() == 1) {
@@ -196,21 +206,19 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 		auto& fs = fs_list[i];
 
 		std::string full_path = FileFinder::GetFullFilesystemPath(fs);
-		std::string title;
+		std::string game_dir_name;
 		if (game_in_main_dir) {
 			// The main dir is URI encoded, the human readable name is in jmain_dir_name
-			const char* main_dir_name = env->GetStringUTFChars(jmain_dir_name, nullptr);
-			title = main_dir_name;
-			env->ReleaseStringUTFChars(jmain_dir_name, main_dir_name);
+			game_dir_name = jstring_to_string(env, jmain_dir_name);
 		} else {
 			// In all other cases the folder name is "clean" and can be used
-			title = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
+			game_dir_name = std::get<1>(FileFinder::GetPathAndFilename(fs.GetFullPath()));
 		}
 
 		std::string save_path;
 		if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
 			// Is an archive and needs a redirected save path
-			save_path = title;
+			save_path = game_dir_name;
 
 			// compatibility with original GameScanner Java code (everything after the extension dot is removed)
 			size_t ext = save_path.find('.');
@@ -219,10 +227,11 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 			}
 		}
 
-		/// Obtaining of the title image:
-		// 1. When the title directory contains only one image: Load it
+		/* Obtaining of the game_dir_name image */
+
+		// 1. When the game_dir_name directory contains only one image: Load it
 		// 2. Attempt to fetch it from the database
-		// 3. If this fails grab the first from the title folder
+		// 3. If this fails grab the first from the game_dir_name folder
 		jbyteArray title_image = nullptr;
 
 		auto load_image = [&](Filesystem_Stream::InputStream& stream) {
@@ -239,7 +248,7 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 			}
 		};
 
-		// 1. When the title directory contains only one image: Load it
+		// 1. When the game_dir_name directory contains only one image: Load it
 		auto title_fs = fs.Subtree("Title");
 		if (title_fs) {
 			auto& content = *title_fs.ListDirectory();
@@ -274,8 +283,7 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 					if (!db->system.title_name.empty()) {
 						auto encodings = lcf::ReaderUtil::DetectEncodings(*db);
 						for (auto &enc: encodings) {
-							lcf::Encoder encoder(enc);
-							if (encoder.IsOk()) {
+							if (lcf::Encoder encoder(enc); encoder.IsOk()) {
 								std::string title_name = lcf::ToString(db->system.title_name);
 								encoder.Encode(title_name);
 								auto title_is = fs.OpenFile("Title", title_name, FileFinder::IMG_TYPES);
@@ -288,9 +296,9 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 			}
 		}
 
-		// 3. Simply grab the first from the title folder
+		// 3. Simply grab the first from the game_dir_name folder
 		if (!title_image) {
-			// No image loaded yet: Grab the first from the title folder
+			// No image loaded yet: Grab the first from the game_dir_name folder
 			if (title_fs) {
 				for (auto &[name, entry]: *title_fs.ListDirectory()) {
 					if (entry.type == DirectoryTree::FileType::Regular) {
@@ -304,11 +312,39 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 			}
 		}
 
-		// Create an instance of "Game"
+		/* Setting the game title */
+		// By default it is just the name of the directory
+		std::string title = game_dir_name;
+		bool title_from_ini = false;
+
+		// Try to grab a title from the INI file
+		if (auto ini_is = fs.OpenFile("RPG_RT.ini"); ini_is) {
+			if (lcf::INIReader ini(ini_is); !ini.ParseError()) {
+				if (std::string ini_title = ini.GetString("RPG_RT", "GameTitle", ""); !ini_title.empty()) {
+					title = ini_title;
+					title_from_ini = true;
+				}
+			}
+		}
+
+		/* Create an instance of "Game" */
 		jstring jgame_path = env->NewStringUTF(("content://" + full_path).c_str());
 		jstring jsave_path = env->NewStringUTF(save_path.c_str());
-		jstring jtitle = env->NewStringUTF(title.c_str());
-		jobject jgame_object = env->NewObject(jgame_class, jgame_constructor, jgame_path, jsave_path, jtitle, title_image);
+		jobject jgame_object = env->NewObject(jgame_class, jgame_constructor, jgame_path, jsave_path, title_image);
+
+		if (title_from_ini) {
+			// Store the raw string in the Game instance so it can be reencoded later via user setting
+			jbyteArray jtitle_raw = env->NewByteArray(title.size());
+			env->SetByteArrayRegion(jtitle_raw, 0, title.size(), reinterpret_cast<jbyte*>(title.data()));
+			jfieldID jtitle_raw_field = env->GetFieldID(jgame_class, "titleRaw", "[B");
+			env->SetObjectField(jgame_object, jtitle_raw_field, jtitle_raw);
+			Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(env, jgame_object);
+		} else {
+			// Use the folder name as the title
+			jstring jtitle = env->NewStringUTF(title.c_str());
+			jmethodID jset_title_method = env->GetMethodID(jgame_class, "setTitle", "(Ljava/lang/String;)V");
+			env->CallVoidMethod(jgame_object, jset_title_method, jtitle);
+		}
 
 		env->SetObjectArrayElement(jgame_array, i, jgame_object);
 	}
@@ -317,3 +353,44 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 	// This is sanitized on the Java site
 	return jgame_array;
 }
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject thiz) {
+	jclass jgame_class = env->GetObjectClass(thiz);
+
+	// Fetch the raw title string (result will be at the end in "title" variable)
+	jfieldID jtitle_raw_field = env->GetFieldID(jgame_class, "titleRaw", "[B");
+	jbyteArray jtitle_raw = reinterpret_cast<jbyteArray>(env->GetObjectField(thiz, jtitle_raw_field));
+
+	if (!jtitle_raw) {
+		return;
+	}
+
+	jbyte* title_data = env->GetByteArrayElements(jtitle_raw, NULL);
+	jsize title_len = env->GetArrayLength(jtitle_raw);
+	std::string title(reinterpret_cast<char*>(title_data), title_len);
+	env->ReleaseByteArrayElements(jtitle_raw, title_data, 0);
+
+	// Obtain the encoding
+	jmethodID jget_encoding_method = env->GetMethodID(jgame_class, "getEncodingCode", "()Ljava/lang/String;");
+	jstring jencoding = (jstring)env->CallObjectMethod(thiz, jget_encoding_method);
+	std::string encoding = jstring_to_string(env, jencoding);
+	if (encoding == "auto") {
+		lcf::Encoder enc(lcf::ReaderUtil::DetectEncoding(title));
+		enc.Encode(title);
+	} else {
+		lcf::Encoder enc(encoding);
+		enc.Encode(title);
+	}
+
+	if (title.empty()) {
+		// Something failed, do not set a new title
+		return;
+	}
+
+	// Set the new title after reencoding
+	jstring jtitle = env->NewStringUTF(title.c_str());
+	jmethodID jset_title_method = env->GetMethodID(jgame_class, "setTitle", "(Ljava/lang/String;)V");
+	env->CallVoidMethod(thiz, jset_title_method, jtitle);
+}
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
index 95e56ade0..58290f9b6 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
@@ -8,10 +8,12 @@
 extern "C" {
 #endif
 
-extern "C"
 JNIEXPORT jobject JNICALL
 Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path, jstring jmain_dir_name);
 
+JNIEXPORT void JNICALL
+Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject thiz);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
index 9a8d95202..b3aab24ca 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/InitActivity.java
@@ -125,7 +125,7 @@ private void startGameStandalone() {
             String saveDir = getExternalFilesDir(null).getAbsolutePath() + "/Save";
             new File(saveDir).mkdirs();
 
-            Game project = new Game(gameDir, saveDir, "", null);
+            Game project = new Game(gameDir, saveDir, null);
             project.setStandalone(true);
             GameBrowserHelper.launchGame(this, project);
             finish();
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
index ff836836e..764a3f7f3 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
@@ -18,6 +18,8 @@ public class Game implements Comparable<Game> {
     final static char escapeCode = '\u0001';
     /** The title shown in the Game Browser */
     private String title;
+    /** Bytes of the title string in an unspecified encoding */
+    private byte[] titleRaw = null;
     /** Path to the game folder (forwarded via --project-path */
     private final String gameFolderPath;
     /** Relative path to the save directory, made absolute by launchGame (forwarded via --save-path) */
@@ -29,7 +31,7 @@ public class Game implements Comparable<Game> {
     /** Game is launched from the APK via standalone mode */
     private boolean standalone = false;
 
-    public Game(String gameFolderPath, String saveFolder, String title, byte[] titleScreen) {
+    public Game(String gameFolderPath, String saveFolder, byte[] titleScreen) {
         this.gameFolderPath = gameFolderPath;
 
         // is only relative here, launchGame will put this in the "saves" directory
@@ -37,8 +39,6 @@ public Game(String gameFolderPath, String saveFolder, String title, byte[] title
             savePath = saveFolder;
         }
 
-        this.title = title;
-
         if (titleScreen != null) {
             this.titleScreen = BitmapFactory.decodeByteArray(titleScreen, 0, titleScreen.length);
         };
@@ -46,33 +46,16 @@ public Game(String gameFolderPath, String saveFolder, String title, byte[] title
         this.isFavorite = isFavoriteFromSettings();
     }
 
-    public static Game fromCacheEntry(Context context, String cache) {
-        String[] entries = cache.split(String.valueOf(escapeCode));
-
-        if (entries.length != 4) {
-            return null;
-        }
-
-        String savePath = entries[0];
-        DocumentFile gameFolder = DocumentFile.fromTreeUri(context, Uri.parse(entries[1]));
-        if (gameFolder == null) {
-            return null;
-        }
-
-        String title = entries[2];
-
-        byte[] titleScreen = null;
-        if (!entries[3].equals("null")) {
-            titleScreen = Base64.decode(entries[3], 0);
-        }
-
-        return new Game(entries[1], savePath, title, titleScreen);
-    }
-
     public String getTitle() {
         return title;
     }
 
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public native void reencodeTitle();
+
     public String getGameFolderPath() {
         return gameFolderPath;
     }
@@ -113,12 +96,41 @@ public int compareTo(Game game) {
         return this.title.compareTo(game.title);
     }
 
+    /**
+     * Returns a unique key to be used for storing settings related to the game.
+     *
+     * @return unique key
+     */
+    public String getKey() {
+        return gameFolderPath.replaceAll("[/ ]", "_");
+    }
+
     public Encoding getEncoding() {
         return SettingsManager.getGameEncoding(this);
     }
 
     public void setEncoding(Encoding encoding) {
         SettingsManager.setGameEncoding(this, encoding);
+        reencodeTitle();
+    }
+
+    /**
+     * @return The encoding number or "auto" when not configured (for use via JNI)
+     */
+    public String getEncodingCode() {
+        return getEncoding().getRegionCode();
+    }
+
+    public Bitmap getTitleScreen() {
+        return titleScreen;
+    }
+
+    public boolean isStandalone() {
+        return standalone;
+    }
+
+    public void setStandalone(boolean standalone) {
+        this.standalone = standalone;
     }
 
     @NonNull
@@ -127,17 +139,58 @@ public String toString() {
         return getTitle();
     }
 
+    public static Game fromCacheEntry(Context context, String cache) {
+        String[] entries = cache.split(String.valueOf(escapeCode));
+
+        if (entries.length != 5) {
+            return null;
+        }
+
+        String savePath = entries[0];
+        DocumentFile gameFolder = DocumentFile.fromTreeUri(context, Uri.parse(entries[1]));
+        if (gameFolder == null) {
+            return null;
+        }
+
+        String title = entries[2];
+
+        byte[] titleRaw = null;
+        if (!entries[3].equals("null")) {
+            titleRaw = Base64.decode(entries[3], 0);
+        }
+
+        byte[] titleScreen = null;
+        if (!entries[4].equals("null")) {
+            titleScreen = Base64.decode(entries[4], 0);
+        }
+
+        Game g = new Game(entries[1], savePath, titleScreen);
+        g.setTitle(title);
+        g.titleRaw = titleRaw;
+
+        if (g.titleRaw != null) {
+            g.reencodeTitle();
+        }
+
+        return g;
+    }
+
     public String toCacheEntry() {
         StringBuilder sb = new StringBuilder();
 
-        // Cache structure: savePath | gameFolderPath | title | titleScreen
+        // Cache structure: savePath | gameFolderPath | title | titleRaw | titleScreen
         sb.append(savePath);
         sb.append(escapeCode);
         sb.append(gameFolderPath);
         sb.append(escapeCode);
         sb.append(title);
         sb.append(escapeCode);
-
+        if (titleRaw != null) {
+            sb.append(Base64.encodeToString(titleRaw, Base64.NO_WRAP));
+        } else {
+            sb.append("null");
+        }
+        sb.append(escapeCode);
         if (titleScreen != null) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             titleScreen.compress(Bitmap.CompressFormat.PNG, 90, baos);
@@ -149,16 +202,4 @@ public String toCacheEntry() {
 
         return sb.toString();
     }
-
-    public Bitmap getTitleScreen() {
-        return titleScreen;
-    }
-
-    public boolean isStandalone() {
-        return standalone;
-    }
-
-    public void setStandalone(boolean standalone) {
-        this.standalone = standalone;
-    }
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
index 5e55c4752..791dcf3c1 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
@@ -321,7 +321,7 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
                         .setTitle(R.string.settings)
                         .setItems(choices_list, (dialog, which) -> {
                             if (which == 0) {
-                                chooseRegion(activity, gameList.get(position));
+                                chooseRegion(activity, holder, gameList.get(position));
                             } else if (which == 1) {
                                 launchGame(position, true);
                             }
@@ -365,7 +365,7 @@ public void updateFavoriteButton(ViewHolder holder, Game game){
             holder.favoriteButton.setImageResource(buttonImageResource);
         }
 
-        public void chooseRegion(final Context context, final Game game) {
+        public void chooseRegion(final Context context, final ViewHolder holder, final Game game) {
             // The list of region choices
             String[] region_array = Encoding.getEncodingDescriptions(context);
 
@@ -383,6 +383,7 @@ public void chooseRegion(final Context context, final Game game) {
 
                     if (!selectedEncoding.equals(encoding)) {
                         game.setEncoding(selectedEncoding);
+                        holder.title.setText(game.getTitle());
                     }
                 })
                 .setNegativeButton(R.string.cancel, null);
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
index 628089d84..7fddba236 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameScanner.java
@@ -127,6 +127,7 @@ private void scanGames(Activity activity){
     private int scanFolderHash(Context context, Uri folderURI) {
         StringBuilder sb = new StringBuilder();
 
+        sb.append("2"); // Bump this when the cache layout changes
         for (String[] array : Helper.listChildrenDocuments(context, folderURI)) {
             sb.append(array[0]);
             sb.append(array[1]);
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index fd72040c6..2d64113f0 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -105,13 +105,13 @@ public static Set<String> getFavoriteGamesList() {
 
     public static void addFavoriteGame(Game game) {
         // Update user's preferences
-        favoriteGamesList.add(game.getGameFolderPath());
+        favoriteGamesList.add(game.getKey());
 
         setFavoriteGamesList(favoriteGamesList);
     }
 
     public static void removeAFavoriteGame(Game game) {
-        favoriteGamesList.remove(game.getTitle());
+        favoriteGamesList.remove(game.getKey());
         setFavoriteGamesList(favoriteGamesList);
     }
 
@@ -383,11 +383,11 @@ public static void setInputLayoutVertical(Activity activity, InputLayout inputLa
     }
 
     public static Encoding getGameEncoding(Game game) {
-        return Encoding.regionCodeToEnum(pref.getString(game.getTitle() + "_Encoding", ""));
+        return Encoding.regionCodeToEnum(pref.getString(game.getKey() + "_Encoding", ""));
     }
 
     public static void setGameEncoding(Game game, Encoding encoding) {
-        editor.putString(game.getTitle() + "_Encoding", encoding.getRegionCode());
+        editor.putString(game.getKey() + "_Encoding", encoding.getRegionCode());
         editor.commit();
     }
 

From 7b5ad5bc65681f9612cd3c7084afe0ffd6e23208 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 16:01:17 +0200
Subject: [PATCH 135/222] Android: Add option to rename the game

---
 .../org/easyrpg/player/game_browser/Game.java | 17 +++++++++--
 .../game_browser/GameBrowserActivity.java     | 28 +++++++++++++++++++
 .../player/settings/SettingsManager.java      | 10 ++++++-
 .../app/src/main/res/values/strings.xml       |  2 ++
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
index 764a3f7f3..fb2286582 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/Game.java
@@ -47,6 +47,11 @@ public Game(String gameFolderPath, String saveFolder, byte[] titleScreen) {
     }
 
     public String getTitle() {
+        String customTitle = getCustomTitle();
+        if (!customTitle.isEmpty()) {
+            return customTitle;
+        }
+
         return title;
     }
 
@@ -56,6 +61,14 @@ public void setTitle(String title) {
 
     public native void reencodeTitle();
 
+    public String getCustomTitle() {
+        return SettingsManager.getCustomGameTitle(this);
+    }
+
+    public void setCustomTitle(String customTitle) {
+        SettingsManager.setCustomGameTitle(this, customTitle);
+    }
+
     public String getGameFolderPath() {
         return gameFolderPath;
     }
@@ -82,7 +95,7 @@ public void setFavorite(boolean isFavorite) {
     }
 
     private boolean isFavoriteFromSettings() {
-        return SettingsManager.getFavoriteGamesList().contains(this.gameFolderPath);
+        return SettingsManager.getFavoriteGamesList().contains(this.getKey());
     }
 
     @Override
@@ -93,7 +106,7 @@ public int compareTo(Game game) {
         if (!this.isFavorite() && game.isFavorite()) {
             return 1;
         }
-        return this.title.compareTo(game.title);
+        return this.getTitle().compareTo(game.getTitle());
     }
 
     /**
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
index 791dcf3c1..5b622b314 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
@@ -8,6 +8,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.DocumentsContract;
+import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -16,6 +17,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -313,6 +315,7 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
             holder.settingsButton.setOnClickListener(v -> {
                 String[] choices_list = {
                     activity.getResources().getString(R.string.select_game_region),
+                    activity.getResources().getString(R.string.game_rename),
                     activity.getResources().getString(R.string.launch_debug_mode)
                 };
 
@@ -323,6 +326,8 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
                             if (which == 0) {
                                 chooseRegion(activity, holder, gameList.get(position));
                             } else if (which == 1) {
+                                renameGame(activity, holder, gameList.get(position));
+                            } else if (which == 2) {
                                 launchGame(position, true);
                             }
                         });
@@ -390,6 +395,29 @@ public void chooseRegion(final Context context, final ViewHolder holder, final G
             builder.show();
         }
 
+        public void renameGame(final Context context, final ViewHolder holder, final Game game) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+            // Set up text input
+            final EditText input = new EditText(context);
+            input.setInputType(InputType.TYPE_CLASS_TEXT);
+            input.setText(holder.title.getText());
+            builder.setView(input);
+
+            builder
+                .setTitle(R.string.game_rename)
+                .setPositiveButton(R.string.ok, (dialog, id) -> {
+                    game.setCustomTitle(input.getText().toString());
+                    holder.title.setText(game.getTitle());
+                })
+                .setNegativeButton(R.string.cancel, null)
+                .setNeutralButton(R.string.revert, (dialog, id) -> {
+                    game.setCustomTitle("");
+                    holder.title.setText(game.getTitle());
+                });
+            builder.show();
+        }
+
         public static class ViewHolder extends RecyclerView.ViewHolder {
             public TextView title;
             public ImageView titleScreen;
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index 2d64113f0..b444f7979 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -106,7 +106,6 @@ public static Set<String> getFavoriteGamesList() {
     public static void addFavoriteGame(Game game) {
         // Update user's preferences
         favoriteGamesList.add(game.getKey());
-
         setFavoriteGamesList(favoriteGamesList);
     }
 
@@ -391,6 +390,15 @@ public static void setGameEncoding(Game game, Encoding encoding) {
         editor.commit();
     }
 
+    public static String getCustomGameTitle(Game game) {
+        return pref.getString(game.getKey() + "_Title", "");
+    }
+
+    public static void setCustomGameTitle(Game game, String customTitle) {
+        editor.putString(game.getKey() + "_Title", customTitle);
+        editor.commit();
+    }
+
     public static int getSpeedModifierA() {
         return speedModifierA;
     }
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index 6d92b8777..b7467f943 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="do_want_quit">Do you really want to quit?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="revert">Revert</string>
     <string name="creating_dir_failed">Creating $PATH directory failed</string>
     <string name="path_not_readable">$PATH not readable</string>
     <string name="no_games_found_and_explanation_android_30">No RPG Maker 2000/2003 games found.\n\nThe EasyRPG folder you selected contains a \"games\" folder. Use a file manager app to put your games in this folder.\nGames can be put in subfolders or in ZIP/LZH archives.\n\nThe EasyRPG folder can be changed in the settings.</string>
@@ -31,6 +32,7 @@
     <string name="select_game_region">Select game region</string>
     <string name="change_the_layout">Change the layout</string>
     <string name="launch_debug_mode">Launch in debug mode</string>
+    <string name="game_rename">Rename game</string>
     <string name="choose_layout">Choose a layout</string>
     <string name="unknown_region">Unknown region</string>
     <string name="region_modification_failed">Changing region failed</string>

From f08e92b0845d2399412fb51e575542a024fa933d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 16:50:37 +0200
Subject: [PATCH 136/222] Android: Provide soundfont path via command line. Fix
 typos

---
 .../game_browser/GameBrowserHelper.java       |  9 ++++++++-
 .../settings/SettingsAudioActivity.java       |  4 ++--
 .../player/settings/SettingsManager.java      | 20 +++++++++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
index e8f20f56c..72050eaf7 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
@@ -79,12 +79,19 @@ public static void launchGame(Context context, Game game, boolean debugMode) {
         args.add(context.getExternalFilesDir(null).getAbsolutePath());
 
         // Soundfont
-        Uri soundfontUri = SettingsManager.getSoundFountFileURI(context);
+        Uri soundfontUri = SettingsManager.getSoundFontFileURI(context);
         if (soundfontUri != null) {
             args.add("--soundfont");
             args.add(soundfontUri.toString());
         }
 
+        // Sound Font Folder path (used by the settings scene)
+        Uri soundFontFolderUri = SettingsManager.getSoundFontsFolderURI(context);
+        if (soundFontFolderUri != null) {
+            args.add("--soundfont-path");
+            args.add(soundFontFolderUri.toString());
+        }
+
         if (debugMode) {
             args.add("--test-play");
         }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
index 17baef7c3..94a1c5965 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
@@ -111,7 +111,7 @@ public SoundfontItemList getDefaultSoundfont(Context context) {
     }
 
     public static boolean isSelectedSoundfontFile(Context context, Uri soundfontUri) {
-        Uri selectedSoundFontUri = SettingsManager.getSoundFountFileURI(context);
+        Uri selectedSoundFontUri = SettingsManager.getSoundFontFileURI(context);
         if (soundfontUri == null && selectedSoundFontUri == null) {
             return true;
         }
@@ -145,7 +145,7 @@ public SoundfontItemList(Context context, String name, Uri uri) {
         }
 
         public void select() {
-            SettingsManager.setSoundFountFileURI(uri);
+            SettingsManager.setSoundFontFileURI(uri);
 
             // Uncheck other RadioButton
             for (SoundfontItemList s : soundfontList) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index b444f7979..e8d43b38b 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -40,7 +40,7 @@ public class SettingsManager {
     private static int speedModifierA;
     private static InputLayout inputLayoutHorizontal, inputLayoutVertical;
     // Note: don't store DocumentFile as they can be nullify with a change of context
-    private static Uri easyRPGFolderURI, soundFountFileURI;
+    private static Uri easyRPGFolderURI, soundFontFileURI;
     private static Set<String> favoriteGamesList = new HashSet<>();
     private static int gamesCacheHash;
     private static Set<String> gamesCache = new HashSet<>();
@@ -324,24 +324,24 @@ public static Uri getSoundFontsFolderURI(Context context) {
         }
     }
 
-    public static Uri getSoundFountFileURI(Context context) {
-        if (soundFountFileURI == null) {
+    public static Uri getSoundFontFileURI(Context context) {
+        if (soundFontFileURI == null) {
             SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
             String soundfontURI = sharedPref.getString(SettingsEnum.SOUNDFONT_URI.toString(), "");
             if (soundfontURI.isEmpty()) {
-                soundFountFileURI = null;
+                soundFontFileURI = null;
             } else {
-                soundFountFileURI = Uri.parse(soundfontURI);
+                soundFontFileURI = Uri.parse(soundfontURI);
             }
         }
-        return soundFountFileURI;
+        return soundFontFileURI;
     }
 
-    public static void setSoundFountFileURI(Uri soundFountFileURI) {
+    public static void setSoundFontFileURI(Uri soundFontFileURI) {
         String st = "";
-        SettingsManager.soundFountFileURI = soundFountFileURI;
-        if (soundFountFileURI != null) {
-            st = soundFountFileURI.toString();
+        SettingsManager.soundFontFileURI = soundFontFileURI;
+        if (soundFontFileURI != null) {
+            st = soundFontFileURI.toString();
         }
         editor.putString(SettingsEnum.SOUNDFONT_URI.toString(), st);
         editor.commit();

From 555db42c96889abd33cbd66deac0253261a3a336 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 18:16:29 +0200
Subject: [PATCH 137/222] Android: Make it possible to configure the Font

Also minor Soundfont code fixes
---
 .../android/app/src/main/AndroidManifest.xml  |   5 +
 .../main/java/org/easyrpg/player/Helper.java  |   1 +
 .../game_browser/GameBrowserHelper.java       |  16 +-
 .../org/easyrpg/player/settings/IniFile.java  |   2 +-
 .../settings/SettingsAudioActivity.java       |   4 +-
 .../easyrpg/player/settings/SettingsEnum.java |   9 +-
 .../player/settings/SettingsFontActivity.java | 268 ++++++++++++++++++
 .../player/settings/SettingsMainActivity.java |   4 +
 .../player/settings/SettingsManager.java      |  96 ++++++-
 .../res/layout/activity_settings_font.xml     | 128 +++++++++
 .../res/layout/activity_settings_main.xml     |   8 +
 .../app/src/main/res/values/strings.xml       |   9 +-
 12 files changed, 529 insertions(+), 21 deletions(-)
 create mode 100644 builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
 create mode 100644 builds/android/app/src/main/res/layout/activity_settings_font.xml

diff --git a/builds/android/app/src/main/AndroidManifest.xml b/builds/android/app/src/main/AndroidManifest.xml
index 877625116..f1a8a6f80 100644
--- a/builds/android/app/src/main/AndroidManifest.xml
+++ b/builds/android/app/src/main/AndroidManifest.xml
@@ -99,6 +99,11 @@
             android:label="@string/input"
             android:parentActivityName=".settings.SettingsMainActivity">
         </activity>
+        <activity
+            android:name=".settings.SettingsFontActivity"
+            android:label="@string/font"
+            android:parentActivityName=".settings.SettingsMainActivity">
+        </activity>
         <activity
             android:name=".button_mapping.ButtonMappingActivity"
             android:configChanges="orientation|screenSize" />
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
index 7a49df8e9..5772805b8 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
@@ -111,6 +111,7 @@ public static void createEasyRPGFolders(Context context, Uri easyRPGFolderURI){
             createFolder(context, easyRPGFolder, SettingsManager.GAMES_FOLDER_NAME);
             createFolder(context, easyRPGFolder, SettingsManager.SOUND_FONTS_FOLDER_NAME);
             createFolder(context, easyRPGFolder, SettingsManager.SAVES_FOLDER_NAME);
+            createFolder(context, easyRPGFolder, SettingsManager.FONTS_FOLDER_NAME);
 
             // The .nomedia file (avoid media app to scan games and RTP folders)
             if (Helper.findFile(context, easyRPGFolder.getUri(), ".nomedia") == null) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
index 72050eaf7..dcb6d3246 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserHelper.java
@@ -78,13 +78,7 @@ public static void launchGame(Context context, Game game, boolean debugMode) {
         args.add("--config-path");
         args.add(context.getExternalFilesDir(null).getAbsolutePath());
 
-        // Soundfont
-        Uri soundfontUri = SettingsManager.getSoundFontFileURI(context);
-        if (soundfontUri != null) {
-            args.add("--soundfont");
-            args.add(soundfontUri.toString());
-        }
-
+        /* FIXME: Currently disabled because the built-in scene cannot handle URI-encoded paths
         // Sound Font Folder path (used by the settings scene)
         Uri soundFontFolderUri = SettingsManager.getSoundFontsFolderURI(context);
         if (soundFontFolderUri != null) {
@@ -92,6 +86,14 @@ public static void launchGame(Context context, Game game, boolean debugMode) {
             args.add(soundFontFolderUri.toString());
         }
 
+        // Font Folder path (used by the settings scene)
+        Uri fontFolderUri = SettingsManager.getFontsFolderURI(context);
+        if (fontFolderUri != null) {
+            args.add("--font-path");
+            args.add(fontFolderUri.toString());
+        }
+        */
+
         if (debugMode) {
             args.add("--test-play");
         }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
index 35648fdcb..1220dd87b 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/IniFile.java
@@ -30,7 +30,7 @@ public IniFile(File iniFile) {
         video = new SectionView("Video");
         audio = new SectionView("Audio");
         input = new SectionView("Input");
-        engine = new SectionView("Engine");
+        engine = new SectionView("Player");
     }
 
     public boolean save() {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
index 94a1c5965..6a8426518 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsAudioActivity.java
@@ -95,7 +95,7 @@ private List<SoundfontItemList> scanAvailableSoundfonts(){
 
                 // Is it a soundfont file ?
                 boolean isDirectory = Helper.isDirectoryFromMimeType(fileDocumentType);
-                if (!isDirectory && name.toLowerCase().endsWith(".sf2")) {
+                if (!isDirectory && (name.toLowerCase().endsWith(".sf2") || name.toLowerCase().endsWith(".soundfont"))) {
                     DocumentFile soundFontFile = Helper.getFileFromDocumentID(this, soundFontsFolder, fileDocumentID);
                     if (soundFontFile != null) {
                         soundfontList.add(new SoundfontItemList(this, name, soundFontFile.getUri()));
@@ -111,7 +111,7 @@ public SoundfontItemList getDefaultSoundfont(Context context) {
     }
 
     public static boolean isSelectedSoundfontFile(Context context, Uri soundfontUri) {
-        Uri selectedSoundFontUri = SettingsManager.getSoundFontFileURI(context);
+        Uri selectedSoundFontUri = SettingsManager.getSoundFontFileURI();
         if (soundfontUri == null && selectedSoundFontUri == null) {
             return true;
         }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
index d86951835..d06a03c0b 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsEnum.java
@@ -11,7 +11,7 @@ enum SettingsEnum {
     LAYOUT_SIZE("PREF_SIZE_EVERY_BUTTONS"),
     EASYRPG_FOLDER_URI("PREF_EASYRPG_FOLDER_URI"),
     ENABLE_RTP_SCANNING("PREF_ENABLE_RTP_SCANNING"),
-    SOUNDFONT_URI("PREF_SOUNDFONT_URI"),
+    SOUNDFONT_URI("Soundfont"),
     FAVORITE_GAMES("PREF_FAVORITE_GAMES_NEW"),
     CACHE_GAMES_HASH("PREF_CACHE_GAMES_HASH"),
     CACHE_GAMES("PREF_CACHE_GAMES"),
@@ -23,7 +23,12 @@ enum SettingsEnum {
     SOUND_VOLUME("SoundVolume"),
     STRETCH("Stretch"),
     GAME_RESOLUTION("GameResolution"),
-    SPEED_MODIFIER_A("SpeedModifierA")
+    SPEED_MODIFIER_A("SpeedModifierA"),
+    FONT1_URI("Font1"),
+    FONT2_URI("Font2"),
+    FONT1_SIZE("Font1Size"),
+    FONT2_SIZE("Font2Size")
+
     ;
 
 
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
new file mode 100644
index 000000000..83ab8a87d
--- /dev/null
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
@@ -0,0 +1,268 @@
+package org.easyrpg.player.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.DocumentsContract;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.documentfile.provider.DocumentFile;
+
+import org.easyrpg.player.Helper;
+import org.easyrpg.player.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SettingsFontActivity extends AppCompatActivity {
+    private LinearLayout fonts1ListLayout;
+    private LinearLayout fonts2ListLayout;
+    private String[] extensions = new String[] {".fon", ".fnt", ".bdf", ".ttf", ".ttc", ".otf", ".woff2", ".woff"};
+
+    List<FontItemList> font1List;
+    List<FontItemList> font2List;
+    private final int SIZE_MIN = 6;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings_font);
+
+        fonts1ListLayout = findViewById(R.id.settings_font1_list);
+        fonts2ListLayout = findViewById(R.id.settings_font2_list);
+
+        SettingsManager.init(getApplicationContext());
+
+        // Setup UI components
+        // The Font Button
+        Button button = this.findViewById(R.id.button_open_font_folder);
+        // We can open the file picker in a specific folder only with API >= 26
+        if (android.os.Build.VERSION.SDK_INT >= 26) {
+            button.setOnClickListener(v -> {
+                // Open the file explorer in the "fonts" folder
+                Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+                intent.setType("*/*");
+                intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, SettingsManager.getFontsFolderURI(this));
+                startActivity(intent);
+            });
+        } else {
+            ViewGroup layout = (ViewGroup) button.getParent();
+            if(layout != null) {
+                layout.removeView(button);
+            }
+        }
+
+        configureFont1Size();
+        configureFont2Size();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        updateFontsListView();
+    }
+
+    private void updateFontsListView() {
+        fonts1ListLayout.removeAllViews();
+        fonts2ListLayout.removeAllViews();
+
+        boolean font1Selected = false;
+        boolean font2Selected = false;
+
+        scanAvailableFonts();
+        for (FontItemList i : font1List) {
+            fonts1ListLayout.addView(i.getRadioButton());
+            if (i.isSelected()) {
+                font1Selected = true;
+            }
+        }
+        for (FontItemList i : font2List) {
+            fonts2ListLayout.addView(i.getRadioButton());
+            if (i.isSelected()) {
+                font2Selected = true;
+            }
+        }
+
+        // If no font is selected, select the default one
+        if (!font1Selected) {
+            font1List.get(0).setSelected(true);
+        }
+        if (!font2Selected) {
+            font2List.get(0).setSelected(true);
+        }
+    }
+
+    private void scanAvailableFonts(){
+        font1List = new ArrayList<>();
+        font2List = new ArrayList<>();
+        font1List.add(new FontItemList(this, this.getString(R.string.settings_font_default), null, true));
+        font2List.add(new FontItemList(this, this.getString(R.string.settings_font_default), null, false));
+
+        Uri fontsFolder = SettingsManager.getFontsFolderURI(this);
+        if (fontsFolder != null) {
+            for (String[] array : Helper.listChildrenDocuments(this, fontsFolder)) {
+                String fileDocumentID = array[0];
+                String fileDocumentType = array[1];
+                String name = array[2];
+
+                // Is it a font file ?
+                boolean isDirectory = Helper.isDirectoryFromMimeType(fileDocumentType);
+                String lname = name.toLowerCase();
+                boolean fontOk = false;
+                for (String ext: extensions) {
+                    if (lname.endsWith(ext)) {
+                        fontOk = true;
+                        break;
+                    }
+                }
+                if (!isDirectory && fontOk) {
+                    DocumentFile fontFile = Helper.getFileFromDocumentID(this, fontsFolder, fileDocumentID);
+                    if (fontFile != null) {
+                        font1List.add(new FontItemList(this, name, fontFile.getUri(), true));
+                        font2List.add(new FontItemList(this, name, fontFile.getUri(), false));
+                    }
+                }
+            }
+        }
+    }
+
+    public static boolean isSelectedFontFile(Context context, Uri fontUri, boolean firstFont) {
+        Uri selectedFontUri = null;
+        if (firstFont) {
+            selectedFontUri = SettingsManager.getFont1FileURI();
+        } else {
+            selectedFontUri = SettingsManager.getFont2FileURI();
+        }
+        if (fontUri == null && selectedFontUri == null) {
+            return true;
+        }
+        else if (fontUri != null) {
+            return fontUri.equals(selectedFontUri);
+        } else {
+            return false;
+        }
+    }
+
+    class FontItemList {
+        private final String name;
+        private final Uri uri;
+        private final RadioButton radioButton;
+        private final boolean firstFont;
+
+        public FontItemList(Context context, String name, Uri uri, boolean firstFont) {
+            this.name = name;
+            this.uri = uri;
+            this.firstFont = firstFont;
+
+            // The Radio Button
+            View layout = getLayoutInflater().inflate(R.layout.settings_soundfont_item_list, null);
+            this.radioButton = layout.findViewById(R.id.settings_soundfont_radio_button);
+            radioButton.setOnClickListener(v -> select());
+            if (isSelectedFontFile(context, uri, firstFont)) {
+                setSelected(true);
+            }
+
+            // The name
+            radioButton.setText(name);
+            radioButton.setOnClickListener(v -> select());
+        }
+
+        public void select() {
+            if (firstFont) {
+                SettingsManager.setFont1FileURI(uri);
+                for (FontItemList s : font1List) {
+                    s.getRadioButton().setChecked(false);
+                }
+                radioButton.setChecked(true);
+            } else {
+                SettingsManager.setFont2FileURI(uri);
+                for (FontItemList s : font2List) {
+                    s.getRadioButton().setChecked(false);
+                }
+                radioButton.setChecked(true);
+            }
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Uri getUri() {
+            return uri;
+        }
+
+        public boolean isSelected() {
+            return radioButton.isChecked();
+        }
+
+        public void setSelected(boolean selected) {
+            radioButton.setChecked(selected);
+        }
+
+        public RadioButton getRadioButton() {
+            return radioButton;
+        }
+    }
+
+    private void configureFont1Size() {
+        SeekBar font1SizeSeekBar = findViewById(R.id.settings_font1_size);
+        font1SizeSeekBar.setProgress(SettingsManager.getFont1Size() - SIZE_MIN);
+
+        TextView t = findViewById(R.id.settings_font1_size_text_view);
+
+        font1SizeSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                SettingsManager.setFont1Size(seekBar.getProgress() + SIZE_MIN);
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+            }
+
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                t.setText(String.valueOf(font1SizeSeekBar.getProgress() + SIZE_MIN));
+            }
+        });
+
+        t.setText(String.valueOf(font1SizeSeekBar.getProgress() + SIZE_MIN));
+    }
+
+    private void configureFont2Size() {
+        SeekBar fontSize2SeekBar = findViewById(R.id.settings_font2_size);
+        fontSize2SeekBar.setProgress(SettingsManager.getFont2Size() - SIZE_MIN);
+
+        TextView t = findViewById(R.id.settings_font2_size_text_view);
+
+        fontSize2SeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                SettingsManager.setFont2Size(seekBar.getProgress() + SIZE_MIN);
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+            }
+
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                t.setText(String.valueOf(fontSize2SeekBar.getProgress() + SIZE_MIN));
+            }
+        });
+
+        t.setText(String.valueOf(fontSize2SeekBar.getProgress() + SIZE_MIN));
+    }
+}
+
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsMainActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsMainActivity.java
index ae94fcbfb..b13979b2f 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsMainActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsMainActivity.java
@@ -24,6 +24,8 @@ public void onCreate(Bundle savedInstanceState) {
         audioButton.setOnClickListener(this);
         Button inputsButton = findViewById(R.id.settings_main_input);
         inputsButton.setOnClickListener(this);
+        Button fontButton = findViewById(R.id.settings_main_font);
+        fontButton.setOnClickListener(this);
         Button folderButton = findViewById(R.id.settings_main_easyrpg_folders);
         folderButton.setOnClickListener(this);
     }
@@ -41,6 +43,8 @@ public void onClick(View v) {
             intent = new Intent(this, SettingsGamesFolderActivity.class);
         } else if (id == R.id.settings_main_input) {
             intent = new Intent(this, SettingsInputActivity.class);
+        } else if (id == R.id.settings_main_font) {
+            intent = new Intent(this, SettingsFontActivity.class);
         }
 
         if (intent != null) {
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
index e8d43b38b..0c414d7ba 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsManager.java
@@ -40,13 +40,15 @@ public class SettingsManager {
     private static int speedModifierA;
     private static InputLayout inputLayoutHorizontal, inputLayoutVertical;
     // Note: don't store DocumentFile as they can be nullify with a change of context
-    private static Uri easyRPGFolderURI, soundFontFileURI;
+    private static Uri easyRPGFolderURI, soundFontFileURI, font1FileURI, font2FileURI;
+    private static int font1Size, font2Size;
     private static Set<String> favoriteGamesList = new HashSet<>();
     private static int gamesCacheHash;
     private static Set<String> gamesCache = new HashSet<>();
     public static String RTP_FOLDER_NAME = "rtp", RTP_2000_FOLDER_NAME = "2000",
         RTP_2003_FOLDER_NAME = "2003", SOUND_FONTS_FOLDER_NAME = "soundfonts",
-        GAMES_FOLDER_NAME = "games", SAVES_FOLDER_NAME = "saves";
+        GAMES_FOLDER_NAME = "games", SAVES_FOLDER_NAME = "saves",
+        FONTS_FOLDER_NAME = "fonts";
     public static int FAST_FORWARD_MODE_HOLD = 0, FAST_FORWARD_MODE_TAP = 1;
 
     private static List<String> imageSizeOption = Arrays.asList("nearest", "integer", "bilinear");
@@ -81,6 +83,9 @@ private static void loadSettings(Context context) {
         musicVolume = configIni.audio.getInteger(MUSIC_VOLUME.toString(), 100);
         soundVolume = configIni.audio.getInteger(SOUND_VOLUME.toString(), 100);
 
+        font1Size = configIni.engine.getInteger(FONT1_SIZE.toString(), 12);
+        font2Size = configIni.engine.getInteger(FONT2_SIZE.toString(), 12);
+
         speedModifierA = configIni.input.getInteger(SPEED_MODIFIER_A.toString(), 3);
 
         favoriteGamesList = new HashSet<>(sharedPref.getStringSet(FAVORITE_GAMES.toString(), new HashSet<>()));
@@ -315,6 +320,15 @@ public static Uri getRTPFolderURI(Context context) {
         }
     }
 
+    public static Uri getFontsFolderURI(Context context) {
+        DocumentFile easyRPGFolder = Helper.getFileFromURI(context, easyRPGFolderURI);
+        if (easyRPGFolder != null) {
+            return Helper.findFileUri(context, easyRPGFolder.getUri(), FONTS_FOLDER_NAME);
+        } else {
+            return null;
+        }
+    }
+
     public static Uri getSoundFontsFolderURI(Context context) {
         DocumentFile easyRPGFolder = Helper.getFileFromURI(context, easyRPGFolderURI);
         if (easyRPGFolder != null) {
@@ -324,10 +338,29 @@ public static Uri getSoundFontsFolderURI(Context context) {
         }
     }
 
-    public static Uri getSoundFontFileURI(Context context) {
+    public static int getFont1Size() {
+        return font1Size;
+    }
+
+    public static void setFont1Size(int i) {
+        font1Size = i;
+        configIni.engine.set(FONT1_SIZE.toString(), i);
+        configIni.save();
+    }
+
+    public static int getFont2Size() {
+        return font2Size;
+    }
+
+    public static void setFont2Size(int i) {
+        font2Size = i;
+        configIni.engine.set(FONT2_SIZE.toString(), i);
+        configIni.save();
+    }
+
+    public static Uri getSoundFontFileURI() {
         if (soundFontFileURI == null) {
-            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
-            String soundfontURI = sharedPref.getString(SettingsEnum.SOUNDFONT_URI.toString(), "");
+            String soundfontURI = configIni.audio.getString(SOUNDFONT_URI.toString(), "");
             if (soundfontURI.isEmpty()) {
                 soundFontFileURI = null;
             } else {
@@ -341,10 +374,57 @@ public static void setSoundFontFileURI(Uri soundFontFileURI) {
         String st = "";
         SettingsManager.soundFontFileURI = soundFontFileURI;
         if (soundFontFileURI != null) {
-            st = soundFontFileURI.toString();
+            configIni.audio.set(SOUNDFONT_URI.toString(), soundFontFileURI.toString());
+        } else {
+            configIni.audio.set(SOUNDFONT_URI.toString(), "");
         }
-        editor.putString(SettingsEnum.SOUNDFONT_URI.toString(), st);
-        editor.commit();
+        configIni.save();
+    }
+
+    public static Uri getFont1FileURI() {
+        if (font1FileURI == null) {
+            String fontURI = configIni.engine.getString(FONT1_URI.toString(), "");
+            if (fontURI.isEmpty()) {
+                font1FileURI = null;
+            } else {
+                font1FileURI = Uri.parse(fontURI);
+            }
+        }
+        return font1FileURI;
+    }
+
+    public static void setFont1FileURI(Uri fontFileURI) {
+        String st = "";
+        SettingsManager.font1FileURI = fontFileURI;
+        if (fontFileURI != null) {
+            configIni.engine.set(FONT1_URI.toString(), fontFileURI.toString());
+        } else {
+            configIni.engine.set(FONT1_URI.toString(), "");
+        }
+        configIni.save();
+    }
+
+    public static Uri getFont2FileURI() {
+        if (font2FileURI == null) {
+            String fontURI = configIni.engine.getString(FONT2_URI.toString(), "");
+            if (fontURI.isEmpty()) {
+                font2FileURI = null;
+            } else {
+                font2FileURI = Uri.parse(fontURI);
+            }
+        }
+        return font2FileURI;
+    }
+
+    public static void setFont2FileURI(Uri fontFileURI) {
+        String st = "";
+        SettingsManager.font2FileURI = fontFileURI;
+        if (fontFileURI != null) {
+            configIni.engine.set(FONT2_URI.toString(), fontFileURI.toString());
+        } else {
+            configIni.engine.set(FONT2_URI.toString(), "");
+        }
+        configIni.save();
     }
 
     public static InputLayout getInputLayoutHorizontal(Activity activity) {
diff --git a/builds/android/app/src/main/res/layout/activity_settings_font.xml b/builds/android/app/src/main/res/layout/activity_settings_font.xml
new file mode 100644
index 000000000..95d45c587
--- /dev/null
+++ b/builds/android/app/src/main/res/layout/activity_settings_font.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/settings_font_linear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:context="org.easyrpg.player.settings.SettingsFontActivity"
+        android:padding="20dp"
+        android:gravity="center">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_custom_soundfont"
+            android:textSize="20sp"
+            android:textColor="#000000"/>
+        <Button
+            android:id="@+id/button_open_font_folder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/open_fonts_folder" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_explanation"
+            android:textSize="18sp" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_explanation2"
+            android:textSize="18sp" />
+
+        <include layout="@layout/separator"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_font_1"
+            android:textSize="20sp"
+            android:paddingTop="10dp"/>
+
+        <LinearLayout
+            android:id="@+id/settings_font1_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:orientation="vertical"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="@string/settings_font_size"
+            android:textSize="20sp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/settings_font1_size_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:textSize="20sp"/>
+
+            <SeekBar
+                android:id="@+id/settings_font1_size"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:max="10"
+                android:progress="100"
+                />
+        </LinearLayout>
+
+        <include layout="@layout/separator"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_font_2"
+            android:textSize="20sp"
+            android:paddingTop="10dp"/>
+
+        <LinearLayout
+            android:id="@+id/settings_font2_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:orientation="vertical"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="@string/settings_font_size"
+            android:textSize="20sp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/settings_font2_size_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:textSize="20sp"/>
+
+            <SeekBar
+                android:id="@+id/settings_font2_size"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:max="10"
+                android:progress="100"
+                />
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/builds/android/app/src/main/res/layout/activity_settings_main.xml b/builds/android/app/src/main/res/layout/activity_settings_main.xml
index 2edbd7b56..96d06fc4b 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_main.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_main.xml
@@ -27,6 +27,14 @@
         android:drawableStart="@drawable/ic_gamepad_black_36dp"
         style="?android:attr/borderlessButtonStyle" />
 
+    <Button
+        android:id="@+id/settings_main_font"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/font"
+        android:drawableStart="@drawable/ic_gamepad_black_36dp"
+        style="?android:attr/borderlessButtonStyle" />
+
     <Button
         android:id="@+id/settings_main_easyrpg_folders"
         android:layout_width="match_parent"
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index b7467f943..7392e12d3 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -65,6 +65,7 @@ Please tell us in detail what went wrong.\n\n
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="input">Input</string>
+    <string name="font">Font</string>
     <string name="easyrpg_folders">EasyRPG Folders</string>
     <string name="settings">Settings</string>
     <string name="screen_size">Screen scaling:</string>
@@ -106,7 +107,13 @@ Please tell us in detail what went wrong.\n\n
     <string name="enable_rtp_support">Enable RTP support</string>
     <string name="rtp_explanation">The RTP provides shared assets used by some games.\nPut the RPG Maker 2000 RTP in \"rtp/2000\" and the RPG Maker 2003 RTP in \"rtp/2003\".\nPlease note that enabling RTP support will significantly increase the initial loading time of a game.</string>
     <string name="open_rtp_folder">Open the RTP folder</string>
-
+    <string name="open_fonts_folder">Open the Fonts folder</string>
+    <string name="settings_fonts_explanation">Put fonts in the \"fonts\" folder. For the best result use TTF fonts or bitmap (FON) fonts.</string>
+    <string name="settings_fonts_explanation2">The game can decide whether it wants the first font or the second font.</string>
+    <string name="settings_font_1">First Font:</string>
+    <string name="settings_font_2">Second Font:</string>
+    <string name="settings_font_size">Font size</string>
+    <string name="settings_font_default">Built-In Font</string>
     <!--InputLayout Managing-->
     <string name="manage_input_layouts">Manage Input Layouts:</string>
     <string name="edit_name">Edit name</string>

From 48f98268d3c462c470bc5afaddc01b3241898e92 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 18:18:31 +0200
Subject: [PATCH 138/222] Settings: Hide Font settings when Freetype is missing

Hide Soundfont and Font settings on Android in general (thx SAF)
---
 src/audio.cpp           |  5 +++++
 src/game_config.cpp     |  3 ++-
 src/window_settings.cpp | 25 +++++++++++++++----------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index a892540a8..b8c0e891f 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -86,6 +86,11 @@ Game_ConfigAudio AudioInterface::GetConfig() const {
 	acfg.fmmidi_midi.SetOptionVisible(false);
 #endif
 
+#ifdef __ANDROID__
+	// FIXME: URI encoded SAF paths are not supported
+	acfg.soundfont.SetOptionVisible(false);
+#endif
+
 	vGetConfig(acfg);
 	return acfg;
 }
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 5e502ec38..f91f6c720 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -41,7 +41,8 @@ namespace {
 }
 
 void Game_ConfigPlayer::Hide() {
-#ifndef HAVE_FREETYPE
+#if !defined(HAVE_FREETYPE) || defined(__ANDROID__)
+	// FIXME (Android): URI encoded SAF paths are not supported
 	font1.SetOptionVisible(false);
 	font1_size.SetOptionVisible(false);
 	font2.SetOptionVisible(false);
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index 4ba861d6f..77a2ab916 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -388,6 +388,7 @@ void Window_Settings::RefreshAudioSoundfont() {
 
 void Window_Settings::RefreshEngine() {
 	auto& cfg = Player::player_config;
+	cfg.Hide();
 
 	// FIXME: Binding &cfg is not needed and generates a warning but MSVC requires it
 	AddOption(cfg.font1, [this, &cfg]() {
@@ -395,11 +396,13 @@ void Window_Settings::RefreshEngine() {
 		Push(eEngineFont1);
 		GetFrame().scratch = -1;
 	});
-	if (cfg.font1.IsLocked()) {
-		GetFrame().options.back().help = "This game uses a custom font";
-	}
-	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_gothic) {
-		GetFrame().options.back().text += " [In use]";
+	if (cfg.font1.IsOptionVisible()) {
+		if (cfg.font1.IsLocked()) {
+			GetFrame().options.back().help = "This game uses a custom font";
+		}
+		if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_gothic) {
+			GetFrame().options.back().text += " [In use]";
+		}
 	}
 
 	AddOption(cfg.font2, [this, &cfg]() {
@@ -407,11 +410,13 @@ void Window_Settings::RefreshEngine() {
 		Push(eEngineFont2);
 		GetFrame().scratch = -1;
 	});
-	if (cfg.font2.IsLocked()) {
-		GetFrame().options.back().help = "This game uses a custom font";
-	}
-	if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_mincho) {
-		GetFrame().options.back().text += " [In use]";
+	if (cfg.font2.IsOptionVisible()) {
+		if (cfg.font2.IsLocked()) {
+			GetFrame().options.back().help = "This game uses a custom font";
+		}
+		if (Main_Data::game_system->GetFontId() == lcf::rpg::System::Font_mincho) {
+			GetFrame().options.back().text += " [In use]";
+		}
 	}
 
 	AddOption(cfg.show_startup_logos, [this, &cfg](){ cfg.show_startup_logos.Set(static_cast<ConfigEnum::StartupLogos>(GetCurrentOption().current_value)); });

From ea64c4da73ab0611d1671b40d5b58ffde0326bee Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Fri, 24 May 2024 19:31:41 +0200
Subject: [PATCH 139/222] Android: Improve font scene, show preview

---
 ...asyrpg_player_game_browser_GameScanner.cpp | 51 +++++++++++++++++++
 ..._easyrpg_player_game_browser_GameScanner.h |  3 ++
 .../main/java/org/easyrpg/player/Helper.java  | 24 +++++++++
 .../player/settings/SettingsFontActivity.java | 50 ++++++++++++++++--
 .../res/layout/activity_settings_audio.xml    |  5 --
 .../res/layout/activity_settings_font.xml     | 47 ++++++++++++++---
 .../app/src/main/res/values/strings.xml       |  4 +-
 7 files changed, 167 insertions(+), 17 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
index 2b3f300e4..1cc4036ad 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
@@ -35,6 +35,9 @@
 #include "utils.h"
 #include "string_view.h"
 #include "platform/android/android.h"
+#include "bitmap.h"
+#include "font.h"
+#include "cache.h"
 
 #include <lcf/ldb/reader.h>
 #include <lcf/reader_util.h>
@@ -394,3 +397,51 @@ Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject th
 	jmethodID jset_title_method = env->GetMethodID(jgame_class, "setTitle", "(Ljava/lang/String;)V");
 	env->CallVoidMethod(thiz, jset_title_method, jtitle);
 }
+
+extern "C"
+JNIEXPORT jbyteArray JNICALL
+Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jclass, jstring jfont, jint jsize, jboolean jfirst_font) {
+	EpAndroid::env = env;
+
+	std::string font = jstring_to_string(env, jfont);
+
+	FontRef font_file;
+	FontRef def_bitmap = Font::DefaultBitmapFont(!jfirst_font);
+
+	if (font.empty()) {
+		// Option "Built-in Font" selected
+		font_file = def_bitmap;
+	} else {
+		auto is = FileFinder::Root().OpenInputStream(font);
+		if (!is) {
+			return nullptr;
+		}
+
+		font_file = Font::CreateFtFont(std::move(is), jsize, false, false);
+		if (!font_file) {
+			return nullptr;
+		}
+
+		font_file->SetFallbackFont(def_bitmap);
+	}
+
+	int width = MESSAGE_BOX_WIDTH - 16;
+	int height = 16 * 6;
+
+	jbyteArray buffer_array = env->NewByteArray(width * height * 4);
+	jbyte* buffer_raw = env->GetByteArrayElements(buffer_array, 0);
+
+	Bitmap::SetFormat(Bitmap::ChooseFormat(format_R8G8B8A8_a().format()));
+	auto sys = Cache::System(CACHE_DEFAULT_BITMAP);
+	BitmapRef draw_area = Bitmap::Create(reinterpret_cast<void*>(buffer_raw), width, height, 0, format_R8G8B8A8_a().format());
+	draw_area->Fill(Color(0, 0, 0, 255));
+
+	Text::Draw(*draw_area, 0, 16 * 0 + 2, *font_file, *sys, Font::ColorDefault, "TheQuickBrownFoxJumpsOverTheLazyDog.!?1234567890=&#%");
+	Text::Draw(*draw_area, 0, 16 * 1 + 2, *font_file, *sys, Font::ColorDefault, "色は匂えど散りぬるを我が世誰ぞ常ならん有為の奥山今#日越えて浅き夢見じ酔いもせず");
+	Text::Draw(*draw_area, 0, 16 * 2 + 2, *font_file, *sys, Font::ColorDefault, "天地玄黃宇宙洪荒日月盈昃辰宿列張寒來暑往秋收冬藏閏#餘成歲律呂調陽");
+	Text::Draw(*draw_area, 0, 16 * 3 + 2, *font_file, *sys, Font::ColorDefault, "키스의고유조건은입술끼리만나야하고특별한기술은필요#치않다");
+	Text::Draw(*draw_area, 0, 16 * 4 + 2, *font_file, *sys, Font::ColorDefault, "(+)[-]{*}</>ÀÁÂÃÄÅÆÇАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬ#ЭЮЯ");
+	Text::Draw(*draw_area, 0, 16 * 5 + 2, *font_file, *sys, Font::ColorDefault, "ÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúû#üýþÿ");
+
+	return buffer_array;
+}
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
index 58290f9b6..9d72538b2 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
@@ -14,6 +14,9 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass
 JNIEXPORT void JNICALL
 Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject thiz);
 
+JNIEXPORT jbyteArray JNICALL
+Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jclass clazz, jstring font, jint size, jboolean first_font);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
index 5772805b8..b01272a5c 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/Helper.java
@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
@@ -328,4 +329,27 @@ public static double getTouchScale(Context context) {
 
         return Math.max(displayMetrics.widthPixels, displayMetrics.heightPixels) / (float) outLargestSize.x;
     }
+
+    public static Bitmap createBitmapFromRGBA(byte[] rgba, int width, int height) {
+        if (rgba == null || rgba.length != width * height * 4) {
+            throw new IllegalArgumentException("Invalid RGBA array length");
+        }
+
+        int[] pixels = new int[width * height];
+
+        for (int i = 0; i < width * height; i++) {
+            int r = rgba[i * 4] & 0xFF;
+            int g = rgba[i * 4 + 1] & 0xFF;
+            int b = rgba[i * 4 + 2] & 0xFF;
+            int a = rgba[i * 4 + 3] & 0xFF;
+
+            pixels[i] = (a << 24) | (r << 16) | (g << 8) | b;
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+
+        return bitmap;
+    }
+
 }
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
index 83ab8a87d..2429ad646 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsFontActivity.java
@@ -2,12 +2,15 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.DocumentsContract;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.SeekBar;
@@ -18,6 +21,7 @@
 
 import org.easyrpg.player.Helper;
 import org.easyrpg.player.R;
+import org.libsdl.app.SDL;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fonts2ListLayout = findViewById(R.id.settings_font2_list);
 
         SettingsManager.init(getApplicationContext());
+        SDL.setContext(getApplicationContext());
 
         // Setup UI components
         // The Font Button
@@ -101,6 +106,33 @@ private void updateFontsListView() {
         }
     }
 
+    private void updatePreview(boolean firstFont) {
+        ImageView imageView;
+        String font = "";
+        int size;
+        if (firstFont) {
+            imageView = findViewById(R.id.settings_font1_preview);
+            Uri fontUri = SettingsManager.getFont1FileURI();
+            if (fontUri != null) {
+                font = fontUri.toString();
+            }
+            size = SettingsManager.getFont1Size();
+        } else {
+            imageView = findViewById(R.id.settings_font2_preview);
+            Uri fontUri = SettingsManager.getFont2FileURI();
+            if (fontUri != null) {
+                font = fontUri.toString();
+            }
+            size = SettingsManager.getFont2Size();
+        }
+
+        byte[] image = DrawText(font, size, firstFont);
+        if (image != null) {
+            Bitmap bitmap = Helper.createBitmapFromRGBA(image,304, 16 * 6);
+            imageView.setImageBitmap(bitmap);
+        }
+    }
+
     private void scanAvailableFonts(){
         font1List = new ArrayList<>();
         font2List = new ArrayList<>();
@@ -183,12 +215,14 @@ public void select() {
                     s.getRadioButton().setChecked(false);
                 }
                 radioButton.setChecked(true);
+                updatePreview(true);
             } else {
                 SettingsManager.setFont2FileURI(uri);
                 for (FontItemList s : font2List) {
                     s.getRadioButton().setChecked(false);
                 }
                 radioButton.setChecked(true);
+                updatePreview(false);
             }
         }
 
@@ -214,16 +248,17 @@ public RadioButton getRadioButton() {
     }
 
     private void configureFont1Size() {
-        SeekBar font1SizeSeekBar = findViewById(R.id.settings_font1_size);
-        font1SizeSeekBar.setProgress(SettingsManager.getFont1Size() - SIZE_MIN);
+        SeekBar fontSize1SeekBar = findViewById(R.id.settings_font1_size);
+        fontSize1SeekBar.setProgress(SettingsManager.getFont1Size() - SIZE_MIN);
 
         TextView t = findViewById(R.id.settings_font1_size_text_view);
 
-        font1SizeSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        fontSize1SeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
 
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
                 SettingsManager.setFont1Size(seekBar.getProgress() + SIZE_MIN);
+                updatePreview(true);
             }
 
             @Override
@@ -232,11 +267,12 @@ public void onStartTrackingTouch(SeekBar seekBar) {
 
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                t.setText(String.valueOf(font1SizeSeekBar.getProgress() + SIZE_MIN));
+                t.setText(String.valueOf(fontSize1SeekBar.getProgress() + SIZE_MIN));
             }
         });
 
-        t.setText(String.valueOf(font1SizeSeekBar.getProgress() + SIZE_MIN));
+        t.setText(String.valueOf(fontSize1SeekBar.getProgress() + SIZE_MIN));
+        updatePreview(true);
     }
 
     private void configureFont2Size() {
@@ -250,6 +286,7 @@ private void configureFont2Size() {
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
                 SettingsManager.setFont2Size(seekBar.getProgress() + SIZE_MIN);
+                updatePreview(false);
             }
 
             @Override
@@ -263,6 +300,9 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         });
 
         t.setText(String.valueOf(fontSize2SeekBar.getProgress() + SIZE_MIN));
+        updatePreview(false);
     }
+
+    private static native byte[] DrawText(String font, int size, boolean firstFont);
 }
 
diff --git a/builds/android/app/src/main/res/layout/activity_settings_audio.xml b/builds/android/app/src/main/res/layout/activity_settings_audio.xml
index 41920d092..e2274a949 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_audio.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_audio.xml
@@ -89,11 +89,6 @@
             android:layout_height="wrap_content"
             android:text="@string/settings_soundfont_explanation"
             android:textSize="18sp" />
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_soundfont_restart_app"
-            android:textSize="18sp" />
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/builds/android/app/src/main/res/layout/activity_settings_font.xml b/builds/android/app/src/main/res/layout/activity_settings_font.xml
index 95d45c587..5df6187f4 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_font.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_font.xml
@@ -13,12 +13,6 @@
         android:padding="20dp"
         android:gravity="center">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_custom_soundfont"
-            android:textSize="20sp"
-            android:textColor="#000000"/>
         <Button
             android:id="@+id/button_open_font_folder"
             android:layout_width="wrap_content"
@@ -80,6 +74,27 @@
                 />
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/settings_font1_preview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:contentDescription="Font 1 Preview"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_size_explanation"
+            android:textSize="18sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_size_explanation2"
+            android:textSize="18sp" />
+
         <include layout="@layout/separator"/>
 
         <TextView
@@ -124,5 +139,25 @@
                 android:progress="100"
                 />
         </LinearLayout>
+
+        <ImageView
+            android:id="@+id/settings_font2_preview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:contentDescription="Font 2 Preview"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_size_explanation"
+            android:textSize="18sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fonts_size_explanation2"
+            android:textSize="18sp" />
     </LinearLayout>
 </ScrollView>
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index 7392e12d3..5e21c5fac 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -109,7 +109,9 @@ Please tell us in detail what went wrong.\n\n
     <string name="open_rtp_folder">Open the RTP folder</string>
     <string name="open_fonts_folder">Open the Fonts folder</string>
     <string name="settings_fonts_explanation">Put fonts in the \"fonts\" folder. For the best result use TTF fonts or bitmap (FON) fonts.</string>
-    <string name="settings_fonts_explanation2">The game can decide whether it wants the first font or the second font.</string>
+    <string name="settings_fonts_explanation2">The game decides whether it uses the first font or the second font.</string>
+    <string name="settings_fonts_size_explanation">The font size setting has no effect when using the built-in font or certain bitmap fonts.</string>
+    <string name="settings_fonts_size_explanation2">The size must be set so that the # is at least partially visible. If you cannot see it, the text will be cut off in-game.</string>
     <string name="settings_font_1">First Font:</string>
     <string name="settings_font_2">Second Font:</string>
     <string name="settings_font_size">Font size</string>

From d7bfcc741990a9597f7930ef7257d327ac1cd2d7 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 25 May 2024 23:39:28 +0200
Subject: [PATCH 140/222] Android: Improve wording of the folder buttons

---
 builds/android/app/src/main/res/values-ca/strings.xml    | 7 +++----
 builds/android/app/src/main/res/values-cs/strings.xml    | 5 ++---
 builds/android/app/src/main/res/values-de/strings.xml    | 7 +++----
 builds/android/app/src/main/res/values-es/strings.xml    | 7 +++----
 builds/android/app/src/main/res/values-fr/strings.xml    | 7 +++----
 builds/android/app/src/main/res/values-in/strings.xml    | 5 ++---
 builds/android/app/src/main/res/values-it/strings.xml    | 7 +++----
 builds/android/app/src/main/res/values-nl/strings.xml    | 9 ++++-----
 builds/android/app/src/main/res/values-pl/strings.xml    | 3 +--
 .../android/app/src/main/res/values-pt-rBR/strings.xml   | 9 ++++-----
 builds/android/app/src/main/res/values-ru/strings.xml    | 5 ++---
 .../android/app/src/main/res/values-zh-rTW/strings.xml   | 5 ++---
 builds/android/app/src/main/res/values-zh/strings.xml    | 5 ++---
 builds/android/app/src/main/res/values/strings.xml       | 9 ++++-----
 14 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/builds/android/app/src/main/res/values-ca/strings.xml b/builds/android/app/src/main/res/values-ca/strings.xml
index 3207614ba..7965d70d4 100644
--- a/builds/android/app/src/main/res/values-ca/strings.xml
+++ b/builds/android/app/src/main/res/values-ca/strings.xml
@@ -100,10 +100,9 @@
     <string name="easyrpg_folders">Carpetes de l\'EasyRPG</string>
     <string name="screen_size">Escalat de la pantalla:</string>
     <string name="settings_custom_soundfont">Soundfont personalitzat:</string>
-    <string name="open_the_sound_fonts_folder">Obre la carpeta de soundfonts</string>
+    <string name="open_the_sound_fonts_folder">Obre la carpeta \"soundfonts\"</string>
     <string name="settings_soundfont_explanation">Poseu els soundfont en format SF2 a la carpeta \"soundfonts\". Els soundfont modifiquen com sona la música MIDI.</string>
-    <string name="settings_soundfont_restart_app">Surt i reinicia l\'aplicació després de seleccionar un soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts trobats:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Soundfont predeterminat</string>
     <string name="select_the_games_folder">Selecciona la carpeta de l\'EasyRPG</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player requereix una carpeta exclusiva. Després de tocar el botó, se\'t demanarà que seleccionis una carpeta.
@@ -116,7 +115,7 @@
     <string name="rtp_explanation">El RTP proporciona fitxers comuns utilitzats per alguns jocs.
 \nCol·loca el RTP del RPG Maker 2000 a \"rtp/2000\" i el RTP del RPG Maker 2003 a \"rtp/2003\".
 \nTingueu en compte que habilitar el suport RTP incrementarà el temps de càrrega d\'un joc de manera significativa.</string>
-    <string name="open_rtp_folder">Obre la carpeta RTP</string>
+    <string name="open_rtp_folder">Obre la carpeta \"rtp\"</string>
     <string name="horizontal_input_layout">Disposició dels botons horitzontal (paisatge)</string>
     <string name="vertical_input_layout">Disposició dels botons vertical (retrat)</string>
     <string name="settings_edit_layout_explanation">Es poden afegir botons en editar una distribució (per exemple, un botó shift).
diff --git a/builds/android/app/src/main/res/values-cs/strings.xml b/builds/android/app/src/main/res/values-cs/strings.xml
index 82b96e7c7..65ea514dc 100644
--- a/builds/android/app/src/main/res/values-cs/strings.xml
+++ b/builds/android/app/src/main/res/values-cs/strings.xml
@@ -71,7 +71,7 @@
 \nPokud tuto aplikaci používáte poprvé, není k dispozici žádná složka EasyRPG. Vytvořte novou složku EasyRPG a poté ji vyberte.
 \n
 \nPokud jste tuto aplikaci používali již dříve, vyberte stávající složku EasyRPG.</string>
-    <string name="open_rtp_folder">Otevřít složku RTP</string>
+    <string name="open_rtp_folder">Otevřít složku \"rtp\"</string>
     <string name="easyrpg_folders">Složky EasyRPG</string>
     <string name="settings_resolution_desc">Změna rozlišení může způsobit grafické chyby nebo rozbít hru. Byli jste varováni!</string>
     <string name="edit_layout">Upravit rozhraní</string>
@@ -105,7 +105,6 @@
     <string name="fast_forward_mode_hold">držet</string>
     <string name="fast_forward">Tlačítko režimu zrychlení:</string>
     <string name="key_fast_forward">Zrychlení</string>
-    <string name="settings_soundfont_restart_app">Po změně zvukové banky prosím opusťte a restartujte aplikaci.</string>
     <string name="fast_forward_mode_tap">stisknout</string>
     <string name="fast_forward_factor">Rychlost:</string>
     <string name="error_saf_download_selected">Adresář pro stahování nemůže být použit jako složka EasyRPG.</string>
@@ -138,4 +137,4 @@
     <string name="scale_nearest">Škálovat na velikost obrazovky metodou nejbližšího souseda (rychlé, špatná kvalita)</string>
     <string name="scale_integer">Škálovat na násobek rozlišení hry (rychlé, menší obraz, dobrá kvalita)</string>
     <string name="scale_bilinear">Škálovat na velikost obrazovky a použít bilineární filtrování (pomalé, dobrá kvalita)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-de/strings.xml b/builds/android/app/src/main/res/values-de/strings.xml
index 72b705100..7a4cb9a19 100644
--- a/builds/android/app/src/main/res/values-de/strings.xml
+++ b/builds/android/app/src/main/res/values-de/strings.xml
@@ -100,10 +100,9 @@
     <string name="easyrpg_folders">EasyRPG-Ordner</string>
     <string name="screen_size">Bildschirmgröße:</string>
     <string name="settings_custom_soundfont">Eigener Soundfont:</string>
-    <string name="open_the_sound_fonts_folder">Soundfont-Ordner öffnen</string>
+    <string name="open_the_sound_fonts_folder">Ordner \"soundfonts\" öffnen</string>
     <string name="settings_soundfont_explanation">Platziere Soundfonts im SF2-Format im \"soundfonts\"-Ordner. Soundfonts ändern den Klang von MIDI-Musik.</string>
-    <string name="settings_soundfont_restart_app">Bitte starte nach dem Andern des Soundfonts die App neu.</string>
-    <string name="settings_soundfont_found">Gefundene Soundfonts:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Standard-Soundfont (Integriert)</string>
     <string name="select_the_games_folder">EasyRPG-Ordner auswählen</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player benötigt einen eigenen Ordner. Nachdem berühren der Schaltfläche wirst du aufgefordert, einen Ordner auszuwählen.
@@ -116,7 +115,7 @@
     <string name="rtp_explanation">Das RTP stellt gemeinsame Assets bereit, die von einigen Spielen verwendet werden.
 \nDas RPG Maker 2000 RTP musst du in \"rtp/2000\" und das RPG Maker 2003 RTP in \"rtp/2003\" platzieren.
 \nBeachte bitte, dass aktivierte RTP-Unterstützung den Start von Spielen spürbar verlangsamt.</string>
-    <string name="open_rtp_folder">RTP-Ordner öffnen</string>
+    <string name="open_rtp_folder">Ordner \"rtp\" öffnen</string>
     <string name="horizontal_input_layout">Horizontales (Landschaft) Eingabe-Layout</string>
     <string name="vertical_input_layout">Vertikales (Portrait) Eingabe-Layout</string>
     <string name="settings_edit_layout_explanation">Beim Bearbeiten des Eingabe-Layouts kannst du weitere Tasten, beispielsweise die Umschalttaste, hinzufügen.
diff --git a/builds/android/app/src/main/res/values-es/strings.xml b/builds/android/app/src/main/res/values-es/strings.xml
index 4b30824bc..487b2bc92 100644
--- a/builds/android/app/src/main/res/values-es/strings.xml
+++ b/builds/android/app/src/main/res/values-es/strings.xml
@@ -100,10 +100,9 @@
     <string name="easyrpg_folders">Carpetas de EasyRPG</string>
     <string name="screen_size">Escalado de la pantalla:</string>
     <string name="settings_custom_soundfont">Soundfont personalizado:</string>
-    <string name="open_the_sound_fonts_folder">Abrir la carpeta de soundfonts</string>
+    <string name="open_the_sound_fonts_folder">Abrir la carpeta \"soundfonts\"</string>
     <string name="settings_soundfont_explanation">Ubica los soundfont en formato SF2 en la carpeta \"soundfonts\". Los soundfont modifican cómo suena la música MIDI.</string>
-    <string name="settings_soundfont_restart_app">Sal y reinicia la aplicación tras seleccionar un soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts encontrados:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Soundfont predeterminado</string>
     <string name="select_the_games_folder">Seleccionar carpeta de EasyRPG</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player. requiere una carpeta exclusiva. Tras tocar el botón se te solicitará seleccionar una carpeta.
@@ -116,7 +115,7 @@
     <string name="rtp_explanation">El RTP proporciona archivos comunes usados por algunos juegos.
 \nColoca el RTP de RPG Maker 2000 en \"rtp/2000\" y el RTP de RPG Maker 2003 en \"rtp/2003\".
 \nTen en cuenta que habilitar el soporte RTP incrementará el tiempo de carga de un juego de manera significativa.</string>
-    <string name="open_rtp_folder">Abrir la carpeta del RTP</string>
+    <string name="open_rtp_folder">Abrir la carpeta \"rtp\"</string>
     <string name="horizontal_input_layout">Distribución de los botones horizontal (apaisada)</string>
     <string name="vertical_input_layout">Distribución de los botones vertical (retrato)</string>
     <string name="settings_edit_layout_explanation">Se pueden añadir botones al editar una distribución (por ejemplo, un botón shift).
diff --git a/builds/android/app/src/main/res/values-fr/strings.xml b/builds/android/app/src/main/res/values-fr/strings.xml
index cc1a5d09f..c5e9889de 100644
--- a/builds/android/app/src/main/res/values-fr/strings.xml
+++ b/builds/android/app/src/main/res/values-fr/strings.xml
@@ -96,10 +96,9 @@
     <string name="easyrpg_folders">Dossiers EasyRPG</string>
     <string name="screen_size">Agrandissement de l\'écran :</string>
     <string name="settings_custom_soundfont">Soundfont personnalisé :</string>
-    <string name="open_the_sound_fonts_folder">Ouvrir le dossier des soundfonts</string>
+    <string name="open_the_sound_fonts_folder">Ouvrir le dossier \"soundfonts\"</string>
     <string name="settings_soundfont_explanation">Mettez vos soundfonts au format SF2 dans le dossier « soundfonts ». Les soundfonts altèrent comment sonnent les musiques MIDI.</string>
-    <string name="settings_soundfont_restart_app">Veuillez quitter et redémarrer l\'application après avoir sélectionné un soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts trouvés :</string>
+    <string name="settings_soundfont_found">Soundfonts :</string>
     <string name="settings_default_soundfont">Soundfont par défaut</string>
     <string name="select_the_games_folder">Choisir le dossier d\'EasyRPG</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player a besoin d\'un dossier dédié. Après avoir appuyé sur le bouton, vous serez demandé de sélectionner un dossier.
@@ -112,7 +111,7 @@
     <string name="rtp_explanation">Le RTP donne accès à certaines ressources partagées utilisées par certains jeux.
 \nMettez le RTP de RPG Maker 2000 dans « rtp/2000 » et le RTP de RPG Maker 2003 dans « rtp/2003 ».
 \nVeuillez noter qu\'activer le support du RTP va significativement augmenter le temps de chargement initial d\'un jeu.</string>
-    <string name="open_rtp_folder">Ouvrir le dossier du RTP</string>
+    <string name="open_rtp_folder">Ouvrir le dossier \"rtp\"</string>
     <string name="horizontal_input_layout">Agencement horizontal (paysage) des contrôles</string>
     <string name="vertical_input_layout">Agencement vertical (portrait) des contrôles</string>
     <string name="settings_edit_layout_explanation">Lorsque vous éditez un agencement des boutons, des boutons peuvent être ajoutés (ex. un bouton Maj).
diff --git a/builds/android/app/src/main/res/values-in/strings.xml b/builds/android/app/src/main/res/values-in/strings.xml
index 82b74d4a5..fe893b998 100644
--- a/builds/android/app/src/main/res/values-in/strings.xml
+++ b/builds/android/app/src/main/res/values-in/strings.xml
@@ -98,9 +98,8 @@
     <string name="easyrpg_folders">Folder EasyRPG</string>
     <string name="screen_size">Ukuran Layar:</string>
     <string name="settings_custom_soundfont">Soundfont kostum:</string>
-    <string name="open_the_sound_fonts_folder">buka folder Soundfont</string>
+    <string name="open_the_sound_fonts_folder">buka folder \"soundfonts\"</string>
     <string name="settings_soundfont_explanation">letakkan soundfont dalam format SF2 pada folder \"soundfont\". Soundfont mengatur bagaimana suara MIDI terdengar.</string>
-    <string name="settings_soundfont_restart_app">silahkan keluar dan ulangi aplikasi setelah memilih soundfont.</string>
     <string name="settings_soundfont_found">soundfont ditemukan:</string>
     <string name="settings_default_soundfont">Soundfont bawaan</string>
     <string name="select_the_games_folder">pilih folder EasyRPG</string>
@@ -114,7 +113,7 @@
     <string name="rtp_explanation">RTP menyediakan aset bersama yang digunakan oleh beberapa permainan.
 \nletakkan RTP RPG Maker 2000 dalam \"rtp/2000\" dan letakkan RTP RPG Maker 2003 dalam \"rtp/2003\".
 \nmohon diingat bahwa menyalakan dukungan RTP akan meningkatkan waktu saat memulai memuat permainan.</string>
-    <string name="open_rtp_folder">buka folder RTP</string>
+    <string name="open_rtp_folder">buka folder \"rtp\"</string>
     <string name="horizontal_input_layout">tata letak masukan horisontal (luas)</string>
     <string name="vertical_input_layout">tata letak masukan vertikal (portal)</string>
     <string name="settings_edit_layout_explanation">ketika mengedit tata letak masukan,tombol bisa ditambahkan (seperti tombol shift).
diff --git a/builds/android/app/src/main/res/values-it/strings.xml b/builds/android/app/src/main/res/values-it/strings.xml
index 695d96be0..545cc7cc3 100644
--- a/builds/android/app/src/main/res/values-it/strings.xml
+++ b/builds/android/app/src/main/res/values-it/strings.xml
@@ -96,10 +96,9 @@
     <string name="easyrpg_folders">Cartelle EasyRPG</string>
     <string name="screen_size">Ridimensionamento dello schermo:</string>
     <string name="settings_custom_soundfont">Soundfont personalizzato:</string>
-    <string name="open_the_sound_fonts_folder">Apri la cartella soundfonts</string>
+    <string name="open_the_sound_fonts_folder">Apri la cartella \"soundfonts\"</string>
     <string name="settings_soundfont_explanation">Metti i soundfonts in formato SF2 nella cartella \"soundfonts\". I soundfonts alterano la musica MIDI.</string>
-    <string name="settings_soundfont_restart_app">Chiudi e riavvia l\'applicazione dopo aver selezionato un soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts trovati:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Soundfont di default</string>
     <string name="select_the_games_folder">Seleziona la cartella EasyRPG</string>
     <string name="id_select_games_folder_explanation">Per usare EasyRPG Player devi selezionare una cartella.
@@ -112,7 +111,7 @@
     <string name="rtp_explanation">Il RTP ti consente di utilizzare assets utilizzati da altri giochi.
 \nMetti RPG Maker 2000 RTP in \"rtp/2000\" e RPG Maker 2003 RTP\" in \"rtp/2003\".
 \nAbilitare il supporto RTP aumenterà significativamente il tempo di caricamento iniziale di un gioco.</string>
-    <string name="open_rtp_folder">Apri la cartella RTP</string>
+    <string name="open_rtp_folder">Apri la cartella \"rtp\"</string>
     <string name="settings_edit_layout_explanation">Quando si modifica la disposizione degli input, possono essere aggiunti anche tasti differenti.
 \n Per aggiungere un pulsante nuovo, premi il pulsante \"Indietro\" e seleziona \"Aggiungi un pulsante\".</string>
     <string name="horizontal_input_layout">Layout di Input Orizzontale (Landscape)</string>
diff --git a/builds/android/app/src/main/res/values-nl/strings.xml b/builds/android/app/src/main/res/values-nl/strings.xml
index 6d2a2704b..ddd0466f4 100644
--- a/builds/android/app/src/main/res/values-nl/strings.xml
+++ b/builds/android/app/src/main/res/values-nl/strings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="settings_soundfont_restart_app">Sluit de app af en start deze opnieuw nadat u een soundfont heeft geselecteerd.</string>
     <string name="baltic">Baltisch</string>
     <string name="settings_resolution_widescreen">Breedbeeld (416x240, 16:9, Experimenteel)</string>
     <string name="choose_layout">Kies een lay-out</string>
     <string name="error_saf_folder_not_empty">De geselecteerde folder bevat andere bestanden en kan niet worden gebruikt als de EasyRPG-folder. Wanneer u alle bestanden in de folder verwijdert, kunt u deze gebruiken als de EasyRPG-folder.</string>
     <string name="exit_without_saving">Afsluiten zonder op te slaan</string>
-    <string name="open_the_sound_fonts_folder">Op de soundfonts-folder</string>
+    <string name="open_the_sound_fonts_folder">Op de \"soundfonts\"-folder</string>
     <string name="vibrate_when_sliding_direction">Trillen tijdens het glijden naar een andere richting</string>
     <string name="error_saf_bad_content_provider">De geselecteerde folder kan niet worden gebruikt als de EasyRPG-folder. Dit probleem kan verschillende oorzaken hebben, bijvoorbeeld als u de hoofdfolder of een opslaglocatie in de cloud heeft geselecteerd.
 \n
@@ -21,7 +20,7 @@
 \n- De RTP (gedeelde middelen die door sommige spellen worden gebruikt) kan worden verstrekt
 \n- Een aangepast soundfont om te wijzigen hoe MIDI-muziekgeluiden kunnen worden verstrekt</string>
     <string name="no_external_storage">Geen externe opslag (bv. SD-kaart) gevonden</string>
-    <string name="settings_soundfont_found">Soundfonts gevonden:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="visit_website">Bezoek onze website</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player vereist een speciale folder. Nadat u de knop heeft aangeraakt, wordt u gevraagd een folder te selecteren.
 \n
@@ -29,7 +28,7 @@
 \n
 \nAls u deze app eerder gebruikt heeft, selecteer dan de bestaande EasyRPG-folder.</string>
     <string name="add_a_button">Knop toevoegen</string>
-    <string name="open_rtp_folder">Open de RTP-folder</string>
+    <string name="open_rtp_folder">Open de \"rtp\"-folder</string>
     <string name="edit_layout">Lay-out bewerken</string>
     <string name="manage_input_layouts">Invoerlay-outs beheren:</string>
     <string name="no_read_access_on_dir">Geen leestoegang op %1$s</string>
@@ -138,4 +137,4 @@
     <string name="audio">Audio</string>
     <string name="change_the_layout">Verander de lay-out</string>
     <string name="enable_vibration">Trillingen inschakelen</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-pl/strings.xml b/builds/android/app/src/main/res/values-pl/strings.xml
index 50c399f21..2749b47b8 100644
--- a/builds/android/app/src/main/res/values-pl/strings.xml
+++ b/builds/android/app/src/main/res/values-pl/strings.xml
@@ -98,7 +98,6 @@
     <string name="settings_custom_soundfont">Niestandardowa czcionka dźwiękowa:</string>
     <string name="open_the_sound_fonts_folder">Otwórz folder Czcionek dźwięków</string>
     <string name="settings_soundfont_explanation">Umieść czcionki dźwiękowe w formacie SF2 w folderze \"soundfonts\". Czcionki dźwiękowe zmieniają brzmienie muzyki MIDI.</string>
-    <string name="settings_soundfont_restart_app">Zamknij i uruchom ponownie aplikację po wybraniu czcionki dźwiękowej.</string>
     <string name="settings_soundfont_found">Znaleziono czcionki dźwiękowe:</string>
     <string name="settings_default_soundfont">Domyślna czcionka dźwiękowa</string>
     <string name="select_the_games_folder">Wybierz folder EasyRPG</string>
@@ -112,7 +111,7 @@
     <string name="rtp_explanation">RTP zapewnia wspólne zasoby używane przez niektóre gry.
 \nUmieść RPG Maker 2000 RTP w \"rtp/2000\" i RPG Maker 2003 RTP w \"rtp/2003\".
 \nNależy pamiętać, że włączenie obsługi RTP znacznie wydłuży początkowy czas ładowania gry.</string>
-    <string name="open_rtp_folder">Otwórz folder RTP</string>
+    <string name="open_rtp_folder">Otwórz folder \"rtp\"</string>
     <string name="horizontal_input_layout">Poziomy układ wejściowy</string>
     <string name="vertical_input_layout">pionowy Układ wejściowy</string>
     <string name="settings_edit_layout_explanation">Podczas edycji układu sterowania można dodać przyciski (np. przycisk Shift).
diff --git a/builds/android/app/src/main/res/values-pt-rBR/strings.xml b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
index 9aee5e545..d4d490269 100644
--- a/builds/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/builds/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -108,16 +108,15 @@
     <string name="error_games_no_rw">A pasta \"Games\" não é legível ou gravável. Selecione um local diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
     <string name="watch_explanation_video">Iniciando e adicionando jogos (Vídeo Explicativo)</string>
     <string name="easyrpg_folders">Pastas EasyRPG</string>
-    <string name="open_the_sound_fonts_folder">Abra a pasta de soundfonts</string>
-    <string name="settings_soundfont_restart_app">Por favor, saia e reinicie o aplicativo após selecionar a soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts encontrados:</string>
+    <string name="open_the_sound_fonts_folder">Abra a pasta de \"soundfonts\"</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Soundfont padrão</string>
     <string name="id_select_games_folder_explanation">O EasyRPG Player requer uma pasta única. Após tocar no botão, você será perguntado para selecionar uma pasta.
 \n
 \nSe você está usando este aplicativo pela primeira vez, não existe a pasta EasyRPG. Crie uma nova pasta EasyRPG e então selecione.
 \n
 \nSe você já usou este aplicativo antes, selecione a pasta EasyRPG existente.</string>
-    <string name="open_rtp_folder">Abra a pasta de RTP</string>
+    <string name="open_rtp_folder">Abra a pasta \"rtp\"</string>
     <string name="music_volume">Volume da música</string>
     <string name="sound_volume">Volume do efeito sonoro</string>
     <string name="error_no_games_folder">A pasta de jogos (games) não existe ou não é uma pasta. Por favor, crie manualmente ou selecione uma localização diferente para a pasta EasyRPG. A pasta EasyRPG pode ser alterada nas configurações.</string>
@@ -147,4 +146,4 @@
     <string name="settings_resolution_ultrawide">Ultrapanorâmico (560x240, 21:9, Experimental)</string>
     <string name="fast_forward_mode_tap">tocar</string>
     <string name="fast_forward_mode_hold">manter</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-ru/strings.xml b/builds/android/app/src/main/res/values-ru/strings.xml
index ef56bcf67..607460b24 100644
--- a/builds/android/app/src/main/res/values-ru/strings.xml
+++ b/builds/android/app/src/main/res/values-ru/strings.xml
@@ -108,7 +108,6 @@
 \n- Может быть предоставлен RTP (общие активы, используемые некоторыми играми).
 \n- Пользовательский звуковой шрифт для изменения того, как могут быть предоставлены звуки MIDI-музыки.</string>
     <string name="settings_soundfont_explanation">Поместите звуковые шрифты в формате SF2 в папку «soundfonts». Soundfonts изменяют звучание MIDI-музыки.</string>
-    <string name="settings_soundfont_restart_app">Пожалуйста, закройте и перезапустите приложение после выбора soundfont.</string>
     <string name="settings_default_soundfont">Обычный soundfount</string>
     <string name="select_the_games_folder">Выберите папку EasyRPG</string>
     <string name="id_select_games_folder_explanation">Для EasyRPG Player требуется отдельная папка. После нажатия на кнопку вам будет предложено выбрать папку.
@@ -121,7 +120,7 @@
     <string name="rtp_explanation">RTP предоставляет общие активы, используемые некоторыми играми.
 \nПоместите RPG Maker 2000 RTP в «rtp/2000», а RPG Maker 2003 RTP в «rtp/2003».
 \nОбратите внимание, что включение поддержки RTP значительно увеличит время загрузки игры.</string>
-    <string name="open_rtp_folder">Откройте папку RTP</string>
+    <string name="open_rtp_folder">Откройте папку \"rtp\"</string>
     <string name="horizontal_input_layout">Горизонтальный (альбомный) интерфейс ввода</string>
     <string name="vertical_input_layout">Вертикальный (книжный) интерфейс ввода</string>
     <string name="scale_nearest">Масштабирование до размера экрана с использованием ближайших пикселей (быстро, плохое качество)</string>
@@ -139,4 +138,4 @@
 \n</string>
     <string name="fast_forward_mode_hold">Удерживать</string>
     <string name="fast_forward_mode_tap">Нажимать</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-zh-rTW/strings.xml b/builds/android/app/src/main/res/values-zh-rTW/strings.xml
index 931091f69..625a76102 100644
--- a/builds/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/builds/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -103,12 +103,11 @@
     <string name="rtp_explanation">RTP 提供共用的素材，有些遊戲會使用它們。
 \n請將 RPG Maker 2000 的 RTP 放在 \"rtp/2000\" 資料夾下，RPG Maker 2003 的 RTP 放在 \"rtp/2003\" 資料夾下。
 \n請注意，啟用 RTP 支援會使遊戲初始化時的載入時間明顯的拉長。</string>
-    <string name="open_rtp_folder">開啟 RTP 資料夾</string>
+    <string name="open_rtp_folder">開啟 \"rtp\" 資料夾</string>
     <string name="horizontal_input_layout">橫向按鍵配置方案</string>
     <string name="vertical_input_layout">縱向按鍵配置方案</string>
     <string name="settings_edit_layout_explanation">編輯按鍵配置方案時可以新增如 Shift 鈕的按鈕。
 \n要新增一個按鈕，點擊「返回」鍵後選擇「新增按鈕」。</string>
-    <string name="settings_soundfont_restart_app">當你選擇了一個音樂聲庫以後，請退出並重新啟動應用程式。</string>
     <string name="settings_resolution_widescreen">寬屏（416x240，16:9比例，實驗性）</string>
     <string name="error_saf_folder_not_empty">選擇的資料夾裡面包括了其他的檔案，不能用作EasyRPG的默認資料夾。當你移除了裡面的其他檔案時，就可以使用這個資料夾了。</string>
     <string name="open_the_sound_fonts_folder">打開音樂聲庫資料夾</string>
@@ -149,4 +148,4 @@
     <string name="error_games_no_rw">無法對「games」資料夾進行讀寫操作。請為EasyRPG提供另一個位置作為默認資料夾。可以在設定中對EasyRPG的默認資料夾進行更改。</string>
     <string name="stretch">忽略縱橫比（拉伸到荧幕寬度）</string>
     <string name="error_no_games_folder">「games」資料夾不存在或者不是資料夾。 請手動創建或為EasyRPG資料夾選擇其他位置。 EasyRPG的默認資料夾可以在設定中更改。</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/builds/android/app/src/main/res/values-zh/strings.xml b/builds/android/app/src/main/res/values-zh/strings.xml
index a1f691595..e543e432c 100644
--- a/builds/android/app/src/main/res/values-zh/strings.xml
+++ b/builds/android/app/src/main/res/values-zh/strings.xml
@@ -83,7 +83,7 @@
     <string name="easyrpg_folders">EasyRPG 文件夹</string>
     <string name="screen_size">屏幕缩放:</string>
     <string name="settings_custom_soundfont">自定义 Soundfont：</string>
-    <string name="open_the_sound_fonts_folder">打开 soundfonts 文件夹</string>
+    <string name="open_the_sound_fonts_folder">打开 \"soundfonts\" 文件夹</string>
     <string name="select_the_games_folder">选择 EasyRPG 文件夹</string>
     <string name="id_select_games_folder_explanation">EasyRPG Player 需要一个专用文件夹。触碰按钮后，系统会要求您选择一个文件夹。
 \n
@@ -95,7 +95,7 @@
     <string name="rtp_explanation">RTP 提供一些游戏所使用的共享素材。
 \n将 \"RPG Maker 2000 RTP\" 放入 \"rtp/2000\" 路径，将 \"RPG Maker 2003 RTP\" 放入 \"rtp/2000\" 路径。
 \n请注意，启用 RTP 支持将显著增加游戏的初始加载时间。</string>
-    <string name="open_rtp_folder">打开 RTP 文件夹</string>
+    <string name="open_rtp_folder">打开 \"rtp\" 文件夹</string>
     <string name="music_volume">音乐音量</string>
     <string name="sound_volume">音效音量</string>
     <string name="launch_debug_mode">以调试模式启动</string>
@@ -120,7 +120,6 @@
 \n-RTP（一些游戏所使用的共享素材）
 \n-一种自定义 soundfont，用于更改 MIDI 音乐的提供方式</string>
     <string name="settings_soundfont_explanation">将 SF2 格式的 sounfonts 放在 \"soundfonts\" 文件夹中，用于改变 MIDI 音乐的声音。</string>
-    <string name="settings_soundfont_restart_app">请在选择 soundfont 后退出并重启应用程序。</string>
     <string name="settings_soundfont_found">找到的 soundfonts：</string>
     <string name="settings_default_soundfont">默认 soundfont</string>
     <string name="horizontal_input_layout">水平（横向）按键布局</string>
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index 5e21c5fac..afb70f7d0 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -82,10 +82,9 @@ Please tell us in detail what went wrong.\n\n
     <string name="enable_vibration">Enable vibrations</string>
     <string name="vibrate_when_sliding_direction">Vibrate when sliding to another direction</string>
     <string name="settings_custom_soundfont">Custom Soundfont:</string>
-    <string name="open_the_sound_fonts_folder">Open the soundfonts folder</string>
+    <string name="open_the_sound_fonts_folder">Open the \"soundfonts\" folder</string>
     <string name="settings_soundfont_explanation">Put soundfonts in SF2-format in the \"soundfonts\" folder. Soundfonts alter how MIDI music sounds.</string>
-    <string name="settings_soundfont_restart_app">Please quit and restart the app after selecting a soundfont.</string>
-    <string name="settings_soundfont_found">Soundfonts found:</string>
+    <string name="settings_soundfont_found">Soundfonts:</string>
     <string name="settings_default_soundfont">Default Soundfont</string>
     <string name="music_volume">Music volume</string>
     <string name="sound_volume">Sound effect volume</string>
@@ -106,8 +105,8 @@ Please tell us in detail what went wrong.\n\n
     <string name="Loading">Loading…</string>
     <string name="enable_rtp_support">Enable RTP support</string>
     <string name="rtp_explanation">The RTP provides shared assets used by some games.\nPut the RPG Maker 2000 RTP in \"rtp/2000\" and the RPG Maker 2003 RTP in \"rtp/2003\".\nPlease note that enabling RTP support will significantly increase the initial loading time of a game.</string>
-    <string name="open_rtp_folder">Open the RTP folder</string>
-    <string name="open_fonts_folder">Open the Fonts folder</string>
+    <string name="open_rtp_folder">Open the \"rtp\" folder</string>
+    <string name="open_fonts_folder">Open the \"fonts\" folder</string>
     <string name="settings_fonts_explanation">Put fonts in the \"fonts\" folder. For the best result use TTF fonts or bitmap (FON) fonts.</string>
     <string name="settings_fonts_explanation2">The game decides whether it uses the first font or the second font.</string>
     <string name="settings_fonts_size_explanation">The font size setting has no effect when using the built-in font or certain bitmap fonts.</string>

From 3ada4cebdfd33a5b3354dedf3ac151da1fa88971 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sat, 25 May 2024 23:48:10 +0200
Subject: [PATCH 141/222] Android: Remove GameScanner suffix from the cpp files

Originally they were generated by a Header generator but by now Android Studio handles this which is more flexible.
---
 .../app/src/gamebrowser/CMakeLists.txt        |  4 +-
 ...pp => org_easyrpg_player_game_browser.cpp} |  4 +-
 .../org_easyrpg_player_game_browser.h         | 45 +++++++++++++++++++
 ..._easyrpg_player_game_browser_GameScanner.h | 23 ----------
 4 files changed, 49 insertions(+), 27 deletions(-)
 rename builds/android/app/src/gamebrowser/{org_easyrpg_player_game_browser_GameScanner.cpp => org_easyrpg_player_game_browser.cpp} (99%)
 create mode 100644 builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
 delete mode 100644 builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h

diff --git a/builds/android/app/src/gamebrowser/CMakeLists.txt b/builds/android/app/src/gamebrowser/CMakeLists.txt
index 3782405e8..79017e5aa 100644
--- a/builds/android/app/src/gamebrowser/CMakeLists.txt
+++ b/builds/android/app/src/gamebrowser/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.7)
 project(easyrpg_android VERSION 1.0 LANGUAGES CXX)
 
 add_library(gamebrowser
-	org_easyrpg_player_game_browser_GameScanner.cpp
-	org_easyrpg_player_game_browser_GameScanner.h
+	org_easyrpg_player_game_browser.cpp
+	org_easyrpg_player_game_browser.h
 )
 
 set_target_properties(gamebrowser PROPERTIES DEBUG_POSTFIX "")
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
similarity index 99%
rename from builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
rename to builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
index 1cc4036ad..8f095524a 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of EasyRPG Player
  *
- * Copyright (c) 2021 EasyRPG Project. All rights reserved.
+ * Copyright (c) EasyRPG Project. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "org_easyrpg_player_game_browser_GameScanner.h"
+#include "org_easyrpg_player_game_browser.h"
 
 #include <zlib.h>
 #include <png.h>
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
new file mode 100644
index 000000000..87d224fcf
--- /dev/null
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of EasyRPG Player
+ *
+ * Copyright (c) EasyRPG Project. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <jni.h>
+
+#ifndef _Included_org_easyrpg_player_game_browser_GameScanner
+#define _Included_org_easyrpg_player_game_browser_GameScanner
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jobject JNICALL
+Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path, jstring jmain_dir_name);
+
+JNIEXPORT void JNICALL
+Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject thiz);
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jclass clazz, jstring font, jint size, jboolean first_font);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
deleted file mode 100644
index 9d72538b2..000000000
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser_GameScanner.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_easyrpg_player_game_browser_GameScanner */
-
-#ifndef _Included_org_easyrpg_player_game_browser_GameScanner
-#define _Included_org_easyrpg_player_game_browser_GameScanner
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JNIEXPORT jobject JNICALL
-Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass clazz, jstring path, jstring jmain_dir_name);
-
-JNIEXPORT void JNICALL
-Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject thiz);
-
-JNIEXPORT jbyteArray JNICALL
-Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jclass clazz, jstring font, jint size, jboolean first_font);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

From 0fb5083cbb78ae8752981c86fb7d11621b97b443 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sun, 26 May 2024 01:10:14 +0200
Subject: [PATCH 142/222] Add custom error display for platforms Implemented
 currently for 3DS and SDL2. Switch and Vita are possible, however an Error
 report might be generated on Switch (bad, could get send to big N) and for
 Vita one would need to match framebuffer format and such when dealing with
 GXM for dialog display. This is not worth currently, since we likely migrate
 away from vita2d library in the future. Go through platform teardown code.
 While this may not work for every case (e.g. out of memory on Wii), this
 should be cleaner.

---
 src/baseui.h                     |  8 ++++++++
 src/output.cpp                   | 27 +++++++++++-------------
 src/platform/3ds/main.cpp        | 24 ++++++++++++++--------
 src/platform/3ds/ui.cpp          | 12 +++++++++++
 src/platform/3ds/ui.h            |  1 +
 src/platform/emscripten/main.cpp |  3 ++-
 src/platform/psvita/main.cpp     | 10 +++++++--
 src/platform/sdl/main.cpp        |  3 ++-
 src/platform/sdl/sdl2_ui.cpp     | 18 ++++++++++++++++
 src/platform/sdl/sdl2_ui.h       |  1 +
 src/platform/switch/main.cpp     | 35 +++++++++++++++++++-------------
 src/platform/wii/main.cpp        |  3 ++-
 src/player.cpp                   |  6 +++---
 src/player.h                     |  3 +++
 14 files changed, 108 insertions(+), 46 deletions(-)

diff --git a/src/baseui.h b/src/baseui.h
index 266c3ee4a..e78775993 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -103,6 +103,14 @@ class BaseUi {
 	 */
 	virtual bool ShowCursor(bool /* flag */) { return true; };
 
+	/**
+	 * Outputs the error message in a custom way depending on platform
+	 *
+	 * @param message message string.
+	 * @return wether error has been handled
+	 */
+	virtual bool HandleErrorOutput(const std::string & /* message */) { return false; }
+
 	/**
 	 * Gets if fullscreen mode is active.
 	 *
diff --git a/src/output.cpp b/src/output.cpp
index a12335fe8..23129d9a1 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -28,8 +28,6 @@
 #include <fmt/ostream.h>
 #ifdef EMSCRIPTEN
 #  include "platform/emscripten/interface.h"
-#elif defined(__vita__)
-#  include <psp2/kernel/processmgr.h>
 #endif
 
 #include "output.h"
@@ -203,10 +201,7 @@ static void HandleErrorOutput(const std::string& err) {
 	BitmapRef surface = DisplayUi->GetDisplaySurface();
 	surface->FillRect(surface->GetRect(), Color(255, 0, 0, 128));
 
-	std::string error = "Error:\n";
-	error += err;
-
-	error += "\n\nEasyRPG Player will close now.\nPress [ENTER] key to exit...";
+	std::string error = err + "\nPress [ENTER] key to exit...";
 
 	Text::Draw(*surface, 11, 11, *Font::DefaultBitmapFont(), Color(0, 0, 0, 255), error);
 	Text::Draw(*surface, 10, 10, *Font::DefaultBitmapFont(), Color(255, 255, 255, 255), error);
@@ -294,16 +289,19 @@ void Output::ToggleLog() {
 
 void Output::ErrorStr(std::string const& err) {
 	WriteLog(LogLevel::Error, err);
+	std::string error = "Error:\n" + err + "\n\nEasyRPG Player will close now.";
+
 	static bool recursive_call = false;
 	if (!recursive_call && DisplayUi) {
 		recursive_call = true;
-		HandleErrorOutput(err);
+		// Try platform handler first, then global one
+		if (!DisplayUi->HandleErrorOutput(error)) {
+			HandleErrorOutput(error);
+		}
 		DisplayUi.reset();
 	} else {
 		// Fallback to Console if the display is not ready yet
-		std::cout << err << std::endl;
-		std::cout << std::endl;
-		std::cout << "EasyRPG Player will close now.";
+		std::cout << error << std::endl;
 #if defined (PLAYER_NINTENDO) || defined(__vita__)
 		// stdin is non-blocking
 		Game_Clock::SleepFor(5s);
@@ -316,11 +314,10 @@ void Output::ErrorStr(std::string const& err) {
 #endif
 	}
 
-	// FIXME: This does not go through platform teardown code
-#ifdef __vita__
-	sceKernelExitProcess(EXIT_FAILURE);
-#endif
-	exit(EXIT_FAILURE);
+	Player::exit_code = EXIT_FAILURE;
+
+	// FIXME: No idea how to indicate error from core in libretro
+	exit(Player::exit_code);
 }
 
 void Output::WarningStr(std::string const& warn) {
diff --git a/src/platform/3ds/main.cpp b/src/platform/3ds/main.cpp
index 61668fdaf..34e934541 100644
--- a/src/platform/3ds/main.cpp
+++ b/src/platform/3ds/main.cpp
@@ -104,6 +104,16 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 	}
 }
 
+void n3dsExit() {
+	romfsExit();
+	stop3DSLink();
+	gfxExit();
+
+	if (old_time_limit != UINT32_MAX) {
+		APT_SetAppCpuTimeLimit(old_time_limit);
+	}
+}
+
 int main(int argc, char* argv[]) {
 	std::vector<std::string> args(argv, argv + argc);
 
@@ -174,17 +184,13 @@ int main(int argc, char* argv[]) {
 		args.push_back(ctr_dir);
 	}
 
+	// Setup teardown code
+	atexit(n3dsExit);
+
 	// Run Player
 	Player::Init(std::move(args));
 	Player::Run();
 
-	romfsExit();
-	stop3DSLink();
-	gfxExit();
-
-	if (old_time_limit != UINT32_MAX) {
-		APT_SetAppCpuTimeLimit(old_time_limit);
-	}
-
-	return EXIT_SUCCESS;
+	// Close
+	return Player::exit_code;
 }
diff --git a/src/platform/3ds/ui.cpp b/src/platform/3ds/ui.cpp
index ffb8f838d..ea4472e36 100644
--- a/src/platform/3ds/ui.cpp
+++ b/src/platform/3ds/ui.cpp
@@ -452,3 +452,15 @@ void CtrUi::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.touch_ui.SetDescription("Toggle the backlight of the bottom screen");
 	cfg.touch_ui.Set(bottom_state != screen_state::off);
 }
+
+bool CtrUi::HandleErrorOutput(const std::string &message) {
+	errorConf errCnf;
+	std::string error = Player::GetFullVersionString();
+	error += "\n\n" + message;
+
+	errorInit(&errCnf, ERROR_TEXT_WORD_WRAP, CFG_LANGUAGE_EN);
+	errorText(&errCnf, error.c_str());
+	errorDisp(&errCnf);
+
+	return true;
+}
diff --git a/src/platform/3ds/ui.h b/src/platform/3ds/ui.h
index 02cc60cda..9dc42b712 100644
--- a/src/platform/3ds/ui.h
+++ b/src/platform/3ds/ui.h
@@ -54,6 +54,7 @@ class CtrUi final : public BaseUi {
 	void ToggleStretch() override;
 	void ToggleTouchUi() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
+	bool HandleErrorOutput(const std::string &message) override;
 
 #ifdef SUPPORT_AUDIO
 	AudioInterface& GetAudio();
diff --git a/src/platform/emscripten/main.cpp b/src/platform/emscripten/main.cpp
index 50f341383..b20b8f80f 100644
--- a/src/platform/emscripten/main.cpp
+++ b/src/platform/emscripten/main.cpp
@@ -87,5 +87,6 @@ extern "C" int main(int argc, char* argv[]) {
 
 	emscripten_set_main_loop(main_loop, 0, 0);
 
-	return EXIT_SUCCESS;
+	// Close
+	return Player::exit_code;
 }
diff --git a/src/platform/psvita/main.cpp b/src/platform/psvita/main.cpp
index 0c797eae6..cbe48236e 100644
--- a/src/platform/psvita/main.cpp
+++ b/src/platform/psvita/main.cpp
@@ -34,6 +34,10 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 	sceClibPrintf("[%s] %s: %s\n", GAME_TITLE, prefix.c_str(), msg.c_str());
 }
 
+void VitaExit() {
+	sceKernelExitProcess(Player::exit_code);
+}
+
 int main(int argc, char* argv[]) {
 	std::vector<std::string> args(argv, argv + argc);
 
@@ -102,11 +106,13 @@ int main(int argc, char* argv[]) {
 		args.push_back(psp2_dir);
 	}
 
+	// Setup teardown code
+	atexit(VitaExit);
+
 	// Run Player
 	Player::Init(std::move(args));
 	Player::Run();
 
 	// Close
-	sceKernelExitProcess(EXIT_SUCCESS);
-	return EXIT_SUCCESS;
+	return Player::exit_code;
 }
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index 031a542f8..2183c87c9 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -86,5 +86,6 @@ extern "C" int main(int argc, char* argv[]) {
 	Player::Init(std::move(args));
 	Player::Run();
 
-	return EXIT_SUCCESS;
+	// Close
+	return Player::exit_code;
 }
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 6e5255166..2e691332a 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -674,6 +674,24 @@ bool Sdl2Ui::ShowCursor(bool flag) {
 	return temp_flag;
 }
 
+bool Sdl2Ui::HandleErrorOutput(const std::string &message) {
+	std::string title = Player::GetFullVersionString();
+
+	// Manually Restore window from fullscreen, since message would not be visible otherwise
+	if ((current_display_mode.flags & SDL_WINDOW_FULLSCREEN_DESKTOP)
+		== SDL_WINDOW_FULLSCREEN_DESKTOP) {
+		SDL_SetWindowFullscreen(sdl_window, 0);
+		SDL_SetWindowSize(sdl_window, 0, 0);
+	}
+
+	if(SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title.c_str(),
+		message.c_str(), sdl_window) != 0) {
+		return false;
+	}
+
+	return true;
+}
+
 void Sdl2Ui::ProcessEvent(SDL_Event &evnt) {
 	switch (evnt.type) {
 		case SDL_WINDOWEVENT:
diff --git a/src/platform/sdl/sdl2_ui.h b/src/platform/sdl/sdl2_ui.h
index c9543f2aa..3b8203e9c 100644
--- a/src/platform/sdl/sdl2_ui.h
+++ b/src/platform/sdl/sdl2_ui.h
@@ -71,6 +71,7 @@ class Sdl2Ui final : public BaseUi {
 	void ToggleVsync() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
 	Rect GetWindowMetrics() const override;
+	bool HandleErrorOutput(const std::string &message) override;
 
 #ifdef SUPPORT_AUDIO
 	AudioInterface& GetAudio() override;
diff --git a/src/platform/switch/main.cpp b/src/platform/switch/main.cpp
index d3685cb8b..8ad2881c1 100644
--- a/src/platform/switch/main.cpp
+++ b/src/platform/switch/main.cpp
@@ -43,12 +43,27 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 	}
 }
 
+void SwitchExit() {
+	romfsExit();
+
+	// Close debug log
+	if (nxlinkSocket >= 0) {
+		close(nxlinkSocket);
+		socketExit();
+		nxlinkSocket = -1;
+	}
+
+	// HOS will close us immediately afterwards, if requested by home menu.
+	// So no further cleanup possible.
+	appletUnlockExit();
+}
+
 int main(int argc, char* argv[]) {
 	std::vector<std::string> args(argv, argv + argc);
 
 	appletLockExit();
 
-	// yuzu/nso
+	// suyu/nso
 	is_nro = envHasArgv();
 	Output::SetLogCallback(LogCallback);
 
@@ -85,21 +100,13 @@ int main(int argc, char* argv[]) {
 		}
 	}
 
+	// Setup platform teardown code
+	atexit(SwitchExit);
+
 	// Run Player
 	Player::Init(std::move(args));
 	Player::Run();
 
-	romfsExit();
-
-	// Close debug log
-	if (nxlinkSocket >= 0) {
-		close(nxlinkSocket);
-		socketExit();
-		nxlinkSocket = -1;
-	}
-
-	// HOS will close us immediately afterwards, if requested by home menu.
-	// So no further cleanup possible.
-	appletUnlockExit();
-	return EXIT_SUCCESS;
+	// Close
+	return Player::exit_code;
 }
diff --git a/src/platform/wii/main.cpp b/src/platform/wii/main.cpp
index 13e33fdaa..2f3d2808b 100644
--- a/src/platform/wii/main.cpp
+++ b/src/platform/wii/main.cpp
@@ -114,5 +114,6 @@ extern "C" int main(int argc, char* argv[]) {
 	Player::Init(std::move(args));
 	Player::Run();
 
-	return EXIT_SUCCESS;
+	// Close
+	return Player::exit_code;
 }
diff --git a/src/player.cpp b/src/player.cpp
index 5f69eec6a..d9bd785f9 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -106,9 +106,9 @@ namespace Player {
 	int menu_offset_y = (screen_height - MENU_HEIGHT) / 2;
 	int message_box_offset_x = (screen_width - MENU_WIDTH) / 2;
 	bool has_custom_resolution = false;
-
-	bool exit_flag;
-	bool reset_flag;
+	int exit_code = EXIT_SUCCESS;
+	bool exit_flag = false;
+	bool reset_flag = false;
 	bool debug_flag;
 	bool hide_title_flag;
 	int load_game_id;
diff --git a/src/player.h b/src/player.h
index bf220f91f..ed6d8022c 100644
--- a/src/player.h
+++ b/src/player.h
@@ -312,6 +312,9 @@ namespace Player {
 	/** Set the desired rendering frames per second */
 	void SetTargetFps(int fps);
 
+	/** Exit code (optionally indicting an error) when program terminates. */
+	extern int exit_code;
+
 	/** Exit flag, if true will exit application on next Player::Update. */
 	extern bool exit_flag;
 

From 7209ec1f9df3952499481a22085008bd302b23b1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 26 May 2024 01:20:18 +0200
Subject: [PATCH 143/222] Android: Add RTP status to the Folders activity

Fix #1845
---
 .../org_easyrpg_player_game_browser.cpp       | 52 ++++++++++++++++++
 .../org_easyrpg_player_game_browser.h         |  3 +
 .../game_browser/GameBrowserActivity.java     |  3 +
 .../settings/SettingsGamesFolderActivity.java | 55 +++++++++++++++++++
 .../activity_settings_easyrpg_folders.xml     | 53 +++++++++++-------
 .../app/src/main/res/values/strings.xml       |  2 +
 src/filefinder_rtp.cpp                        |  2 +-
 src/rtp.cpp                                   | 38 ++++---------
 src/rtp.h                                     | 15 ++++-
 9 files changed, 174 insertions(+), 49 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
index 8f095524a..aeb06ea3c 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
@@ -38,6 +38,7 @@
 #include "bitmap.h"
 #include "font.h"
 #include "cache.h"
+#include "rtp.h"
 
 #include <lcf/ldb/reader.h>
 #include <lcf/reader_util.h>
@@ -186,6 +187,8 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass,
 	// jpath is the SAF path to the game, is converted to FilesystemView "root"
 	std::string spath = jstring_to_string(env, jpath);
 	auto root = FileFinder::Root().Create(spath);
+	root.ClearCache();
+
 	std::vector<FilesystemView> fs_list = FileFinder::FindGames(root);
 
 	jclass jgame_class = env->FindClass("org/easyrpg/player/game_browser/Game");
@@ -445,3 +448,52 @@ Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jcla
 
 	return buffer_array;
 }
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_org_easyrpg_player_settings_SettingsGamesFolderActivity_DetectRtp(JNIEnv *env, jobject, jstring jpath, jobject hit_info, int version) {
+	EpAndroid::env = env;
+
+
+	std::string path = jstring_to_string(env, jpath);
+
+	auto fs = FileFinder::Root().Create(path);
+	if (!fs) {
+		return;
+	}
+
+	fs.ClearCache();
+
+	auto hits = RTP::Detect(fs, version);
+
+	if (hits.empty()) {
+		return;
+	}
+
+	// Find RTP with highest hit rate
+	double best_rate = 0;
+	int best_index = 0;
+
+	for (size_t i = 0; i < hits.size(); ++i) {
+		double rate = static_cast<double>(hits[i].hits) / hits[i].max;
+		if (rate > best_rate) {
+			best_index = i;
+			best_rate = rate;
+		}
+	}
+
+	RTP::RtpHitInfo& best_hit = hits[best_index];
+
+	jclass hit_info_cls = env->GetObjectClass(hit_info);
+	jfieldID name_field = env->GetFieldID(hit_info_cls, "name", "Ljava/lang/String;");
+	jfieldID version_field = env->GetFieldID(hit_info_cls, "version", "I");
+	jfieldID hits_field = env->GetFieldID(hit_info_cls, "hits", "I");
+	jfieldID max_field = env->GetFieldID(hit_info_cls, "max", "I");
+
+	jstring jname = env->NewStringUTF(best_hit.name.c_str());
+	env->SetObjectField(hit_info, name_field, jname);
+
+	env->SetIntField(hit_info, version_field, best_hit.version);
+	env->SetIntField(hit_info, hits_field, best_hit.hits);
+	env->SetIntField(hit_info, max_field, best_hit.max);
+}
diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
index 87d224fcf..a9a059492 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.h
@@ -39,6 +39,9 @@ Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject th
 JNIEXPORT jbyteArray JNICALL
 Java_org_easyrpg_player_settings_SettingsFontActivity_DrawText(JNIEnv *env, jclass clazz, jstring font, jint size, jboolean first_font);
 
+JNIEXPORT void JNICALL
+Java_org_easyrpg_player_settings_SettingsGamesFolderActivity_DetectRtp(JNIEnv *env, jobject thiz, jstring path, jobject hit_info, int version);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
index 5b622b314..f6fa1cb5d 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/game_browser/GameBrowserActivity.java
@@ -37,6 +37,7 @@
 
 import org.easyrpg.player.R;
 import org.easyrpg.player.settings.SettingsManager;
+import org.libsdl.app.SDL;
 
 import java.util.Collections;
 import java.util.List;
@@ -68,6 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         }
 
+        SDL.setContext(getApplicationContext());
+
         setContentView(R.layout.activity_games_browser);
 
         // Configure the toolbar
diff --git a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsGamesFolderActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsGamesFolderActivity.java
index 5c7e54cdd..37e4aad8f 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsGamesFolderActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/settings/SettingsGamesFolderActivity.java
@@ -8,12 +8,14 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.easyrpg.player.R;
 import org.easyrpg.player.game_browser.GameBrowserActivity;
 import org.easyrpg.player.game_browser.GameBrowserHelper;
+import org.libsdl.app.SDL;
 
 public class SettingsGamesFolderActivity extends AppCompatActivity {
     private GameBrowserHelper.SafError safError = GameBrowserHelper.SafError.OK;
@@ -22,6 +24,7 @@ public class SettingsGamesFolderActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.activity_settings_easyrpg_folders);
+        SDL.setContext(getApplicationContext());
 
         safError = GameBrowserHelper.SafError.OK;
 
@@ -78,6 +81,8 @@ public void onCreate(Bundle savedInstanceState) {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(GameBrowserHelper.VIDEO_URL));
             startActivity(browserIntent);
         });
+
+        DetectRtp();
     }
 
     @Override
@@ -87,6 +92,8 @@ public void onResume() {
         if (safError != GameBrowserHelper.SafError.OK && safError != GameBrowserHelper.SafError.ABORTED) {
             GameBrowserHelper.showErrorMessage(this, safError);
             safError = GameBrowserHelper.SafError.OK;
+        } else {
+            DetectRtp();
         }
     }
 
@@ -110,4 +117,52 @@ public void onActivityResult(int requestCode, int resultCode, Intent resultData)
         intent = new Intent(this, GameBrowserActivity.class);
         startActivity(intent);
     }
+
+    private void DetectRtp() {
+        Uri rtpUri = SettingsManager.getRTPFolderURI(this);
+        if (rtpUri == null) {
+            return;
+        }
+
+        RtpHitInfo hitInfo = new RtpHitInfo();
+        DetectRtp(rtpUri + "/2000", hitInfo, 2000);
+
+        TextView res = findViewById(R.id.settings_rtp_2000_result);
+        String rtpText;
+        if (hitInfo.version == 2000) {
+            rtpText = getApplicationContext().getResources().getString(R.string.rtp_found);
+            rtpText = rtpText.replace("$YEAR", "2000")
+                .replace("$NAME", hitInfo.name)
+                .replace("$FOUND", Integer.toString(hitInfo.hits))
+                .replace("$MAX", Integer.toString(hitInfo.max));
+        } else {
+            rtpText = getApplicationContext().getResources().getString(R.string.rtp_not_found);
+            rtpText = rtpText.replace("$YEAR", "2000");
+        }
+        res.setText(rtpText);
+
+        DetectRtp(rtpUri + "/2003", hitInfo, 2003);
+
+        res = findViewById(R.id.settings_rtp_2003_result);
+        if (hitInfo.version == 2003) {
+            rtpText = getApplicationContext().getResources().getString(R.string.rtp_found);
+            rtpText = rtpText.replace("$YEAR", "2003")
+                .replace("$NAME", hitInfo.name)
+                .replace("$FOUND", Integer.toString(hitInfo.hits))
+                .replace("$MAX", Integer.toString(hitInfo.max));
+        } else {
+            rtpText = getApplicationContext().getResources().getString(R.string.rtp_not_found);
+            rtpText = rtpText.replace("$YEAR", "2003");
+        }
+        res.setText(rtpText);
+    }
+
+    public static class RtpHitInfo {
+        String name;
+        int version = 0;
+        int hits = 0;
+        int max = 0;
+    };
+
+    private native void DetectRtp(String path, RtpHitInfo hitInfo, int version);
 }
diff --git a/builds/android/app/src/main/res/layout/activity_settings_easyrpg_folders.xml b/builds/android/app/src/main/res/layout/activity_settings_easyrpg_folders.xml
index d14235c7b..a8545a0d2 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_easyrpg_folders.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_easyrpg_folders.xml
@@ -11,26 +11,6 @@
         android:gravity="center"
         android:padding="20dp">
 
-        <Button
-            android:id="@+id/set_games_folder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/select_the_games_folder" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/id_select_games_folder_explanation"
-            android:textSize="18sp" />
-
-        <Button
-            android:id="@+id/watch_video"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/watch_explanation_video" />
-
-        <include layout="@layout/separator"/>
-
         <Button
             android:id="@+id/open_game_folder"
             android:layout_width="wrap_content"
@@ -59,5 +39,38 @@
             android:text="@string/rtp_explanation"
             android:textSize="18sp" />
 
+        <TextView
+            android:id="@+id/settings_rtp_2000_result"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/rtp_not_found"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/settings_rtp_2003_result"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/rtp_not_found"
+            android:textSize="18sp" />
+
+        <include layout="@layout/separator"/>
+
+        <Button
+            android:id="@+id/set_games_folder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/select_the_games_folder" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/id_select_games_folder_explanation"
+            android:textSize="18sp" />
+
+        <Button
+            android:id="@+id/watch_video"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/watch_explanation_video" />
     </LinearLayout>
 </ScrollView>
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index afb70f7d0..251e7100c 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -105,6 +105,8 @@ Please tell us in detail what went wrong.\n\n
     <string name="Loading">Loading…</string>
     <string name="enable_rtp_support">Enable RTP support</string>
     <string name="rtp_explanation">The RTP provides shared assets used by some games.\nPut the RPG Maker 2000 RTP in \"rtp/2000\" and the RPG Maker 2003 RTP in \"rtp/2003\".\nPlease note that enabling RTP support will significantly increase the initial loading time of a game.</string>
+    <string name="rtp_not_found">RTP $YEAR not found. Games that require this RTP will have missing assets.</string>
+    <string name="rtp_found">RTP $YEAR found: $NAME ($FOUND of $MAX assets found)</string>
     <string name="open_rtp_folder">Open the \"rtp\" folder</string>
     <string name="open_fonts_folder">Open the \"fonts\" folder</string>
     <string name="settings_fonts_explanation">Put fonts in the \"fonts\" folder. For the best result use TTF fonts or bitmap (FON) fonts.</string>
diff --git a/src/filefinder_rtp.cpp b/src/filefinder_rtp.cpp
index cd9a60161..7753a527c 100644
--- a/src/filefinder_rtp.cpp
+++ b/src/filefinder_rtp.cpp
@@ -275,7 +275,7 @@ Filesystem_Stream::InputStream FileFinder_RTP::LookupInternal(StringView dir, St
 
 			if (game_rtp.size() == 1) {
 				// From now on the RTP lookups should be perfect
-				Output::Debug("Game uses RTP \"{}\"", RTP::Names[(int) game_rtp[0]]);
+				Output::Debug("Game uses RTP \"{}\"", RTP::kTypes[(int) game_rtp[0]]);
 			}
 		}
 	}
diff --git a/src/rtp.cpp b/src/rtp.cpp
index 049c85a19..bd1c77806 100644
--- a/src/rtp.cpp
+++ b/src/rtp.cpp
@@ -21,22 +21,6 @@
 #include <cstring>
 #include "rtp.h"
 
-namespace RTP {
-	const char* Names[] {
-		"Official Japanese",
-		"Official English",
-		"Don Miguel English Translation",
-		"Don Miguel RTP Addon",
-		"Official Japanese",
-		"Official English",
-		"RPG Advocate English Translation",
-		"Vlad Russian Translation",
-		"RPG Universe Spanish/Portuguese Translation",
-		"Korean Translation",
-		"Official Traditional Chinese"
-	};
-}
-
 static std::pair<int, int> get_table_idx(const char* const lookup_table[16], const int lookup_table_idx[16], StringView category) {
 	int i;
 
@@ -78,17 +62,17 @@ static void detect_helper(const FilesystemView& fs, std::vector<struct RTP::RtpH
 
 std::vector<RTP::RtpHitInfo> RTP::Detect(const FilesystemView& fs, int version, int miss_limit) {
 	std::vector<struct RTP::RtpHitInfo> hit_list = {{
-		{RTP::Type::RPG2000_OfficialJapanese, Names[0], 2000, 0, 465, fs},
-		{RTP::Type::RPG2000_OfficialEnglish, Names[1], 2000, 0, 465, fs},
-		{RTP::Type::RPG2000_DonMiguelEnglish, Names[2], 2000, 0, 500, fs},
-		{RTP::Type::RPG2000_DonMiguelAddon, Names[3], 2000, 0, 503, fs},
-		{RTP::Type::RPG2003_OfficialJapanese, Names[4], 2003, 0, 675, fs},
-		{RTP::Type::RPG2003_OfficialEnglish, Names[5], 2003, 0, 675, fs},
-		{RTP::Type::RPG2003_RpgAdvocateEnglish, Names[6], 2003, 0, 675, fs},
-		{RTP::Type::RPG2003_VladRussian, Names[7], 2003, 0, 350, fs},
-		{RTP::Type::RPG2003_RpgUniverseSpanishPortuguese, Names[8], 2003, 0, 600, fs},
-		{RTP::Type::RPG2003_Korean, Names[9], 2003, 0, 675, fs},
-		{RTP::Type::RPG2003_OfficialTraditionalChinese, Names[10], 2003, 0, 676, fs}
+		{RTP::Type::RPG2000_OfficialJapanese, kTypes[0], 2000, 0, 465, fs},
+		{RTP::Type::RPG2000_OfficialEnglish, kTypes[1], 2000, 0, 465, fs},
+		{RTP::Type::RPG2000_DonMiguelEnglish, kTypes[2], 2000, 0, 500, fs},
+		{RTP::Type::RPG2000_DonMiguelAddon, kTypes[3], 2000, 0, 503, fs},
+		{RTP::Type::RPG2003_OfficialJapanese, kTypes[4], 2003, 0, 675, fs},
+		{RTP::Type::RPG2003_OfficialEnglish, kTypes[5], 2003, 0, 675, fs},
+		{RTP::Type::RPG2003_RpgAdvocateEnglish, kTypes[6], 2003, 0, 675, fs},
+		{RTP::Type::RPG2003_VladRussian, kTypes[7], 2003, 0, 350, fs},
+		{RTP::Type::RPG2003_RpgUniverseSpanishPortuguese, kTypes[8], 2003, 0, 600, fs},
+		{RTP::Type::RPG2003_Korean, kTypes[9], 2003, 0, 675, fs},
+		{RTP::Type::RPG2003_OfficialTraditionalChinese, kTypes[10], 2003, 0, 676, fs}
 	}};
 
 	auto SOUND_TYPES = Utils::MakeSvVector(".wav", ".mp3");
diff --git a/src/rtp.h b/src/rtp.h
index ba1b2ac92..b062025c4 100644
--- a/src/rtp.h
+++ b/src/rtp.h
@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 
+#include <lcf/enum_tags.h>
 #include "filefinder.h"
 
 /**
@@ -52,7 +53,19 @@ namespace RTP {
 		RPG2003_OfficialTraditionalChinese
 	};
 
-	extern const char* Names[];
+	constexpr auto kTypes = lcf::makeEnumTags<Type>(
+		"Official Japanese",
+		"Official English",
+		"Don Miguel English Translation",
+		"Don Miguel RTP Addon",
+		"Official Japanese",
+		"Official English",
+		"RPG Advocate English Translation",
+		"Vlad Russian Translation",
+		"RPG Universe Spanish/Portuguese Translation",
+		"Korean Translation",
+		"Official Traditional Chinese"
+	);
 
 	struct RtpHitInfo {
 		RTP::Type type;

From 6d8303479055d0809e268cb30a9267b880a137e9 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 26 May 2024 01:21:43 +0200
Subject: [PATCH 144/222] Android: Add "Toggle FPS" and "Reset Game" to the
 game drawer

Related #3103
---
 .../player/player/EasyRpgPlayerActivity.java  | 22 +++++++-
 .../android/app/src/main/res/menu/player.xml  |  4 ++
 .../app/src/main/res/values/strings.xml       |  3 ++
 ...pg_player_player_EasyRpgPlayerActivity.cpp | 24 ++++++---
 ...yrpg_player_player_EasyRpgPlayerActivity.h | 52 +++++++++++--------
 5 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
index be416e152..828be979e 100644
--- a/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
+++ b/builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java
@@ -181,10 +181,14 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if (item.getItemId() == R.id.toggle_ui) {
             uiVisible = !uiVisible;
             showInputLayout();
+        } else if (item.getItemId() == R.id.toggle_fps) {
+            toggleFps();
         } else if (item.getItemId() == R.id.edit_layout) {
             editLayout();
         } else if (item.getItemId() == R.id.report_bug) {
             reportBug();
+        } else if (item.getItemId() == R.id.reset_game) {
+            showResetGameDialog();
         } else if (item.getItemId() == R.id.end_game) {
             showEndGameDialog();
         }
@@ -312,6 +316,20 @@ public void openOrCloseMenu() {
         }
     }
 
+    private void showResetGameDialog() {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+        alertDialogBuilder.setTitle(R.string.app_name);
+
+        // set dialog message
+        alertDialogBuilder.setMessage(R.string.do_want_reset).setCancelable(false)
+            .setPositiveButton(R.string.yes, (dialog, id) -> resetGame()).setNegativeButton(R.string.no, (dialog, id) -> dialog.cancel());
+
+        // create alert dialog
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        alertDialog.show();
+    }
+
     private void showEndGameDialog() {
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
         alertDialogBuilder.setTitle(R.string.app_name);
@@ -330,7 +348,9 @@ private void showEndGameDialog() {
 
     public static native void endGame();
 
-    public static native void setFastForwardMultiplier(int m);
+    public static native void resetGame();
+
+    public static native void toggleFps();
 
     protected String[] getArguments() {
         return getIntent().getStringArrayExtra(TAG_COMMAND_LINE);
diff --git a/builds/android/app/src/main/res/menu/player.xml b/builds/android/app/src/main/res/menu/player.xml
index 6f63be8d2..a0ea7d53a 100644
--- a/builds/android/app/src/main/res/menu/player.xml
+++ b/builds/android/app/src/main/res/menu/player.xml
@@ -4,10 +4,14 @@
 		  android:title="@string/settings" />
     <item android:id="@+id/edit_layout"
           android:title="@string/edit_layout" />
+    <item android:id="@+id/toggle_fps"
+        android:title="@string/toggle_fps" />
 	<item android:id="@+id/toggle_ui"
 		android:title="@string/toggle_ui" />
     <item android:id="@+id/report_bug"
           android:title="@string/report_bug" />
+    <item android:id="@+id/reset_game"
+        android:title="@string/reset_game" />
     <item android:id="@+id/end_game"
           android:title="@string/end_game" />
 </menu>
diff --git a/builds/android/app/src/main/res/values/strings.xml b/builds/android/app/src/main/res/values/strings.xml
index 251e7100c..cc2cab0c6 100644
--- a/builds/android/app/src/main/res/values/strings.xml
+++ b/builds/android/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="do_want_quit">Do you really want to quit?</string>
+    <string name="do_want_reset">Do you really want to reset?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="revert">Revert</string>
@@ -52,6 +53,8 @@
 
     <!--Ingame menu-->
     <string name="toggle_ui">Toggle virtual buttons</string>
+    <string name="toggle_fps">Toggle FPS display</string>
+    <string name="reset_game">Reset game</string>
     <string name="end_game">End game</string>
     <string name="report_bug">Report a bug</string>
     <string name="report_bug_msg">This function will open your E-mail program (e.g. Gmail) to send us the bug report.\n\nIf you don\'t want to send a mail or don\'t have a mail program configured you can open a new issue at https://github.com/EasyRPG/Player/issues instead.</string>
diff --git a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
index 6809bca55..9fe5731ca 100644
--- a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
+++ b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
@@ -34,16 +34,24 @@ extern "C" {
 
 // To prevent race conditions use EpAndroid::schedule for everything that is not just a variable read/write
 
-JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endGame
-  (JNIEnv *, jclass)
-{
-	Player::exit_flag = true;
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endGame(JNIEnv *, jclass) {
+	EpAndroid::schedule([]() {
+		Player::exit_flag = true;
+	});
 }
 
-JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_setFastForwardMultiplier
-  (JNIEnv *, jclass, jint ji)
-{
-	Player::speed_modifier_a = ji;
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_resetGame(JNIEnv *, jclass) {
+	EpAndroid::schedule([]() {
+		Player::reset_flag = true;
+	});
+}
+
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_toggleFps(JNIEnv *, jclass) {
+	EpAndroid::schedule([]() {
+		if (DisplayUi) {
+			DisplayUi->ToggleShowFps();
+		}
+	});
 }
 
 JNIEXPORT void JNICALL
diff --git a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h
index 007658f6d..2ac45887b 100644
--- a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h
+++ b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h
@@ -1,4 +1,27 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
+/*
+ * This file is part of EasyRPG Player
+ *
+ * Copyright (c) EasyRPG Project. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
 #include <jni.h>
 /* Header for class org_easyrpg_player_EasyRpgPlayerActivity */
 
@@ -7,29 +30,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_CHANGE_TITLE
-#define org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_CHANGE_TITLE 1L
-#undef org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_UNUSED
-#define org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_UNUSED 2L
-#undef org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_TEXTEDIT_HIDE
-#define org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_TEXTEDIT_HIDE 3L
-#undef org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_USER
-#define org_easyrpg_player_player_EasyRpgPlayerActivity_COMMAND_USER 32768L
-/*
- * Class:     org_easyrpg_player_EasyRpgPlayerActivity
- * Method:    endGame
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endGame
-  (JNIEnv *, jclass);
 
-/*
- * Class:     org_easyrpg_player_EasyRpgPlayerActivity
- * Method:    setFastForwardMultiplier
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_setFastForwardMultiplier
-  (JNIEnv *, jclass, jint);
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endGame(JNIEnv *, jclass);
+
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_resetGame(JNIEnv *, jclass);
+
+JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_toggleFps(JNIEnv *, jclass);
 
 JNIEXPORT void JNICALL
 Java_org_easyrpg_player_player_EasyRpgPlayerActivity_openSettings(JNIEnv *, jclass);

From 9fec8a31e3a654be531d673a7c9035c8338aa7f1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 27 May 2024 11:09:16 +0200
Subject: [PATCH 145/222] Regression fix of the Scene refactor: Battle skills
 were not listed correctly

Somehow the compiler does not complain when you pass an integer to a parameter of type "const Game_Actor&".
---
 src/scene_battle_rpg2k.cpp  | 2 +-
 src/scene_battle_rpg2k3.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scene_battle_rpg2k.cpp b/src/scene_battle_rpg2k.cpp
index 12a768b48..1026e3c9d 100644
--- a/src/scene_battle_rpg2k.cpp
+++ b/src/scene_battle_rpg2k.cpp
@@ -651,7 +651,7 @@ Scene_Battle_Rpg2k::SceneActionReturn Scene_Battle_Rpg2k::ProcessSceneActionSkil
 		ResetWindows(true);
 
 		skill_window->SetActive(true);
-		skill_window->SetActor(active_actor->GetId());
+		skill_window->SetActor(*active_actor);
 		if (previous_state == State_SelectCommand) {
 			skill_window->RestoreActorIndex(actor_index - 1);
 		}
diff --git a/src/scene_battle_rpg2k3.cpp b/src/scene_battle_rpg2k3.cpp
index e2c2a5406..7f42653e4 100644
--- a/src/scene_battle_rpg2k3.cpp
+++ b/src/scene_battle_rpg2k3.cpp
@@ -1516,7 +1516,7 @@ Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneActionSk
 		ResetWindows(true);
 
 		skill_window->SetActive(true);
-		skill_window->SetActor(active_actor->GetId());
+		skill_window->SetActor(*active_actor);
 		if (previous_state == State_SelectCommand) {
 			skill_window->RestoreActorIndex(actor_index);
 		}

From dd068009bda29372a69401e216092ac918f079e6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 27 May 2024 11:09:31 +0200
Subject: [PATCH 146/222] Fix warnings

---
 src/async_handler.cpp        | 1 -
 src/audio_decoder_midi.cpp   | 6 +++---
 src/dynrpg_textplugin.cpp    | 4 ++--
 src/game_interpreter.cpp     | 9 ++++-----
 src/game_interpreter_map.cpp | 4 ++--
 src/game_strings.cpp         | 5 ++---
 src/game_strings.h           | 2 +-
 src/maniac_patch.cpp         | 2 +-
 src/scene_equip.cpp          | 1 -
 src/scene_skill.cpp          | 1 -
 src/scene_skill.h            | 2 +-
 src/scene_status.cpp         | 1 -
 src/scene_status.h           | 2 +-
 src/sprite_airshipshadow.h   | 6 ------
 src/sprite_character.h       | 6 ------
 src/spriteset_map.cpp        | 4 ----
 src/utils.cpp                | 6 ++++++
 17 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/async_handler.cpp b/src/async_handler.cpp
index bb7fea510..cfd8a7bf4 100644
--- a/src/async_handler.cpp
+++ b/src/async_handler.cpp
@@ -219,7 +219,6 @@ void AsyncHandler::CreateRequestMapping(const std::string& file) {
 void AsyncHandler::ClearRequests() {
 	auto it = async_requests.begin();
 	while (it != async_requests.end()) {
-		auto& req = *it;
 		if (it->second.IsReady()) {
 			it = async_requests.erase(it);
 		} else {
diff --git a/src/audio_decoder_midi.cpp b/src/audio_decoder_midi.cpp
index 31b773ede..1f010ada5 100644
--- a/src/audio_decoder_midi.cpp
+++ b/src/audio_decoder_midi.cpp
@@ -91,11 +91,11 @@ static bool midimsg_validate(uint32_t msg) {
 	// Do some very basic sanity checks on the messages as
 	// invalid messages can cause the underlying MIDI synth to crash.
 	uint8_t event_type = midimsg_get_event_type(msg);
-	uint8_t channel = midimsg_get_channel(msg);
+	//uint8_t channel = midimsg_get_channel(msg);
 	uint8_t value1 = midimsg_get_value1(msg);
-	uint8_t value2 = midimsg_get_value2(msg);
+	//uint8_t value2 = midimsg_get_value2(msg);
 
-	if ((event_type >= 0 && event_type < 64) ||
+	if (event_type < 64 ||
 		(event_type >= 70 && event_type < 84) ||
 		(event_type == 88) ||
 		(event_type >= 91 && event_type < 96) ||
diff --git a/src/dynrpg_textplugin.cpp b/src/dynrpg_textplugin.cpp
index 3d98ddb7f..3a075f1b5 100644
--- a/src/dynrpg_textplugin.cpp
+++ b/src/dynrpg_textplugin.cpp
@@ -138,7 +138,7 @@ class DynRpgText : public Drawable {
 	std::vector<uint8_t> Save(const std::string& id) {
 		std::stringstream ss;
 		ss << x << "," << y << ",";
-		for (int i = 0; i < texts.size(); ++i) {
+		for (size_t i = 0; i < texts.size(); ++i) {
 			std::string t = texts[i];
 			// Replace , with a sentinel 0x01 to not mess up the tokenizer
 			std::replace(t.begin(), t.end(), ',', '\1');
@@ -252,9 +252,9 @@ class DynRpgText : public Drawable {
 
 	std::vector<std::string> texts;
 	BitmapRef bitmap;
+	int pic_id = 1;
 	int x = 0;
 	int y = 0;
-	int pic_id = 1;
 	int color = 0;
 	bool fixed = false;
 };
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index e3b9dd0b4..f0a6f7ed1 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -1769,7 +1769,7 @@ int Game_Interpreter::ValueOrVariableBitfield(int mode, int shift, int val) {
 }
 
 int Game_Interpreter::ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) {
-	assert(com.parameters.size() > val_idx);
+	assert(static_cast<int>(com.parameters.size()) > val_idx);
 
 	if (!Player::IsPatchManiac()) {
 		return com.parameters[val_idx];
@@ -1777,8 +1777,7 @@ int Game_Interpreter::ValueOrVariableBitfield(lcf::rpg::EventCommand const& com,
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
-		int mode = com.parameters[mode_idx];
+	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
 		return ValueOrVariableBitfield(com.parameters[mode_idx], shift, com.parameters[val_idx]);
 	}
 
@@ -1792,7 +1791,7 @@ StringView Game_Interpreter::CommandStringOrVariable(lcf::rpg::EventCommand cons
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
+	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
 		return Main_Data::game_strings->GetWithMode(ToString(com.string), com.parameters[mode_idx], com.parameters[val_idx], *Main_Data::game_variables);
 	}
 
@@ -1806,7 +1805,7 @@ StringView Game_Interpreter::CommandStringOrVariableBitfield(lcf::rpg::EventComm
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() >= std::max(mode_idx, val_idx) + 1) {
+	if (static_cast<int>(com.parameters.size()) >= std::max(mode_idx, val_idx) + 1) {
 		int mode = com.parameters[mode_idx];
 		return Main_Data::game_strings->GetWithMode(ToString(com.string), (mode & (0xF << shift * 4)) >> shift * 4, com.parameters[val_idx], *Main_Data::game_variables);
 	}
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 5bf55e435..e0d4f4257 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -124,7 +124,7 @@ bool Game_Interpreter_Map::RequestMainMenuScene(int subscreen_id, int actor_inde
 			actor_index--;
 			actors = Main_Data::game_party->GetActors();
 
-			if (actor_index < 0 || actor_index >= actors.size()) {
+			if (actor_index < 0 || actor_index >= static_cast<int>(actors.size())) {
 				Output::Warning("RequestMainMenu: Invalid actor party member {}", actor_index);
 				return false;
 			}
@@ -725,7 +725,7 @@ bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& /*
 	return false;
 }
 
-bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const& com) { // code 11950
+bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const&) { // code 11950
 	auto& frame = GetFrame();
 	auto& index = frame.current_command;
 
diff --git a/src/game_strings.cpp b/src/game_strings.cpp
index 1258a854e..52e74c1ce 100644
--- a/src/game_strings.cpp
+++ b/src/game_strings.cpp
@@ -185,7 +185,7 @@ StringView Game_Strings::ToFile(Str_Params params, std::string filename, int enc
 
 	// Maniacs forces the File in Text/ folder with .txt extension
 	filename = "Text/" + filename;
-	
+
 	// EasyRPG Extension: When "*" is at the end of filename, ".txt" is not appended
 	if (Player::HasEasyRpgExtensions() && filename.back() == '*') {
 		filename.pop_back();
@@ -228,7 +228,6 @@ StringView Game_Strings::PopLine(Str_Params params, int offset, int string_out_i
 		return {};
 	}
 
-	int index;
 	std::string result;
 	StringView str = Get(params.string_id);
 
@@ -306,7 +305,7 @@ const Game_Strings::Strings_t& Game_Strings::RangeOp(Str_Params params, int stri
 }
 
 std::string Game_Strings::PrependMin(StringView string, int min_size, char c) {
-	if (string.size() < min_size) {
+	if (static_cast<int>(string.size()) < min_size) {
 		int s = min_size - string.size();
 		return std::string(s, c) + ToString(string);
 	}
diff --git a/src/game_strings.h b/src/game_strings.h
index 38a20c653..ac7f0302e 100644
--- a/src/game_strings.h
+++ b/src/game_strings.h
@@ -127,7 +127,7 @@ inline std::vector<lcf::DBString> Game_Strings::GetLcfData() const {
 
 	for (auto& [index, value]: _strings) {
 		assert(index > 0);
-		if (index >= lcf_data.size()) {
+		if (index >= static_cast<int>(lcf_data.size())) {
 			lcf_data.resize(index + 1);
 		}
 		lcf_data[index - 1] = lcf::DBString(value);
diff --git a/src/maniac_patch.cpp b/src/maniac_patch.cpp
index 7e60fb3d4..0b8875269 100644
--- a/src/maniac_patch.cpp
+++ b/src/maniac_patch.cpp
@@ -673,7 +673,7 @@ StringView ManiacPatch::GetLcfName(int data_type, int id, bool is_dynamic) {
 	case 13: //.cev[a].name
 	{
 		// assuming the vector of common events here is ordered by common event ID
-		if (Game_Map::GetCommonEvents().size() >= id) {
+		if (static_cast<int>(Game_Map::GetCommonEvents().size()) >= id) {
 			return Game_Map::GetCommonEvents()[id - 1].GetName();
 		}
 		break;
diff --git a/src/scene_equip.cpp b/src/scene_equip.cpp
index a945fb651..49149646d 100644
--- a/src/scene_equip.cpp
+++ b/src/scene_equip.cpp
@@ -183,7 +183,6 @@ void Scene_Equip::UpdateEquipSelection() {
 		item_window->SetIndex(0);
 	} else if (actors.size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		const auto& actor = actors[actor_index];
 		actor_index = (actor_index + 1) % actors.size();
 		Scene::Push(std::make_shared<Scene_Equip>(actors, actor_index, equip_window->GetIndex()), true);
 	} else if (actors.size() > 1 && Input::IsTriggered(Input::LEFT)) {
diff --git a/src/scene_skill.cpp b/src/scene_skill.cpp
index 6824c278c..c6077d6a2 100644
--- a/src/scene_skill.cpp
+++ b/src/scene_skill.cpp
@@ -79,7 +79,6 @@ void Scene_Skill::vUpdate() {
 				Scene::PopUntil(Scene::Map);
 				Game_Map::SetNeedRefresh(true);
 			} else if (Algo::IsNormalOrSubskill(*skill)) {
-				int actor_target_index = actor_index;
 				Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Decision));
 				Scene::Push(std::make_shared<Scene_ActorTarget>(skill_id, actor_index));
 				skill_index = skill_window->GetIndex();
diff --git a/src/scene_skill.h b/src/scene_skill.h
index 23c1f7b57..3ee7b9887 100644
--- a/src/scene_skill.h
+++ b/src/scene_skill.h
@@ -44,7 +44,7 @@ class Scene_Skill : public Scene {
 
 private:
 	std::vector<Game_Actor*> actors;
-	/** Actor in the span whose skills are displayed. */
+	/** Actor in the vector whose skills are displayed. */
 	int actor_index;
 	/** Skill to select at startup. */
 	int skill_index;
diff --git a/src/scene_status.cpp b/src/scene_status.cpp
index 4a41a98fc..4026091f8 100644
--- a/src/scene_status.cpp
+++ b/src/scene_status.cpp
@@ -67,7 +67,6 @@ void Scene_Status::vUpdate() {
 		Scene::Pop();
 	} else if (actors.size() > 1 && Input::IsTriggered(Input::RIGHT)) {
 		Main_Data::game_system->SePlay(Main_Data::game_system->GetSystemSE(Main_Data::game_system->SFX_Cursor));
-		const auto& actor = actors[actor_index];
 		actor_index = (actor_index + 1) % actors.size();
 		Scene::Push(std::make_shared<Scene_Status>(actors, actor_index), true);
 	} else if (actors.size() > 1 && Input::IsTriggered(Input::LEFT)) {
diff --git a/src/scene_status.h b/src/scene_status.h
index 1a2504631..8dd2e20df 100644
--- a/src/scene_status.h
+++ b/src/scene_status.h
@@ -37,7 +37,7 @@ class Scene_Status : public Scene {
 	 * Constructor.
 	 *
 	 * @param actors list of actors
-	 * @param index index in the span to show
+	 * @param index index in the vector to show
 	 */
 	Scene_Status(std::vector<Game_Actor*> actors, int actor_index);
 
diff --git a/src/sprite_airshipshadow.h b/src/sprite_airshipshadow.h
index f73226864..96752dcbd 100644
--- a/src/sprite_airshipshadow.h
+++ b/src/sprite_airshipshadow.h
@@ -31,12 +31,6 @@
  */
 class Sprite_AirshipShadow : public Sprite {
 public:
-	enum CloneType {
-		Original = 1,
-		XClone = 2,
-		YClone = 4
-	};
-
 	Sprite_AirshipShadow(int x_offset = 0, int y_offset = 0);
 	void Draw(Bitmap& dst) override;
 	void Update();
diff --git a/src/sprite_character.h b/src/sprite_character.h
index bb8f9187d..09ad7a98a 100644
--- a/src/sprite_character.h
+++ b/src/sprite_character.h
@@ -32,12 +32,6 @@ struct FileRequestResult;
  */
 class Sprite_Character : public Sprite {
 public:
-	enum CloneType {
-		Original = 1,
-		XClone = 2,
-		YClone = 4
-	};
-
 	/**
 	 * Constructor.
 	 *
diff --git a/src/spriteset_map.cpp b/src/spriteset_map.cpp
index 0d16a5277..8dce2e7cb 100644
--- a/src/spriteset_map.cpp
+++ b/src/spriteset_map.cpp
@@ -208,8 +208,6 @@ bool Spriteset_Map::RequireClear(DrawableList& drawable_list) {
 }
 
 void Spriteset_Map::CreateSprite(Game_Character* character, bool create_x_clone, bool create_y_clone) {
-	using CloneType = Sprite_Character::CloneType;
-
 	auto add_sprite = [&](auto&& chara) {
 		chara->SetRenderOx(map_render_ox);
 		chara->SetRenderOy(map_render_oy);
@@ -234,8 +232,6 @@ void Spriteset_Map::CreateSprite(Game_Character* character, bool create_x_clone,
 }
 
 void Spriteset_Map::CreateAirshipShadowSprite(bool create_x_clone, bool create_y_clone) {
-	using CloneType = Sprite_AirshipShadow::CloneType;
-
 	auto add_sprite = [&](auto&& chara) {
 		chara->SetRenderOx(map_render_ox);
 		chara->SetRenderOy(map_render_oy);
diff --git a/src/utils.cpp b/src/utils.cpp
index 0dc36fac6..38ba68633 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -474,6 +474,8 @@ void Utils::SwapByteOrder(uint16_t& us) {
 #ifdef WORDS_BIGENDIAN
 	us =	(us >> 8) |
 			(us << 8);
+#else
+	(void)us;
 #endif
 }
 
@@ -483,6 +485,8 @@ void Utils::SwapByteOrder(uint32_t& ui) {
 			((ui<<8) & 0x00FF0000) |
 			((ui>>8) & 0x0000FF00) |
 			(ui << 24);
+#else
+	(void)ui;
 #endif
 }
 
@@ -494,6 +498,8 @@ void Utils::SwapByteOrder(double& d) {
 	uint32_t tmp = p[0];
 	p[0] = p[1];
 	p[1] = tmp;
+#else
+	(void)d;
 #endif
 }
 

From f5faba432f1f2990c479b153c030a9043ef30e77 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sun, 2 Jun 2024 14:11:14 +0200
Subject: [PATCH 147/222] Wii U: Bundle Icons and Splash screens

---
 CMakeLists.txt                |   6 ++++--
 resources/wiiu/icon.png       | Bin 0 -> 9295 bytes
 resources/wiiu/splash-drc.png | Bin 0 -> 10757 bytes
 resources/wiiu/splash-tv.png  | Bin 0 -> 4085 bytes
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 resources/wiiu/icon.png
 create mode 100644 resources/wiiu/splash-drc.png
 create mode 100644 resources/wiiu/splash-tv.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e1cdd57..208374b91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1257,9 +1257,11 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 		wut_create_rpx(easyrpg-player)
 		wut_create_wuhb(easyrpg-player
 			NAME "EasyRPG Player ${PLAYER_VERSION_FULL}"
-			SHORT_NAME "Player"
+			SHORTNAME "EasyRPG Player"
 			AUTHOR "EasyRPG Team"
-		) # todo icon, splashs)
+			ICON resources/wiiu/icon.png
+			TVSPLASH resources/wiiu/splash-tv.png
+			DRCSPLASH resources/wiiu/splash-drc.png)
 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.rpx
 				${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.wuhb
 			DESTINATION . COMPONENT wiiu)
diff --git a/resources/wiiu/icon.png b/resources/wiiu/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e2300781f410ecedf95328ad5980c7260121588
GIT binary patch
literal 9295
zcmV-VB(U3wP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il001BWNkl<Zc-rlq
zca$X8b>4qf)p0scPfzN}VRJxQEYgw$2oL~4g0d)4A}PzJf+<q8E$JLvlqDZYR-)u1
zADbd+Qx-wXHcb<hL>`&}L?8$*00LNGcY$5(VsqY|-O1Crx~iW4=rG+g9jZD3p!S_J
zXJ)FaUsb*DyWhL-zWZKDSS${wWBoy?@;@bqHv+qW?MQ3@MuC1H2)OHCRWfm;-Ukg9
zVdb!Br2Z7J1k3>Efa3xV0sDYsWpxS*w<>C%Eb^aAO%tF3`1wN*1Mdai4NNt5H50(M
z8gPq*XbBOjlk6n$6o~Hv-)bcZgb*M}O%R~6)o+*JqrlGrV`f3hq%vGDx#Dy=s{wiz
z#MgkY0EcQ3!3qf)BY-58Tt))8Rf3NLzto5%Unf9y0;~sB06YTH7ZKv6W=Wt}y+Orp
zD+PZP_yY<48o0U9{#e)a>&WMe&2FpH8A<>*0>6YLg^+jySg!4sNi8IRt?(7;W55?A
zct0SoySgdxb0_MWb{+Xr0#s?gH6)OM+d#S>i6n5a5&LU|0D~a?8Sp0(L>jaD@+Z7b
zfGP@5p9BCAkUo(6%|Rem@%$<(V3h!OC^p+)O7Ib>p&^*G?hzzFyH0@WU4T@p6{S*{
zzZKXDoB=MFHfRg?_Av10ip{pCaqufK6SVAg0@U;YB$MqbF_rfZW^yrv`YK?S06z=-
zF|fmCYvcykTYd2laa{q-IDsa+1AqZwCol^fsYrqnA}A&;|Brz!0P6@~lAY2Tt1pgK
zt}DPA0@%%pXk`*e1;2o;z{QG6U_k-y0R9}<QM^H$%>?*Tb$&{#z!yHaPJp!vP-7Tn
zjRYHk!?k>ZS_Bvb{u0<zc7p{1NDWwhDflJjIssOTy{rppgal;=27oB=bYXO`wkxP5
z;GYA2y<()wB=}YXLjUMX)p;LtGg6{@MV|*gRq1Qh6yRgPpICBI-eTZOlGN1Cn{(53
z$4oWNUaEfnt-$$0ut=&?^C<8=U~{EwI^E8<Eck1ID^7W?Ij-0x?9Or`XOdYAUDT}S
z?WF|kDme-~NN&oxc({@||3)?NEsgZ0&V#-da7mJoWbkym2@QL3cH41!9ViaDVqMvI
zmdvt7YAM6w`538~TJ;)jR|2u_&t@yxoX7SzYr%9Y@O&-jaJ>RZ9S6S}Af?A$UOSQL
zApQ|gRlw_&^s>s_v1Jx7#44&o+sPp6^zYVHK+litUaIB;{0Az{>Q(gtDoB5az%RA-
z(tg|SR2aUokHMRJaEG19O5-<Vb1C?v9(pDM=oy3bvbyfNo$?7985vY?D&#!o->USr
z?Z9jG?x|b>q>h1K3HY_8d(_9k4dI3@zFtXOOLP8(t7J3!y8CFW8VHjrU`91^f9@cc
zc2=eUzXjZ7E>O`q@C%k!%km@{MsMz?cU!P2i?3H49vj``ep2%pvMH_ZeYIK%q*nB?
zxv#DOPp+-$45evYH5H&U(qC#_l^R!)VQ6QB$Ob=}(K%0D7;x$3Sr*R4%KU-0s)1;1
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

literal 0
HcmV?d00001

diff --git a/resources/wiiu/splash-drc.png b/resources/wiiu/splash-drc.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87d7ca6a186efbca015eefffd027268ba074907
GIT binary patch
literal 10757
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

literal 0
HcmV?d00001

diff --git a/resources/wiiu/splash-tv.png b/resources/wiiu/splash-tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..50a3a96f33c43014ae2d29f83fb793c478d91fb0
GIT binary patch
literal 4085
zcmeAS@N?(olHy`uVBq!ia0y~yU<ERnE^sgbDF=BkMg|7{J)SO(Ar-gY-Zad5?7+}=
zu|n{~^c!XT6E1D_x}F!JyJX`>#w#-&xa1u?mTH@GzYJRCCtR@mf!2fWCB}(~t{Wz2
zn0$`Q7CN^7IH&xqCzt=Q0ZmT&ewYPFaU=i<fdfE7p#f-<0|PSyLjway0V5BPV3Gh5
zECwhnVzi)X#;*mdeK@t?b|N+{1bl_2g_wXqXhE=uu>~B8L~B6=Jbo>sVK*F->d;Gf
zkdk4zXLFVfoWSHobnMV3ix0t|{?T!U<-+3XI-^68hO?tDO`7)SQgH9bGvDj$c6X)E
zK6-A_w4OB2j!EhVfT4@Oe50%ent0lWp*dphbT^KglgsjSXTJHp_u1w5^XAv=o1e7*
z?Y<Z0(?cg-$=#mv!<*^;G2sNDYlw})h9jwJ4UQ(I*1L?wH}6!vdottQlaB>nuRhB@
z{;j+Ekoe_Ejz52Yy7l?h;m5HJ>GyQX>?|tIlWYS+L;ad-r@QO7t-Q_P&&qJ8f(ckD
z6J6v_*mH)(pyO&)X3K%;Ij^pr?W{Oicl_|lm2BJZm)WkL7Ap8)<*^+qif?SL)V8ry
zl4kS{kkQNX+{>ROnel%J0UCR@QKR+eTfNnbo?ktilzy_q*5;lh<FRw3`<cNleg9j%
ze>XR2@o-E~^9MCch|YmR<|mi$6n#)%clV#kp_?BIxC%~Y`<Wgy-aYyL=a<LJi}&20
zvj1-4J(>Tzga27`GJj$LwQq<m#S{uB*UX9rI;Y_UX`w|-^8n#R1dEua4$;{MtdQ8`
zJu=#S90|g}=qEaMMuQq7ClVcYV1+bF*~GS$hhRmD2r&d}c$Nyp_zIEQ5G-P9!+{IC
d2LF$2H@tcu2W^??4lHUIJYD@<);T3K0RUYj@VWp1

literal 0
HcmV?d00001


From 0247d174f9546d131ea83c4a9a6ccf09db1623df Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Sun, 2 Jun 2024 15:26:04 +0200
Subject: [PATCH 148/222] CMakeLists.txt: Simplify Support bundling a game for
 Wii U

---
 CMakeLists.txt                          | 106 +++++++++++-------------
 CMakePresets.json                       |   4 -
 builds/cmake/CMakePresets.json.template |   4 -
 builds/cmake/gen-cmake-presets.py       |   0
 docs/BUILDING.md                        |  11 ++-
 5 files changed, 52 insertions(+), 73 deletions(-)
 mode change 100644 => 100755 builds/cmake/gen-cmake-presets.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 208374b91..dda4cb35c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -539,8 +539,22 @@ set_property(SOURCE src/version.cpp PROPERTY COMPILE_DEFINITIONS
 )
 
 # Platform setup
-set(PLAYER_TARGET_PLATFORM "SDL2" CACHE STRING "Platform to compile for. Options: SDL2 SDL1 libretro psvita 3ds switch wii amigaos4")
-set_property(CACHE PLAYER_TARGET_PLATFORM PROPERTY STRINGS SDL2 SDL1 libretro psvita 3ds switch wii amigaos4)
+if(NINTENDO_3DS)
+	set(PLAYER_TARGET_PLATFORM "3ds" CACHE STRING "Platform to compile for.")
+elseif(NINTENDO_SWITCH)
+	set(PLAYER_TARGET_PLATFORM "switch" CACHE STRING "Platform to compile for.")
+elseif(VITA)
+	set(PLAYER_TARGET_PLATFORM "psvita" CACHE STRING "Platform to compile for.")
+elseif(NINTENDO_WII)
+	set(PLAYER_TARGET_PLATFORM "wii" CACHE STRING "Platform to compile for.")
+elseif(NINTENDO_WIIU)
+	set(PLAYER_TARGET_PLATFORM "SDL2" CACHE STRING "Platform to compile for.")
+elseif(AMIGA)
+	set(PLAYER_TARGET_PLATFORM "SDL1" CACHE STRING "Platform to compile for.")
+else()
+	set(PLAYER_TARGET_PLATFORM "SDL2" CACHE STRING "Platform to compile for. Options: SDL2 SDL1 libretro")
+	set_property(CACHE PLAYER_TARGET_PLATFORM PROPERTY STRINGS SDL2 SDL1 libretro)
+endif()
 set(PLAYER_BUILD_EXECUTABLE ON)
 set(PLAYER_TEST_LIBRARIES ${PROJECT_NAME})
 
@@ -601,9 +615,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
 	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/libretro)
 	target_link_libraries(${PROJECT_NAME} retro_common)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "3ds")
-	if(NOT NINTENDO_3DS)
-		message(FATAL_ERROR "Missing toolchain file! Use '-DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/3DS.cmake' option.")
-	endif()
 	target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_UI=CtrUi PLAYER_NINTENDO)
 	target_compile_options(${PROJECT_NAME} PUBLIC -Wno-psabi) # Remove abi warning after devkitarm ships newer gcc
 	# generate gfx assets
@@ -634,9 +645,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "3ds")
 		src/platform/3ds/ui.h)
 	target_link_libraries(${PROJECT_NAME} 3ds-assets)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "psvita")
-	if(NOT VITA)
-		message(FATAL_ERROR "Missing toolchain file! Use '-DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake' option.")
-	endif()
 	include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_UI=Psp2Ui)
 	target_compile_options(${PROJECT_NAME} PUBLIC -Wno-psabi) # Remove abi warning after vitasdk ships newer gcc
@@ -649,9 +657,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "psvita")
 		src/platform/psvita/ui.cpp
 		src/platform/psvita/ui.h)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "switch")
-	if(NOT NINTENDO_SWITCH)
-		message(FATAL_ERROR "Missing toolchain file! Use '-DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/Switch.cmake' option.")
-	endif()
 	target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_UI=NxUi PLAYER_NINTENDO)
 	find_package(OpenGL CONFIG REQUIRED)
 	find_library(GLAD glad REQUIRED)
@@ -671,12 +676,7 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "switch")
 		src/platform/switch/ui.h)
 	target_link_libraries(${PROJECT_NAME} switch-assets)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
-	if(NOT NINTENDO_WII)
-		message(FATAL_ERROR "Missing toolchain file! Use '-DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/Wii.cmake' option.")
-	endif()
-	find_package(SDL REQUIRED)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=1 PLAYER_NINTENDO)
-	target_include_directories(${PROJECT_NAME} PUBLIC ${SDL_INCLUDE_DIR})
 	target_sources(${PROJECT_NAME} PRIVATE
 		src/platform/wii/audio.cpp
 		src/platform/wii/audio.h
@@ -686,19 +686,7 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
 		src/platform/sdl/axis.h
 		src/platform/sdl/sdl_ui.cpp
 		src/platform/sdl/sdl_ui.h)
-elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "amigaos4")
-	if(NOT AMIGAOS4)
-		message(FATAL_ERROR "Missing toolchain file! Use '-DCMAKE_TOOLCHAIN_FILE=path/to/ppc-amigaos.cmake' option.")
-	endif()
-	find_package(SDL REQUIRED)
-	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=1)
-	target_include_directories(${PROJECT_NAME} PUBLIC ${SDL_INCLUDE_DIR})
-	target_sources(${PROJECT_NAME} PRIVATE
-		src/platform/sdl/sdl_audio.cpp
-		src/platform/sdl/sdl_audio.h
-		src/platform/sdl/axis.h
-		src/platform/sdl/sdl_ui.cpp
-		src/platform/sdl/sdl_ui.h)
+	player_find_package(NAME SDL1 TARGET SDL::SDLmain REQUIRED)
 else()
 	message(FATAL_ERROR "Invalid target platform")
 endif()
@@ -710,13 +698,17 @@ if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|psvita|switch|wii)$" OR NINTENDO_WII
 	set(PLAYER_ENABLE_TESTS OFF)
 	option(PLAYER_VERSIONED_PACKAGES "Create zip packages with versioned name (for internal use)" ON)
 endif()
-# Make romfs available
-if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|switch)$")
-	option(PLAYER_ROMFS "Embedd a directory in the executable" OFF)
-	set(PLAYER_ROMFS_PATH "romfs" CACHE PATH "Directory to include in executable as romfs:/ path")
-	set(ROMFS_ARG "NO_ROMFS_IGNORE_ME")
-	if(PLAYER_ROMFS)
-		set(ROMFS_ARG "ROMFS")
+# Make content available (romfs/wuhb bundle)
+if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|switch)$" OR NINTENDO_WIIU)
+	option(PLAYER_BUNDLE "Embedd a directory in the executable" OFF)
+	set(PLAYER_BUNDLE_PATH "content" CACHE PATH "Directory to include in executable")
+	set(BUNDLE_ARG "_IGNORE_ME")
+	if(PLAYER_BUNDLE)
+		if(NINTENDO_WIIU)
+			set(BUNDLE_ARG "CONTENT")
+		else()
+			set(BUNDLE_ARG "ROMFS")
+		endif()
 	endif()
 endif()
 
@@ -914,21 +906,17 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL1")
 	set(PLAYER_AUDIO_BACKEND "SDL1" CACHE STRING "Audio system to use. Options: SDL1 OFF")
 	set_property(CACHE PLAYER_AUDIO_BACKEND PROPERTY STRINGS SDL1 OFF)
 else()
+	# Assuming that all platforms not targeting SDL have only one audio backend
 	set(PLAYER_AUDIO_BACKEND "Default" CACHE STRING "Audio system to use. Options: Default OFF")
 	set_property(CACHE PLAYER_AUDIO_BACKEND PROPERTY STRINGS Default OFF)
-
-	if(${PLAYER_AUDIO_BACKEND} STREQUAL "Default")
-		# Assuming that all platforms not targeting SDL have only one audio backend
-		set(PLAYER_AUDIO_BACKEND ${PLAYER_TARGET_PLATFORM})
-	endif()
 endif()
 
 # Configure Audio backends
-if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii|amigaos4)$")
+if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL[12]|Default)$")
 	set(PLAYER_HAS_AUDIO ON)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC SUPPORT_AUDIO=1)
 
-	if(${PLAYER_AUDIO_BACKEND} STREQUAL "libretro")
+	if(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
 		if (WIN32 OR UNIX OR APPLE)
 			set(SUPPORT_NATIVE_MIDI ON)
 		endif()
@@ -983,7 +971,7 @@ CMAKE_DEPENDENT_OPTION(PLAYER_WITH_FLUIDLITE "Play MIDI audio with fluidlite" ON
 CMAKE_DEPENDENT_OPTION(PLAYER_WITH_XMP "Play MOD audio with libxmp" ON "PLAYER_HAS_AUDIO" OFF)
 CMAKE_DEPENDENT_OPTION(PLAYER_ENABLE_DRWAV "Play WAV audio with dr_wav (built-in). Unsupported files are played by libsndfile." ON "PLAYER_HAS_AUDIO" OFF)
 
-if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii|amigaos4)$")
+if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL[12]|Default)$")
 	set(PLAYER_AUDIO_RESAMPLER "Auto" CACHE STRING "Audio resampler to use. Options: Auto speexdsp samplerate OFF")
 	set_property(CACHE PLAYER_AUDIO_RESAMPLER PROPERTY STRINGS Auto speexdsp samplerate OFF)
 
@@ -1099,7 +1087,7 @@ if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii|a
 endif()
 
 # Executable
-if(${PLAYER_BUILD_EXECUTABLE} AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL(1|2)$" AND NOT NINTENDO_WIIU)
+if(${PLAYER_BUILD_EXECUTABLE} AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL[12]$" AND NOT NINTENDO_WIIU)
 	if(APPLE)
 		set(EXE_NAME "EasyRPG-Player.app")
 		set_source_files_properties(${${PROJECT_NAME}_BUNDLE_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
@@ -1215,7 +1203,7 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 			ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/3ds/icon.png)
 		ctr_create_3dsx(easyrpg-player
 			SMDH easyrpg-player.smdh
-			${ROMFS_ARG} ${PLAYER_ROMFS_PATH})
+			${BUNDLE_ARG} ${PLAYER_BUNDLE_PATH})
 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.3dsx
 				resources/3ds/easyrpg-player.xml # consider removing, *hax² is mostly obsolete
 			DESTINATION easyrpg-player COMPONENT 3ds)
@@ -1231,14 +1219,13 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 		nx_create_nro(easyrpg-player
 			NACP easyrpg-player.nacp
 			ICON "${PROJECT_SOURCE_DIR}/resources/switch/icon.jpg"
-			${ROMFS_ARG} ${PLAYER_ROMFS_PATH})
+			${BUNDLE_ARG} ${PLAYER_BUNDLE_PATH})
 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.nro
 			DESTINATION easyrpg-player COMPONENT switch)
 	elseif(NINTENDO_WII)
 		add_executable(easyrpg-player src/platform/wii/main.cpp)
 		target_link_libraries(easyrpg-player
 			${PROJECT_NAME}
-			${SDL_LIBRARIES}
 			-laesnd
 			-lfat
 			-lwiikeyboard)
@@ -1261,7 +1248,8 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 			AUTHOR "EasyRPG Team"
 			ICON resources/wiiu/icon.png
 			TVSPLASH resources/wiiu/splash-tv.png
-			DRCSPLASH resources/wiiu/splash-drc.png)
+			DRCSPLASH resources/wiiu/splash-drc.png
+			${BUNDLE_ARG} ${PLAYER_BUNDLE_PATH})
 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.rpx
 				${CMAKE_CURRENT_BINARY_DIR}/easyrpg-player.wuhb
 			DESTINATION . COMPONENT wiiu)
@@ -1317,12 +1305,6 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 	set(CPACK_ARCHIVE_DEBUG_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PLATFORM}-debug")
 	set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY OFF) # we do this manually
 	include(CPack)
-elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "amigaos4")
-	add_executable(easyrpg-player "src/platform/sdl/main.cpp")
-	target_link_libraries(easyrpg-player
-		${PROJECT_NAME}
-		${SDL_LIBRARIES})
-	# FIXME: packaging?
 else() # library
 	if(${PLAYER_TARGET_PLATFORM} STREQUAL "libretro")
 		add_library(easyrpg_libretro
@@ -1495,9 +1477,15 @@ endif()
 
 # Print summary
 message(STATUS "")
-message(STATUS "Target system: ${PLAYER_TARGET_PLATFORM}")
-if(PLAYER_ROMFS)
-	message(STATUS "RomFS: Embedding directory \"${PLAYER_ROMFS_PATH}\"")
+set(TARGET_STATUS "${PLAYER_TARGET_PLATFORM}")
+if(NINTENDO_WIIU)
+	set(TARGET_STATUS "Wii U (SDL2)")
+elseif(AMIGA)
+	set(TARGET_STATUS "Amiga (SDL1)")
+endif()
+message(STATUS "Target system: ${TARGET_STATUS}")
+if(PLAYER_BUNDLE)
+	message(STATUS "Embedding directory \"${PLAYER_BUNDLE_PATH}\"")
 endif()
 message(STATUS "")
 
@@ -1507,7 +1495,7 @@ if(PLAYER_BUILD_LIBLCF)
 endif()
 
 message(STATUS "Audio backend: ${PLAYER_AUDIO_BACKEND}")
-if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL2|SDL1|libretro|psvita|3ds|switch|wii)$")
+if(${PLAYER_AUDIO_BACKEND} MATCHES "^(SDL[12]|Default)$")
 	message(STATUS "")
 
 	set(WAV_LIBS)
diff --git a/CMakePresets.json b/CMakePresets.json
index 2f2d4e5da..53ff62878 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -417,7 +417,6 @@
 			"name": "3ds-parent",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "3ds",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
 			},
 			"inherits": "dkp-user",
@@ -478,7 +477,6 @@
 			"name": "switch-parent",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "switch",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch"
 			},
 			"inherits": "dkp-user",
@@ -539,7 +537,6 @@
 			"name": "wii-parent",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "wii",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii"
 			},
 			"inherits": "dkp-user",
@@ -660,7 +657,6 @@
 			"name": "psvita-parent",
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/vita/vitasdk/share/vita.toolchain.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "psvita",
 				"BUILD_SHARED_LIBS": "OFF"
 			},
 			"hidden": true,
diff --git a/builds/cmake/CMakePresets.json.template b/builds/cmake/CMakePresets.json.template
index 15a21b7ea..c611d2508 100644
--- a/builds/cmake/CMakePresets.json.template
+++ b/builds/cmake/CMakePresets.json.template
@@ -77,7 +77,6 @@
 			"displayName": "Nintendo 3DS",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/3DS.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "3ds",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/3ds"
 			},
 			"inherits": "dkp-user"
@@ -87,7 +86,6 @@
 			"displayName": "Nintendo Switch",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "switch",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/switch"
 			},
 			"inherits": "dkp-user"
@@ -97,7 +95,6 @@
 			"displayName": "Nintendo Wii",
 			"toolchainFile": "$env{DEVKITPRO}/cmake/Wii.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "wii",
 				"PLAYER_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/wii"
 			},
 			"inherits": "dkp-user"
@@ -116,7 +113,6 @@
 			"displayName": "PlayStation Vita",
 			"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS}/vita/vitasdk/share/vita.toolchain.cmake",
 			"cacheVariables": {
-				"PLAYER_TARGET_PLATFORM": "psvita",
 				"BUILD_SHARED_LIBS": "OFF"
 			}
 		}
diff --git a/builds/cmake/gen-cmake-presets.py b/builds/cmake/gen-cmake-presets.py
old mode 100644
new mode 100755
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 83856138b..567acdd7f 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -94,13 +94,13 @@ The unsigned APK is stored in:
     app/build/outputs/apk/release/app-release-unsigned.apk
 
 
-## Nintendo and Sony Homebrew ports (Wii, 3DS, Switch, PSVita/PSTV)
+## Nintendo and Sony Homebrew ports (Wii (U), 3DS, Switch, PSVita/PSTV)
 
 This is based on the CMake method.
 
 Building requirements:
 
-- devkitPPC for Wii
+- devkitPPC for Wii and Wii U
 - devkitARM for 3DS
 - devkitA64 for Switch
 - vitasdk for PSVita/PSTV
@@ -110,13 +110,12 @@ and vitasdk: https://vitasdk.org
 
 Invoke CMake with these additional parameters:
 
-    -DCMAKE_TOOLCHAIN_FILE=<DEVKITPRO>/cmake/3DS|Switch|Wii.cmake
+    -DCMAKE_TOOLCHAIN_FILE=<DEVKITPRO>/cmake/3DS|Switch|Wii|WiiU.cmake
                          (or <VITASDK>/share/vita.toolchain.cmake)
-    -DPLAYER_TARGET_PLATFORM=3ds|switch|wii|psvita
 
-Switch and 3DS support romfs game loading, use these parameters:
+Switch, Wii U and 3DS support shipping games, use these parameters:
 
-    -DPLAYER_ROMFS=ON -DPLAYER_ROMFS_PATH=path/to/myGame
+    -DPLAYER_BUNDLE=ON -DPLAYER_BUNDLE_PATH=path/to/myGame
 
 
 [buildscripts]: https://github.com/EasyRPG/buildscripts

From cb3d941153c7fc5cf65276fefb60f04827363fe5 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Mon, 3 Jun 2024 01:38:49 +0200
Subject: [PATCH 149/222] Wii U: Handle main loop Support shipped games Better
 CWD handling

---
 CMakeLists.txt               |   2 +-
 src/platform/sdl/main.cpp    |  17 ++---
 src/platform/sdl/sdl2_ui.cpp |  18 ++---
 src/platform/wiiu/main.cpp   | 136 +++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+), 27 deletions(-)
 create mode 100644 src/platform/wiiu/main.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dda4cb35c..a0594bde8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1239,7 +1239,7 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 			${CMAKE_CURRENT_BINARY_DIR}/resources/wii/meta.xml
 			DESTINATION easyrpg-player COMPONENT wii)
 	elseif(NINTENDO_WIIU)
-		add_executable(easyrpg-player src/platform/sdl/main.cpp)
+		add_executable(easyrpg-player src/platform/wiiu/main.cpp)
 		target_link_libraries(easyrpg-player ${PROJECT_NAME})
 		wut_create_rpx(easyrpg-player)
 		wut_create_wuhb(easyrpg-player
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index 9924e4746..aeffa5b80 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -31,17 +31,14 @@
 #elif defined(__ANDROID__)
 #  include <android/log.h>
 #  include "platform/android/android.h"
-#elif defined(__WIIU__)
-#  include <coreinit/debug.h>
 #endif
 
-#if defined(__ANDROID__) || defined(__WIIU__)
+#ifdef __ANDROID__
 static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserData /* userdata */) {
-#  if defined(__ANDROID__)
-#    ifdef NDEBUG
+#  ifdef NDEBUG
 	// docs say debugging logs should be disabled for release builds
 	if (lvl == LogLevel::Debug || lvl == LogLevel::Info) return;
-#    endif
+#  endif
 
 	int prio = (lvl == LogLevel::Error) ? ANDROID_LOG_ERROR :
 		(lvl == LogLevel::Warning) ? ANDROID_LOG_WARN :
@@ -49,12 +46,6 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 		ANDROID_LOG_INFO;
 
 	__android_log_write(prio, GAME_TITLE, msg.c_str());
-#  elif defined(__WIIU__)
-	std::string m = std::string("[" GAME_TITLE "] ") +
-		Output::LogLevelToString(lvl) + ": " + msg;
-
-	OSReport("%s\n", m.c_str());
-#  endif
 }
 #endif
 
@@ -80,7 +71,7 @@ extern "C" int main(int argc, char* argv[]) {
 	args.assign(argv, argv + argc);
 #endif
 
-#if defined(__WIIU__) || defined(__ANDROID__)
+#ifdef __ANDROID__
 	Output::SetLogCallback(LogCallback);
 #endif
 
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 416c57595..fe21e034a 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -155,9 +155,6 @@ Sdl2Ui::Sdl2Ui(long width, long height, const Game_Config& cfg) : BaseUi(cfg)
 	// Only handle keyboard events when the canvas has focus
 	SDL_SetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT, "#canvas");
 #endif
-#ifdef __WIIU__
-	//WHBProcInit();
-#endif
 
 	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
 		Output::Error("Couldn't initialize SDL.\n{}\n", SDL_GetError());
@@ -210,10 +207,6 @@ Sdl2Ui::~Sdl2Ui() {
 		SDL_DestroyWindow(sdl_window);
 	}
 	SDL_Quit();
-
-#ifdef __WIIU__
-	//WHBProcShutdown();
-#endif
 }
 
 bool Sdl2Ui::vChangeDisplaySurfaceResolution(int new_width, int new_height) {
@@ -527,6 +520,11 @@ void Sdl2Ui::ToggleZoom() {
 void Sdl2Ui::ProcessEvents() {
 	SDL_Event evnt;
 
+#ifdef __WIIU__
+	if (!WHBProcIsRunning())
+		Player::Exit();
+#endif
+
 #if defined(USE_MOUSE) && defined(SUPPORT_MOUSE)
 	// Reset Mouse scroll
 	keys[Input::Keys::MOUSE_SCROLLUP] = false;
@@ -1265,12 +1263,6 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.vsync.SetOptionVisible(false);
 	cfg.pause_when_focus_lost.Lock(false);
 	cfg.pause_when_focus_lost.SetOptionVisible(false);
-#elif defined(__WIIU__)
-	// FIXME: Some options below may crash, better disable for now
-	cfg.fullscreen.SetOptionVisible(false);
-	cfg.window_zoom.SetOptionVisible(false);
-	cfg.vsync.SetOptionVisible(false);
-	cfg.pause_when_focus_lost.SetOptionVisible(false);
 #endif
 }
 
diff --git a/src/platform/wiiu/main.cpp b/src/platform/wiiu/main.cpp
new file mode 100644
index 000000000..e67a7fb68
--- /dev/null
+++ b/src/platform/wiiu/main.cpp
@@ -0,0 +1,136 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <cstdlib>
+#include <unistd.h>
+#include <string>
+#include <vector>
+#include <chrono>
+#include "player.h"
+#include "utils.h"
+#include "output.h"
+
+#ifdef USE_SDL // SDL might wrap main()
+#  include <SDL.h>
+#endif
+#include <coreinit/debug.h>
+#include <whb/proc.h>
+#include <sysapp/launch.h>
+
+using namespace std::chrono_literals;
+
+#ifdef NDEBUG
+// stubbed
+static void initLogging() {}
+static void deinitLogging() {}
+#else
+#include <whb/log.h>
+#include <whb/log_cafe.h>
+#include <whb/log_module.h>
+#include <whb/log_udp.h>
+
+static bool moduleLogInit = false;
+static bool cafeLogInit = false;
+static bool udpLogInit = false;
+
+static void initLogging() {
+	if (!(moduleLogInit = WHBLogModuleInit())) {
+		cafeLogInit = WHBLogCafeInit();
+		udpLogInit  = WHBLogUdpInit();
+	}
+}
+
+static void deinitLogging() {
+	if (moduleLogInit) {
+		WHBLogModuleDeinit();
+		moduleLogInit = false;
+	}
+	if (cafeLogInit) {
+		WHBLogCafeDeinit();
+		cafeLogInit = false;
+	}
+	if (udpLogInit) {
+		WHBLogUdpDeinit();
+		udpLogInit = false;
+	}
+}
+#endif
+
+static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserData /* userdata */) {
+	std::string m = std::string("[" GAME_TITLE "] ") +
+		Output::LogLevelToString(lvl) + ": " + msg;
+
+#ifdef NDEBUG
+	OSReport("%s\n", m.c_str());
+#else
+	WHBLogPrintf("%s\n", m.c_str());
+#endif
+}
+
+/**
+ * If the main function ever needs to change, be sure to update the `main()`
+ * functions of the other platforms as well.
+ */
+extern "C" int main(int argc, char* argv[]) {
+	std::vector<std::string> args{argv, argv + argc};
+
+	initLogging();
+	WHBProcInit();
+
+	Output::SetLogCallback(LogCallback);
+
+	const char *default_dir = "fs:/vol/external01/wiiu/apps/easyrpg-player";
+
+	// Check if wuhb has some files inside or not
+	if(::access("fs:/vol/content/RPG_RT.lmt", F_OK) == 0) {
+		Output::Debug("Running packaged game from wuhb.");
+		std::string cafe_dir = "fs:/vol/content";
+
+		args.push_back("--project-path");
+		args.push_back(cafe_dir);
+
+		//args.push_back("--save-path");
+		//args.push_back(cafe_dir);
+	} else if(::access(default_dir, F_OK) == 0) {
+		chdir(default_dir);
+	} else {
+		// fall back to current working directory
+		char working_dir[256];
+		getcwd(working_dir, 255);
+		args.push_back("--project-path");
+		args.push_back(working_dir);
+	}
+
+	Player::Init(std::move(args));
+	Player::Run();
+
+	// FIXME: somehow the wiiu sdl2 port does not clean up procui
+	// without launching the menu manually
+#if 1
+	SYSLaunchMenu();
+	while(WHBProcIsRunning()) {
+		Output::Debug("Waiting for shutdown...");
+		Game_Clock::SleepFor(1s);
+	}
+#else
+	WHBProcShutdown();
+#endif
+
+	deinitLogging();
+
+	return EXIT_SUCCESS;
+}

From 9eef79473825f48cf692e230f646da8fb8b934ab Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Mon, 3 Jun 2024 01:39:49 +0200
Subject: [PATCH 150/222] SDL: use system format for audio warn if unsupported

---
 src/platform/sdl/sdl_audio.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/platform/sdl/sdl_audio.cpp b/src/platform/sdl/sdl_audio.cpp
index 063fcfc49..16d0a4ecf 100644
--- a/src/platform/sdl/sdl_audio.cpp
+++ b/src/platform/sdl/sdl_audio.cpp
@@ -64,6 +64,7 @@ AudioDecoder::Format sdl_format_to_format(Uint16 format) {
 			return AudioDecoder::Format::F32;
 #endif
 		default:
+			Output::Warning("Couldn't find GenericAudio format for {:#x}", format);
 			assert(false);
 	}
 
@@ -96,7 +97,7 @@ SdlAudio::SdlAudio(const Game_ConfigAudio& cfg) :
 	SDL_AudioSpec want = {};
 	SDL_AudioSpec have = {};
 	want.freq = frequency;
-	want.format = AUDIO_S16;
+	want.format = AUDIO_S16SYS;
 	want.channels = 2;
 	want.samples = 2048;
 	want.callback = sdl_audio_callback;

From e7c5592858f3f6157494f6a644d83145d36750f5 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Mon, 3 Jun 2024 01:40:57 +0200
Subject: [PATCH 151/222] Wii U: use full paths for consistency

---
 src/decoder_wildmidi.cpp | 7 ++++++-
 src/filefinder_rtp.cpp   | 5 +++--
 src/game_config.cpp      | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/decoder_wildmidi.cpp b/src/decoder_wildmidi.cpp
index a4d00cd7c..f9555dcdf 100644
--- a/src/decoder_wildmidi.cpp
+++ b/src/decoder_wildmidi.cpp
@@ -142,9 +142,14 @@ bool WildMidiDecoder::Initialize(std::string& status_message) {
 	}
 #elif defined(__WIIU__)
 	// preferred SD card directory
-	config_file = "/vol/external01/data/easyrpg-player/wildmidi.cfg";
+	config_file = "fs:/vol/external01/wiiu/apps/easyrpg-player/wildmidi.cfg";
 	found = FileFinder::Root().Exists(config_file);
 
+	// shipped
+	if (!found) {
+		config_file = "fs:/vol/content/wildmidi.cfg";
+		found = FileFinder::Root().Exists(config_file);
+	}
 	// Current directory
 	if (!found) {
 		config_file = "wildmidi.cfg";
diff --git a/src/filefinder_rtp.cpp b/src/filefinder_rtp.cpp
index 7753a527c..eb2b273e8 100644
--- a/src/filefinder_rtp.cpp
+++ b/src/filefinder_rtp.cpp
@@ -52,8 +52,9 @@ FileFinder_RTP::FileFinder_RTP(bool no_rtp, bool no_rtp_warnings, std::string rt
 	AddPath("sd:/data/rtp/" + version_str);
 	AddPath("usb:/data/rtp/" + version_str);
 #elif defined(__WIIU__)
-	AddPath("./rtp/" + version_str);
-	AddPath("/data/easyrpg-player/rtp/" + version_str);
+	AddPath("fs:/vol/content/rtp/" + version_str); // shipped
+	AddPath("rtp/" + version_str);
+	AddPath("fs:/vol/external01/wiiu/data/easyrpg-player/rtp/" + version_str);
 #elif defined(__SWITCH__)
 	AddPath("./rtp/" + version_str);
 	AddPath("/switch/easyrpg-player/rtp/" + version_str);
diff --git a/src/game_config.cpp b/src/game_config.cpp
index f91f6c720..2b31ac308 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -124,7 +124,7 @@ FilesystemView Game_Config::GetGlobalConfigFilesystem() {
 #ifdef __wii__
 		path = "/data/easyrpg-player";
 #elif defined(__WIIU__)
-		path = "/vol/external01/data/easyrpg-player"; // temp
+		path = "fs:/vol/external01/wiiu/apps/easyrpg-player";
 #elif defined(__SWITCH__)
 		path = "/switch/easyrpg-player";
 #elif defined(__3DS__)

From a92515999b954d7d2d42eca3126519031c5ec6db Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 3 Jun 2024 19:44:21 +0200
Subject: [PATCH 152/222] Wii U: Manually handle ProcUI without the WHB wrapper

The ProcUI API is very unstable and querying it crashes when a shutdown was requested.

For more control use it directly.
---
 CMakeLists.txt               |  1 +
 src/platform/sdl/sdl2_ui.cpp |  8 ------
 src/platform/wiiu/main.cpp   | 53 ++++++++++++++++++++++++++----------
 src/platform/wiiu/main.h     | 19 +++++++++++++
 src/player.cpp               |  8 ++++++
 5 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 src/platform/wiiu/main.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0594bde8..7c7284616 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,6 +593,7 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
 	if(NINTENDO_WIIU)
 		target_compile_definitions(${PROJECT_NAME} PUBLIC PLAYER_NINTENDO)
 		target_sources(${PROJECT_NAME} PRIVATE
+			src/platform/wiiu/main.h
 			src/platform/wiiu/input_buttons.cpp)
 	endif()
 
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index fe21e034a..8e2509b13 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
@@ -31,8 +30,6 @@
 #  include <SDL_system.h>
 #elif defined(EMSCRIPTEN)
 #  include <emscripten.h>
-#elif defined(__WIIU__)
-#  include <whb/proc.h>
 #endif
 #include "icon.h"
 
@@ -520,11 +517,6 @@ void Sdl2Ui::ToggleZoom() {
 void Sdl2Ui::ProcessEvents() {
 	SDL_Event evnt;
 
-#ifdef __WIIU__
-	if (!WHBProcIsRunning())
-		Player::Exit();
-#endif
-
 #if defined(USE_MOUSE) && defined(SUPPORT_MOUSE)
 	// Reset Mouse scroll
 	keys[Input::Keys::MOUSE_SCROLLUP] = false;
diff --git a/src/platform/wiiu/main.cpp b/src/platform/wiiu/main.cpp
index e67a7fb68..16406ec4a 100644
--- a/src/platform/wiiu/main.cpp
+++ b/src/platform/wiiu/main.cpp
@@ -27,8 +27,10 @@
 #ifdef USE_SDL // SDL might wrap main()
 #  include <SDL.h>
 #endif
+
 #include <coreinit/debug.h>
-#include <whb/proc.h>
+#include <coreinit/foreground.h>
+#include <proc_ui/procui.h>
 #include <sysapp/launch.h>
 
 using namespace std::chrono_literals;
@@ -46,6 +48,7 @@ static void deinitLogging() {}
 static bool moduleLogInit = false;
 static bool cafeLogInit = false;
 static bool udpLogInit = false;
+static bool prodUiExited = false;
 
 static void initLogging() {
 	if (!(moduleLogInit = WHBLogModuleInit())) {
@@ -81,6 +84,38 @@ static void LogCallback(LogLevel lvl, std::string const& msg, LogCallbackUserDat
 #endif
 }
 
+static uint32_t SaveCallback(void*) {
+	OSSavesDone_ReadyToRelease();
+	return 0;
+}
+
+bool WiiU_ProcessProcUI() {
+	ProcUIStatus status = ProcUIProcessMessages(TRUE);
+	if (status == PROCUI_STATUS_EXITING) {
+		prodUiExited = true;
+		return false;
+	} else if (status == PROCUI_STATUS_RELEASE_FOREGROUND) {
+		ProcUIDrawDoneRelease();
+	}
+	return true;
+}
+
+void WiiU_Exit() {
+	Output::Debug("Shutdown Reason: {}", prodUiExited ? "HOME Menu" : "Player Exit");
+
+    if (!prodUiExited) {
+		// Exit was not through the Home Menu
+		// Manually launch the system menu
+		SYSLaunchMenu();
+		Game_Clock::SleepFor(std::chrono::milliseconds(10));
+		while (WiiU_ProcessProcUI()) {}
+	}
+
+	ProcUIShutdown();
+
+	deinitLogging();
+}
+
 /**
  * If the main function ever needs to change, be sure to update the `main()`
  * functions of the other platforms as well.
@@ -89,7 +124,7 @@ extern "C" int main(int argc, char* argv[]) {
 	std::vector<std::string> args{argv, argv + argc};
 
 	initLogging();
-	WHBProcInit();
+	ProcUIInitEx(SaveCallback, nullptr);
 
 	Output::SetLogCallback(LogCallback);
 
@@ -118,19 +153,7 @@ extern "C" int main(int argc, char* argv[]) {
 	Player::Init(std::move(args));
 	Player::Run();
 
-	// FIXME: somehow the wiiu sdl2 port does not clean up procui
-	// without launching the menu manually
-#if 1
-	SYSLaunchMenu();
-	while(WHBProcIsRunning()) {
-		Output::Debug("Waiting for shutdown...");
-		Game_Clock::SleepFor(1s);
-	}
-#else
-	WHBProcShutdown();
-#endif
-
-	deinitLogging();
+	WiiU_Exit();
 
 	return EXIT_SUCCESS;
 }
diff --git a/src/platform/wiiu/main.h b/src/platform/wiiu/main.h
new file mode 100644
index 000000000..16f91bb38
--- /dev/null
+++ b/src/platform/wiiu/main.h
@@ -0,0 +1,19 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+bool WiiU_ProcessProcUI();
+void WiiU_Exit();
diff --git a/src/player.cpp b/src/player.cpp
index ae4120e39..573fd15e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -31,6 +31,8 @@
 #  include <windows.h>
 #elif defined(EMSCRIPTEN)
 #  include <emscripten.h>
+#elif defined(__WIIU__)
+#  include "platform/wiiu/main.h"
 #endif
 
 #include "async_handler.h"
@@ -216,6 +218,12 @@ void Player::Run() {
 	// libretro invokes the MainLoop through a retro_run-callback
 #else
 	while (Transition::instance().IsActive() || (Scene::instance && Scene::instance->type != Scene::Null)) {
+#if defined(__WIIU__)
+		if (!WiiU_ProcessProcUI()) {
+			Player::Exit();
+			return;
+		}
+#endif
 		MainLoop();
 	}
 #endif

From a2aa44e377cee5c7733f3d706f020d2509524d0d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 3 Jun 2024 19:45:02 +0200
Subject: [PATCH 153/222] Wii U: Fix MakeDirectory logic

Consider "/vol" a valid path
---
 src/platform.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/platform.cpp b/src/platform.cpp
index ea799a96f..010650267 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -157,6 +157,13 @@ bool Platform::File::MakeDirectory(bool follow_symlinks) const {
 			}
 		}
 
+#if defined(__WIIU__)
+		if (cur_path == "fs:/vol" || cur_path == "/vol") {
+			// /vol is part of the path but checking for existance fails
+			continue;
+		}
+#endif
+
 		File cf(cur_path);
 		if (cf.IsDirectory(follow_symlinks)) {
 			continue;

From bcc1ce4544d026dfd7f24eb7dad4419b4aae39da Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 3 Jun 2024 20:06:59 +0200
Subject: [PATCH 154/222] Wii U: Disable settings that do not work

---
 src/platform/sdl/sdl2_ui.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 8e2509b13..f89b5a54b 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -1255,6 +1255,9 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 	cfg.vsync.SetOptionVisible(false);
 	cfg.pause_when_focus_lost.Lock(false);
 	cfg.pause_when_focus_lost.SetOptionVisible(false);
+#elif defined(__WIIU__)
+	// Only makes the screen flicker
+	cfg.fullscreen.SetOptionVisible(false);
 #endif
 }
 

From c409653a3ef77d7a4e45e9d8125064b8e56ffd3a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 4 Jun 2024 19:04:29 +0200
Subject: [PATCH 155/222] ZipFS: Replace the scan backward for determining if
 it is a ZIP with a single read

Was the only agressive use of "end" in our code.
---
 src/filesystem_zip.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/filesystem_zip.cpp b/src/filesystem_zip.cpp
index 68e593510..eee40b0e3 100644
--- a/src/filesystem_zip.cpp
+++ b/src/filesystem_zip.cpp
@@ -30,8 +30,8 @@
 #include <algorithm>
 #include <fmt/core.h>
 
-constexpr uint32_t end_of_central_directory = 0x06054b50;
-constexpr int32_t end_of_central_directory_size = 22;
+constexpr char end_of_central_directory[] = "\x50\x4b\x05\x06";
+constexpr int32_t end_of_central_directory_size = 18;
 
 constexpr uint32_t central_directory_entry = 0x02014b50;
 constexpr uint32_t local_header = 0x04034b50;
@@ -212,23 +212,31 @@ bool ZipFilesystem::FindCentralDirectory(std::istream& zipfile, uint32_t& offset
 	bool found = false;
 
 	// seek to the first position where the end_of_central_directory Signature may occur
-	zipfile.seekg(-end_of_central_directory_size, std::ios_base::end);
+	zipfile.seekg(-end_of_central_directory_size - UINT16_MAX, std::ios_base::end);
+	zipfile.clear();
 
 	// The only variable length field in the end of central directory is the comment which
 	// has a maximum length of UINT16_MAX - so if we seek longer, this is no zip file
-	for (size_t i = 0; i < UINT16_MAX && zipfile.good() && !found; i++) {
-		zipfile.read(reinterpret_cast<char*>(&magic), sizeof(magic));
-		Utils::SwapByteOrder(magic); // Take care of big endian systems
-		if (magic == end_of_central_directory) {
+	std::vector<char> items(UINT16_MAX);
+	zipfile.read(items.data(), items.size());
+	zipfile.clear();
+
+	items.resize(zipfile.gcount());
+	if (items.size() < sizeof(magic)) {
+		return false;
+	}
+
+	int i = static_cast<int>(items.size()) - sizeof(magic);
+	// The data is read once and then scanned backwards in memory (faster)
+	for (; i >= 0 && !found; --i) {
+		if (!memcmp(items.data() + i, end_of_central_directory, 4)) {
 			found = true;
-		}
-		else {
-			// if not yet found the magic number step one byte back in the file
-			zipfile.seekg(-(static_cast<int>(sizeof(magic)) + 1), std::ios_base::cur);
+			break;
 		}
 	}
 
 	if (found) {
+		zipfile.seekg(-(static_cast<int>(items.size()) - i - 4), std::ios_base::cur); // Move right after the magic
 		zipfile.seekg(6, std::ios_base::cur); // Jump over multiarchive related fields
 		zipfile.read(reinterpret_cast<char*>(&num_entries), sizeof(uint16_t));
 		Utils::SwapByteOrder(num_entries);

From a2055d5081032709057bf55df9b26e366fcc5e74 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 4 Jun 2024 19:06:00 +0200
Subject: [PATCH 156/222] Add a custom buffered filebuf that uses a file
 descriptor

Implemented for the WiiU because IO through std::filebuf appears to be unbuffered.

But can maybe help on other platforms.

Can be toggled by setting USE_CUSTOM_FILE_READBUF to the prefered buffer size.
---
 src/filesystem_native.cpp | 20 ++++++++-
 src/filesystem_stream.cpp | 86 +++++++++++++++++++++++++++++++++++++++
 src/filesystem_stream.h   | 24 +++++++++++
 src/system.h              |  1 +
 4 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/src/filesystem_native.cpp b/src/filesystem_native.cpp
index b3969f3b2..1ae415fcd 100644
--- a/src/filesystem_native.cpp
+++ b/src/filesystem_native.cpp
@@ -20,14 +20,21 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
+#include <ios>
 #include <string>
 #include <vector>
 #include <fmt/core.h>
 
+#include "filesystem_stream.h"
 #include "system.h"
 #include "output.h"
 #include "platform.h"
 
+#ifdef USE_CUSTOM_FILE_READBUF
+#  include <sys/stat.h>
+#  include <fcntl.h>
+#endif
+
 NativeFilesystem::NativeFilesystem(std::string base_path, FilesystemView parent_fs) : Filesystem(std::move(base_path), parent_fs) {
 }
 
@@ -48,7 +55,17 @@ int64_t NativeFilesystem::GetFilesize(StringView path) const {
 }
 
 std::streambuf* NativeFilesystem::CreateInputStreambuffer(StringView path, std::ios_base::openmode mode) const {
-	auto* buf = new std::filebuf();
+#ifdef USE_CUSTOM_FILE_READBUF
+	(void)mode;
+	int fd = open(ToString(path).c_str(), O_RDONLY);
+	if (fd < 0) {
+		return nullptr;
+	}
+
+	return new Filesystem_Stream::FdStreamBuf(fd);
+#else
+	auto buf = new std::filebuf();
+
 	buf->open(
 #ifdef _MSC_VER
 		Utils::ToWideString(path),
@@ -63,6 +80,7 @@ std::streambuf* NativeFilesystem::CreateInputStreambuffer(StringView path, std::
 	}
 
 	return buf;
+#endif
 }
 
 std::streambuf* NativeFilesystem::CreateOutputStreambuffer(StringView path, std::ios_base::openmode mode) const {
diff --git a/src/filesystem_stream.cpp b/src/filesystem_stream.cpp
index cadf97d4a..5d20a5924 100644
--- a/src/filesystem_stream.cpp
+++ b/src/filesystem_stream.cpp
@@ -19,6 +19,10 @@
 
 #include <utility>
 
+#ifdef USE_CUSTOM_FILE_READBUF
+#  include <unistd.h>
+#endif
+
 Filesystem_Stream::InputStream::InputStream(std::streambuf* sb, std::string name) :
 	std::istream(sb), name(std::move(name)) {}
 
@@ -122,3 +126,85 @@ Filesystem_Stream::InputMemoryStreamBuf::InputMemoryStreamBuf(std::vector<uint8_
 		: InputMemoryStreamBufView(buffer), buffer(std::move(buffer)) {
 
 }
+
+
+#ifdef USE_CUSTOM_FILE_READBUF
+
+Filesystem_Stream::FdStreamBuf::FdStreamBuf(int fd) : fd(fd) {
+	clear_buffer();
+}
+
+Filesystem_Stream::FdStreamBuf::~FdStreamBuf() {
+	close(fd);
+}
+
+Filesystem_Stream::FdStreamBuf::int_type Filesystem_Stream::FdStreamBuf::underflow() {
+	assert(gptr() == egptr());
+
+	auto bytes_read = read(fd, buffer.begin(), buffer.size());
+	if (bytes_read <= 0) {
+		return traits_type::eof();
+	}
+	file_offset += bytes_read;
+
+	setg(buffer.begin(), buffer.begin(), buffer.begin() + bytes_read);
+
+	return traits_type::to_int_type(*gptr());
+}
+
+std::streambuf::pos_type Filesystem_Stream::FdStreamBuf::seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode) {
+	if (dir == std::ios_base::beg) {
+		offset = offset - file_offset + bytes_remaining();
+		dir = std::ios_base::cur;
+	}
+
+	if (dir == std::ios_base::cur) {
+		if (offset < 0) {
+			auto dist = std::distance(gptr(), gptr() - offset);
+			if (gptr() + offset < eback()) {
+				// Not cached: Outside of the buffer: Reposition the stream
+				file_offset = lseek(fd, -dist - bytes_remaining(), SEEK_CUR);
+				clear_buffer();
+			} else {
+				setg(buffer.begin(), gptr() - dist, egptr());
+			}
+		} else if (offset > 0) {
+			auto dist = std::distance(gptr(), gptr() + offset);
+			if (gptr() + offset > egptr()) {
+				// Not cached: Outside of the buffer: Reposition the stream
+				file_offset = lseek(fd, dist - bytes_remaining(), SEEK_CUR);
+				clear_buffer();
+			} else {
+				setg(buffer.begin(), gptr() + dist, egptr());
+			}
+		}
+		return file_offset - bytes_remaining();
+	} else {
+		// Not cached: Seek to end
+		clear_buffer();
+		file_offset = lseek(fd, offset, SEEK_END);
+
+		if (file_offset < 0) {
+			file_offset = 0;
+			return -1;
+		}
+
+		return file_offset;
+	}
+
+	assert(false);
+}
+
+std::streambuf::pos_type Filesystem_Stream::FdStreamBuf::seekpos(std::streambuf::pos_type pos, std::ios_base::openmode mode) {
+	return seekoff(pos, std::ios_base::beg, mode);
+}
+
+void Filesystem_Stream::FdStreamBuf::clear_buffer() {
+	setg(buffer.begin(), buffer.end(), buffer.end());
+}
+
+ssize_t Filesystem_Stream::FdStreamBuf::bytes_remaining() const {
+	return egptr() - gptr();
+}
+
+#endif
diff --git a/src/filesystem_stream.h b/src/filesystem_stream.h
index 4a0d76bc7..2114f9381 100644
--- a/src/filesystem_stream.h
+++ b/src/filesystem_stream.h
@@ -24,6 +24,7 @@
 #include <ostream>
 #include "filesystem.h"
 #include "utils.h"
+#include "system.h"
 
 namespace Filesystem_Stream {
 	class InputStream final : public std::istream {
@@ -96,6 +97,29 @@ namespace Filesystem_Stream {
 		std::vector<uint8_t> buffer;
 	};
 
+#ifdef USE_CUSTOM_FILE_READBUF
+	class FdStreamBuf : public std::streambuf {
+	public:
+		FdStreamBuf(int fd);
+		FdStreamBuf(FdStreamBuf const& other) = delete;
+		FdStreamBuf const& operator=(FdStreamBuf const& other) = delete;
+		~FdStreamBuf();
+
+	protected:
+		int_type underflow();
+		std::streambuf::pos_type seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode mode);
+		std::streambuf::pos_type seekpos(std::streambuf::pos_type pos, std::ios_base::openmode);
+
+	private:
+		void clear_buffer();
+		ssize_t bytes_remaining() const;
+
+		int fd;
+		off_t file_offset = 0;
+		std::array<char, USE_CUSTOM_FILE_READBUF> buffer;
+	};
+#endif
+
 	static constexpr std::ios_base::seekdir CSeekdirToCppSeekdir(int origin);
 
 	static constexpr int CppSeekdirToCSeekdir(std::ios_base::seekdir origin);
diff --git a/src/system.h b/src/system.h
index c2f627d2c..3c0c29181 100644
--- a/src/system.h
+++ b/src/system.h
@@ -71,6 +71,7 @@
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
 #  define SUPPORT_TOUCH
+#  define USE_CUSTOM_FILE_READBUF 16 * 1024
 #elif defined(_WIN32)
 #  define SUPPORT_ZOOM
 #  define SUPPORT_MOUSE

From e49777df492801aa6569606ce2013ea901c3dade Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 4 Jun 2024 20:53:37 +0200
Subject: [PATCH 157/222] Wii U: Put wildmidi config and config.ini in "data"

With the upcoming audiocfg branch it will create "Soundfont" and "Font" folders on startup.
Looks ugly when in the game directory as they are shown.
---
 src/decoder_wildmidi.cpp | 2 +-
 src/game_config.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/decoder_wildmidi.cpp b/src/decoder_wildmidi.cpp
index f9555dcdf..447661a8a 100644
--- a/src/decoder_wildmidi.cpp
+++ b/src/decoder_wildmidi.cpp
@@ -142,7 +142,7 @@ bool WildMidiDecoder::Initialize(std::string& status_message) {
 	}
 #elif defined(__WIIU__)
 	// preferred SD card directory
-	config_file = "fs:/vol/external01/wiiu/apps/easyrpg-player/wildmidi.cfg";
+	config_file = "fs:/vol/external01/wiiu/data/easyrpg-player/wildmidi.cfg";
 	found = FileFinder::Root().Exists(config_file);
 
 	// shipped
diff --git a/src/game_config.cpp b/src/game_config.cpp
index 2b31ac308..d9fbcd335 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -124,7 +124,7 @@ FilesystemView Game_Config::GetGlobalConfigFilesystem() {
 #ifdef __wii__
 		path = "/data/easyrpg-player";
 #elif defined(__WIIU__)
-		path = "fs:/vol/external01/wiiu/apps/easyrpg-player";
+		path = "fs:/vol/external01/wiiu/data/easyrpg-player";
 #elif defined(__SWITCH__)
 		path = "/switch/easyrpg-player";
 #elif defined(__3DS__)

From f204d6d3cd0f990c27291a5a71e2e047e1798d9f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 4 Jun 2024 21:01:31 +0200
Subject: [PATCH 158/222] Wii U: Update assets

Thanks @jetrotal
---
 resources/wiiu/icon.png       | Bin 9295 -> 4087 bytes
 resources/wiiu/splash-drc.png | Bin 10757 -> 147110 bytes
 resources/wiiu/splash-tv.png  | Bin 4085 -> 25796 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/wiiu/icon.png b/resources/wiiu/icon.png
index 9e2300781f410ecedf95328ad5980c7260121588..704aa1947213ca1fb3febc9a3c0f2c6a3b197e3b 100644
GIT binary patch
literal 4087
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

literal 9295
zcmV-VB(U3wP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il001BWNkl<Zc-rlq
zca$X8b>4qf)p0scPfzN}VRJxQEYgw$2oL~4g0d)4A}PzJf+<q8E$JLvlqDZYR-)u1
zADbd+Qx-wXHcb<hL>`&}L?8$*00LNGcY$5(VsqY|-O1Crx~iW4=rG+g9jZD3p!S_J
zXJ)FaUsb*DyWhL-zWZKDSS${wWBoy?@;@bqHv+qW?MQ3@MuC1H2)OHCRWfm;-Ukg9
zVdb!Br2Z7J1k3>Efa3xV0sDYsWpxS*w<>C%Eb^aAO%tF3`1wN*1Mdai4NNt5H50(M
z8gPq*XbBOjlk6n$6o~Hv-)bcZgb*M}O%R~6)o+*JqrlGrV`f3hq%vGDx#Dy=s{wiz
z#MgkY0EcQ3!3qf)BY-58Tt))8Rf3NLzto5%Unf9y0;~sB06YTH7ZKv6W=Wt}y+Orp
zD+PZP_yY<48o0U9{#e)a>&WMe&2FpH8A<>*0>6YLg^+jySg!4sNi8IRt?(7;W55?A
zct0SoySgdxb0_MWb{+Xr0#s?gH6)OM+d#S>i6n5a5&LU|0D~a?8Sp0(L>jaD@+Z7b
zfGP@5p9BCAkUo(6%|Rem@%$<(V3h!OC^p+)O7Ib>p&^*G?hzzFyH0@WU4T@p6{S*{
zzZKXDoB=MFHfRg?_Av10ip{pCaqufK6SVAg0@U;YB$MqbF_rfZW^yrv`YK?S06z=-
zF|fmCYvcykTYd2laa{q-IDsa+1AqZwCol^fsYrqnA}A&;|Brz!0P6@~lAY2Tt1pgK
zt}DPA0@%%pXk`*e1;2o;z{QG6U_k-y0R9}<QM^H$%>?*Tb$&{#z!yHaPJp!vP-7Tn
zjRYHk!?k>ZS_Bvb{u0<zc7p{1NDWwhDflJjIssOTy{rppgal;=27oB=bYXO`wkxP5
z;GYA2y<()wB=}YXLjUMX)p;LtGg6{@MV|*gRq1Qh6yRgPpICBI-eTZOlGN1Cn{(53
z$4oWNUaEfnt-$$0ut=&?^C<8=U~{EwI^E8<Eck1ID^7W?Ij-0x?9Or`XOdYAUDT}S
z?WF|kDme-~NN&oxc({@||3)?NEsgZ0&V#-da7mJoWbkym2@QL3cH41!9ViaDVqMvI
zmdvt7YAM6w`538~TJ;)jR|2u_&t@yxoX7SzYr%9Y@O&-jaJ>RZ9S6S}Af?A$UOSQL
zApQ|gRlw_&^s>s_v1Jx7#44&o+sPp6^zYVHK+litUaIB;{0Az{>Q(gtDoB5az%RA-
z(tg|SR2aUokHMRJaEG19O5-<Vb1C?v9(pDM=oy3bvbyfNo$?7985vY?D&#!o->USr
z?Z9jG?x|b>q>h1K3HY_8d(_9k4dI3@zFtXOOLP8(t7J3!y8CFW8VHjrU`91^f9@cc
zc2=eUzXjZ7E>O`q@C%k!%km@{MsMz?cU!P2i?3H49vj``ep2%pvMH_ZeYIK%q*nB?
zxv#DOPp+-$45evYH5H&U(qC#_l^R!)VQ6QB$Ob=}(K%0D7;x$3Sr*R4%KU-0s)1;1
zR8U0)&I0453h*%S2~+)IF;uw*e9<}*lv;fy%d$Hawm%r<UB5bw%?Zg=XNPH$1pcUp
z{s|8Y=Ms6q%gNeOH4v3lppke&u>^qwz_9`WeiOLG90Ba*mA3)>YF2M|D(rkH%6<Q8
z6XUzW9D8n#l@-C86}J(J!W}<9f;Zsf+UaEsUDPCQ)5F51Qlh0w-N3gCM^8{l-LBgO
zxXQurklat)F~DsfisJ9fUH{bH7?&?Cx6R=*TXfan9q%2+>9q5MFCF8xy_eeGEr>=P
z!m<M=foX}{jL{orukCcZS}y&y!1wmJx%=ajM7ITt$7WB*dE=#}Hy!+9%t2Rp$47_g
za=5tg$_iiq+<xM7sn(M~l*f0h#0IMP0-Kb4c<`r9kB#lNmP&sq;A_F3+}+Fj{_SRh
zLtU$lopJEW-m7i(_N|uWqK0?CMt8S|z@U?x-aW+Pl?<~NVl|(ybzMQjzQBtLxrH2e
zn!N{mA#1f2Ba$i&Vs|R+{^$gE{L`_bmD^Aluy^zND>E!EW*X}Eg#kv!z(@(SxPj2Y
zPz91*YRZq$Q-ZO+ZX~aYE(zRS4z}#+!x8du?%*|qLF-6RXmhF2VPP37PTGJC&3dM-
z1mESg^U&{XB{Jb%Rh^8&fG>=i$Z+QD3X*Iccs*gDrwsfaFO%cLM0!GaTy6}>U`3Df
z>hU*7q*D!%O6UTwC(K5lpR@6+tfXW3{XTAgaFBs<ACLawi=^Y(vS)9&J7`1&s?RHI
zu#ubnYcf39V3)S0fAmGVc;BbD5R9&_7YztEexDCR=qy}SEQ7DB2HKKAI2hoz+jcM!
z9mQ^U;tK@m^0-j!GS3{?+YtDWBbM9cVq<U{5pOp(&+E)AE-=3`Pgj?Vu}wZc_LsNu
zzkc^+;&Z90PHv-QkctkWm1(2mxuXj3`+(1i56}whU)vDjF+UIe_GSVDtKfG_K70-j
zc17lv>0Nx|doPkqr!9j&JvPew-}Nr~BLfT$M~RN~<MVgnay$6p%Rl0==l3=o5Ykq3
zwr`kba%7z0p%FaF0CrajNrx*dS8>|y_yTUW?it|tfw|&*LQ^DY!WURu<a|(|gFzIj
z{I{I*^dI=mjm05e0ep|$jo;(r9XswKKJR31anTw$dGH^&YY*Mw2$P$~2!vL<mdBre
zitjx8OvB)37j@h&7q{)$fiDoqjgo9`23@;|y0<YN7-e}Sj;3Ythn@W5AMT=i)VHn;
znpOb|^1SAZpp2>Y`K{~w*A9oAU3MP+y{$#?HB~PIf7gZ^aoW6`ID5vjH2XbX?!E0c
z{DC0Ru>ll$b?W0gd%xc__%6GXpLyV3+-@(C{!sCAMOGN>o+9er#%N%O#g*kE34ZS1
z-GIw$Z(VSxVay}|x7=y#FO@$@hKGJ<YnkPHg&U9EO>Zzz1Ycy`96El|n$wpu*mLWR
zxZPd`NBfXVtnE8{zt7`8ey%0pM?!s!Ob%nStxusC?4DxOyNe<3aFGO&K`$Tr{oN>b
zsdfH9Jr$6u|0_4dycS45z@A^8Dth~xs^iKyi1>o^1_SJzxEV#UA+m0k7X+8*W-VEN
zI2d3eI!fPQ-#W{0CHO-VQCu!Z)$jBMqKtWW5OVggxUx)AP17|5cmDIq=DUK%(}ju^
zbW{OKrGMg%0k+)JzxtUfi1>o|JwCRN??jR*g0E@1rT!maVsse0-C5S>KmF3vEw}tG
zx2x`V`$Lm#4edro;rzuMk+<B_&%_-AEe#RZ^#!ELPGHBS-`nHnoxd_%{5%`i7z#v+
zeSX366N|az6E&N)bUn?`2nGBE!mIuA)tLpp`NOB12LHnkJz&c6%Nkjd2>YY-I5r|n
zGV$dE0Pp;jVSJIU=DLCgBeGH_39wcL?*8~BPIs>HGAWfFj}MQ-$&Rs|>%a%dHn4ES
z<8tFF+0W?N!_PJazR%_1XCAnhpg(Nd@(U%SrATMvY>8}P*gt}r$r4{q;B-5<`{R@C
zGCOnR?6mby-PTu}*wIuSS(ouUeQX@wM3>uvFd)9HG<8jzoXc8LN*uEzXHGQ*{s-=R
zS5fxOT7D_`08WR4E#X_}a(YlRSu!b==(ZqJxAirz0u2U*<#vN#TI^1R-5(w){+~{z
z845%g?ipmTC+81jR@_KNdA7RK;jngHJL@8QsZ_ct%WoF^LJ0)|Y<BI+-BUbwPrE-n
zg2QEN&LK404M-hUfKp~}xo@C2<jbT~e3BQB!^wu>Tq=Udx=}Oh8`$npu*v2dMs~=|
zT)m2}=@@w@%WXljE6M)Y^k~!I7ai2$QM#1@3}FyoPT=ozvF-lWIfPaMLml%0>`sLn
z-xpo&*VQb&p&%QFH|6?$0}_kQvhjLpV5L9YXTAYsI5&5Zm8F$peOtySn*!hAu(bqy
z$jzv3i`<lRa5GsnRcGgWqeT^HW0&7K0<7!%?-|4uuotc0sW|EJcQcp=HnUPYAUV+6
zW9j;7Md#U9UO+c;JCNPA?XI^3_{AVmUoYLtK(Q-y1?)`SGuV8H*kamPXNG|?+<1Rq
znf3R0d~A$v1W7_<-Ds+_W*wWyCM;j~<+HDH_H=G3Twi}T@43Bt+Jmkd9RnXgmSr}D
zb|Fi0Q3Xods9`_A4D3>e3DCc(yR7dA80sD*<nv*ZTx3)A`{&XADa+T@48fPa`!(j~
zmjHP1uJ`c3jeF432D+O6N#|DlXiElz;Rrwb@Ov5pUpI8q;1^1?KSWn@w5S69J{JR9
zx-Cz6H`5I$z#mu|V%h6A%3Arq>8GMZ#&Z$5bTUoQ<>#jH?f5)CB+W-MR^R#Q>T+@T
z_)%7p)*3mhX}oguAVc9EBH;+rlap*8*#ub~n`R^A4lvpm<&K+gWcT)+`20RbC#-`X
z&n#GPd_^X)B$zYKqU#23j|;o(;^d1n9b2N_HUboW+noyc{OUA{Lq=0|l8F=}-TmA!
zxecchBpH{{O~!d#4vAM!9JBn8SxsZ#(ZkFy%`!1KPNc7!jZ@QX7@uO(_$1Tg6AbhX
z(mT*g|3EK_V%`J|A&6(@8+VRng-dgn(Udf@EaM-v@%s0#78j#7qXcF~1GaWCt3ZOm
z?GfzW++}oKN0wwJ`$lovyx3$rYTEoZvD>F_z~g$N;q0A#uOH^MH;(bs_uR*>oxAAk
z?{4}zGg_jl?*~I3Y<dV-BCBTc20RRIk8tkgnYX6`td*{v5A~PHze90x`^H@ayLw3_
z1!_iEl1z`o&f(K18h&717#u!*f)@_$$8A&S3H4T-$~9ABsU<GYUS@H5g=@3(B-3fq
zY6hpni7cB_5m}a5x@u!lK2_`nlFJz`zPi|vZlEm+P}=_wZVVKUtC=i4fe^icq5S{W
zWp3BbUF<!$pNq52S;%rM##f*CF8}a@C)mAnC)>uR8IF#xi}CA*&f;Q><;4YNW7n8j
zn&ZmcEN9MNWNERoKOzZ<a5%v5a6g+y$Jn}YL(OPrci6+FYeCYEB{WrMaHFraxr5cZ
z3DL$b0CE|=g#=Gc%}M=a|1dT=7Y|U=)(N1<3cvW^&+`}m`@ghgL1;$L@}vDP^P~MQ
z0}$}}2>JZEP;GXF`T6*|>*%V1nyx-WDI~$%!V+@}OB{Ih4Q%!&*t&6wcip;+p@IH&
z=ZCyDY*%vKfUfIACcL<Pj<QVRmLcAWE}+2NvCRWa+!e}?{WT;B?wG!XZf`GY#vs#J
zSB}@~rrYV`wKK<BPTGvBvJ{K46pN8as;uRhFd&muE!Allf~(i&dGWw&oV|RBiQysK
zu2rQmBshO@fsFGSk^~NygSjJF7Ouux7#4mL0zuuAU1h-^pW8;z)17w+o0GR)H{ZfL
zZn}j|7cJA=o`xq*o#QXQ@Fkvn?#CF0kssaIaOvG;N?F==?JR90fDnQ}|LQ~d+&SfN
z+X4;u|7*(!?|qnETeo!#{A@}?%QpXV3(YY2{tutykuQIfcrt@5OW5r;WJ$&l29la7
zYrD540VGMn70NZ1*J00JOrguw)o}k`seJgs4>A<#Z+k=Os?iegOUtpD(|q=?zr@0P
z9H+~MBa`zzve=4k_qHVffG6a{>#*a<CuMr=zLsA@krn>M2Y(Td%iXr;5C%1!zGli|
zBFX3f$NwZAORsCYw><$|UK?GGRcFU#%jf<Zt!>PJ-^(w*_vhZS{eHa?SJUi${z;UC
zC<e@2UfbKB06|~*0tkDa)J9fm`L!meCfG5(q2=|qL;5R~1PNYzVRdr}TZfixw3TK(
z-ViFQ)^qVfnny1_$zpOArxIW^GRW}YI03)6CD;4FJKo1@C;rphLi#H^hZ-lJPqFj<
zE?gGV;NFr1D3q&nagOX=Ad#8})+cB7ghFhenr8FxWW{KlX~Knr?Ap4GeXk#WTS$MU
z0Mg1_in&usJlouFe*$DPu#il0;K|vVQM<XtMV{XG5>M~T?O-|->1WH-BvS(;j1Em&
z%Ei0q=6AG&0M(>l5)y`PAT$u!+%p-vKvtyOMiVxWY>me_B%8$fSC<$X3B7#@P>f@z
z4PN=dMav=Ei?cIaoSorua;td82BU19m|}8hjN$&;bM^gwee{GvmRAzhlYS#D5Ltn)
z=ANaux0_(lPdE_3<#b|K6jIp?OUp4X&Riv~#TzC<JZ5m|c&s&8yqOAc=ISzu7VP17
z_VOjpUcLl8gH4v07#d~E#5fyAHZ#~?9s`giiJLZUX?O`(sq{-iLeCgz2?NC;F&2$7
z5*=iqFM{2s;BmU>3b}E2b>YZwWuvMFnyRw@;8FG+d6h&agOIGXf#Q_8&>{lVqk`q-
zg|04F-2hOb-1o_yT%C=zRl+umjPVQif2eE?;HmSc`0W4v+lHlIO=mIE0xe<SaVSho
zPq1yn6b^@-P}om662Kp*@3<~5FY|xC`WR>DFIc~in8B&%E;o&L)t$sdn+Q-!f?Yqq
zk&NDcFWO^s^RGYh@nV8UJf7rtzwnvH{FeMX19Vj|IX=YA+qcry6=ERjp?9DgS(dpr
zKhKZ$z0C19PO+Fs;&9m+jSh0pt+z5YQNH7jVHiB}<!^Fq=Cox3TzKUgYFcY60os-l
z=JMJJPI~D?$r>8RkDO-r%{QSaG7g8GCx84ytj-qeszG`oi=^w^dHc=m+_I70{%)o>
z58@AcktB)zhYs_lul@rUE?*^`U$m-g1`CVJymI&mbJrHxx@oE`EpEq-4eUSoTJd~S
z&Y%M6#Vl$f+tyv!+ZJu;3cKiJxwJ6D!B_UL2B8AhcfLu@W-xTYJ$K#7#PAT~n+6%5
ziWW15j-5Wm*T4NZnqgF}<G`__Jo4plmK%*t;r$QZXZd~{9vh;O4FD``FW(jd2qAEK
z>>VY5WQRj1PZEzcmSm8PXVF!`Z8z;?pg+RYreQ*XK$(>P-D6MG1iw&@o;}6$&z8T;
zd+YQhA&>bPK3S1*dhBg~D@ofFz~)rwbXi)Ckx1kSkhSnST46wHAxm#>Hyb8K8JUQ#
zbMj7{JySIWZ2edsUOw<T@nmMTp=Fs3o6Ii-7m~=gp=8<e-x35+9GxYA$bz@43pKwA
zIGr@V8dyta5jxzseG^_^7d;XGx^pgExn?Pt6I)nfake}b(ccrX29Baw%L|lDazS)}
z038KCzbRCtCxp%JU~zfL^yotvkXhCUh5hvR^e{M9Ik!O5tW5~brxGL=%e$k1&)Rgj
zq<}12^Z<o5S!f#pbk$me6_#r?bgleuos)yZba`A{x?+CZtz|R}T`)Zw#p870?W#Nv
z@AX*A&@ptu+|qJ$#MUvtOsqjyp=|`vGS&znvaqFZoF2N-Vg_2w93iw=ZV%vlZr_F5
z?Zq2#bMneL^U9&-HjR#iBLpJVEi}>{uqfXWOUo-|+uJP1VhyQV<1xSbtY}*(IFqmz
z08%_Mp-_l_^56%EEiZHG@@dXrnBn~8%PeJLNcJ3EWt&{IdLti~f9UQ##Vz3gUOIHh
zwDs$mT(qyJJBT+_odCUI^UKpEk((HbC6lC*Y3zB2^6aHc=0Vg1hOVP)I<lFiYGy-v
zqC*5w6V@VFk_-pVz0N&%y^9T7Cz;$lMk=8aTTZYrca77R&T--LW#$)S#1ct-zAgp_
zdf7fTMbICnZ?KO*$jiY)2Td;>)3Q1uE9j5r*5y}||3d$5lVwxGz(VXlo=l?VRV<s;
zIC}E51p-)5(UR?9ghi!j8vzmvDTINgrOp{W%eS9+jF0`ohf!n&ug{Iw=VoB2hmG4d
zl8B{9CekF+E9e=4;*{`ugM_;MI2<;TsWkua>=UM=e!1U*-kva_u)nsX%QC^BpSgu4
z(?h|9r6p3yB;e<nm-d-XE|EmeoHI>D0nJgNZ3HlMLE=gZZ`4|1!)sUG;K$GXm^<&f
zV_h^Y5c1|HeR?W->3{p}ubS>>)pQo2<r-<QuLobCzK0&^?Ph*{+0^WwtjHwO8MLg<
zwfT9TdhP{FF#tVnm{U<fLpz3wP7DK=F2x)A-lNYy#^cXFRovjIURhp=^TogWTi!Tx
z#*+0LDM2Xg$LsOn3)Bx?M?xXfQ@cVEWaJc!^DBJ$(QjDFD-@bQ=#W}YTZ#i%eZO#H
z3SePZ%Eb$@hF|6SooAon)nmta@b*1Sj80cf6HBJjym;uxd~ffwmS!Cd-N?=LtE<C5
zGh5O1hQiiHLWaTL|LAd4)tW<Wqy%bGMNMh79l)k{ZWrxM2r+cQ!ig0kTN`^N!Nu7b
z{`<GS4&<_e#-mXJ9uLWk%K4egoIH2da<)-n=%;6LNgk7<V}zsTfDH!%mY=~Y_yuCd
zuBFU_Tkkb;qI#6jIsq*1O?&OcBHh#ereE>4nibR}DYcyZYYBtxTc>e2>~x3CO<RY<
z?SHq17S}O!ot0~e+VbDvdxO@}pzWbxO*Oc3aGtkHF;pFOS;OUVuzk}828SZ1H**LD
z0@&>Bo8u5#F6VIZLL6b3+#f(#3;c+dL;@{(oeSq;B(A03bnt}%YEnn&aQlrn;Bh(W
z9k8}dOfckYqxBo8NtNZRaU{7#)?bGg)(Ox^eu5C3f8lDwvHq4da59UQFxaqRjFD(R
zBU1yWt-m-D=<aUIz3H)BNP6y6ZvLPh)?W$4#=8KEDxjt{PCa$0q1bjy8dx<*&gSO)
zZ`r<;NPoywV&}S%Krqtsdo$8G>7PHlOgf<=OLAMRU$jC2M1v{-kcz3CdFD#TNuZ~5
zuaE2P?dIKg?j{uSF+AGXl5(q)LT13%5(cr^1j{pd>6hq;^&^^5fCeK_vDqYNp1DFc
z)tO~iTFgLOF^Kl|a_^qo=?({&+BDp7eT@tS&4535X1V?==dHH6sNZwjn!&!<6<93s
zxfCa#xWve9eRz7?lRR43_*v+J+i$#qk!U}mu%FQh>-~ON7Z47&MwMblZoEI6VD9u1
zAk}vKs5X{w-1-|PK#>H3hTd5tgvj{>&s?T^)JOm3FgBmuGT;mE2@VGX+<VvU^agvd
zc_sRzJx$l|bUO%!yeuyyEU)+}4E40Qfv)N-UWn&pUoruHNn48+S$_kr95~(1BHB`e
z!J&0B<dEr|4&fW>!tS;;6g1LR1CgQlg6Lg0Y-P*%G<Lg_$WR#B(f9%tP18xM8q3LC
zw{_sv{XFx+i<W^mQaNW&O{!cwv51<|kYuU8$G=AUO<Dgs0#s&1Qv{&Nu3+sAOR|Kw
z$4z)FfTt(dHAwj>df6uDUL|LgMD&bYCXt@X9SjEpOpZ@7F*JtH+r?0{pHR1-j2_3p
z903f&K-Ud2S)H^d$W%ye%c?q$e)aE|P1oKay0ErTPv?esYEotKe2m0W8YHZBMWPbq
z!h-d;lmJv#fhJ2~mvJEkvMjS>Pm~R}jG`_lm|02^PiBi*K(a%^+hr%<3e(@)&rn|&
zr_+zO%S|8{#v5D>*eoP-8NJRrnaY_ud5l?AXJskL(n5-4GRX`3enc!CN3s>HJpVf@
zFmzD_J(I{1n@N&RsJXX%N|N<mK+RfzJ@8vcfcB7Jo!33)=aav6H>2CaXo)OWW7jx*
z{t}sZ?qW`_VAwZ?Pnw{|Geof4k9`f$1p+iuN<q(NHL|2powLN<xvA%w!)any(;%GK
z?J{aY;`|#|P!k%d<uqza14+s?jnv@VK$?>N+73ZW2+(d40NnXgJNUKVdMAU!0W^`}
z()<;UU%tS~@@o2*-yXyz4I&o&^mvAFI-O)u(WKNmQd9#wo6$(6R8q-oap$fA=$f)f
z+Oe7u6b`!CFg8SwC&0-gvwZ!(9pv!d^B_s9#?gYVu^rOiA_7!Ufi{xB?Q`({kKDya
ze(ffF!JLmU6T8H@%a@spB}k`Mw{TTN7jAr{XJyivE)=~BJGt-J*DP=?&D_nBMpu&P
zwgj58h-OctN#*kx(SZOPN22s~2Z^t!eEkatc>K{Lq+)7oAJ~kX*HroXLxC0$ptB?>
z5aB%^+QQHLvpozBuLfq$&7EatezuGZi^~~|lF*|p$;gHSLlek0Y4x|PmYr8x98Not
z?k-09dKnwYg@WfUWchzz+0WyT9w8miwtfv?)8N-9Kw)r^1l+A4KqpB6x!n6(?w;cQ
zhqrLYeVfZ(yOznOnOUCU_~i@CFK0=o(rBt)735N|eQp~bua{^~kVr6qC;ysTRn^${
z)OmjJ_s2N!?1kpu>e0{`zO~jbASD5pfq~`-@aB=AR28=G9_7|MC%ECAQO3sy(L{!n
zzEXCcs^;XrbgjN3E7%pe;@(3SPAqX?-z5(3y~?2%&$V9W+X8-7=V9%qS0rFRaHDAg
zxSTaWeRD}rT6~c%Hf-u;XhV?jh?kLxAmOkFx66a0Tf=3y<8auBuc)M#B~s}G^YaPL
zpI&1Ae4Mi<<~V(Hf!J)aLj3z}0)7qY&zA!d@D1RnED@k4sC7sn-W)<S42IO^Ye=mD
z-=g#v$~SGm@uqLS$_Hg_C|VOX?pW!BwM+HzvI@S1ujZWA<1%olX)CGtK^5P%3hV#T
z6j6EnC2F*vdGLkRc0D8m`&!j+)w?xOtr5gO65uP4UznBr7Jy&jqkS@P3^>^o-onh2
zulcXEL4J~nP~|y=6{|N3z8TzvD9Haw;8<Zg>Zw+Gux3uEs0KetL|6-aO(PX8P+7@r
zzfURV1p<86%9DwPl)!`<{3H;e8t{!+eGSVO>%h0%Sl?ai>z)C|>V3;m+__t-?kt=3
zpry+HNgW=JwQJbesKr~7{n}|lRjmIkFkY$v0AI5PnyBp)2rK6DHdcgITYQbv8U}xT
z`C27g+YY=|R{@-k{2ZsKuLR`Yt}RULE8W`>000CENkl<Zsv+gGW6Yde$fPkEJXe-w
zWJSi%jdjPHskar+CP`AoOreV4*O2}4q4&D;b`*yHrNQq*z$3sf)n}+EK|DwQYDz5(
zgQs8oUfnA1-u)mzN6x)__k%eCthu+sxqtlkzf!l}-}~U-wDsINu5&ZsKT-f+2(fNm
zz!w4ClJr$^OWx{5%W7}=d#o5mu`*g*55AtqI5&MQN$b+WUjqIL_zg>UX;KXUKKZFn
zRF%oK5?Olg7e4o2Yu-k+dJA&;$xnTvSVtx0_~fTPfh^1GB>gL&d9wKTM?ZaU&3kC{
z+_hamb*s1FGgelJzsh4=Jg3sSfd35K4{UCn1e6h>v{VDKAirkL#bUiSn~kIU&er_?
z(S2vJ*=*|wP!GsP&po>DY{f3&_dfVHYi3ef2L91Jwq?mHl?ZSS_>cL%g2qVj*6R#p
zSuUzXDOn1~nprK>PVsLM_~bD?w>ERB+RC6W12+S|-t<_wO<jOg0;m}^kY$+@2QH$m
z*+sly`LZlmZ0E0h=E-%I{gux=S@C|W%6f%!OV6*W9Ks@1s)PS|;LDZL)@m&c`%_>N
zc)%jYHK%*6bOA^Aokg)J=oL0<7KUNEix5qGUa9N&=%?>p=dG9C@7hTpS(4Uy)^$e&
zRs)39!G8?+(`q@3wRG<?@JHk_hOCqGCunl#E1!9?s&!Y5l{NVM!fJGQb#kXt*$@1Y
z5aM#ZuwJe5Fz{!<765zxRq%y`_j(l=hQa1tV|6d`#>=@4o;TexT6Rp9Weg$Mbo0pS
z@mJ30&Mi4swcc0Gmu<Oj80+gY^LeG?Yww|Ozm<w^7;L^})Rc2r%O4RY;sE(_1o#~x
z#JB2k)lB(Waxa(KQY1hL2~1Tang6i4y52lrt^UWNHFcQ-{||%^U$0lG*)6Y*02hIc
zilPiuB7h}qq!tmO(}ZYv4o5UxUjx0!e&F8=A--YeWGj1~9Rm(4iV_8;Dnu|^44l+F
z#!`EMZkM$;X!QV(2_ZfWJZZLatDD|kP!#29zy;h|jR0>sB6L&~L>m;uRQbFR;@==i
zN6c0(5S9smq9`$P$pq(t4M3!p8njl*-x_3SZAMQ+L%TA+5%_H(#GfKbv6|mm1AZe4
zfT9$?auE1-{_kC7LrN(>RVg(ASOcD*)G@$Y2YOZD>n|(TfzJvd{w453D;Ft!8Kvbm
zv)OHx*0|pae4MpY$yFZ0@<kgQ7PQ_4XdUP^Pp@zJj{sj3LcC<<LY<he-41+)TzZ+f
z{?pQ*Gx@gN-b%pQ*^NF7ycc+P#ZklcVy2uVm%aO4;9KpuK&Skujd?#|d){#z1^R&?
x7M7;}gq9Sr1k8||i9Jp(V`pD}=-t-x{{dDG54Fc_KIZ@c002ovPDHLkV1iD6N4Nk0

diff --git a/resources/wiiu/splash-drc.png b/resources/wiiu/splash-drc.png
index d87d7ca6a186efbca015eefffd027268ba074907..6b02413aa5af38b58844641bd8599fe1a8a904a0 100644
GIT binary patch
literal 147110
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
QRKTB}wvkr3rhUx+0QF=o#sB~S

literal 10757
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

diff --git a/resources/wiiu/splash-tv.png b/resources/wiiu/splash-tv.png
index 50a3a96f33c43014ae2d29f83fb793c478d91fb0..fb380777d80e701c33d4d3f0a90bb36fedf83c78 100644
GIT binary patch
literal 25796
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
N-yUnrY;*jj{{t!4lj;Bf

literal 4085
zcmeAS@N?(olHy`uVBq!ia0y~yU<ERnE^sgbDF=BkMg|7{J)SO(Ar-gY-Zad5?7+}=
zu|n{~^c!XT6E1D_x}F!JyJX`>#w#-&xa1u?mTH@GzYJRCCtR@mf!2fWCB}(~t{Wz2
zn0$`Q7CN^7IH&xqCzt=Q0ZmT&ewYPFaU=i<fdfE7p#f-<0|PSyLjway0V5BPV3Gh5
zECwhnVzi)X#;*mdeK@t?b|N+{1bl_2g_wXqXhE=uu>~B8L~B6=Jbo>sVK*F->d;Gf
zkdk4zXLFVfoWSHobnMV3ix0t|{?T!U<-+3XI-^68hO?tDO`7)SQgH9bGvDj$c6X)E
zK6-A_w4OB2j!EhVfT4@Oe50%ent0lWp*dphbT^KglgsjSXTJHp_u1w5^XAv=o1e7*
z?Y<Z0(?cg-$=#mv!<*^;G2sNDYlw})h9jwJ4UQ(I*1L?wH}6!vdottQlaB>nuRhB@
z{;j+Ekoe_Ejz52Yy7l?h;m5HJ>GyQX>?|tIlWYS+L;ad-r@QO7t-Q_P&&qJ8f(ckD
z6J6v_*mH)(pyO&)X3K%;Ij^pr?W{Oicl_|lm2BJZm)WkL7Ap8)<*^+qif?SL)V8ry
zl4kS{kkQNX+{>ROnel%J0UCR@QKR+eTfNnbo?ktilzy_q*5;lh<FRw3`<cNleg9j%
ze>XR2@o-E~^9MCch|YmR<|mi$6n#)%clV#kp_?BIxC%~Y`<Wgy-aYyL=a<LJi}&20
zvj1-4J(>Tzga27`GJj$LwQq<m#S{uB*UX9rI;Y_UX`w|-^8n#R1dEua4$;{MtdQ8`
zJu=#S90|g}=qEaMMuQq7ClVcYV1+bF*~GS$hhRmD2r&d}c$Nyp_zIEQ5G-P9!+{IC
d2LF$2H@tcu2W^??4lHUIJYD@<);T3K0RUYj@VWp1


From 274bbc96ce467195ba553f9145cb4b572f00a350 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 6 Jun 2024 00:37:32 +0200
Subject: [PATCH 159/222] Use custom readbuf on our homebrew platforms

---
 src/system.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/system.h b/src/system.h
index 3c0c29181..37d772901 100644
--- a/src/system.h
+++ b/src/system.h
@@ -60,13 +60,16 @@
 #elif defined(__3DS__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define USE_CUSTOM_FILE_READBUF 4 * 1024
 #elif defined(__vita__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define USE_CUSTOM_FILE_READBUF 4 * 1024
 #elif defined(__wii__)
 #  include <cstdint>
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define USE_CUSTOM_FILE_READBUF 4 * 1024
 #elif defined(__WIIU__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
@@ -82,6 +85,7 @@
 #elif defined(__SWITCH__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
+#  define USE_CUSTOM_FILE_READBUF 16 * 1024
 #elif defined(PLAYER_AMIGA) && !defined(__AROS__)
 #  define SUPPORT_ZOOM
 #  define SUPPORT_MOUSE

From 8ac8c166add4238984f438f827064d67355a6b84 Mon Sep 17 00:00:00 2001
From: Carsten Teibes <dev@f4ke.de>
Date: Tue, 11 Jun 2024 22:34:25 +0200
Subject: [PATCH 160/222] Make our life on GitHub easier: - Automatically label
 pull requests - Hilight some warnings in the output - Keep actions updated

---
 .github/dependabot.yml                   | 12 +++
 .github/gcc_comment_matcher.json         | 17 ++++
 .github/labeler.yml                      | 98 ++++++++++++++++++++++++
 .github/workflows/pr_labels.yml          | 27 +++++++
 .github/workflows/stable-compilation.yml |  3 +
 5 files changed, 157 insertions(+)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/gcc_comment_matcher.json
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/pr_labels.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..202e28ba0
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - "Building"
+    #reviewers:
+    #  - carstene1ns
+    commit-message:
+      prefix: "CI"
diff --git a/.github/gcc_comment_matcher.json b/.github/gcc_comment_matcher.json
new file mode 100644
index 000000000..81995b459
--- /dev/null
+++ b/.github/gcc_comment_matcher.json
@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..972b28d35
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,98 @@
+#
+# See https://github.com/actions/labeler
+# and workflows/pr_labels.yml for reference
+#
+
+Building:
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/**
+    - CMakeLists.txt
+    - builds/**
+    - '!builds/android/app/**'
+    - Makefile.am
+    - configure.ac
+
+Documentation:
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/**
+    - '**/*.md'
+    - '**/*.adoc'
+    - src/docmain.h
+    - '**/Doxyfile*'
+    - resources/unix/*.metainfo.xml
+
+Tests:
+- changed-files:
+  - any-glob-to-any-file: [ tests/** ]
+
+Window/Scenes:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/window_*, src/**/scene_* ]
+
+# misc
+
+Audio:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/*audio* ]
+
+FileFinder:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/filefinder*, src/**/filesystem* ]
+
+Fonts:
+- changed-files:
+  - any-glob-to-any-file:
+    - resources/exfont.png
+    - resources/ttyp0/**
+    - resources/shinonome/**
+    - resources/wenquanyi/**
+    - src/**/*font*
+    - src/generated/bitmapfont_*
+
+MIDI:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/*midi* ]
+
+# platforms
+
+3DS:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/3ds/**, resources/3ds/** ]
+
+Android:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/android/**, builds/android/app/** ]
+
+Emscripten:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/emscripten/**, resources/emscripten/** ]
+
+libretro:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/libretro/** ]
+
+macOS:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/macos/**, resources/macos/** ]
+
+PSVita:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/psvita/**, resources/psvita/** ]
+
+Switch:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/switch/**, resources/switch/** ]
+
+Wii:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/wii/**, resources/wii/** ]
+
+WiiU:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/wiiu/**, resources/wiiu/** ]
+
+Win32:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/windows/**, resources/windows/** ]
diff --git a/.github/workflows/pr_labels.yml b/.github/workflows/pr_labels.yml
new file mode 100644
index 000000000..e4d84c449
--- /dev/null
+++ b/.github/workflows/pr_labels.yml
@@ -0,0 +1,27 @@
+name: "Label Pull Requests"
+on:
+  pull_request_target:
+    types: [opened, ready_for_review]
+
+jobs:
+  update:
+    permissions:
+      contents: read
+      pull-requests: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+           # pull_request_target is run under forks, use main repo source
+           fetch-depth: 0
+           repository: EasyRPG/Player
+           ref: master
+
+      - name: Update labels
+        uses: actions/labeler@v5
+        with:
+          sync-labels: true
+          dot: true
diff --git a/.github/workflows/stable-compilation.yml b/.github/workflows/stable-compilation.yml
index fb0e08d85..53908fec3 100644
--- a/.github/workflows/stable-compilation.yml
+++ b/.github/workflows/stable-compilation.yml
@@ -57,6 +57,9 @@ jobs:
         with:
           ref: ${{ github.event.inputs.git-ref }}
 
+      - name: Use gcc problem matcher
+        run: echo "::add-matcher::.github/gcc_comment_matcher.json"
+
       - name: Compile
         run: |
           VER="(GA, `date +%Y-%m-%d`)"

From 48240216a8badaec19366d667290c01039eabf27 Mon Sep 17 00:00:00 2001
From: Dzmitry Kushnarou <dzmitry@kushnarou.pt>
Date: Tue, 18 Jun 2024 22:59:04 +0100
Subject: [PATCH 161/222] ttyp0 changes (remove Thai and Hebrew), generator fix

Fix #2999
---
 resources/shinonome/generate_cxx_font.rb |    10 +-
 resources/ttyp0/font.bit                 | 11851 ++++++++-------------
 resources/ttyp0/font_hebrew.bit          |  1751 +++
 resources/ttyp0/font_thai.bit            |  1694 +++
 src/generated/bitmapfont_ttyp0.h         |   177 +-
 5 files changed, 7715 insertions(+), 7768 deletions(-)
 create mode 100644 resources/ttyp0/font_hebrew.bit
 create mode 100644 resources/ttyp0/font_thai.bit

diff --git a/resources/shinonome/generate_cxx_font.rb b/resources/shinonome/generate_cxx_font.rb
index fa7c4fa06..7cd3e6d95 100755
--- a/resources/shinonome/generate_cxx_font.rb
+++ b/resources/shinonome/generate_cxx_font.rb
@@ -4,6 +4,8 @@
 
 FONT_SIZE = 12
 EMPTY_CHAR = Array.new(FONT_SIZE, 0x0)
+OUTPUT_FOLDER='../../src/generated'
+
 
 def skip_until(f, regex)
   while(not f.eof?)
@@ -194,19 +196,19 @@ def read_bdf_chars(f)
 gothic_final = gothic.merge(hankaku) \
 	.merge(korean).merge(chinese).merge(latin) \
     .merge(latin_ext_a).merge(extras).merge(extras_fullwidth)
-code_max = write_all(File.new("../../src/shinonome_gothic.h", "w"), "SHINONOME_GOTHIC", gothic_final)
+code_max = write_all(File.new("#{OUTPUT_FOLDER}/shinonome_gothic.h", "w"), "SHINONOME_GOTHIC", gothic_final)
 print "done\n"
 
 print "Generating Mincho..."
-code_max = [write_all(File.new("../../src/shinonome_mincho.h", "w"), "SHINONOME_MINCHO", mincho), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/shinonome_mincho.h", "w"), "SHINONOME_MINCHO", mincho), code_max].max
 print "done\n"
 
 print "Generating RMG2000..."
-code_max = [write_all(File.new("../../src/bitmapfont_rmg2000.h", "w"), "BITMAPFONT_RMG2000", rmg2000), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/bitmapfont_rmg2000.h", "w"), "BITMAPFONT_RMG2000", rmg2000), code_max].max
 print "done\n"
 
 print "Generating ttyp0..."
-code_max = [write_all(File.new("../../src/bitmapfont_ttyp0.h", "w"), "BITMAPFONT_TTYP0", ttyp0), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/bitmapfont_ttyp0.h", "w"), "BITMAPFONT_TTYP0", ttyp0), code_max].max
 print "done\n"
 
 print "done\n"
diff --git a/resources/ttyp0/font.bit b/resources/ttyp0/font.bit
index 8b7f89ec7..eafc8f760 100644
--- a/resources/ttyp0/font.bit
+++ b/resources/ttyp0/font.bit
@@ -37,7 +37,7 @@ SIZE 12 75 75
 FONTBOUNDINGBOX 6 12 0 -3
 STARTPROPERTIES 19
 FONTNAME_REGISTRY ""
-FOUNDRY "UW"
+FOUNDRY "EasyRPG"
 FAMILY_NAME "Ttyp0"
 WEIGHT_NAME "Medium"
 SLANT "R"
@@ -23712,25 +23712,6 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x05D0
-ENCODING 1240
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-.@.@..
-.@..@.
-..@@..
-.@.@..
-.@..@.
-.@@.@.
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x2135
 ENCODING 1240
 SWIDTH 840 0
@@ -23750,7 +23731,7 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05D1
+STARTCHAR 0x2136
 ENCODING 1241
 SWIDTH 840 0
 DWIDTH 6 0
@@ -23769,8 +23750,8 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x2136
-ENCODING 1241
+STARTCHAR 0x2137
+ENCODING 1242
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23782,14 +23763,14 @@ BITMAP
 ...@..
 ...@..
 ...@..
-...@..
-.@@@@.
+..@.@.
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05D2
-ENCODING 1242
+STARTCHAR 0x2138
+ENCODING 1243
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23797,18 +23778,18 @@ BITMAP
 ......
 ......
 ......
-.@@...
+@@@@@.
+...@..
+...@..
 ...@..
 ...@..
 ...@..
-..@.@.
-.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x2137
-ENCODING 1242
+STARTCHAR 0x10D0
+ENCODING 1305
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23816,37 +23797,37 @@ BITMAP
 ......
 ......
 ......
-.@@...
-...@..
-...@..
+......
+..@...
 ...@..
-..@.@.
+....@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05D3
-ENCODING 1243
+STARTCHAR 0x10D1
+ENCODING 1306
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@@@@.
-...@..
-...@..
-...@..
+..@...
 ...@..
 ...@..
+..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x2138
-ENCODING 1243
+STARTCHAR 0x10D2
+ENCODING 1307
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23854,18 +23835,18 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-...@..
-...@..
-...@..
-...@..
-...@..
-......
-......
 ......
+..@...
+.@.@..
+...@..
+..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05D4
-ENCODING 1244
+STARTCHAR 0x10D3
+ENCODING 1308
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23873,18 +23854,18 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-....@.
-.@..@.
+......
+..@@..
 .@..@.
 .@..@.
 .@..@.
-......
-......
-......
+..@@..
+..@...
+.@@@..
+....@.
 ENDCHAR
-STARTCHAR 0x05D5
-ENCODING 1245
+STARTCHAR 0x10D4
+ENCODING 1309
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23892,18 +23873,18 @@ BITMAP
 ......
 ......
 ......
-..@@..
-...@..
-...@..
-...@..
-...@..
-...@..
-......
-......
 ......
+..@@..
+..@.@.
+....@.
+....@.
+....@.
+....@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05D6
-ENCODING 1246
+STARTCHAR 0x10D5
+ENCODING 1310
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23911,37 +23892,37 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-..@...
-..@...
-..@...
-..@...
-..@...
-......
-......
 ......
+..@@..
+..@.@.
+....@.
+..@@..
+....@.
+....@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05D7
-ENCODING 1247
+STARTCHAR 0x10D6
+ENCODING 1311
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@@@@.
-.@..@.
-.@..@.
-.@..@.
+..@...
+.@.@..
+.@.@..
+..@...
+..@@..
 .@..@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05D8
-ENCODING 1248
+STARTCHAR 0x10D7
+ENCODING 1312
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23949,18 +23930,18 @@ BITMAP
 ......
 ......
 ......
-@..@@.
-@...@.
-@...@.
-@...@.
-@..@..
-@@@...
+......
+..@.@.
+.@.@.@
+.@.@.@
+.@.@.@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05D9
-ENCODING 1249
+STARTCHAR 0x10D8
+ENCODING 1313
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23968,18 +23949,18 @@ BITMAP
 ......
 ......
 ......
-..@@..
-...@..
-...@..
-......
-......
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05DB
-ENCODING 1250
+STARTCHAR 0x10D9
+ENCODING 1314
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -23987,18 +23968,18 @@ BITMAP
 ......
 ......
 ......
-.@@@..
+......
 ....@.
 ....@.
 ....@.
+..@@..
 ....@.
-.@@@..
-......
-......
-......
+....@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05DA
-ENCODING 1251
+STARTCHAR 0x10DA
+ENCODING 1315
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24006,56 +23987,56 @@ BITMAP
 ......
 ......
 ......
-.@@@@.
-....@.
-....@.
-....@.
-....@.
-....@.
-....@.
-....@.
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@....
+..@...
+.@@@..
+....@.
 ENDCHAR
-STARTCHAR 0x05DC
-ENCODING 1252
+STARTCHAR 0x10DB
+ENCODING 1316
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@@.
-....@.
-....@.
+..@@..
+.@..@.
 ....@.
-...@..
-..@...
+..@@@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05DE
-ENCODING 1253
+STARTCHAR 0x10DC
+ENCODING 1317
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@.@@..
-.@@.@.
+..@@..
+.@....
+.@....
+.@@@..
 .@..@.
 .@..@.
-@...@.
-@.@@@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05DD
-ENCODING 1254
+STARTCHAR 0x10DD
+ENCODING 1318
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24063,37 +24044,37 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@@@@.
+......
+..@.@.
+.@.@.@
+.@.@.@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05E0
-ENCODING 1255
+STARTCHAR 0x10DE
+ENCODING 1319
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-...@@.
-....@.
-....@.
+.@....
+..@@..
 ....@.
+...@..
+..@@..
 ....@.
-.@@@@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05DF
-ENCODING 1256
+STARTCHAR 0x10DF
+ENCODING 1320
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24101,26 +24082,45 @@ BITMAP
 ......
 ......
 ......
-..@@..
-...@..
-...@..
-...@..
-...@..
-...@..
-...@..
-...@..
 ......
+.@.@@@
+.@.@.@
+.@.@.@
+..@..@
+.....@
+.....@
+..@..@
+...@@.
 ENDCHAR
-STARTCHAR 0x05E1
-ENCODING 1257
+STARTCHAR 0x10E0
+ENCODING 1321
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+....@.
+..@@..
+.@....
+.@@.@.
+.@.@.@
+.@.@.@
+.@...@
+.@...@
+......
 ......
 ......
-@@@@@.
+ENDCHAR
+STARTCHAR 0x10E1
+ENCODING 1322
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@....
+.@....
+.@....
 .@..@.
 .@..@.
 .@..@.
@@ -24130,8 +24130,8 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05E2
-ENCODING 1258
+STARTCHAR 0x10E2
+ENCODING 1323
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24139,18 +24139,37 @@ BITMAP
 ......
 ......
 ......
-.@..@.
-.@..@.
-..@.@.
-..@@..
 ...@..
-.@@...
+..@.@.
+.@.@.@
+.@...@
+.@...@
+.@...@
+.@...@
+.@...@
+..@@@.
+ENDCHAR
+STARTCHAR 0x10E3
+ENCODING 1324
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
 ......
 ......
+......
+.@.@@.
+.@@@.@
+...@.@
+.....@
+.....@
+.@...@
+.@...@
+..@@@.
 ENDCHAR
-STARTCHAR 0x05E4
-ENCODING 1259
+STARTCHAR 0x10E4
+ENCODING 1325
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24158,37 +24177,37 @@ BITMAP
 ......
 ......
 ......
-@@@@..
-.@..@.
-.@@.@.
-....@.
-....@.
-.@@@..
-......
-......
 ......
+..@@@@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+.....@
+..@..@
+...@@.
 ENDCHAR
-STARTCHAR 0x05E3
-ENCODING 1260
+STARTCHAR 0x10E5
+ENCODING 1326
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@@@..
-.@..@.
-.@@.@.
 ....@.
 ....@.
 ....@.
+..@@@.
+..@.@.
+....@.
+....@.
 ....@.
 ....@.
-......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05E6
-ENCODING 1261
+STARTCHAR 0x10E6
+ENCODING 1327
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24196,18 +24215,18 @@ BITMAP
 ......
 ......
 ......
-.@..@.
-.@..@.
-..@@..
-...@..
-....@.
-.@@@@.
-......
-......
 ......
+..@.@.
+.@.@.@
+.@.@.@
+.@...@
+.@....
+..@...
+.@@@@.
+.....@
 ENDCHAR
-STARTCHAR 0x05E5
-ENCODING 1262
+STARTCHAR 0x10E7
+ENCODING 1328
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24215,56 +24234,56 @@ BITMAP
 ......
 ......
 ......
+......
 .@..@.
 .@..@.
-.@.@..
-.@@...
-.@....
-.@....
-.@....
-.@....
-......
+.@..@.
+..@@@.
+....@.
+.@..@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05E7
-ENCODING 1263
+STARTCHAR 0x10E8
+ENCODING 1329
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-.@@@..
+@@.@@.
+@.@.@.
+@.@.@.
 ....@.
+..@@@.
 .@..@.
-.@.@..
-.@.@..
-.@....
-.@....
-.@....
+.@..@.
+..@@..
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x05E8
-ENCODING 1264
+STARTCHAR 0x10E9
+ENCODING 1330
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
+..@@..
+.@..@.
 .@@@..
-....@.
-....@.
-....@.
-....@.
-....@.
+.@....
+.@@@..
+.@..@.
+.@..@.
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05E9
-ENCODING 1265
+STARTCHAR 0x10EA
+ENCODING 1331
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24272,75 +24291,94 @@ BITMAP
 ......
 ......
 ......
-@.@.@.
-@.@.@.
-@.@.@.
-@@..@.
-@..@..
-@@@...
-......
-......
 ......
+.@.@..
+.@..@.
+.@..@.
+.@.@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05EA
-ENCODING 1266
+STARTCHAR 0x10EB
+ENCODING 1332
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@@@..
-.@..@.
+....@.
+....@.
+....@.
+..@@@.
 .@..@.
 .@..@.
 .@..@.
-@@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4F
-ENCODING 1267
+STARTCHAR 0x10EC
+ENCODING 1333
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@.@.
+.@.@.@
+.@.@.@
 .@....
-.@....
-.@.@..
-.@..@.
-..@@..
+..@@@.
+..@.@.
+..@.@.
+..@.@.
+...@..
+...@..
+...@..
+ENDCHAR
+STARTCHAR 0x10ED
+ENCODING 1334
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+..@...
+..@...
 ...@..
 ....@.
+...@@.
+..@.@.
+...@@.
+....@.
 ....@.
-......
-......
-......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x05F0
-ENCODING 1268
+STARTCHAR 0x10EE
+ENCODING 1335
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@.@@.
-.@..@.
-.@..@.
+.@....
+.@....
+.@.@..
+.@@@..
 .@..@.
 .@..@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05F1
-ENCODING 1269
+STARTCHAR 0x10EF
+ENCODING 1336
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24348,113 +24386,132 @@ BITMAP
 ......
 ......
 ......
-@@.@@.
+......
+.@..@.
+.@..@.
+..@@..
 .@..@.
 .@..@.
+..@...
+.@@...
+......
+ENDCHAR
+STARTCHAR 0x10F0
+ENCODING 1337
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+..@@..
 ....@.
+..@@..
 ....@.
+..@@..
 ....@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05F2
-ENCODING 1270
+STARTCHAR 0x10F1
+ENCODING 1338
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@@.@@.
-.@..@.
+.@.@..
 .@..@.
-......
-......
-......
+.@...@
+.@.@@.
+.@...@
+.@.@@.
+.@...@
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB2A
-ENCODING 1271
+STARTCHAR 0x10F2
+ENCODING 1339
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-....@.
 ......
-@.@.@.
-@.@.@.
-@.@.@.
-@@..@.
-@..@..
-@@@...
 ......
 ......
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
+.@..@.
+......
+......
 ENDCHAR
-STARTCHAR 0xFB2B
-ENCODING 1272
+STARTCHAR 0x10F3
+ENCODING 1340
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
-@.....
 ......
-@.@.@.
-@.@.@.
-@.@.@.
-@@..@.
-@..@..
-@@@...
 ......
 ......
 ......
+..@@@.
+....@.
+...@..
+..@@..
+....@.
+....@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0xFB1D
-ENCODING 1273
+STARTCHAR 0x10F4
+ENCODING 1341
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-..@@..
-...@..
-...@..
-......
 ...@..
+..@...
+..@...
+...@@.
+....@.
 ...@..
-......
-......
-......
+..@@..
+....@.
+....@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0xFB2E
-ENCODING 1274
+STARTCHAR 0x10F5
+ENCODING 1342
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-.@.@..
-.@..@.
 ..@@..
-.@.@..
 .@..@.
-.@@.@.
+.@..@.
+..@@@@
+..@@@@
+.@..@.
+.@..@.
+..@@..
+......
 ......
-.@@@@.
 ......
 ENDCHAR
-STARTCHAR 0xFB1F
-ENCODING 1275
+STARTCHAR 0x10F6
+ENCODING 1343
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24462,18 +24519,37 @@ BITMAP
 ......
 ......
 ......
-@@.@@.
-.@..@.
-.@..@.
 ......
-.@@@@.
+..@.@.
+.@.@.@
+.@.@.@
+.@.@.@
+...@@.
+...@..
+...@..
+..@...
+ENDCHAR
+STARTCHAR 0x10F7
+ENCODING 1344
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
 ......
 ......
 ......
+..@@..
+.@..@.
+....@.
+...@..
+..@...
+.@....
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0xFB2F
-ENCODING 1276
+STARTCHAR 0x10F8
+ENCODING 1345
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24481,18 +24557,18 @@ BITMAP
 ......
 ......
 ......
-.@.@..
+......
+.@..@.
 .@..@.
-..@@..
-.@.@..
 .@..@.
-.@@.@.
-......
 .@@@..
-..@...
+.@....
+.@..@.
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0xFB30
-ENCODING 1277
+STARTCHAR 0x10FA
+ENCODING 1346
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24500,37 +24576,37 @@ BITMAP
 ......
 ......
 ......
-.@.@..
-.@..@.
-..@@..
-.@.@..
-.@@.@.
-.@@.@.
 ......
+..@@..
+.@..@.
+.@....
+..@...
+..@@@.
+.@....
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB31
-ENCODING 1278
+STARTCHAR 0x10FD
+ENCODING 1347
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-.@@...
-...@..
-.@.@..
+..@@..
 .@.@..
+.@....
+..@...
 ...@..
-.@@@@.
+....@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB32
-ENCODING 1279
+STARTCHAR 0xE09C
+ENCODING 1348
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24538,18 +24614,18 @@ BITMAP
 ......
 ......
 ......
-.@@...
-...@..
-.@.@..
-.@.@..
-..@.@.
-.@..@.
-......
-......
 ......
+..@@.@
+.@.@@@
+.@.@..
+.@....
+.@....
+.@...@
+.@...@
+..@@@.
 ENDCHAR
-STARTCHAR 0xFB33
-ENCODING 1280
+STARTCHAR 0x10FE
+ENCODING 1349
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24557,18 +24633,18 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-...@..
-.@.@..
-.@.@..
-...@..
-...@..
+.@..@.
+..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB34
-ENCODING 1281
+STARTCHAR 0x10FF
+ENCODING 1350
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24576,18 +24652,18 @@ BITMAP
 ......
 ......
 ......
-@@@@@.
-....@.
-.@.@@.
-.@.@@.
+......
+..@@..
 .@..@.
 .@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB35
-ENCODING 1282
+STARTCHAR 0x10F9
+ENCODING 1351
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -24595,816 +24671,968 @@ BITMAP
 ......
 ......
 ......
+......
+..@@..
+.@..@.
+.@..@.
+.@..@.
 ..@@..
+..@...
+..@.@.
 ...@..
+ENDCHAR
+STARTCHAR 0xE093
+ENCODING 1352
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
 .@.@..
 .@.@..
+......
+..@...
 ...@..
-...@..
+....@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB36
-ENCODING 1283
+STARTCHAR 0xE098
+ENCODING 1353
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@.@.
+..@.@.
 ......
-......
-@@@@@.
-..@...
-@.@...
-@.@...
-..@...
-..@...
+..@.@.
+.@.@.@
+.@.@.@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB38
-ENCODING 1284
+STARTCHAR 0xE09B
+ENCODING 1354
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@.@.
+..@.@.
 ......
-......
-@..@@.
-@...@.
-@.@.@.
-@.@.@.
-@..@..
-@@@...
-......
-......
-......
+.@.@@.
+.@@@.@
+...@.@
+.....@
+.....@
+.@...@
+.@...@
+..@@@.
 ENDCHAR
-STARTCHAR 0xFB39
-ENCODING 1285
+STARTCHAR 0xE091
+ENCODING 1355
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@...
+...@..
 ......
-......
-..@@..
+..@...
 ...@..
-.@.@..
-.@....
+....@.
+.@..@.
+..@@..
 ......
 ......
 ......
+ENDCHAR
+STARTCHAR 0xE099
+ENCODING 1356
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
+..@@..
+.@..@.
 ......
+.@.@@.
+.@@@.@
+...@.@
+.....@
+.....@
+.@...@
+.@...@
+..@@@.
 ENDCHAR
-STARTCHAR 0xFB3B
-ENCODING 1286
+STARTCHAR 0xE090
+ENCODING 1357
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
-......
 .@@@..
+......
+..@...
+...@..
 ....@.
-..@.@.
-..@.@.
-....@.
-.@@@..
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB3A
-ENCODING 1287
+STARTCHAR 0xE095
+ENCODING 1358
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
+..@@@.
 ......
-.@@@@.
-....@.
-..@.@.
+..@@..
 ..@.@.
 ....@.
 ....@.
 ....@.
 ....@.
-......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0xFB3C
-ENCODING 1288
+STARTCHAR 0xE096
+ENCODING 1359
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@@.
-....@.
+......
+..@@@.
+......
+..@@..
+.@..@.
+.@..@.
 .@..@.
 .@..@.
-...@..
-..@...
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB3E
-ENCODING 1289
+STARTCHAR 0xE097
+ENCODING 1360
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
+..@@@.
 ......
-@.@@..
-.@@.@.
-.@.@@.
-.@.@@.
-@...@.
-@.@@@.
+..@.@.
+.@.@.@
+.@.@.@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB40
-ENCODING 1290
+STARTCHAR 0xE09A
+ENCODING 1361
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
+..@@@.
 ......
-...@@.
-....@.
-..@.@.
-..@.@.
-....@.
-.@@@@.
-......
-......
-......
+.@.@@.
+.@@@.@
+...@.@
+.....@
+.....@
+.@...@
+.@...@
+..@@@.
 ENDCHAR
-STARTCHAR 0xFB41
-ENCODING 1291
+STARTCHAR 0xE094
+ENCODING 1362
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@@@.
 ......
+.@@.@@
 ......
-......
-@@@@@.
-.@..@.
-.@.@@.
-.@.@@.
+..@...
+...@..
+....@.
 .@..@.
 ..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB44
-ENCODING 1292
+STARTCHAR 0xE092
+ENCODING 1363
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@@@.
+..@...
+...@..
 ......
-......
-......
-@@@@..
-@...@.
-@.@.@.
-..@.@.
+..@...
+...@..
 ....@.
-.@@@..
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB43
-ENCODING 1293
+STARTCHAR 0x0531
+ENCODING 1364
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@.@@.
+.@..@@
+..@@.@
 ......
 ......
-@@@@..
-@...@.
-@.@.@.
-..@.@.
-....@.
-....@.
-....@.
-....@.
 ......
 ENDCHAR
-STARTCHAR 0xFB46
-ENCODING 1294
+STARTCHAR 0x0532
+ENCODING 1365
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
+..@@..
 .@..@.
-..@.@.
-.@.@..
-.@.@..
-....@.
+.@..@.
+.@....
+.@....
 .@@@@.
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB47
-ENCODING 1295
+STARTCHAR 0x0533
+ENCODING 1366
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@@@
+....@.
+....@.
 ......
 ......
-.@@@..
-....@.
-.@@.@.
-.@@@..
-.@.@..
-.@....
-.@....
-.@....
 ......
 ENDCHAR
-STARTCHAR 0xFB48
-ENCODING 1296
+STARTCHAR 0x0534
+ENCODING 1367
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-.@@@..
+..@@..
+.@..@.
+.@..@.
+.@..@.
 ....@.
-..@.@.
-..@.@.
+....@@
 ....@.
 ....@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB49
-ENCODING 1297
+STARTCHAR 0x0535
+ENCODING 1368
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-@.@.@.
-@.@@@.
-@.@@@.
-@@..@.
-@..@..
-@@@...
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB2C
-ENCODING 1298
+STARTCHAR 0x0536
+ENCODING 1369
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-....@.
 ......
-@.@.@.
-@.@@@.
-@.@@@.
-@@..@.
-@..@..
-@@@...
+..@@..
+.@..@.
+.@..@.
+..@@@.
+....@.
+.@.@..
+.@@@..
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB2D
-ENCODING 1299
+STARTCHAR 0x0537
+ENCODING 1370
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
-@.....
 ......
-@.@.@.
-@.@@@.
-@.@@@.
-@@..@.
-@..@..
-@@@...
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@....
+.@....
+.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4A
-ENCODING 1300
+STARTCHAR 0x0538
+ENCODING 1371
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@....
+.@....
+.@....
+.@@@@.
 ......
 ......
-@@@@..
+......
+ENDCHAR
+STARTCHAR 0x0539
+ENCODING 1372
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+..@@..
 .@..@.
+.@.@@@
 .@@.@.
 .@@.@.
-.@..@.
-@@..@.
+.@.@..
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4B
-ENCODING 1301
+STARTCHAR 0x053A
+ENCODING 1373
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@...
-..@...
 ......
+....@.
+....@.
+..@@@@
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ..@@..
-...@..
-...@..
-...@..
-...@..
-...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4C
-ENCODING 1302
+STARTCHAR 0x053B
+ENCODING 1374
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@....
+.@....
 .@@@..
+.@..@.
+.@..@.
+.@..@.
+.@....
+.@....
 ......
-.@@...
-...@..
-...@..
-...@..
-...@..
+......
+......
+ENDCHAR
+STARTCHAR 0x053C
+ENCODING 1375
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@....
+.@....
+.@....
+.@....
+.@....
+.@....
+.@....
 .@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4D
-ENCODING 1303
+STARTCHAR 0x053D
+ENCODING 1376
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@..
-......
-.@@@..
-....@.
-....@.
-....@.
-....@.
-.@@@..
+.@....
+.@....
+.@@@.@
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xFB4E
-ENCODING 1304
+STARTCHAR 0x053E
+ENCODING 1377
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@..
-......
-@@@@..
 .@..@.
-.@@.@.
-....@.
-....@.
-.@@@..
+..@@..
+..@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D0
-ENCODING 1305
+STARTCHAR 0x053F
+ENCODING 1378
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@....
+.@....
+.@..@.
+.@..@.
+.@..@.
+..@@@.
+....@.
+....@.
+......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x0540
+ENCODING 1379
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
-..@...
 ...@..
-....@.
-.@..@.
 ..@@..
+...@..
+..@...
+.@....
+.@....
+..@@..
+....@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D1
-ENCODING 1306
+STARTCHAR 0x0541
+ENCODING 1380
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@...
-...@..
-...@..
 ..@@..
 .@..@.
 .@..@.
-.@..@.
+....@.
+....@.
 ..@@..
+.@.@..
+.@@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D2
-ENCODING 1307
+STARTCHAR 0x0542
+ENCODING 1381
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@...
-.@.@..
-...@..
 ..@@..
 .@..@.
 .@..@.
-.@..@.
-..@@..
+....@.
+....@.
+....@.
+....@.
+....@@
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10D3
-ENCODING 1308
+STARTCHAR 0x0543
+ENCODING 1382
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@...@
+..@.@.
+...@..
+..@.@.
+..@.@.
+.@...@
+.@...@
+.@@@@@
 ......
 ......
 ......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-..@@..
-..@...
-.@@@..
-....@.
 ENDCHAR
-STARTCHAR 0x10D4
-ENCODING 1309
+STARTCHAR 0x0544
+ENCODING 1383
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@.@@@
+.@.@.@
+.@.@..
+.@.@..
+.@.@..
+.@.@..
+.@.@..
+..@...
+......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x0545
+ENCODING 1384
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
 ..@@..
-..@.@.
-....@.
-....@.
+.@..@.
 ....@.
+.@@@..
 ....@.
+.....@
 .@..@.
 ..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10D5
-ENCODING 1310
+STARTCHAR 0x0546
+ENCODING 1385
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@@...
+..@...
+..@...
+..@...
+..@..@
+..@..@
+..@..@
+...@@.
+......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x0547
+ENCODING 1386
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
+.@....
 ..@@..
 ..@.@.
-....@.
-..@@..
-....@.
-....@.
+.@....
+.@....
+.@....
 .@..@.
 ..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10D6
-ENCODING 1311
+STARTCHAR 0x0548
+ENCODING 1387
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@...
-.@.@..
-.@.@..
-..@...
 ..@@..
 .@..@.
 .@..@.
-..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D7
-ENCODING 1312
+STARTCHAR 0x0549
+ENCODING 1388
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@..@.
+....@.
+....@.
+....@.
+.@.@..
+..@...
+...@..
+......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x054A
+ENCODING 1389
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
-..@.@.
+..@@@.
 .@.@.@
 .@.@.@
 .@.@.@
-..@..@
+...@.@
+...@.@
+.....@
+.....@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D8
-ENCODING 1313
+STARTCHAR 0x054B
+ENCODING 1390
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@@..
-.@..@.
-.@..@.
+..@...
+.@.@..
 .@..@.
+..@.@.
+...@..
+.@.@..
+.@@@..
 .@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10D9
-ENCODING 1314
+STARTCHAR 0x054C
+ENCODING 1391
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@...
+.@.@..
+.@.@..
+.@.@..
+.@.@..
+.@.@@@
+.@.@..
+.@.@..
 ......
 ......
 ......
-....@.
-....@.
-....@.
-..@@..
-....@.
-....@.
-.@..@.
-..@@..
 ENDCHAR
-STARTCHAR 0x10DA
-ENCODING 1315
+STARTCHAR 0x054D
+ENCODING 1392
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@@..
 .@..@.
 .@..@.
 .@..@.
-.@....
-..@...
-.@@@..
-....@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10DB
-ENCODING 1316
+STARTCHAR 0x054E
+ENCODING 1393
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
 ....@.
-..@@@.
+....@.
 .@..@.
 .@..@.
 .@..@.
-..@@..
+..@@@.
+....@.
+....@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10DC
-ENCODING 1317
+STARTCHAR 0x054F
+ENCODING 1394
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ..@@..
-.@....
-.@....
-.@@@..
-.@..@.
 .@..@.
+.@....
+..@...
+...@..
+....@.
 .@..@.
 ..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10DD
-ENCODING 1318
+STARTCHAR 0x0550
+ENCODING 1395
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@.@.
-.@.@.@
-.@.@.@
-.@...@
-.@...@
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@....
+.@....
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10DE
-ENCODING 1319
+STARTCHAR 0x0551
+ENCODING 1396
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-..@@..
-....@.
-...@..
 ..@@..
+.@..@.
+..@.@.
+.@@@..
 ....@.
+.....@
 .@..@.
 ..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10DF
-ENCODING 1320
+STARTCHAR 0x0552
+ENCODING 1397
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@....
+.@....
+.@....
 ......
 ......
 ......
-.@.@@@
-.@.@.@
-.@.@.@
-..@..@
-.....@
-.....@
-..@..@
-...@@.
 ENDCHAR
-STARTCHAR 0x10E0
-ENCODING 1321
+STARTCHAR 0x0553
+ENCODING 1398
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-....@.
-..@@..
-.@....
-.@@.@.
+...@..
+..@@@.
 .@.@.@
 .@.@.@
-.@...@
-.@...@
+.@.@.@
+.@.@.@
+..@@@.
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10E1
-ENCODING 1322
+STARTCHAR 0x0554
+ENCODING 1399
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
-.@..@.
+..@@..
 .@..@.
 .@..@.
 .@..@.
-..@@..
+.@@@..
+.@....
+@@@@..
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10E2
-ENCODING 1323
+STARTCHAR 0x0555
+ENCODING 1400
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
+......
 ......
 ......
-...@..
-..@.@.
-.@.@.@
-.@...@
-.@...@
-.@...@
-.@...@
-.@...@
-..@@@.
 ENDCHAR
-STARTCHAR 0x10E3
-ENCODING 1324
+STARTCHAR 0x0556
+ENCODING 1401
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@.@..
+.@.@..
+..@@@.
+...@.@
+...@.@
+.@.@.@
+..@@@.
 ......
 ......
 ......
-.@.@@.
-.@@@.@
-...@.@
-.....@
-.....@
-.@...@
-.@...@
-..@@@.
 ENDCHAR
-STARTCHAR 0x10E4
-ENCODING 1325
+STARTCHAR 0x0561
+ENCODING 1402
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25413,36 +25641,36 @@ BITMAP
 ......
 ......
 ......
-..@@@@
 .@.@.@
 .@.@.@
 .@.@.@
-..@.@.
-.....@
-..@..@
-...@@.
+.@.@.@
+..@@@@
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10E5
-ENCODING 1326
+STARTCHAR 0x0562
+ENCODING 1403
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-....@.
-....@.
-....@.
-..@@@.
-..@.@.
-....@.
-....@.
-....@.
-....@.
+......
+......
+......
+.@@@..
 .@..@.
-..@@..
+.@..@.
+.@....
+.@@@@.
+.@....
+.@....
+.@....
 ENDCHAR
-STARTCHAR 0x10E6
-ENCODING 1327
+STARTCHAR 0x0563
+ENCODING 1404
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25451,17 +25679,17 @@ BITMAP
 ......
 ......
 ......
-..@.@.
-.@.@.@
-.@.@.@
-.@...@
-.@....
-..@...
-.@@@@.
-.....@
+..@@..
+.@.@..
+.@.@..
+.@.@..
+..@@@@
+...@..
+...@..
+...@..
 ENDCHAR
-STARTCHAR 0x10E7
-ENCODING 1328
+STARTCHAR 0x0564
+ENCODING 1405
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25470,55 +25698,74 @@ BITMAP
 ......
 ......
 ......
-.@..@.
-.@..@.
-.@..@.
-..@@@.
-....@.
-.@..@.
-.@..@.
-..@@..
+.@@...
+.@.@..
+.@.@..
+.@.@..
+.@.@@@
+...@..
+...@..
+...@..
 ENDCHAR
-STARTCHAR 0x10E8
-ENCODING 1329
+STARTCHAR 0x0565
+ENCODING 1406
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-@@.@@.
-@.@.@.
-@.@.@.
-....@.
-..@@@.
+.@....
+.@....
+.@....
+.@@@@.
+.@....
 .@..@.
 .@..@.
-..@@..
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10E9
-ENCODING 1330
+STARTCHAR 0x0566
+ENCODING 1407
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@@@..
-.@....
-.@@@..
+......
+......
+......
+..@@@.
 .@..@.
 .@..@.
 .@..@.
+..@@@.
+....@.
+....@.
+....@@
+ENDCHAR
+STARTCHAR 0x0567
+ENCODING 1408
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
-......
+.@....
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@....
+..@@..
+....@.
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x10EA
-ENCODING 1331
+STARTCHAR 0x0568
+ENCODING 1409
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25527,17 +25774,36 @@ BITMAP
 ......
 ......
 ......
-.@.@..
+.@@@..
 .@..@.
 .@..@.
-.@.@..
 .@..@.
 .@..@.
+.@....
+.@....
+.@@@@.
+ENDCHAR
+STARTCHAR 0x0569
+ENCODING 1410
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@@..
+.@..@.
 .@..@.
-..@@..
+.@.@@@
+.@@.@.
+.@@.@.
+.@@.@.
+.@.@..
+.@....
+.@....
+.@....
 ENDCHAR
-STARTCHAR 0x10EB
-ENCODING 1332
+STARTCHAR 0x056A
+ENCODING 1411
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25546,8 +25812,8 @@ BITMAP
 ....@.
 ....@.
 ....@.
-..@@@.
-.@..@.
+...@@@
+..@.@.
 .@..@.
 .@..@.
 ..@@..
@@ -25555,46 +25821,65 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10EC
-ENCODING 1333
+STARTCHAR 0x056B
+ENCODING 1412
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@.@.
-.@.@.@
-.@.@.@
 .@....
-..@@@.
-..@.@.
-..@.@.
-..@.@.
+.@....
+.@....
+.@@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@....
+.@....
+.@....
+ENDCHAR
+STARTCHAR 0x056C
+ENCODING 1413
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+...@..
 ...@..
 ...@..
 ...@..
+...@..
+...@..
+...@@@
 ENDCHAR
-STARTCHAR 0x10ED
-ENCODING 1334
+STARTCHAR 0x056D
+ENCODING 1414
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@...
-..@...
-...@..
-....@.
-...@@.
-..@.@.
-...@@.
-....@.
-....@.
-.@..@.
-..@@..
+.@....
+.@....
+.@....
+.@@@.@
+.@.@.@
+.@.@.@
+.@.@.@
+.@..@@
+.@....
+.@....
+.@....
 ENDCHAR
-STARTCHAR 0x10EE
-ENCODING 1335
+STARTCHAR 0x056E
+ENCODING 1415
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25602,9 +25887,9 @@ BITMAP
 ......
 .@....
 .@....
+..@...
+..@@@@
 .@.@..
-.@@@..
-.@..@.
 .@..@.
 .@..@.
 ..@@..
@@ -25612,65 +25897,65 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10EF
-ENCODING 1336
+STARTCHAR 0x056F
+ENCODING 1416
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
+.@....
+.@....
+.@....
 .@..@.
 .@..@.
-..@@..
 .@..@.
 .@..@.
-..@...
-.@@...
-......
+..@@@.
+....@.
+....@.
+....@.
 ENDCHAR
-STARTCHAR 0x10F0
-ENCODING 1337
+STARTCHAR 0x0570
+ENCODING 1417
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-....@.
-..@@..
-....@.
-..@@..
+...@@.
+..@.@.
+..@...
+.@....
+.@....
+.@@...
+...@@.
 ....@.
-.@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10F1
-ENCODING 1338
+STARTCHAR 0x0571
+ENCODING 1418
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@.@..
+..@@..
+..@...
+...@..
+..@@..
+.@..@.
+.@..@.
 .@..@.
-.@...@
-.@.@@.
-.@...@
-.@.@@.
-.@...@
 ..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10F2
-ENCODING 1339
+STARTCHAR 0x0572
+ENCODING 1419
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25679,93 +25964,93 @@ BITMAP
 ......
 ......
 ......
-..@@..
+.@@@..
 .@..@.
 .@..@.
 .@..@.
-..@@..
 .@..@.
-......
-......
+....@.
+....@.
+....@@
 ENDCHAR
-STARTCHAR 0x10F3
-ENCODING 1340
+STARTCHAR 0x0573
+ENCODING 1420
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@@@.
 ....@.
 ...@..
+..@...
+.@@...
 ..@@..
-....@.
-....@.
 .@..@.
-..@@..
+.@..@.
+.@@@@.
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10F4
-ENCODING 1341
+STARTCHAR 0x0574
+ENCODING 1421
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@..
-..@...
-..@...
 ...@@.
-....@.
 ...@..
-..@@..
-....@.
 ....@.
 .@..@.
-..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@@.
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10F5
-ENCODING 1342
+STARTCHAR 0x0575
+ENCODING 1422
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
-..@@@@
-..@@@@
-.@..@.
-.@..@.
-..@@..
 ......
 ......
 ......
+..@@..
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+.@@...
 ENDCHAR
-STARTCHAR 0x10F6
-ENCODING 1343
+STARTCHAR 0x0576
+ENCODING 1423
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@....
+.@....
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@@.
 ......
 ......
 ......
-..@.@.
-.@.@.@
-.@.@.@
-.@.@.@
-...@@.
-...@..
-...@..
-..@...
 ENDCHAR
-STARTCHAR 0x10F7
-ENCODING 1344
+STARTCHAR 0x0577
+ENCODING 1424
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25778,13 +26063,13 @@ BITMAP
 .@..@.
 ....@.
 ...@..
+...@..
 ..@...
 .@....
-.@..@.
-..@@..
+..@@@.
 ENDCHAR
-STARTCHAR 0x10F8
-ENCODING 1345
+STARTCHAR 0x0578
+ENCODING 1425
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25793,17 +26078,17 @@ BITMAP
 ......
 ......
 ......
+.@@@..
 .@..@.
 .@..@.
 .@..@.
-.@@@..
-.@....
-.@..@.
 .@..@.
-..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x10FA
-ENCODING 1346
+STARTCHAR 0x0579
+ENCODING 1426
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25812,55 +26097,55 @@ BITMAP
 ......
 ......
 ......
-..@@..
-.@..@.
-.@....
+...@..
+..@...
+...@..
+...@..
 ..@...
-..@@@.
 .@....
-......
-......
+.@....
+..@@@.
 ENDCHAR
-STARTCHAR 0x10FD
-ENCODING 1347
+STARTCHAR 0x057A
+ENCODING 1427
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@.@..
-.@....
-..@...
-...@..
-....@.
-.@..@.
-..@@..
 ......
 ......
 ......
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
+..@@@@
+.....@
+.....@
+.....@
 ENDCHAR
-STARTCHAR 0xE09C
-ENCODING 1348
+STARTCHAR 0x057B
+ENCODING 1428
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@@.@
-.@.@@@
+..@@..
+.@..@.
+.@..@.
+.@..@.
 .@.@..
+..@@..
+..@...
+..@...
 .@....
 .@....
-.@...@
-.@...@
 ..@@@.
 ENDCHAR
-STARTCHAR 0x10FE
-ENCODING 1349
+STARTCHAR 0x057C
+ENCODING 1429
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25868,18 +26153,18 @@ BITMAP
 ......
 ......
 ......
-.@..@.
-..@@..
-.@..@.
-.@..@.
-.@..@.
-..@@..
+......
+.@@...
+.@.@..
+.@.@..
+.@.@..
+.@.@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10FF
-ENCODING 1350
+STARTCHAR 0x057D
+ENCODING 1430
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -25888,568 +26173,568 @@ BITMAP
 ......
 ......
 ......
-..@@..
 .@..@.
 .@..@.
 .@..@.
-..@@..
+.@..@.
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x10F9
-ENCODING 1351
+STARTCHAR 0x057E
+ENCODING 1431
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-..@@..
+....@.
+....@.
+....@.
 .@..@.
 .@..@.
 .@..@.
-..@@..
-..@...
-..@.@.
-...@..
+.@..@.
+..@@@.
+....@.
+....@.
+....@@
 ENDCHAR
-STARTCHAR 0xE093
-ENCODING 1352
+STARTCHAR 0x057F
+ENCODING 1432
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@.@..
-.@.@..
 ......
-..@...
-...@..
-....@.
-.@..@.
-..@@..
+......
+......
+.@.@@.
+.@.@.@
+.@.@.@
+.@.@.@
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xE098
-ENCODING 1353
-SWIDTH 840 0
+STARTCHAR 0x0580
+ENCODING 1433
+SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@.@.
-..@.@.
-......
-..@.@.
-.@.@.@
-.@.@.@
-.@...@
-.@...@
 ......
 ......
 ......
+.@@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@....
+.@....
+.@....
 ENDCHAR
-STARTCHAR 0xE09B
-ENCODING 1354
+STARTCHAR 0x0581
+ENCODING 1434
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@.@.
-..@.@.
 ......
-.@.@@.
-.@@@.@
-...@.@
-.....@
-.....@
-.@...@
-.@...@
-..@@@.
-ENDCHAR
-STARTCHAR 0xE091
-ENCODING 1355
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
 ......
-..@...
-...@..
 ......
-..@...
-...@..
+..@@@.
+.@..@.
+.@..@.
+.@..@.
+..@@@.
 ....@.
 .@..@.
 ..@@..
-......
-......
-......
 ENDCHAR
-STARTCHAR 0xE099
-ENCODING 1356
+STARTCHAR 0x0582
+ENCODING 1435
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
 ......
-.@.@@.
-.@@@.@
-...@.@
-.....@
-.....@
-.@...@
-.@...@
+......
+......
+.@@...
+..@...
+..@...
+..@...
 ..@@@.
+......
+......
+......
 ENDCHAR
-STARTCHAR 0xE090
-ENCODING 1357
+STARTCHAR 0x0583
+ENCODING 1436
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-.@@@..
-......
-..@...
 ...@..
-....@.
-.@..@.
-..@@..
-......
-......
-......
+...@..
+...@..
+.@.@@.
+.@.@.@
+.@.@.@
+.@.@.@
+..@@.@
+...@..
+...@..
+...@..
 ENDCHAR
-STARTCHAR 0xE095
-ENCODING 1358
+STARTCHAR 0x0584
+ENCODING 1437
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
-..@@@.
 ......
-..@@..
-..@.@.
-....@.
-....@.
-....@.
-....@.
+......
+.@@@..
 .@..@.
-..@@..
+.@..@.
+.@..@.
+.@@@..
+.@....
+.@@@@.
+.@....
 ENDCHAR
-STARTCHAR 0xE096
-ENCODING 1359
+STARTCHAR 0x0585
+ENCODING 1438
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ......
-..@@@.
+......
 ......
 ..@@..
 .@..@.
 .@..@.
 .@..@.
-.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xE097
-ENCODING 1360
+STARTCHAR 0x0586
+ENCODING 1439
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
+..@@..
+.@.@..
+.@.@..
+..@@..
+...@@.
+...@.@
+.@.@.@
 ..@@@.
+...@..
+...@..
+...@..
+ENDCHAR
+STARTCHAR 0x0587
+ENCODING 1440
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
-..@.@.
-.@.@.@
-.@.@.@
-.@...@
-.@...@
+.@....
+.@....
+.@....
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xE09A
-ENCODING 1361
+STARTCHAR 0x0391
+ENCODING 1441
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+..@@..
+.@..@.
+.@..@.
+.@@@@.
+.@..@.
+.@..@.
+.@..@.
+......
 ......
-..@@@.
 ......
-.@.@@.
-.@@@.@
-...@.@
-.....@
-.....@
-.@...@
-.@...@
-..@@@.
 ENDCHAR
-STARTCHAR 0xE094
-ENCODING 1362
+STARTCHAR 0x0392
+ENCODING 1442
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@@.
 ......
-.@@.@@
-......
-..@...
-...@..
-....@.
+.@@@..
 .@..@.
-..@@..
+.@..@.
+.@@@..
+.@..@.
+.@..@.
+.@..@.
+.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0xE092
-ENCODING 1363
+STARTCHAR 0x0393
+ENCODING 1443
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@@.
-..@...
-...@..
 ......
+..@@@@
+..@...
+..@...
+..@...
+..@...
+..@...
+..@...
 ..@...
-...@..
-....@.
-.@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0531
-ENCODING 1364
+STARTCHAR 0x0394
+ENCODING 1444
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@.@@.
-.@..@@
-..@@.@
+...@..
+...@..
+..@.@.
+..@.@.
+.@...@
+.@...@
+.@...@
+.@@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0532
-ENCODING 1365
+STARTCHAR 0x0395
+ENCODING 1445
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
+.@@@@.
 .@....
 .@....
-.@@@@.
+.@@@..
+.@....
 .@....
 .@....
+.@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0533
-ENCODING 1366
+STARTCHAR 0x0396
+ENCODING 1446
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@@@
-....@.
+.@@@@.
 ....@.
+...@..
+...@..
+..@...
+..@...
+.@....
+.@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0534
-ENCODING 1367
+STARTCHAR 0x0397
+ENCODING 1447
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
 .@..@.
 .@..@.
 .@..@.
-....@.
-....@@
-....@.
-....@.
+.@@@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0535
-ENCODING 1368
+STARTCHAR 0x0398
+ENCODING 1448
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@@.
-.@....
-.@....
-.@..@.
-.@..@.
-..@@..
+..@@@.
+.@...@
+.@...@
+.@@@@@
+.@...@
+.@...@
+.@...@
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0536
-ENCODING 1369
+STARTCHAR 0x03F4
+ENCODING 1449
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
 ..@@@.
-....@.
-.@.@..
-.@@@..
-.@..@.
+.@...@
+.@...@
+.@@@@@
+.@...@
+.@...@
+.@...@
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0537
-ENCODING 1370
+STARTCHAR 0x0399
+ENCODING 1450
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@@.
-.@....
-.@....
-.@....
-.@....
-.@@@..
+..@@@.
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0538
-ENCODING 1371
+STARTCHAR 0x039A
+ENCODING 1451
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
 .@..@.
 .@..@.
+.@.@..
+.@@...
+.@.@..
+.@.@..
+.@..@.
 .@..@.
-.@....
-.@....
-.@....
-.@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0539
-ENCODING 1372
+STARTCHAR 0x039B
+ENCODING 1452
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@.@@@
-.@@.@.
-.@@.@.
-.@.@..
-.@....
-.@....
+...@..
+...@..
+..@.@.
+..@.@.
+.@...@
+.@...@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053A
-ENCODING 1373
+STARTCHAR 0x039C
+ENCODING 1453
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-....@.
-....@.
-..@@@@
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
+.@...@
+.@@.@@
+.@@.@@
+.@.@.@
+.@.@.@
+.@...@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053B
-ENCODING 1374
+STARTCHAR 0x039D
+ENCODING 1454
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@..
 .@..@.
 .@..@.
+.@@.@.
+.@@.@.
+.@.@@.
+.@.@@.
+.@..@.
 .@..@.
-.@....
-.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053C
-ENCODING 1375
+STARTCHAR 0x039E
+ENCODING 1455
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
-.@....
-.@....
-.@....
-.@....
+.@@@@.
+.@..@.
+......
+..@@..
+......
+......
+.@..@.
 .@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053D
-ENCODING 1376
+STARTCHAR 0x039F
+ENCODING 1456
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@.@
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
+..@@..
+.@..@.
 .@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053E
-ENCODING 1377
+STARTCHAR 0x03A0
+ENCODING 1457
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@@@@.
+.@..@.
+.@..@.
 .@..@.
-..@@..
-..@.@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x053F
-ENCODING 1378
+STARTCHAR 0x03A1
+ENCODING 1458
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
+.@@@..
 .@..@.
 .@..@.
 .@..@.
-..@@@.
-....@.
-....@.
+.@@@..
+.@....
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0540
-ENCODING 1379
+STARTCHAR 0x03A3
+ENCODING 1459
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@@@@.
+.@....
+..@...
 ...@..
-..@@..
 ...@..
 ..@...
 .@....
-.@....
-..@@..
-....@.
+.@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0541
-ENCODING 1380
+STARTCHAR 0x03F9
+ENCODING 1460
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -26457,18 +26742,18 @@ BITMAP
 ......
 ..@@..
 .@..@.
+.@....
+.@....
+.@....
+.@....
 .@..@.
-....@.
-....@.
 ..@@..
-.@.@..
-.@@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0542
-ENCODING 1381
+STARTCHAR 0x03FD
+ENCODING 1461
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -26476,123 +26761,104 @@ BITMAP
 ......
 ..@@..
 .@..@.
-.@..@.
 ....@.
 ....@.
 ....@.
 ....@.
-....@@
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0543
-ENCODING 1382
+STARTCHAR 0x03A4
+ENCODING 1462
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@...@
-..@.@.
-...@..
-..@.@.
-..@.@.
-.@...@
-.@...@
 .@@@@@
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0544
-ENCODING 1383
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-.@.@@@
-.@.@.@
-.@.@..
-.@.@..
-.@.@..
-.@.@..
-.@.@..
-..@...
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0545
-ENCODING 1384
+STARTCHAR 0x03A5
+ENCODING 1463
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-....@.
-.@@@..
-....@.
-.....@
-.@..@.
-..@@..
+.@...@
+.@...@
+..@.@.
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0546
-ENCODING 1385
+STARTCHAR 0x03D2
+ENCODING 1464
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@...
-..@...
-..@...
-..@...
-..@..@
-..@..@
-..@..@
-...@@.
+.@@.@@
+.@.@.@
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0547
-ENCODING 1386
+STARTCHAR 0x03A6
+ENCODING 1465
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-..@@..
-..@.@.
-.@....
-.@....
-.@....
-.@..@.
-..@@..
+...@..
+..@@@.
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
+..@@@.
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0548
-ENCODING 1387
+STARTCHAR 0x03A7
+ENCODING 1466
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
 .@..@.
 .@..@.
 .@..@.
+..@@..
+..@@..
 .@..@.
 .@..@.
 .@..@.
@@ -26600,84 +26866,84 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0549
-ENCODING 1388
+STARTCHAR 0x03A8
+ENCODING 1467
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-....@.
-....@.
-....@.
-.@.@..
-..@...
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
+..@@@.
+...@..
+...@..
 ...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054A
-ENCODING 1389
+STARTCHAR 0x03A9
+ENCODING 1468
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ..@@@.
-.@.@.@
-.@.@.@
-.@.@.@
-...@.@
-...@.@
-.....@
-.....@
+.@...@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054B
-ENCODING 1390
+STARTCHAR 0x2126
+ENCODING 1468
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@...
-.@.@..
-.@..@.
+..@@@.
+.@...@
+.@...@
+.@...@
+.@...@
 ..@.@.
-...@..
-.@.@..
-.@@@..
-.@..@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054C
-ENCODING 1391
+STARTCHAR 0x03DC
+ENCODING 1469
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@@@
+..@...
+..@...
+..@@@.
+..@...
+..@...
+..@...
 ..@...
-.@.@..
-.@.@..
-.@.@..
-.@.@..
-.@.@@@
-.@.@..
-.@.@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054D
-ENCODING 1392
+STARTCHAR 0x0376
+ENCODING 1470
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -26685,227 +26951,227 @@ BITMAP
 ......
 .@..@.
 .@..@.
+.@.@@.
+.@.@@.
+.@@.@.
+.@@.@.
 .@..@.
 .@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054E
-ENCODING 1393
+STARTCHAR 0x03DE
+ENCODING 1471
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@...
+..@...
+.@....
+.@@@@.
 ....@.
 ....@.
-.@..@.
-.@..@.
-.@..@.
-..@@@.
-....@.
-....@@
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x054F
-ENCODING 1394
+STARTCHAR 0x03D8
+ENCODING 1472
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@....
-..@...
+..@@@.
+.@...@
+.@...@
+.@...@
+..@@@.
+...@..
+...@..
 ...@..
-....@.
-.@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0550
-ENCODING 1395
+STARTCHAR 0x03DA
+ENCODING 1473
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@....
+...@@@
+..@...
 .@....
 .@....
 .@....
+..@@@.
+....@.
+....@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0551
-ENCODING 1396
+STARTCHAR 0x03E0
+ENCODING 1474
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
+...@..
+...@..
 ..@.@.
-.@@@..
-....@.
-.....@
-.@..@.
-..@@..
+..@.@.
+.@..@@
+.@.@.@
+.@.@.@
+.@.@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0552
-ENCODING 1397
+STARTCHAR 0x0372
+ENCODING 1475
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@@@@.
-.@....
-.@....
-.@....
-.@....
-.@....
+.@@@@@
+.@.@.@
+.@.@.@
+.@.@.@
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0553
-ENCODING 1398
+STARTCHAR 0x03FA
+ENCODING 1476
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@..
+..@.@.
 ..@@@.
 .@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-..@@@.
-...@..
+.@...@
+.@...@
+.@...@
+.@...@
+.@...@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0554
-ENCODING 1399
+STARTCHAR 0x0370
+ENCODING 1477
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@@@..
 .@....
-@@@@..
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@....
 .@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0555
-ENCODING 1400
+STARTCHAR 0x03F7
+ENCODING 1478
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
+.@....
+.@....
+.@@@..
 .@..@.
 .@..@.
-..@@..
+.@@@..
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0556
-ENCODING 1401
+STARTCHAR 0x03B1
+ENCODING 1479
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@.@..
-.@.@..
-..@@@.
-...@.@
-...@.@
+......
+......
+..@..@
 .@.@.@
-..@@@.
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0561
-ENCODING 1402
+STARTCHAR 0x03B2
+ENCODING 1480
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-..@@@@
-......
-......
+..@@..
+.@..@.
+.@..@.
+.@@@..
+.@..@.
+.@..@.
+.@..@.
+.@@@..
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x0562
-ENCODING 1403
+STARTCHAR 0x03D0
+ENCODING 1481
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
+..@@..
+.@..@.
+.@@@..
+.@....
 .@@@..
 .@..@.
 .@..@.
-.@....
-.@@@@.
-.@....
-.@....
-.@....
+..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x0563
-ENCODING 1404
+STARTCHAR 0x03B3
+ENCODING 1482
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -26913,56 +27179,56 @@ BITMAP
 ......
 ......
 ......
-......
-..@@..
-.@.@..
-.@.@..
-.@.@..
-..@@@@
+.@..@.
+.@..@.
+..@.@.
+...@..
 ...@..
 ...@..
 ...@..
+...@..
+......
 ENDCHAR
-STARTCHAR 0x0564
-ENCODING 1405
+STARTCHAR 0x03B4
+ENCODING 1483
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@@.
+.@....
+..@...
+..@@..
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
-.@@...
-.@.@..
-.@.@..
-.@.@..
-.@.@@@
-...@..
-...@..
-...@..
 ENDCHAR
-STARTCHAR 0x0565
-ENCODING 1406
+STARTCHAR 0x03B5
+ENCODING 1484
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+......
+......
+..@@@.
 .@....
+.@@@..
 .@....
 .@....
-.@@@@.
-.@....
-.@..@.
-.@..@.
 ..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0566
-ENCODING 1407
+STARTCHAR 0x03F5
+ENCODING 1485
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -26970,37 +27236,37 @@ BITMAP
 ......
 ......
 ......
-......
 ..@@@.
-.@..@.
-.@..@.
-.@..@.
+.@....
+.@@@..
+.@....
+.@....
 ..@@@.
-....@.
-....@.
-....@@
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x0567
-ENCODING 1408
+STARTCHAR 0x03B6
+ENCODING 1486
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
 .@@@@.
+...@..
+..@...
+..@...
 .@....
 .@....
 .@....
-..@@..
+..@@@.
 ....@.
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x0568
-ENCODING 1409
+STARTCHAR 0x03B7
+ENCODING 1487
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27008,47 +27274,47 @@ BITMAP
 ......
 ......
 ......
-......
-.@@@..
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-.@....
-.@....
-.@@@@.
+....@.
+....@.
+......
 ENDCHAR
-STARTCHAR 0x0569
-ENCODING 1410
+STARTCHAR 0x03B8
+ENCODING 1488
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@..
+..@@..
 .@..@.
 .@..@.
-.@.@@@
-.@@.@.
-.@@.@.
-.@@.@.
-.@.@..
-.@....
-.@....
-.@....
+.@@@@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x056A
-ENCODING 1411
+STARTCHAR 0x03D1
+ENCODING 1489
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
+.@..@.
+.@..@.
+..@@@@
 ....@.
-....@.
-....@.
-...@@@
-..@.@.
 .@..@.
 .@..@.
 ..@@..
@@ -27056,141 +27322,84 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x056B
-ENCODING 1412
+STARTCHAR 0x03B9
+ENCODING 1490
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
-.@@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@....
-.@....
-.@....
-ENDCHAR
-STARTCHAR 0x056C
-ENCODING 1413
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
 ......
 ......
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
-..@@..
-...@..
-...@..
-...@..
-...@..
-...@..
-...@..
-...@@@
-ENDCHAR
-STARTCHAR 0x056D
-ENCODING 1414
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
 ......
-.@....
-.@....
-.@....
-.@@@.@
-.@.@.@
-.@.@.@
-.@.@.@
-.@..@@
-.@....
-.@....
-.@....
 ENDCHAR
-STARTCHAR 0x056E
-ENCODING 1415
+STARTCHAR 0x03BA
+ENCODING 1491
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-..@...
-..@@@@
+......
+......
+.@..@.
+.@..@.
 .@.@..
+.@@@..
 .@..@.
 .@..@.
-..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x056F
-ENCODING 1416
+STARTCHAR 0x03F0
+ENCODING 1492
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@@.
-....@.
-....@.
-....@.
-ENDCHAR
-STARTCHAR 0x0570
-ENCODING 1417
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
 ......
-...@@.
+......
+.@..@.
 ..@.@.
-..@...
-.@....
-.@....
-.@@...
-...@@.
-....@.
+..@@..
+..@@..
+.@.@..
+.@..@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0571
-ENCODING 1418
+STARTCHAR 0x03BB
+ENCODING 1493
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
 ..@...
+..@...
+...@..
 ...@..
 ..@@..
 .@..@.
 .@..@.
 .@..@.
-..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0572
-ENCODING 1419
+STARTCHAR 0x03BC
+ENCODING 1494
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27198,94 +27407,94 @@ BITMAP
 ......
 ......
 ......
-......
-.@@@..
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-....@.
-....@.
-....@@
+.@.@@.
+.@@.@.
+.@....
+.@....
+......
 ENDCHAR
-STARTCHAR 0x0573
-ENCODING 1420
+STARTCHAR 0x00B5
+ENCODING 1494
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-....@.
-...@..
-..@...
-.@@...
-..@@..
-.@..@.
-.@..@.
-.@@@@.
 ......
 ......
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@.@@.
+.@@.@.
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x0574
-ENCODING 1421
+STARTCHAR 0x03BD
+ENCODING 1495
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@@.
-...@..
-....@.
-.@..@.
+......
+......
 .@..@.
 .@..@.
 .@..@.
-..@@@.
+..@.@.
+..@@..
+..@...
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0575
-ENCODING 1422
+STARTCHAR 0x03BE
+ENCODING 1496
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-......
-......
-......
+.@@@@.
+..@...
+.@....
 ..@@..
+..@...
+.@....
+.@....
+..@@@.
+....@.
 ...@..
-...@..
-...@..
-...@..
-...@..
-...@..
-.@@...
+......
 ENDCHAR
-STARTCHAR 0x0576
-ENCODING 1423
+STARTCHAR 0x03BF
+ENCODING 1497
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+......
+......
 ..@@..
-.@....
-.@....
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-..@@@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0577
-ENCODING 1424
+STARTCHAR 0x03C0
+ENCODING 1498
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27293,27 +27502,8 @@ BITMAP
 ......
 ......
 ......
-......
-..@@..
+.@@@@.
 .@..@.
-....@.
-...@..
-...@..
-..@...
-.@....
-..@@@.
-ENDCHAR
-STARTCHAR 0x0578
-ENCODING 1425
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@..
 .@..@.
 .@..@.
 .@..@.
@@ -27322,8 +27512,8 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0579
-ENCODING 1426
+STARTCHAR 0x03D6
+ENCODING 1499
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27331,18 +27521,18 @@ BITMAP
 ......
 ......
 ......
+.@@@@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+......
+......
 ......
-...@..
-..@...
-...@..
-...@..
-..@...
-.@....
-.@....
-..@@@.
 ENDCHAR
-STARTCHAR 0x057A
-ENCODING 1427
+STARTCHAR 0x03C1
+ENCODING 1500
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27350,37 +27540,37 @@ BITMAP
 ......
 ......
 ......
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@@@..
+.@....
+.@....
 ......
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-..@@@@
-.....@
-.....@
-.....@
 ENDCHAR
-STARTCHAR 0x057B
-ENCODING 1428
+STARTCHAR 0x03F1
+ENCODING 1501
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+......
+......
 ..@@..
 .@..@.
 .@..@.
 .@..@.
-.@.@..
-..@@..
-..@...
-..@...
-.@....
+.@..@.
+.@@@..
 .@....
-..@@@.
+..@@..
+......
 ENDCHAR
-STARTCHAR 0x057C
-ENCODING 1429
+STARTCHAR 0x03C3
+ENCODING 1502
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27388,18 +27578,18 @@ BITMAP
 ......
 ......
 ......
-......
-.@@...
-.@.@..
-.@.@..
+..@@@@
 .@.@..
-.@.@@@
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x057D
-ENCODING 1430
+STARTCHAR 0x03C2
+ENCODING 1503
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27407,37 +27597,37 @@ BITMAP
 ......
 ......
 ......
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
 ..@@@.
-......
-......
+.@....
+.@....
+.@....
+.@....
+..@@@.
+....@.
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x057E
-ENCODING 1431
+STARTCHAR 0x03F2
+ENCODING 1504
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-....@.
-....@.
-....@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
+......
+......
 ..@@@.
-....@.
-....@.
-....@@
+.@....
+.@....
+.@....
+.@....
+..@@@.
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x057F
-ENCODING 1432
+STARTCHAR 0x037B
+ENCODING 1505
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27445,18 +27635,18 @@ BITMAP
 ......
 ......
 ......
-......
-.@.@@.
-.@.@.@
-.@.@.@
-.@.@.@
-..@@.@
+.@@@..
+....@.
+....@.
+....@.
+....@.
+.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0580
-ENCODING 1433
+STARTCHAR 0x03C4
+ENCODING 1506
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27464,18 +27654,18 @@ BITMAP
 ......
 ......
 ......
+.@@@@.
+..@...
+..@...
+..@...
+..@...
+...@@.
+......
+......
 ......
-.@@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@....
-.@....
-.@....
 ENDCHAR
-STARTCHAR 0x0581
-ENCODING 1434
+STARTCHAR 0x03C5
+ENCODING 1507
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27483,18 +27673,18 @@ BITMAP
 ......
 ......
 ......
-......
-..@@@.
 .@..@.
 .@..@.
 .@..@.
-..@@@.
-....@.
+.@..@.
 .@..@.
 ..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x0582
-ENCODING 1435
+STARTCHAR 0x03C6
+ENCODING 1508
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27502,18 +27692,18 @@ BITMAP
 ......
 ......
 ......
-......
-.@@...
-..@...
-..@...
-..@...
+....@.
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
 ..@@@.
-......
-......
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0583
-ENCODING 1436
+STARTCHAR 0x03D5
+ENCODING 1509
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27521,18 +27711,18 @@ BITMAP
 ......
 ...@..
 ...@..
-...@..
-.@.@@.
+..@@@.
 .@.@.@
 .@.@.@
 .@.@.@
-..@@.@
-...@..
+.@.@.@
+..@@@.
 ...@..
 ...@..
+......
 ENDCHAR
-STARTCHAR 0x0584
-ENCODING 1437
+STARTCHAR 0x03C7
+ENCODING 1510
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -27540,693 +27730,731 @@ BITMAP
 ......
 ......
 ......
-......
-.@@@..
 .@..@.
 .@..@.
 .@..@.
-.@@@..
-.@....
-.@@@@.
-.@....
-ENDCHAR
-STARTCHAR 0x0585
-ENCODING 1438
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
+..@@..
 ..@@..
 .@..@.
 .@..@.
 .@..@.
-..@@..
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x0586
-ENCODING 1439
+STARTCHAR 0x03C8
+ENCODING 1511
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-.@.@..
-.@.@..
-..@@..
-...@@.
-...@.@
+...@..
+...@..
+.@.@.@
+.@.@.@
+.@.@.@
+.@.@.@
 .@.@.@
 ..@@@.
 ...@..
 ...@..
-...@..
+......
 ENDCHAR
-STARTCHAR 0x0587
-ENCODING 1440
+STARTCHAR 0x03C9
+ENCODING 1512
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@....
-.@....
-.@....
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@@@
+......
+......
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0391
-ENCODING 1441
+STARTCHAR 0x03DD
+ENCODING 1513
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@..
-..@@..
-.@..@.
-.@..@.
-.@@@@.
-.@..@.
-.@..@.
-.@..@.
 ......
 ......
+..@@@.
+.@....
+.@....
+.@....
+.@@@..
+.@....
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x0392
-ENCODING 1442
+STARTCHAR 0x0377
+ENCODING 1514
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@..
-.@..@.
+......
+......
 .@..@.
-.@@@..
 .@..@.
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
-.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0393
-ENCODING 1443
+STARTCHAR 0x03DF
+ENCODING 1515
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@@@
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-......
-......
+@.....
+.@....
+.@....
+.@..@.
+.@.@@.
+.@@.@.
+.@..@.
+....@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0394
-ENCODING 1444
+STARTCHAR 0x03D9
+ENCODING 1516
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@..
-...@..
-..@.@.
-..@.@.
+......
+......
+..@@@.
 .@...@
 .@...@
 .@...@
-.@@@@@
-......
-......
+..@.@.
+...@..
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0395
-ENCODING 1445
+STARTCHAR 0x03DB
+ENCODING 1517
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@.
-.@....
+......
+.....@
+..@@@.
 .@....
-.@@@..
 .@....
 .@....
 .@....
-.@@@@.
+..@...
+...@..
+..@...
 ......
+ENDCHAR
+STARTCHAR 0x03E1
+ENCODING 1518
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
+.@....
+..@...
+...@..
+..@@..
+.@..@.
+...@@.
+..@.@.
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0396
-ENCODING 1446
+STARTCHAR 0x0373
+ENCODING 1519
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@.
-....@.
+.@@@@@
+.@.@.@
+.@.@.@
+...@..
+...@..
+...@..
 ...@..
 ...@..
-..@...
-..@...
-.@....
-.@@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0397
-ENCODING 1447
+STARTCHAR 0x03FB
+ENCODING 1520
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@..@.
-.@..@.
+......
+......
 .@..@.
 .@@@@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-......
-......
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x0398
-ENCODING 1448
+STARTCHAR 0x0371
+ENCODING 1521
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@@.
-.@...@
-.@...@
-.@@@@@
-.@...@
-.@...@
-.@...@
-..@@@.
+......
+......
+.@....
+.@....
+.@@@@.
+.@....
+.@....
+.@....
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03F4
-ENCODING 1449
+STARTCHAR 0x03F8
+ENCODING 1522
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@@.
-.@...@
-.@...@
-.@@@@@
-.@...@
-.@...@
-.@...@
-..@@@.
-......
-......
+.@....
+.@....
+.@.@..
+.@@.@.
+.@..@.
+.@..@.
+.@@.@.
+.@.@..
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x0399
-ENCODING 1450
+STARTCHAR 0x03F3
+ENCODING 1523
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@@.
 ...@..
 ...@..
+......
+..@@..
 ...@..
 ...@..
 ...@..
 ...@..
+...@..
+@..@..
+.@@...
+......
+ENDCHAR
+STARTCHAR 0x03F6
+ENCODING 1524
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
 ..@@@.
+....@.
+....@.
+.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x039A
-ENCODING 1451
+STARTCHAR 0x03FE
+ENCODING 1525
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@..
 .@..@.
-.@..@.
-.@.@..
-.@@...
+.@....
 .@.@..
 .@.@..
+.@....
 .@..@.
-.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x039B
-ENCODING 1452
+STARTCHAR 0x03FF
+ENCODING 1526
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@..
-...@..
+..@@..
+.@..@.
+....@.
 ..@.@.
 ..@.@.
-.@...@
-.@...@
-.@...@
-.@...@
+....@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x039C
-ENCODING 1453
+STARTCHAR 0x037C
+ENCODING 1527
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@...@
-.@@.@@
-.@@.@@
-.@.@.@
-.@.@.@
-.@...@
-.@...@
-.@...@
-......
 ......
 ......
-ENDCHAR
-STARTCHAR 0x039D
-ENCODING 1454
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-.@..@.
-.@..@.
-.@@.@.
-.@@.@.
-.@.@@.
-.@.@@.
-.@..@.
-.@..@.
+..@@@.
+.@....
+.@.@..
+.@.@..
+.@....
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x039E
-ENCODING 1455
+STARTCHAR 0x037D
+ENCODING 1528
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@.
-.@..@.
-......
-..@@..
 ......
 ......
-.@..@.
-.@@@@.
+.@@@..
+....@.
+..@.@.
+..@.@.
+....@.
+.@@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x039F
-ENCODING 1456
+STARTCHAR 0x03FC
+ENCODING 1529
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+......
+......
 ..@@..
 .@..@.
 .@..@.
 .@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
+.@@@..
+.@....
+@@@@..
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x03A0
-ENCODING 1457
+STARTCHAR 0xE08B
+ENCODING 1530
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-......
-......
+..@@@.
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+..@@@.
 ......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x03A1
-ENCODING 1458
+STARTCHAR 0xE08E
+ENCODING 1531
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@..
-.@..@.
-.@..@.
-.@..@.
-.@@@..
-.@....
-.@....
-.@....
-......
-......
+...@..
+...@..
+...@..
+...@..
+..@.@.
+..@.@.
+.@...@
+.@...@
 ......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x03A3
-ENCODING 1459
+STARTCHAR 0xE08C
+ENCODING 1532
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@.
-.@....
-..@...
-...@..
-...@..
-..@...
-.@....
-.@@@@.
 ......
 ......
+.@@...
+...@..
+...@..
+...@..
+...@..
+...@..
 ......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x03F9
-ENCODING 1460
+STARTCHAR 0xE08F
+ENCODING 1533
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+......
+......
 ..@@..
 .@..@.
-.@....
-.@....
-.@....
-.@....
 .@..@.
-..@@..
-......
-......
+.@..@.
+.@..@.
+.@..@.
 ......
+.@..@.
+..@@..
 ENDCHAR
-STARTCHAR 0x03FD
-ENCODING 1461
+STARTCHAR 0x1FBC
+ENCODING 1534
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ..@@..
+..@@..
 .@..@.
-....@.
-....@.
-....@.
-....@.
 .@..@.
-..@@..
-......
-......
+.@@@@.
+.@..@.
+.@..@.
+.@..@.
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x03A4
-ENCODING 1462
+STARTCHAR 0x1FCC
+ENCODING 1535
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@@@@
-...@..
-...@..
-...@..
-...@..
-...@..
+.@..@.
+.@..@.
+.@..@.
+.@@@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ...@..
 ...@..
 ......
-......
-......
 ENDCHAR
-STARTCHAR 0x03A5
-ENCODING 1463
+STARTCHAR 0x1FFC
+ENCODING 1536
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+..@@@.
+.@...@
+.@...@
 .@...@
 .@...@
 ..@.@.
 ..@.@.
+.@@.@@
 ...@..
 ...@..
-...@..
-...@..
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x03D2
-ENCODING 1464
+STARTCHAR 0x1FB3
+ENCODING 1537
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-.@@.@@
+......
+......
+..@..@
 .@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ...@..
 ...@..
-...@..
-...@..
-...@..
-...@..
+......
+ENDCHAR
+STARTCHAR 0x1FC3
+ENCODING 1538
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 ......
 ......
 ......
+.@.@@.
+.@@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@.@.
+..@.@.
+......
 ENDCHAR
-STARTCHAR 0x03A6
-ENCODING 1465
+STARTCHAR 0x1FF3
+ENCODING 1539
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-...@..
-..@@@.
-.@.@.@
+......
+......
+.@..@@
+.@...@
 .@.@.@
 .@.@.@
 .@.@.@
-..@@@.
+..@.@.
+...@..
 ...@..
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x03A7
-ENCODING 1466
+STARTCHAR 0x1FB9
+ENCODING 1540
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@@@.
 ......
-.@..@.
-.@..@.
-.@..@.
 ..@@..
 ..@@..
 .@..@.
+.@@@@.
+.@..@.
 .@..@.
 .@..@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03A8
-ENCODING 1467
+STARTCHAR 0x1FD9
+ENCODING 1541
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@@@.
 ......
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
 ..@@@.
 ...@..
 ...@..
 ...@..
+...@..
+...@..
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03A9
-ENCODING 1468
+STARTCHAR 0x1FE9
+ENCODING 1542
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@@@@
 ......
-..@@@.
-.@...@
 .@...@
 .@...@
-.@...@
-..@.@.
 ..@.@.
-.@@.@@
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x2126
-ENCODING 1468
+STARTCHAR 0x1FB1
+ENCODING 1543
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
 ..@@@.
-.@...@
-.@...@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
+......
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03DC
-ENCODING 1469
+STARTCHAR 0x1FD1
+ENCODING 1544
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
-..@@@@
-..@...
+.@@@..
+......
 ..@...
-..@@@.
 ..@...
 ..@...
 ..@...
 ..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0376
-ENCODING 1470
+STARTCHAR 0x1FE1
+ENCODING 1545
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
 ......
+.@@@@.
+......
+.@..@.
 .@..@.
 .@..@.
-.@.@@.
-.@.@@.
-.@@.@.
-.@@.@.
 .@..@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03DE
-ENCODING 1471
+STARTCHAR 0x1FB8
+ENCODING 1546
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@...
-..@...
-.@....
+.@..@.
+..@@..
+..@@..
+..@@..
+.@..@.
 .@@@@.
-....@.
-....@.
+.@..@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x1FD8
+ENCODING 1547
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@..@.
+..@@..
+..@@@.
 ...@..
 ...@..
+...@..
+...@..
+...@..
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03D8
-ENCODING 1472
+STARTCHAR 0x1FE8
+ENCODING 1548
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@@.
-.@...@
+.@..@.
+..@@..
 .@...@
 .@...@
-..@@@.
+..@.@.
+...@..
 ...@..
 ...@..
 ...@..
@@ -28234,489 +28462,584 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03DA
-ENCODING 1473
+STARTCHAR 0x1FB0
+ENCODING 1549
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@.@.
+...@..
 ......
-...@@@
-..@...
-.@....
-.@....
-.@....
-..@@@.
-....@.
-....@.
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03E0
-ENCODING 1474
+STARTCHAR 0x1FD0
+ENCODING 1550
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@..
+..@...
 ......
-...@..
-...@..
-..@.@.
-..@.@.
-.@..@@
-.@.@.@
-.@.@.@
-.@.@.@
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0372
-ENCODING 1475
+STARTCHAR 0x1FE0
+ENCODING 1551
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@..@.
+..@@..
 ......
-.@@@@@
-.@.@.@
-.@.@.@
-.@.@.@
-...@..
-...@..
-...@..
-...@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03FA
-ENCODING 1476
+STARTCHAR 0x0386
+ENCODING 1552
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@.@.
-..@@@.
-.@.@.@
-.@...@
-.@...@
-.@...@
-.@...@
-.@...@
+.@....
+@..@@.
+...@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0370
-ENCODING 1477
+STARTCHAR 0x1FBB
+ENCODING 1552
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@....
-.@....
-.@....
-.@@@@.
-.@....
-.@....
-.@....
 .@....
+@..@@.
+...@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03F7
-ENCODING 1478
+STARTCHAR 0x1FC9
+ENCODING 1553
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@....
-.@....
-.@@@..
-.@..@.
-.@..@.
-.@@@..
-.@....
 .@....
+@.@@@@
+..@...
+..@...
+..@@@.
+..@...
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B1
-ENCODING 1479
+STARTCHAR 0x0388
+ENCODING 1553
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@....
+@.@@@@
+..@...
+..@...
+..@@@.
+..@...
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x0389
+ENCODING 1554
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@....
+@.@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B2
-ENCODING 1480
+STARTCHAR 0x1FCB
+ENCODING 1554
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@..
-.@..@.
-.@..@.
-.@@@..
-.@..@.
-.@..@.
-.@..@.
-.@@@..
-.@....
 .@....
+@.@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+..@..@
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03D0
-ENCODING 1481
+STARTCHAR 0x1FDB
+ENCODING 1555
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@..
-.@..@.
-.@@@..
 .@....
-.@@@..
-.@..@.
-.@..@.
-..@@..
+@..@@@
+....@.
+....@.
+....@.
+....@.
+....@.
+....@.
+...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B3
-ENCODING 1482
+STARTCHAR 0x038A
+ENCODING 1555
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@....
+@..@@@
+....@.
+....@.
+....@.
+....@.
+....@.
+....@.
+...@@@
 ......
 ......
 ......
-.@..@.
-.@..@.
-..@.@.
-...@..
-...@..
-...@..
-...@..
-...@..
-......
 ENDCHAR
-STARTCHAR 0x03B4
-ENCODING 1483
+STARTCHAR 0x1FF9
+ENCODING 1556
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@@.
 .@....
-..@...
-..@@..
-.@..@.
-.@..@.
-.@..@.
-..@@..
+@..@@.
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B5
-ENCODING 1484
+STARTCHAR 0x038C
+ENCODING 1556
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@....
+@..@@.
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+...@@.
 ......
 ......
 ......
-..@@@.
-.@....
-.@@@..
-.@....
+ENDCHAR
+STARTCHAR 0x1FEB
+ENCODING 1557
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 .@....
-..@@@.
+@.....
+.@...@
+.@...@
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03F5
-ENCODING 1485
+STARTCHAR 0x038E
+ENCODING 1557
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@....
+@.....
+.@...@
+.@...@
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
-..@@@.
-.@....
-.@@@..
-.@....
+ENDCHAR
+STARTCHAR 0x03D3
+ENCODING 1558
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
 .@....
-..@@@.
+@.....
+.@@.@@
+.@.@.@
+...@..
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B6
-ENCODING 1486
+STARTCHAR 0x03D3
+ENCODING 1558
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@@@@.
-...@..
-..@...
-..@...
 .@....
-.@....
-.@....
-..@@@.
-....@.
+@.....
+.@@.@@
+.@.@.@
+...@..
 ...@..
+...@..
+...@..
+...@..
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03B7
-ENCODING 1487
+STARTCHAR 0x1FFB
+ENCODING 1559
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@....
+@.@@@.
+.@...@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
+ENDCHAR
+STARTCHAR 0x038F
+ENCODING 1559
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@....
+@.@@@.
+.@...@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03B8
-ENCODING 1488
+STARTCHAR 0x1F71
+ENCODING 1560
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
-..@@..
-.@..@.
-.@..@.
-.@@@@.
+..@..@
+.@.@.@
 .@..@.
 .@..@.
 .@..@.
-..@@..
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03D1
-ENCODING 1489
+STARTCHAR 0x03AC
+ENCODING 1560
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
-..@@..
-.@..@.
+..@..@
+.@.@.@
 .@..@.
-..@@@@
-....@.
 .@..@.
 .@..@.
-..@@..
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03B9
-ENCODING 1490
+STARTCHAR 0x03AD
+ENCODING 1561
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-..@...
-..@...
-..@...
-..@...
+...@..
 ..@...
-...@@.
+......
+..@@@.
+.@....
+.@@@..
+.@....
+.@....
+..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03BA
-ENCODING 1491
+STARTCHAR 0x03AE
+ENCODING 1562
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
 ......
-......
-......
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
-.@.@..
-.@@@..
 .@..@.
 .@..@.
-......
-......
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x03F0
-ENCODING 1492
+STARTCHAR 0x03AF
+ENCODING 1563
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
 ......
-......
-......
-.@..@.
-..@.@.
-..@@..
-..@@..
-.@.@..
-.@..@@
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03BB
-ENCODING 1493
+STARTCHAR 0x03CC
+ENCODING 1564
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@...
-..@...
-...@..
 ...@..
+..@...
+......
 ..@@..
 .@..@.
 .@..@.
 .@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03BC
-ENCODING 1494
+STARTCHAR 0x03CD
+ENCODING 1565
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
+...@..
+..@...
 ......
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-.@.@@.
-.@@.@.
-.@....
-.@....
+.@..@.
+..@@..
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x00B5
-ENCODING 1494
+STARTCHAR 0x03CE
+ENCODING 1566
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
 ......
 ......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@.@@.
-.@@.@.
-.@....
-.@....
 ......
 ENDCHAR
-STARTCHAR 0x03BD
-ENCODING 1495
+STARTCHAR 0x1F73
+ENCODING 1561
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
+......
+..@@@.
+.@....
+.@@@..
+.@....
+.@....
+..@@@.
+......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x1F75
+ENCODING 1562
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+...@..
+..@...
 ......
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
 .@..@.
-..@.@.
-..@@..
-..@...
-......
-......
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x03BE
-ENCODING 1496
+STARTCHAR 0x1F77
+ENCODING 1563
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
 ......
-.@@@@.
 ..@...
-.@....
-..@@..
 ..@...
-.@....
-.@....
-..@@@.
-....@.
-...@..
+..@...
+..@...
+..@...
+...@@.
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03BF
-ENCODING 1497
+STARTCHAR 0x1F79
+ENCODING 1564
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
+...@..
+..@...
 ......
 ..@@..
 .@..@.
@@ -28728,35 +29051,35 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03C0
-ENCODING 1498
+STARTCHAR 0x1F7B
+ENCODING 1565
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
 ......
-......
-......
-.@@@@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03D6
-ENCODING 1499
+STARTCHAR 0x1F7D
+ENCODING 1566
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
-......
-......
-.@@@@@
+.@..@@
 .@...@
 .@.@.@
 .@.@.@
@@ -28766,699 +29089,737 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03C1
-ENCODING 1500
+STARTCHAR 0x1FB4
+ENCODING 1567
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
-......
-......
-..@@..
-.@..@.
+..@..@
+.@.@.@
 .@..@.
 .@..@.
 .@..@.
-.@@@..
-.@....
-.@....
+..@@.@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x03F1
-ENCODING 1501
+STARTCHAR 0x1FC4
+ENCODING 1568
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+...@..
+..@...
 ......
-......
-......
-..@@..
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-.@@@..
-.@....
-..@@..
+..@.@.
+..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x03C3
-ENCODING 1502
+STARTCHAR 0x1FF4
+ENCODING 1569
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+....@.
+...@..
 ......
-......
-......
-..@@@@
-.@.@..
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x03C2
-ENCODING 1503
+STARTCHAR 0x1FBA
+ENCODING 1570
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@.....
+.@.@@.
+...@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
-..@@@.
-.@....
-.@....
-.@....
-.@....
-..@@@.
-....@.
-...@..
-......
 ENDCHAR
-STARTCHAR 0x03F2
-ENCODING 1504
+STARTCHAR 0x1FC8
+ENCODING 1571
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-..@@@.
-.@....
-.@....
-.@....
-.@....
+@.....
+.@@@@@
+..@...
+..@...
 ..@@@.
+..@...
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x037B
-ENCODING 1505
+STARTCHAR 0x1FCA
+ENCODING 1572
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@.....
+.@@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
-.@@@..
+ENDCHAR
+STARTCHAR 0x1FDA
+ENCODING 1573
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@.....
+.@.@@@
 ....@.
 ....@.
 ....@.
 ....@.
-.@@@..
+....@.
+....@.
+...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03C4
-ENCODING 1506
+STARTCHAR 0x1FF8
+ENCODING 1574
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-.@@@@.
-..@...
-..@...
-..@...
-..@...
+@.....
+.@.@@.
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
 ...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03C5
-ENCODING 1507
+STARTCHAR 0x1FEA
+ENCODING 1575
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
+@.....
+.@....
+.@...@
+.@...@
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03C6
-ENCODING 1508
+STARTCHAR 0x1FFA
+ENCODING 1576
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@.....
+.@@@@.
+.@...@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
-....@.
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-..@@@.
-...@..
-...@..
-......
 ENDCHAR
-STARTCHAR 0x03D5
-ENCODING 1509
+STARTCHAR 0x1F70
+ENCODING 1577
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-...@..
-...@..
-..@@@.
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-..@@@.
-...@..
+..@...
 ...@..
 ......
-ENDCHAR
-STARTCHAR 0x03C7
-ENCODING 1510
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-.@..@.
-.@..@.
-.@..@.
-..@@..
-..@@..
+..@..@
+.@.@.@
 .@..@.
 .@..@.
 .@..@.
+..@@.@
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03C8
-ENCODING 1511
+STARTCHAR 0x1F72
+ENCODING 1578
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-...@..
+..@...
 ...@..
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
-.@.@.@
+......
 ..@@@.
-...@..
-...@..
+.@....
+.@@@..
+.@....
+.@....
+..@@@.
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03C9
-ENCODING 1512
+STARTCHAR 0x1F74
+ENCODING 1579
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
-......
-......
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
+.@.@@.
+.@@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x03DD
-ENCODING 1513
+STARTCHAR 0x1F76
+ENCODING 1580
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
-..@@@.
-.@....
-.@....
-.@....
-.@@@..
-.@....
-.@....
-.@....
 ......
 ENDCHAR
-STARTCHAR 0x0377
-ENCODING 1514
+STARTCHAR 0x1F78
+ENCODING 1581
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
-......
-......
+..@@..
 .@..@.
 .@..@.
-.@.@@.
-.@@.@.
 .@..@.
 .@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03DF
-ENCODING 1515
+STARTCHAR 0x1F7A
+ENCODING 1582
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
-@.....
-.@....
-.@....
 .@..@.
-.@.@@.
-.@@.@.
 .@..@.
-....@.
-....@.
-....@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03D9
-ENCODING 1516
+STARTCHAR 0x1F7C
+ENCODING 1583
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
-......
-......
-..@@@.
-.@...@
-.@...@
+.@..@@
 .@...@
+.@.@.@
+.@.@.@
+.@.@.@
 ..@.@.
-...@..
-...@..
-...@..
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x03DB
-ENCODING 1517
+STARTCHAR 0x1FB2
+ENCODING 1584
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-.....@
-..@@@.
-.@....
-.@....
-.@....
-.@....
 ..@...
 ...@..
-..@...
+......
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x03E1
-ENCODING 1518
+STARTCHAR 0x1FC2
+ENCODING 1585
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@....
 ..@...
 ...@..
-..@@..
+......
+.@.@@.
+.@@.@.
 .@..@.
-...@@.
-..@.@.
 .@..@.
-....@.
-....@.
+.@..@.
+.@..@.
+..@.@.
+..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x0373
-ENCODING 1519
+STARTCHAR 0x1FF2
+ENCODING 1586
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@...
+...@..
 ......
-.@@@@@
+.@..@@
+.@...@
 .@.@.@
 .@.@.@
+.@.@.@
+..@.@.
 ...@..
 ...@..
-...@..
-...@..
-...@..
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x03FB
-ENCODING 1520
-SWIDTH 840 0
+STARTCHAR 0x1F09
+ENCODING 1587
+SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
+@..@@.
+.@.@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
-.@..@.
-.@@@@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@....
-.@....
-......
 ENDCHAR
-STARTCHAR 0x0371
-ENCODING 1521
+STARTCHAR 0x1F19
+ENCODING 1588
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-.@....
-.@....
-.@@@@.
-.@....
-.@....
-.@....
+@@....
+@.@@@@
+.@@...
+..@...
+..@@@.
+..@...
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03F8
-ENCODING 1522
+STARTCHAR 0x1F29
+ENCODING 1589
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
+@.@..@
+.@@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+..@..@
 ......
-.@....
-.@....
-.@.@..
-.@@.@.
-.@..@.
-.@..@.
-.@@.@.
-.@.@..
-.@....
-.@....
-......
-ENDCHAR
-STARTCHAR 0x03F3
-ENCODING 1523
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-...@..
-...@..
 ......
-..@@..
-...@..
-...@..
-...@..
-...@..
-...@..
-@..@..
-.@@...
 ......
 ENDCHAR
-STARTCHAR 0x03F6
-ENCODING 1524
+STARTCHAR 0x1F39
+ENCODING 1590
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-.@@@..
+@@....
+@..@@@
+.@..@.
 ....@.
-..@@@.
 ....@.
 ....@.
-.@@@..
+....@.
+....@.
+...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03FE
-ENCODING 1525
+STARTCHAR 0x1F49
+ENCODING 1591
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@..
-.@..@.
-.@....
-.@.@..
-.@.@..
-.@....
-.@..@.
-..@@..
+@@....
+@..@@.
+.@@..@
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03FF
-ENCODING 1526
+STARTCHAR 0x1FEC
+ENCODING 1592
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@..
-.@..@.
-....@.
-..@.@.
-..@.@.
-....@.
-.@..@.
-..@@..
+@@....
+@.@@@.
+.@@..@
+..@..@
+..@..@
+..@@@.
+..@...
+..@...
+..@...
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x037C
-ENCODING 1527
+STARTCHAR 0x1F59
+ENCODING 1593
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-..@@@.
-.@....
-.@.@..
-.@.@..
-.@....
-..@@@.
+@@....
+@.....
+.@...@
+.@...@
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x037D
-ENCODING 1528
+STARTCHAR 0x1F69
+ENCODING 1594
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-.@@@..
-....@.
+@@....
+@..@@.
+.@@..@
+.@...@
+.@...@
+.@...@
 ..@.@.
 ..@.@.
-....@.
-.@@@..
+.@@.@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03FC
-ENCODING 1529
+STARTCHAR 0x1F01
+ENCODING 1595
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
 ..@@..
+..@...
+...@..
+..@..@
+.@.@.@
 .@..@.
 .@..@.
 .@..@.
-.@@@..
-.@....
-@@@@..
-.@....
+..@@.@
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0xE08B
-ENCODING 1530
+STARTCHAR 0x1F11
+ENCODING 1596
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@@.
-...@..
-...@..
-...@..
-...@..
-...@..
+..@@..
+..@...
 ...@..
 ..@@@.
+.@....
+.@@@..
+.@....
+.@....
+..@@@.
+......
+......
 ......
-.@..@.
-..@@..
 ENDCHAR
-STARTCHAR 0xE08E
-ENCODING 1531
+STARTCHAR 0x1F21
+ENCODING 1597
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-...@..
-...@..
-...@..
+..@@..
+..@...
 ...@..
-..@.@.
-..@.@.
-.@...@
-.@...@
-......
+.@.@@.
+.@@.@.
 .@..@.
-..@@..
+.@..@.
+.@..@.
+.@..@.
+....@.
+....@.
+......
 ENDCHAR
-STARTCHAR 0xE08C
-ENCODING 1532
+STARTCHAR 0x1F31
+ENCODING 1598
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@...
+.@....
+..@...
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
-.@@...
-...@..
-...@..
-...@..
-...@..
-...@..
-......
-.@..@.
-..@@..
 ENDCHAR
-STARTCHAR 0xE08F
-ENCODING 1533
+STARTCHAR 0x1F41
+ENCODING 1599
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
+..@@..
+..@...
+...@..
 ..@@..
 .@..@.
 .@..@.
 .@..@.
 .@..@.
-.@..@.
-......
-.@..@.
 ..@@..
+......
+......
+......
 ENDCHAR
-STARTCHAR 0x1FBC
-ENCODING 1534
+STARTCHAR 0x1FE5
+ENCODING 1600
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
 ..@@..
+..@...
+...@..
 ..@@..
 .@..@.
 .@..@.
-.@@@@.
-.@..@.
 .@..@.
 .@..@.
-...@..
-...@..
+.@@@..
+.@....
+.@....
 ......
 ENDCHAR
-STARTCHAR 0x1FCC
-ENCODING 1535
+STARTCHAR 0x1F51
+ENCODING 1601
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@..@.
-.@..@.
+..@@..
+..@...
+...@..
 .@..@.
-.@@@@.
 .@..@.
 .@..@.
 .@..@.
 .@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x1F61
+ENCODING 1602
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@@..
+..@...
 ...@..
-...@..
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+......
+......
 ......
 ENDCHAR
-STARTCHAR 0x1FFC
-ENCODING 1536
+STARTCHAR 0x1F89
+ENCODING 1603
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
+@..@@.
+.@.@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
 ......
-..@@@.
-.@...@
+ENDCHAR
+STARTCHAR 0x1F99
+ENCODING 1604
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
+@.@..@
+.@@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0x1FA9
+ENCODING 1605
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
+@..@@.
+.@@..@
 .@...@
 .@...@
 .@...@
@@ -29469,15 +29830,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FB3
-ENCODING 1537
+STARTCHAR 0x1F81
+ENCODING 1606
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
+..@@..
+..@...
+...@..
 ..@..@
 .@.@.@
 .@..@.
@@ -29488,15 +29849,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FC3
-ENCODING 1538
+STARTCHAR 0x1F91
+ENCODING 1607
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
+..@@..
+..@...
+...@..
 .@.@@.
 .@@.@.
 .@..@.
@@ -29507,15 +29868,15 @@ BITMAP
 ..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x1FF3
-ENCODING 1539
+STARTCHAR 0x1FA1
+ENCODING 1608
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
+..@@..
+..@...
+...@..
 .@..@@
 .@...@
 .@.@.@
@@ -29526,205 +29887,186 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FB9
-ENCODING 1540
+STARTCHAR 0x1F08
+ENCODING 1609
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@@.
-......
-..@@..
-..@@..
-.@..@.
-.@@@@.
-.@..@.
-.@..@.
-.@..@.
+@@....
+.@.@@.
+@..@@.
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FD9
-ENCODING 1541
+STARTCHAR 0x1F18
+ENCODING 1610
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@@.
-......
-..@@@.
-...@..
-...@..
-...@..
-...@..
-...@..
+@@....
+.@@@@@
+@.@...
+..@...
 ..@@@.
+..@...
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FE9
-ENCODING 1542
+STARTCHAR 0x1F28
+ENCODING 1611
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@@@
-......
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
+@@....
+.@@..@
+@.@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FB1
-ENCODING 1543
+STARTCHAR 0x1F38
+ENCODING 1612
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
+.@.@@@
+@...@.
+....@.
+....@.
+....@.
+....@.
+....@.
+...@@@
+......
 ......
-..@@@.
 ......
+ENDCHAR
+STARTCHAR 0x1F48
+ENCODING 1613
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
+.@.@@.
+@.@..@
 ..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
+..@..@
+..@..@
+..@..@
+..@..@
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FD1
-ENCODING 1544
+STARTCHAR 0x1F68
+ENCODING 1614
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-.@@@..
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FE1
-ENCODING 1545
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-.@@@@.
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
+@@....
+.@.@@.
+@.@..@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FB8
-ENCODING 1546
+STARTCHAR 0x1F00
+ENCODING 1615
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@..@.
-..@@..
-..@@..
-..@@..
-.@..@.
-.@@@@.
+...@@.
+....@.
+...@..
+..@..@
+.@.@.@
 .@..@.
 .@..@.
 .@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FD8
-ENCODING 1547
+STARTCHAR 0x1F10
+ENCODING 1616
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@..@.
 ..@@..
-..@@@.
-...@..
-...@..
-...@..
-...@..
 ...@..
+..@...
+..@@@.
+.@....
+.@@@..
+.@....
+.@....
 ..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FE8
-ENCODING 1548
+STARTCHAR 0x1F20
+ENCODING 1617
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@..@.
 ..@@..
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
 ...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FB0
-ENCODING 1549
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@.@.
-...@..
-......
-..@..@
-.@.@.@
+..@...
+.@.@@.
+.@@.@.
 .@..@.
 .@..@.
 .@..@.
-..@@.@
-......
-......
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x1FD0
-ENCODING 1550
+STARTCHAR 0x1F30
+ENCODING 1618
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@.@..
+..@@..
+...@..
 ..@...
-......
 ..@...
 ..@...
 ..@...
@@ -29735,16 +30077,16 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FE0
-ENCODING 1551
+STARTCHAR 0x1F40
+ENCODING 1619
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@..@.
 ..@@..
-......
-.@..@.
+...@..
+..@...
+..@@..
 .@..@.
 .@..@.
 .@..@.
@@ -29754,301 +30096,301 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0386
-ENCODING 1552
+STARTCHAR 0x1FE4
+ENCODING 1620
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+...@..
+..@...
+..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@@@..
 .@....
-@..@@.
-...@@.
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FBB
-ENCODING 1552
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
 .@....
-@..@@.
-...@@.
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x1FC9
-ENCODING 1553
+STARTCHAR 0x1F50
+ENCODING 1621
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
+..@@..
+...@..
 ..@...
-..@@@@
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0388
-ENCODING 1553
+STARTCHAR 0x1F60
+ENCODING 1622
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
+..@@..
+...@..
 ..@...
-..@@@@
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0389
-ENCODING 1554
+STARTCHAR 0x1F88
+ENCODING 1623
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.@..@
+@@....
+.@.@@.
+@..@@.
 ..@..@
 ..@..@
 ..@@@@
 ..@..@
 ..@..@
 ..@..@
-..@..@
-......
-......
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x1FCB
-ENCODING 1554
+STARTCHAR 0x1F98
+ENCODING 1624
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
+@@....
+.@@..@
 @.@..@
 ..@..@
-..@..@
 ..@@@@
 ..@..@
 ..@..@
 ..@..@
 ..@..@
-......
-......
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x1FDB
-ENCODING 1555
+STARTCHAR 0x1FA8
+ENCODING 1625
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@..@@@
-....@.
-....@.
-....@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
+@@....
+.@.@@.
+@.@..@
+.@...@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x038A
-ENCODING 1555
+STARTCHAR 0x1F80
+ENCODING 1626
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@..@@@
-....@.
-....@.
-....@.
-....@.
-....@.
+...@@.
 ....@.
-...@@@
-......
-......
+...@..
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FF9
-ENCODING 1556
+STARTCHAR 0x1F90
+ENCODING 1627
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@..@@.
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-...@@.
-......
+..@@..
+...@..
+..@...
+.@.@@.
+.@@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@.@.
+..@.@.
 ......
+ENDCHAR
+STARTCHAR 0x1FA0
+ENCODING 1628
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@@..
+...@..
+..@...
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x038C
-ENCODING 1556
+STARTCHAR 0x1F0D
+ENCODING 1629
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@..@@.
-..@..@
-..@..@
+@@..@.
+@..@..
+.@.@@.
+...@@.
 ..@..@
+..@@@@
 ..@..@
 ..@..@
 ..@..@
-...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FEB
-ENCODING 1557
+STARTCHAR 0x1F1D
+ENCODING 1630
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.....
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
+@@..@.
+@..@..
+.@@@@@
+..@...
+..@...
+..@@@.
+..@...
+..@...
+..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x038E
-ENCODING 1557
+STARTCHAR 0x1F2D
+ENCODING 1631
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.....
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
+@@..@.
+@..@..
+.@@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03D3
-ENCODING 1558
+STARTCHAR 0x1F3D
+ENCODING 1632
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.....
-.@@.@@
-.@.@.@
-...@..
-...@..
-...@..
-...@..
-...@..
+@@..@.
+@..@..
+.@.@@@
+....@.
+....@.
+....@.
+....@.
+....@.
+...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03D3
-ENCODING 1558
+STARTCHAR 0x1F4D
+ENCODING 1633
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.....
-.@@.@@
-.@.@.@
-...@..
-...@..
-...@..
-...@..
-...@..
+@@..@.
+@..@..
+.@.@@.
+..@..@
+..@..@
+..@..@
+..@..@
+..@..@
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FFB
-ENCODING 1559
+STARTCHAR 0x1F5D
+ENCODING 1634
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.@@@.
-.@...@
-.@...@
+@@..@.
+@..@..
 .@...@
 .@...@
 ..@.@.
-..@.@.
-.@@.@@
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x038F
-ENCODING 1559
+STARTCHAR 0x1F6D
+ENCODING 1635
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@....
-@.@@@.
-.@...@
-.@...@
+@@..@.
+@..@..
+.@.@@.
+..@..@
 .@...@
 .@...@
 ..@.@.
@@ -30058,34 +30400,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F71
-ENCODING 1560
+STARTCHAR 0x1F05
+ENCODING 1636
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@..
-......
-..@..@
-.@.@.@
-.@..@.
-.@..@.
+.@@..@
 .@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03AC
-ENCODING 1560
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-....@.
-...@..
-......
+..@...
 ..@..@
 .@.@.@
 .@..@.
@@ -30096,15 +30419,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03AD
-ENCODING 1561
+STARTCHAR 0x1F15
+ENCODING 1637
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 ..@@@.
 .@....
 .@@@..
@@ -30115,15 +30438,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03AE
-ENCODING 1562
+STARTCHAR 0x1F25
+ENCODING 1638
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 .@.@@.
 .@@.@.
 .@..@.
@@ -30134,15 +30457,15 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x03AF
-ENCODING 1563
+STARTCHAR 0x1F35
+ENCODING 1639
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 ..@...
 ..@...
 ..@...
@@ -30153,15 +30476,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03CC
-ENCODING 1564
+STARTCHAR 0x1F45
+ENCODING 1640
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 ..@@..
 .@..@.
 .@..@.
@@ -30172,15 +30495,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03CD
-ENCODING 1565
+STARTCHAR 0x1F55
+ENCODING 1641
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 .@..@.
 .@..@.
 .@..@.
@@ -30191,15 +30514,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x03CE
-ENCODING 1566
+STARTCHAR 0x1F65
+ENCODING 1642
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@..
-......
+.@@..@
+.@..@.
+..@...
 .@..@@
 .@...@
 .@.@.@
@@ -30210,129 +30533,72 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F73
-ENCODING 1561
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-...@..
-..@...
-......
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F75
-ENCODING 1562
+STARTCHAR 0x1F8D
+ENCODING 1643
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
-..@...
-......
+@@..@.
+@..@..
 .@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
+...@@.
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ....@.
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F77
-ENCODING 1563
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-...@..
-..@...
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F79
-ENCODING 1564
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-...@..
-..@...
-......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F7B
-ENCODING 1565
+STARTCHAR 0x1F9D
+ENCODING 1644
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
-..@...
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
+@@..@.
+@..@..
+.@@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F7D
-ENCODING 1566
+STARTCHAR 0x1FAD
+ENCODING 1645
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@..
-......
-.@..@@
+@@..@.
+@..@..
+.@.@@.
+..@..@
+.@...@
 .@...@
-.@.@.@
-.@.@.@
-.@.@.@
 ..@.@.
-......
-......
+..@.@.
+.@@.@@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FB4
-ENCODING 1567
+STARTCHAR 0x1F85
+ENCODING 1646
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@..
-......
+.@@..@
+.@..@.
+..@...
 ..@..@
 .@.@.@
 .@..@.
@@ -30343,15 +30609,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FC4
-ENCODING 1568
+STARTCHAR 0x1F95
+ENCODING 1647
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@..
+.@@..@
+.@..@.
 ..@...
-......
 .@.@@.
 .@@.@.
 .@..@.
@@ -30362,15 +30628,15 @@ BITMAP
 ..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x1FF4
-ENCODING 1569
+STARTCHAR 0x1FA5
+ENCODING 1648
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@..
-......
+.@@..@
+.@..@.
+..@...
 .@..@@
 .@...@
 .@.@.@
@@ -30381,17 +30647,17 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FBA
-ENCODING 1570
+STARTCHAR 0x1F0B
+ENCODING 1649
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
+@@.@..
+@...@.
 .@.@@.
 ...@@.
 ..@..@
-..@..@
 ..@@@@
 ..@..@
 ..@..@
@@ -30400,32 +30666,33 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FC8
-ENCODING 1571
+STARTCHAR 0x1F1B
+ENCODING 1650
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
+@@.@..
+@...@.
 .@@@@@
 ..@...
 ..@...
 ..@@@.
 ..@...
 ..@...
-..@...
 ..@@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FCA
-ENCODING 1572
+STARTCHAR 0x1F2B
+ENCODING 1651
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
+@@.@..
+@...@.
 .@@..@
 ..@..@
 ..@..@
@@ -30433,57 +30700,56 @@ BITMAP
 ..@..@
 ..@..@
 ..@..@
-..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FDA
-ENCODING 1573
+STARTCHAR 0x1F3B
+ENCODING 1652
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
+@@.@..
+@...@.
 .@.@@@
 ....@.
 ....@.
 ....@.
 ....@.
 ....@.
-....@.
 ...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FF8
-ENCODING 1574
+STARTCHAR 0x1F4B
+ENCODING 1653
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
+@@.@..
+@...@.
 .@.@@.
 ..@..@
 ..@..@
 ..@..@
 ..@..@
 ..@..@
-..@..@
 ...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FEA
-ENCODING 1575
+STARTCHAR 0x1F5B
+ENCODING 1654
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
-.@....
+@@.@..
+@...@.
 .@...@
 .@...@
 ..@.@.
@@ -30495,16 +30761,16 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FFA
-ENCODING 1576
+STARTCHAR 0x1F6B
+ENCODING 1655
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@.....
-.@@@@.
-.@...@
-.@...@
+@@.@..
+@...@.
+.@.@@.
+..@..@
 .@...@
 .@...@
 ..@.@.
@@ -30514,15 +30780,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F70
-ENCODING 1577
+STARTCHAR 0x1F03
+ENCODING 1656
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 ..@..@
 .@.@.@
 .@..@.
@@ -30533,15 +30799,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F72
-ENCODING 1578
+STARTCHAR 0x1F13
+ENCODING 1657
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 ..@@@.
 .@....
 .@@@..
@@ -30552,15 +30818,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F74
-ENCODING 1579
+STARTCHAR 0x1F23
+ENCODING 1658
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 .@.@@.
 .@@.@.
 .@..@.
@@ -30571,15 +30837,15 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F76
-ENCODING 1580
+STARTCHAR 0x1F33
+ENCODING 1659
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 ..@...
 ..@...
 ..@...
@@ -30590,15 +30856,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F78
-ENCODING 1581
+STARTCHAR 0x1F43
+ENCODING 1660
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 ..@@..
 .@..@.
 .@..@.
@@ -30609,15 +30875,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F7A
-ENCODING 1582
+STARTCHAR 0x1F53
+ENCODING 1661
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 .@..@.
 .@..@.
 .@..@.
@@ -30628,15 +30894,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F7C
-ENCODING 1583
+STARTCHAR 0x1F63
+ENCODING 1662
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 .@..@@
 .@...@
 .@.@.@
@@ -30647,15 +30913,72 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FB2
-ENCODING 1584
+STARTCHAR 0x1F8B
+ENCODING 1663
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@...
+@@.@..
+@...@.
+.@.@@.
+...@@.
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0x1F9B
+ENCODING 1664
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@.@..
+@...@.
+.@@..@
+..@..@
+..@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0x1FAB
+ENCODING 1665
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@.@..
+@...@.
+.@.@@.
+..@..@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
+...@..
 ...@..
 ......
+ENDCHAR
+STARTCHAR 0x1F83
+ENCODING 1666
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@@.@.
+.@...@
+..@...
 ..@..@
 .@.@.@
 .@..@.
@@ -30666,15 +30989,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1FC2
-ENCODING 1585
+STARTCHAR 0x1F93
+ENCODING 1667
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 .@.@@.
 .@@.@.
 .@..@.
@@ -30685,15 +31008,15 @@ BITMAP
 ..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x1FF2
-ENCODING 1586
+STARTCHAR 0x1FA3
+ENCODING 1668
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@.
+.@...@
 ..@...
-...@..
-......
 .@..@@
 .@...@
 .@.@.@
@@ -30704,16 +31027,16 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F09
-ENCODING 1587
+STARTCHAR 0x1F0C
+ENCODING 1669
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @..@@.
-.@.@@.
-..@..@
+...@@.
 ..@..@
 ..@@@@
 ..@..@
@@ -30723,18 +31046,18 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F19
-ENCODING 1588
+STARTCHAR 0x1F1C
+ENCODING 1670
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @.@@@@
-.@@...
 ..@...
-..@@@.
 ..@...
+..@@@.
 ..@...
 ..@...
 ..@@@@
@@ -30742,18 +31065,18 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F29
-ENCODING 1589
+STARTCHAR 0x1F2C
+ENCODING 1671
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @.@..@
-.@@..@
 ..@..@
-..@@@@
 ..@..@
+..@@@@
 ..@..@
 ..@..@
 ..@..@
@@ -30761,15 +31084,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F39
-ENCODING 1590
+STARTCHAR 0x1F3C
+ENCODING 1672
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @..@@@
-.@..@.
 ....@.
 ....@.
 ....@.
@@ -30780,15 +31103,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F49
-ENCODING 1591
+STARTCHAR 0x1F4C
+ENCODING 1673
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @..@@.
-.@@..@
 ..@..@
 ..@..@
 ..@..@
@@ -30799,53 +31122,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FEC
-ENCODING 1592
+STARTCHAR 0x1F6C
+ENCODING 1674
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @.@@@.
-.@@..@
-..@..@
-..@..@
-..@@@.
-..@...
-..@...
-..@...
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F59
-ENCODING 1593
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-@.....
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F69
-ENCODING 1594
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-@..@@.
-.@@..@
 .@...@
 .@...@
 .@...@
@@ -30856,15 +31141,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F01
-ENCODING 1595
+STARTCHAR 0x1F04
+ENCODING 1675
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 ..@..@
 .@.@.@
 .@..@.
@@ -30875,15 +31160,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F11
-ENCODING 1596
+STARTCHAR 0x1F14
+ENCODING 1676
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 ..@@@.
 .@....
 .@@@..
@@ -30894,15 +31179,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F21
-ENCODING 1597
+STARTCHAR 0x1F24
+ENCODING 1677
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 .@.@@.
 .@@.@.
 .@..@.
@@ -30913,34 +31198,34 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F31
-ENCODING 1598
+STARTCHAR 0x1F34
+ENCODING 1678
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@...
+.@@..@
+..@.@.
 .@....
 ..@...
 ..@...
 ..@...
 ..@...
 ..@...
-..@...
 ...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F41
-ENCODING 1599
+STARTCHAR 0x1F44
+ENCODING 1679
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 ..@@..
 .@..@.
 .@..@.
@@ -30951,34 +31236,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FE5
-ENCODING 1600
+STARTCHAR 0x1F54
+ENCODING 1680
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@@@..
-.@....
+.@@..@
+..@.@.
 .@....
-......
-ENDCHAR
-STARTCHAR 0x1F51
-ENCODING 1601
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-..@...
-...@..
 .@..@.
 .@..@.
 .@..@.
@@ -30989,15 +31255,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F61
-ENCODING 1602
+STARTCHAR 0x1F64
+ENCODING 1681
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 .@..@@
 .@...@
 .@.@.@
@@ -31008,16 +31274,16 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F89
-ENCODING 1603
+STARTCHAR 0x1F8C
+ENCODING 1682
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @..@@.
-.@.@@.
-..@..@
+...@@.
 ..@..@
 ..@@@@
 ..@..@
@@ -31027,18 +31293,18 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F99
-ENCODING 1604
+STARTCHAR 0x1F9C
+ENCODING 1683
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
+@@..@.
+.@.@..
 @.@..@
-.@@..@
 ..@..@
-..@@@@
 ..@..@
+..@@@@
 ..@..@
 ..@..@
 ..@..@
@@ -31046,15 +31312,15 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1FA9
-ENCODING 1605
+STARTCHAR 0x1FAC
+ENCODING 1684
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-@..@@.
-.@@..@
+@@..@.
+.@.@..
+@.@@@.
 .@...@
 .@...@
 .@...@
@@ -31065,15 +31331,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F81
-ENCODING 1606
+STARTCHAR 0x1F84
+ENCODING 1685
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 ..@..@
 .@.@.@
 .@..@.
@@ -31084,15 +31350,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F91
-ENCODING 1607
+STARTCHAR 0x1F94
+ENCODING 1686
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 .@.@@.
 .@@.@.
 .@..@.
@@ -31103,15 +31369,15 @@ BITMAP
 ..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x1FA1
-ENCODING 1608
+STARTCHAR 0x1FA4
+ENCODING 1687
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-..@...
-...@..
+.@@..@
+..@.@.
+.@....
 .@..@@
 .@...@
 .@.@.@
@@ -31122,16 +31388,16 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F08
-ENCODING 1609
+STARTCHAR 0x1F0A
+ENCODING 1688
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@.
+@@.@..
+.@..@.
 @..@@.
-..@..@
+...@@.
 ..@..@
 ..@@@@
 ..@..@
@@ -31141,18 +31407,18 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F18
-ENCODING 1610
+STARTCHAR 0x1F1A
+ENCODING 1689
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@@@@@
-@.@...
+@@.@..
+.@..@.
+@.@@@@
 ..@...
-..@@@.
 ..@...
+..@@@.
 ..@...
 ..@...
 ..@@@@
@@ -31160,18 +31426,18 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F28
-ENCODING 1611
+STARTCHAR 0x1F2A
+ENCODING 1690
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@@..@
+@@.@..
+.@..@.
 @.@..@
 ..@..@
-..@@@@
 ..@..@
+..@@@@
 ..@..@
 ..@..@
 ..@..@
@@ -31179,15 +31445,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F38
-ENCODING 1612
+STARTCHAR 0x1F3A
+ENCODING 1691
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@@
-@...@.
+@@.@..
+.@..@.
+@..@@@
 ....@.
 ....@.
 ....@.
@@ -31198,15 +31464,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F48
-ENCODING 1613
+STARTCHAR 0x1F4A
+ENCODING 1692
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@.
-@.@..@
+@@.@..
+.@..@.
+@..@@.
 ..@..@
 ..@..@
 ..@..@
@@ -31217,15 +31483,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F68
-ENCODING 1614
+STARTCHAR 0x1F6A
+ENCODING 1693
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@.
-@.@..@
+@@.@..
+.@..@.
+@.@@@.
 .@...@
 .@...@
 .@...@
@@ -31236,15 +31502,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F00
-ENCODING 1615
+STARTCHAR 0x1F02
+ENCODING 1694
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@@.
-....@.
-...@..
+.@@.@.
+..@..@
+.@....
 ..@..@
 .@.@.@
 .@..@.
@@ -31255,15 +31521,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F10
-ENCODING 1616
+STARTCHAR 0x1F12
+ENCODING 1695
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 ..@@@.
 .@....
 .@@@..
@@ -31274,15 +31540,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F20
-ENCODING 1617
+STARTCHAR 0x1F22
+ENCODING 1696
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 .@.@@.
 .@@.@.
 .@..@.
@@ -31293,15 +31559,15 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F30
-ENCODING 1618
+STARTCHAR 0x1F32
+ENCODING 1697
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 ..@...
 ..@...
 ..@...
@@ -31312,15 +31578,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F40
-ENCODING 1619
+STARTCHAR 0x1F42
+ENCODING 1698
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 ..@@..
 .@..@.
 .@..@.
@@ -31331,34 +31597,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1FE4
-ENCODING 1620
+STARTCHAR 0x1F52
+ENCODING 1699
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@@@..
-.@....
+.@@.@.
+..@..@
 .@....
-......
-ENDCHAR
-STARTCHAR 0x1F50
-ENCODING 1621
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-...@..
-..@...
 .@..@.
 .@..@.
 .@..@.
@@ -31369,15 +31616,15 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F60
-ENCODING 1622
+STARTCHAR 0x1F62
+ENCODING 1700
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 .@..@@
 .@...@
 .@.@.@
@@ -31388,16 +31635,16 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x1F88
-ENCODING 1623
+STARTCHAR 0x1F8A
+ENCODING 1701
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@.
+@@.@..
+.@..@.
 @..@@.
-..@..@
+...@@.
 ..@..@
 ..@@@@
 ..@..@
@@ -31407,18 +31654,18 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1F98
-ENCODING 1624
+STARTCHAR 0x1F9A
+ENCODING 1702
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@@..@
+@@.@..
+.@..@.
 @.@..@
 ..@..@
-..@@@@
 ..@..@
+..@@@@
 ..@..@
 ..@..@
 ..@..@
@@ -31426,15 +31673,15 @@ BITMAP
 ....@.
 ......
 ENDCHAR
-STARTCHAR 0x1FA8
-ENCODING 1625
+STARTCHAR 0x1FAA
+ENCODING 1703
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-@@....
-.@.@@.
-@.@..@
+@@.@..
+.@..@.
+@.@@@.
 .@...@
 .@...@
 .@...@
@@ -31445,15 +31692,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F80
-ENCODING 1626
+STARTCHAR 0x1F82
+ENCODING 1704
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-...@@.
-....@.
-...@..
+.@@.@.
+..@..@
+.@....
 ..@..@
 .@.@.@
 .@..@.
@@ -31464,15 +31711,15 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F90
-ENCODING 1627
+STARTCHAR 0x1F92
+ENCODING 1705
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 .@.@@.
 .@@.@.
 .@..@.
@@ -31483,15 +31730,15 @@ BITMAP
 ..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x1FA0
-ENCODING 1628
+STARTCHAR 0x1FA2
+ENCODING 1706
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-...@..
-..@...
+.@@.@.
+..@..@
+.@....
 .@..@@
 .@...@
 .@.@.@
@@ -31502,4150 +31749,1034 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x1F0D
-ENCODING 1629
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F1D
-ENCODING 1630
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
-..@@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2D
-ENCODING 1631
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3D
-ENCODING 1632
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@@
-....@.
-....@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F4D
-ENCODING 1633
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@.
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F5D
-ENCODING 1634
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6D
-ENCODING 1635
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@.
-..@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F05
-ENCODING 1636
+STARTCHAR 0x1FB6
+ENCODING 1707
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@..@
+..@@..
 .@..@.
-..@...
+......
 ..@..@
 .@.@.@
 .@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F15
-ENCODING 1637
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F25
-ENCODING 1638
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F35
-ENCODING 1639
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F45
-ENCODING 1640
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F55
-ENCODING 1641
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F65
-ENCODING 1642
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8D
-ENCODING 1643
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9D
-ENCODING 1644
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAD
-ENCODING 1645
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-@..@..
-.@.@@.
-..@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F85
-ENCODING 1646
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F95
-ENCODING 1647
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA5
-ENCODING 1648
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@..@.
-..@...
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F0B
-ENCODING 1649
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F1B
-ENCODING 1650
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
-..@@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2B
-ENCODING 1651
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3B
-ENCODING 1652
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@@
-....@.
-....@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F4B
-ENCODING 1653
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@.
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F5B
-ENCODING 1654
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6B
-ENCODING 1655
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@.
-..@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F03
-ENCODING 1656
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F13
-ENCODING 1657
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F23
-ENCODING 1658
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F33
-ENCODING 1659
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F43
-ENCODING 1660
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F53
-ENCODING 1661
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F63
-ENCODING 1662
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8B
-ENCODING 1663
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9B
-ENCODING 1664
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAB
-ENCODING 1665
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-@...@.
-.@.@@.
-..@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F83
-ENCODING 1666
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F93
-ENCODING 1667
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA3
-ENCODING 1668
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-.@...@
-..@...
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F0C
-ENCODING 1669
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@..@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F1C
-ENCODING 1670
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@.@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
-..@@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2C
-ENCODING 1671
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@.@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3C
-ENCODING 1672
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@..@@@
-....@.
-....@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F4C
-ENCODING 1673
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@..@@.
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6C
-ENCODING 1674
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@.@@@.
-.@...@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F04
-ENCODING 1675
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F14
-ENCODING 1676
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F24
-ENCODING 1677
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F34
-ENCODING 1678
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F44
-ENCODING 1679
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F54
-ENCODING 1680
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F64
-ENCODING 1681
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8C
-ENCODING 1682
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@..@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9C
-ENCODING 1683
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@.@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAC
-ENCODING 1684
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@..@.
-.@.@..
-@.@@@.
-.@...@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F84
-ENCODING 1685
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F94
-ENCODING 1686
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA4
-ENCODING 1687
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-..@.@.
-.@....
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F0A
-ENCODING 1688
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@..@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F1A
-ENCODING 1689
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@.@@@@
-..@...
-..@...
-..@@@.
-..@...
-..@...
-..@@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2A
-ENCODING 1690
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@.@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3A
-ENCODING 1691
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@..@@@
-....@.
-....@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F4A
-ENCODING 1692
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@..@@.
-..@..@
-..@..@
-..@..@
-..@..@
-..@..@
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6A
-ENCODING 1693
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@.@@@.
-.@...@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F02
-ENCODING 1694
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F12
-ENCODING 1695
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F22
-ENCODING 1696
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F32
-ENCODING 1697
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F42
-ENCODING 1698
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F52
-ENCODING 1699
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F62
-ENCODING 1700
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8A
-ENCODING 1701
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@..@@.
-...@@.
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9A
-ENCODING 1702
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@.@..@
-..@..@
-..@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAA
-ENCODING 1703
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@.@..
-.@..@.
-@.@@@.
-.@...@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F82
-ENCODING 1704
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F92
-ENCODING 1705
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA2
-ENCODING 1706
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@.
-..@..@
-.@....
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1FB6
-ENCODING 1707
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0xE08A
-ENCODING 1708
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-..@@@.
-.@....
-.@@@..
-.@....
-.@....
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FC6
-ENCODING 1709
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FD6
-ENCODING 1710
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0xE08D
-ENCODING 1711
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-..@@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FE6
-ENCODING 1712
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FF6
-ENCODING 1713
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FB7
-ENCODING 1714
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1FC7
-ENCODING 1715
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FF7
-ENCODING 1716
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@..
-.@..@.
-......
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F0F
-ENCODING 1717
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@.
-@@.@@.
-@.@..@
-.@@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2F
-ENCODING 1718
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-..@..@
-@@@..@
-@.@..@
-.@@@@@
-..@..@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3F
-ENCODING 1719
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@@
-@@..@.
-@...@.
-.@..@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F5F
-ENCODING 1720
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-..@..@
-@@@..@
-@.@.@.
-.@.@@.
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6F
-ENCODING 1721
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-......
-@@.@@.
-@.@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F07
-ENCODING 1722
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F27
-ENCODING 1723
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F37
-ENCODING 1724
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@@..
-@@..@.
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F57
-ENCODING 1725
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@@..
-@@..@.
-..@...
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F67
-ENCODING 1726
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8F
-ENCODING 1727
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@.
-@@.@@.
-@.@..@
-.@@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9F
-ENCODING 1728
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-..@..@
-@@@..@
-@.@..@
-.@@@@@
-..@..@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAF
-ENCODING 1729
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-......
-@@.@@.
-@.@..@
-.@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F87
-ENCODING 1730
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F97
-ENCODING 1731
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA7
-ENCODING 1732
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@@..@
-...@..
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F0E
-ENCODING 1733
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@.
-@@.@@.
-.@@..@
-@.@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F2E
-ENCODING 1734
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-..@..@
-@@@..@
-.@@..@
-@.@@@@
-..@..@
-..@..@
-..@..@
-..@..@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F3E
-ENCODING 1735
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@@
-@@..@.
-.@..@.
-@...@.
-....@.
-....@.
-....@.
-...@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F6E
-ENCODING 1736
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-......
-@@.@@.
-.@@..@
-@@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F06
-ENCODING 1737
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F26
-ENCODING 1738
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F36
-ENCODING 1739
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@@..
-@..@@.
-..@...
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F56
-ENCODING 1740
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F66
-ENCODING 1741
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1F8E
-ENCODING 1742
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-...@@.
-@@.@@.
-.@@..@
-@.@..@
-..@@@@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1F9E
-ENCODING 1743
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-..@..@
-@@@..@
-.@@..@
-@.@@@@
-..@..@
-..@..@
-..@..@
-..@..@
-....@.
-....@.
-......
-ENDCHAR
-STARTCHAR 0x1FAE
-ENCODING 1744
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@@....
-......
-@@.@@.
-.@@..@
-@@...@
-.@...@
-..@.@.
-..@.@.
-.@@.@@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F86
-ENCODING 1745
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-..@..@
-.@.@.@
-.@..@.
-.@..@.
-.@..@.
-..@@.@
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x1F96
-ENCODING 1746
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-.@.@@.
-.@@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@.@.
-..@.@.
-......
-ENDCHAR
-STARTCHAR 0x1FA6
-ENCODING 1747
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@..@@
-...@..
-.@..@@
-.@...@
-.@.@.@
-.@.@.@
-.@.@.@
-..@.@.
-...@..
-...@..
-......
-ENDCHAR
-STARTCHAR 0x03AA
-ENCODING 1748
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@@
-......
-..@@@.
-...@..
-...@..
-...@..
-...@..
-...@..
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03AB
-ENCODING 1749
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@@
-......
-.@...@
-.@...@
-..@.@.
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03D4
-ENCODING 1750
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@.@@
-......
-.@@.@@
-.@.@.@
-...@..
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03CA
-ENCODING 1751
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@.@..
-.@.@..
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03CB
-ENCODING 1752
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@.@.
-..@.@.
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FD3
-ENCODING 1753
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@.@.@
-.@@..@
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0390
-ENCODING 1753
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@.@.@
-.@@..@
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FE3
-ENCODING 1754
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@.@.@
-.@@..@
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x03B0
-ENCODING 1754
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@.@.@
-.@@..@
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FD2
-ENCODING 1755
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@.@.@
-......
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FE2
-ENCODING 1756
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@..@
-.@.@.@
-......
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FD7
-ENCODING 1757
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@@@..
-@...@.
-.@.@..
-..@...
-..@...
-..@...
-..@...
-..@...
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x1FE7
-ENCODING 1758
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@@@.
-.@...@
-..@.@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-.@..@.
-..@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E01
-ENCODING 1759
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@@.@.
-..@.@.
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E02
-ENCODING 1760
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@.@.
-..@.@.
-..@.@.
-..@.@.
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E03
-ENCODING 1761
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@.@.@.
-@@@.@.
-@.@.@.
-..@.@.
-...@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E04
-ENCODING 1762
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@@.@.
-.@..@.
-.@..@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E05
-ENCODING 1763
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@.@..
-@.@.@.
-@...@.
-@@@.@.
-@...@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E06
-ENCODING 1764
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@.@.@.
-@@@.@.
-@.@.@.
-..@@@.
-.@@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E07
-ENCODING 1765
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-...@@.
-...@@.
-.@..@.
-..@.@.
-...@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E08
-ENCODING 1766
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@..
-....@.
-..@.@.
-..@@@.
-....@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E09
-ENCODING 1767
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@..
-....@.
-.@@.@.
-..@@@.
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E0A
-ENCODING 1768
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@.@.
-..@.@.
-..@@..
-..@.@.
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E0B
-ENCODING 1769
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@.@.@.
-@@@.@.
-@.@@..
-..@.@.
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E0C
-ENCODING 1770
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@..@
-@..@.@
-@..@.@
-@.@@@@
-@.@@.@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E0D
-ENCODING 1771
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@..@.
-@.@.@.
-@.@.@.
-@.@.@.
-@..@..
-......
-..@.@.
-...@..
-ENDCHAR
-STARTCHAR 0xE09D
-ENCODING 1772
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@..@.
-@.@.@.
-@.@.@.
-@.@.@.
-@..@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E0E
-ENCODING 1773
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@@.@.
-..@.@.
-..@.@.
-....@.
-....@.
-..@@..
-ENDCHAR
-STARTCHAR 0x0E0F
-ENCODING 1774
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@@.@.
-..@.@.
-..@.@.
-....@.
-..@.@.
-.@@@..
-ENDCHAR
-STARTCHAR 0x0E10
-ENCODING 1775
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@@.
-...@..
-..@.@.
-...@@.
-....@.
-......
-..@.@.
-.@@@..
-ENDCHAR
-STARTCHAR 0xE09E
-ENCODING 1776
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@@.
-...@..
-..@.@.
-...@@.
-....@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E11
-ENCODING 1777
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@.@.@.
-@@@@@.
-@.@.@.
-..@.@.
-..@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E12
-ENCODING 1778
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@.@.@
-@@@@.@
-@..@.@
-@@.@.@
-@.@@@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E13
-ENCODING 1779
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@..@.
-@.@.@.
-@.@.@.
-@.@@@@
-@.@.@@
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E14
-ENCODING 1780
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@..@.
-.@@.@.
-.@@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E15
-ENCODING 1781
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@.@..
-@.@.@.
-@...@.
-@@..@.
-@@..@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E16
-ENCODING 1782
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@@..
-@...@.
-@@..@.
-.@..@.
-.@@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E17
-ENCODING 1783
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@@..@.
-@@.@@.
-.@@.@.
-.@..@.
-.@..@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E18
-ENCODING 1784
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@@.
-.@....
-..@@..
-..@.@.
-.@@@..
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E19
-ENCODING 1785
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@@.@..
-.@.@..
-.@.@..
-.@@@@.
-.@.@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1A
-ENCODING 1786
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@.@.
-.@@.@.
-..@.@.
-..@.@.
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1B
-ENCODING 1787
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-....@.
-....@.
-....@.
-.@@.@.
-.@@.@.
-..@.@.
-..@.@.
-..@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1C
-ENCODING 1788
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@@..@.
-@...@.
-@.@.@.
-@@.@@.
-@...@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1D
-ENCODING 1789
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-....@.
-....@.
-....@.
-@@..@.
-@...@.
-@.@.@.
-@@.@@.
-@...@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1E
-ENCODING 1790
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-@.@.@.
-@.@.@.
-@@.@@.
-@@.@@.
-@...@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E1F
-ENCODING 1791
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-....@.
-....@.
-....@.
-@.@.@.
-@.@.@.
-@@.@@.
-@@.@@.
-@...@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E20
-ENCODING 1792
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-.@..@.
-.@@.@.
-..@.@.
-.@@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E21
-ENCODING 1793
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@.@.
-..@.@.
-..@.@.
-.@@@@.
-.@@.@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E22
-ENCODING 1794
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-.@@.@.
-.@..@.
-.@@.@.
-.@..@.
-.@@@@.
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x0E23
-ENCODING 1795
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@@.
-.@....
-.@@@..
-...@..
-..@@..
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E24
-ENCODING 1796
+STARTCHAR 0xE08A
+ENCODING 1708
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
+..@@@.
+.@....
+.@@@..
+.@....
+.@....
+..@@@.
 ......
 ......
 ......
-.@@@..
-@...@.
-@@..@.
-.@..@.
-.@@.@.
-....@.
-....@.
-....@.
 ENDCHAR
-STARTCHAR 0x0E25
-ENCODING 1797
+STARTCHAR 0x1FC6
+ENCODING 1709
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
-......
-......
-......
-.@@@..
-....@.
-..@.@.
 .@.@@.
+.@@.@.
 .@..@.
-......
-......
+.@..@.
+.@..@.
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0E26
-ENCODING 1798
+STARTCHAR 0x1FD6
+ENCODING 1710
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
-..@@..
-.@..@.
-.@@.@.
-..@.@.
-.@@.@.
-....@.
-....@.
-....@.
 ENDCHAR
-STARTCHAR 0x0E27
-ENCODING 1799
+STARTCHAR 0xE08D
+ENCODING 1711
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
+..@@..
+.@..@.
 ......
 ..@@..
 .@..@.
-....@.
-...@@.
-...@@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E28
-ENCODING 1800
+STARTCHAR 0x1FE6
+ENCODING 1712
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
-......
-......
-......
-..@@@.
 .@..@.
-.@@@@.
-.@@.@.
 .@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E29
-ENCODING 1801
+STARTCHAR 0x1FF6
+ENCODING 1713
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
-......
-......
-......
-.@@.@.
-.@@.@.
-..@@@@
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
 ..@.@.
-..@@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E2A
-ENCODING 1802
+STARTCHAR 0x1FB7
+ENCODING 1714
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-.@@@.@
-...@@.
-..@.@.
-.@.@@.
+..@@..
 .@..@.
 ......
-......
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0E2B
-ENCODING 1803
+STARTCHAR 0x1FC7
+ENCODING 1715
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
-......
-......
-......
-@@.@@.
 .@.@@.
-.@.@..
 .@@.@.
 .@..@.
-......
-......
+.@..@.
+.@..@.
+.@..@.
+..@.@.
+..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x0E2C
-ENCODING 1804
+STARTCHAR 0x1FF7
+ENCODING 1716
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@..
+.@..@.
 ......
-......
-...@@.
-...@@@
-@...@.
-@.@.@.
-@@.@@.
-@@.@@.
-@...@.
-......
-......
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0E2D
-ENCODING 1805
+STARTCHAR 0x1F0F
+ENCODING 1717
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-.@@@..
-....@.
-.@@.@.
-.@..@.
-..@@..
+@@....
+...@@.
+@@.@@.
+@.@..@
+.@@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E2E
-ENCODING 1806
+STARTCHAR 0x1F2F
+ENCODING 1718
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
+@@....
+..@..@
+@@@..@
+@.@..@
 .@@@@@
-....@.
-.@@.@.
-.@..@.
-..@@..
+..@..@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E2F
-ENCODING 1807
+STARTCHAR 0x1F3F
+ENCODING 1719
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
+@@....
+...@@@
+@@..@.
+@...@.
 .@..@.
-.@.@@.
-..@.@.
 ....@.
 ....@.
+....@.
+...@@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E5A
-ENCODING 1808
+STARTCHAR 0x1F5F
+ENCODING 1720
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-@.@.@.
+@@....
+..@..@
+@@@..@
 @.@.@.
-.@@.@.
-..@.@.
-..@.@.
+.@.@@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E46
-ENCODING 1809
+STARTCHAR 0x1F6F
+ENCODING 1721
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
 ......
+@@.@@.
+@.@..@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
-.@.@..
-@.@.@.
-@...@.
-@@..@.
-....@.
-....@.
-....@.
-...@..
 ENDCHAR
-STARTCHAR 0x0E45
-ENCODING 1810
+STARTCHAR 0x1F07
+ENCODING 1722
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@@@.
+.@@..@
+...@..
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
-......
-..@@..
-.@..@.
-....@.
-....@.
-....@.
-....@.
-....@.
-....@.
 ENDCHAR
-STARTCHAR 0x0E32
-ENCODING 1811
+STARTCHAR 0x1F27
+ENCODING 1723
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-..@@..
+..@@@.
+.@@..@
+...@..
+.@.@@.
+.@@.@.
+.@..@.
+.@..@.
+.@..@.
 .@..@.
 ....@.
 ....@.
-....@.
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x0E33
-ENCODING 1812
+STARTCHAR 0x1F37
+ENCODING 1724
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-@@....
-@@....
-......
-..@@..
-.@..@.
-....@.
-....@.
-....@.
+.@@@..
+@@..@.
+..@...
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E40
-ENCODING 1813
+STARTCHAR 0x1F57
+ENCODING 1725
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-..@...
-..@...
+.@@@..
+@@..@.
 ..@...
-..@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
 ..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E41
-ENCODING 1814
+STARTCHAR 0x1F67
+ENCODING 1726
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
-@..@..
-@..@..
-@..@..
-@@.@@.
-@@.@@.
+..@@@.
+.@@..@
+...@..
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E42
-ENCODING 1815
+STARTCHAR 0x1F8F
+ENCODING 1727
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@@@.
-.@....
-..@...
-...@..
-...@..
-...@..
-...@@.
+@@....
 ...@@.
+@@.@@.
+@.@..@
+.@@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
 ......
-......
+ENDCHAR
+STARTCHAR 0x1F9F
+ENCODING 1728
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
+..@..@
+@@@..@
+@.@..@
+.@@@@@
+..@..@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0E43
-ENCODING 1816
+STARTCHAR 0x1FAF
+ENCODING 1729
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
 ......
-.@@...
-@..@..
-@@.@..
-@@.@..
+@@.@@.
+@.@..@
+.@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ...@..
 ...@..
-...@@.
-...@@.
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x0E44
-ENCODING 1817
+STARTCHAR 0x1F87
+ENCODING 1730
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-@.@...
-@@.@..
-.@.@..
+..@@@.
+.@@..@
 ...@..
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ...@..
 ...@..
-...@@.
-...@@.
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x0E30
-ENCODING 1818
+STARTCHAR 0x1F97
+ENCODING 1731
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-......
+..@@@.
+.@@..@
+...@..
+.@.@@.
+.@@.@.
 .@..@.
-.@@@..
-......
 .@..@.
-.@@@..
-......
-......
+.@..@.
+.@..@.
+..@.@.
+..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x0E31
-ENCODING 1819
+STARTCHAR 0x1FA7
+ENCODING 1732
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
+..@@@.
+.@@..@
+...@..
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+...@..
 ...@..
-...@@@
-......
-......
-......
-......
-......
-......
-......
-......
 ......
 ENDCHAR
-STARTCHAR 0x0E34
-ENCODING 1820
+STARTCHAR 0x1F0E
+ENCODING 1733
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-.@@@@.
-......
-......
-......
+@@....
+...@@.
+@@.@@.
+.@@..@
+@.@..@
+..@@@@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x1F2E
+ENCODING 1734
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
+..@..@
+@@@..@
+.@@..@
+@.@@@@
+..@..@
+..@..@
+..@..@
+..@..@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E35
-ENCODING 1821
+STARTCHAR 0x1F3E
+ENCODING 1735
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
+@@....
+...@@@
+@@..@.
+.@..@.
+@...@.
 ....@.
-.@@@@.
-......
-......
+....@.
+....@.
+...@@@
 ......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x1F6E
+ENCODING 1736
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@@....
 ......
+@@.@@.
+.@@..@
+@@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E36
-ENCODING 1822
+STARTCHAR 0x1F06
+ENCODING 1737
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-...@@.
-.@@@@.
-......
-......
-......
-......
-......
-......
+..@@@.
+.@..@@
+...@..
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E37
-ENCODING 1823
+STARTCHAR 0x1F26
+ENCODING 1738
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-..@.@.
+..@@@.
+.@..@@
+...@..
+.@.@@.
 .@@.@.
-......
-......
-......
-......
-......
-......
-......
-......
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0E47
-ENCODING 1824
+STARTCHAR 0x1F36
+ENCODING 1739
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@..
-.@....
 .@@@..
-......
-......
-......
-......
-......
-......
+@..@@.
+..@...
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E4D
-ENCODING 1825
+STARTCHAR 0x1F56
+ENCODING 1740
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-....@@
-....@@
-......
-......
-......
+..@@@.
+.@..@@
+...@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
+ENDCHAR
+STARTCHAR 0x1F66
+ENCODING 1741
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@@@.
+.@..@@
+...@..
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E4E
-ENCODING 1826
+STARTCHAR 0x1F8E
+ENCODING 1742
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-....@@
+@@....
 ...@@.
-......
-......
-......
-......
-......
-......
-......
-......
+@@.@@.
+.@@..@
+@.@..@
+..@@@@
+..@..@
+..@..@
+..@..@
+....@.
+....@.
 ......
 ENDCHAR
-STARTCHAR 0x0E48
-ENCODING 1827
+STARTCHAR 0x1F9E
+ENCODING 1743
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+@@....
+..@..@
+@@@..@
+.@@..@
+@.@@@@
+..@..@
+..@..@
+..@..@
+..@..@
 ....@.
 ....@.
 ......
-......
-......
-......
-......
-......
-......
-......
-......
-......
 ENDCHAR
-STARTCHAR 0x0E49
-ENCODING 1828
+STARTCHAR 0x1FAE
+ENCODING 1744
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-..@@.@
-...@@.
-......
-......
-......
-......
-......
-......
-......
-......
+@@....
 ......
+@@.@@.
+.@@..@
+@@...@
+.@...@
+..@.@.
+..@.@.
+.@@.@@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0E4A
-ENCODING 1829
+STARTCHAR 0x1F86
+ENCODING 1745
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.@@@.@
-.@.@@.
-......
-......
-......
-......
-......
-......
-......
-......
-......
+..@@@.
+.@..@@
+...@..
+..@..@
+.@.@.@
+.@..@.
+.@..@.
+.@..@.
+..@@.@
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0E4B
-ENCODING 1830
+STARTCHAR 0x1F96
+ENCODING 1746
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-....@.
-...@@@
-....@.
-......
-......
-......
-......
-......
-......
-......
-......
+..@@@.
+.@..@@
+...@..
+.@.@@.
+.@@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@.@.
+..@.@.
 ......
 ENDCHAR
-STARTCHAR 0x0E4C
-ENCODING 1831
+STARTCHAR 0x1FA6
+ENCODING 1747
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-.....@
-..@@@@
-..@@..
-......
-......
-......
-......
-......
-......
-......
-......
+..@@@.
+.@..@@
+...@..
+.@..@@
+.@...@
+.@.@.@
+.@.@.@
+.@.@.@
+..@.@.
+...@..
+...@..
 ......
 ENDCHAR
-STARTCHAR 0x0E38
-ENCODING 1832
+STARTCHAR 0x03AA
+ENCODING 1748
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@@
 ......
+..@@@.
+...@..
+...@..
+...@..
+...@..
+...@..
+..@@@.
 ......
 ......
 ......
-......
-......
-......
-......
-......
-......
-...@@.
-....@.
 ENDCHAR
-STARTCHAR 0x0E39
-ENCODING 1833
+STARTCHAR 0x03AB
+ENCODING 1749
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@@
 ......
+.@...@
+.@...@
+..@.@.
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
-......
-......
-......
-......
-......
-......
-.@@.@.
-..@@@.
 ENDCHAR
-STARTCHAR 0x0E3A
-ENCODING 1834
+STARTCHAR 0x03D4
+ENCODING 1750
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@.@@
 ......
+.@@.@@
+.@.@.@
+...@..
+...@..
+...@..
+...@..
+...@..
 ......
 ......
 ......
-......
-......
-......
-......
-......
-......
-...@@.
-...@@.
 ENDCHAR
-STARTCHAR 0x0E50
-ENCODING 1835
+STARTCHAR 0x03CA
+ENCODING 1751
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@..
+.@.@..
 ......
-......
-......
-......
-.@@@..
-@...@.
-@...@.
-@...@.
-.@@@..
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E51
-ENCODING 1836
+STARTCHAR 0x03CB
+ENCODING 1752
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+..@.@.
+..@.@.
 ......
-......
-......
-......
-.@@@..
-@...@.
-@.@.@.
-@.@.@.
-.@....
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E52
-ENCODING 1837
+STARTCHAR 0x1FD3
+ENCODING 1753
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@.@
+.@@..@
 ......
-......
-......
-@.....
-@..@..
-@.@.@.
-@.@.@.
-@...@.
-@@@@@.
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E53
-ENCODING 1838
+STARTCHAR 0x0390
+ENCODING 1753
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@.@
+.@@..@
 ......
-......
-......
-......
-.@.@..
-@@@@@.
-@...@.
-@@..@.
-.@.@..
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E54
-ENCODING 1839
+STARTCHAR 0x1FE3
+ENCODING 1754
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@.@
+.@@..@
 ......
-......
-......
-....@.
-.@@@..
-@.....
-@.@@..
-@.@@..
-.@.@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E55
-ENCODING 1840
+STARTCHAR 0x03B0
+ENCODING 1754
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@.@.@
+.@@..@
 ......
-......
-@@....
-@.@.@.
-.@@@..
-@.....
-@.@@..
-@.@@..
-.@.@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E56
-ENCODING 1841
+STARTCHAR 0x1FD2
+ENCODING 1755
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@..@
+.@.@.@
 ......
-......
-@.....
-@.....
-@@@@..
-....@.
-....@.
-@@..@.
-.@@@..
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E57
-ENCODING 1842
+STARTCHAR 0x1FE2
+ENCODING 1756
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
+.@@..@
+.@.@.@
 ......
-......
-....@.
-....@.
 .@..@.
-@@@.@.
-@.@.@.
-@.@.@.
-@.@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E58
-ENCODING 1843
+STARTCHAR 0x1FD7
+ENCODING 1757
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-....@.
 .@@@..
-@.....
-@..@@.
-@@.@@.
-@.@@@.
+@...@.
+.@.@..
+..@...
+..@...
+..@...
+..@...
+..@...
+...@@.
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E59
-ENCODING 1844
+STARTCHAR 0x1FE7
+ENCODING 1758
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
 BITMAP
-......
-......
-......
-....@.
+..@@@.
+.@...@
+..@.@.
 .@..@.
-@.@@..
-@..@..
-@@..@.
-.@@.@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E4F
-ENCODING 1845
+STARTCHAR 0xE09D
+ENCODING 1772
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -35653,18 +32784,18 @@ BITMAP
 ......
 ......
 ......
-..@@..
-.@..@.
-@.@@.@
-@.@@.@
+......
 .@..@.
-..@@..
+@.@.@.
+@.@.@.
+@.@.@.
+@..@..
 ......
 ......
 ......
 ENDCHAR
-STARTCHAR 0x0E5B
-ENCODING 1846
+STARTCHAR 0xE09E
+ENCODING 1776
 SWIDTH 840 0
 DWIDTH 6 0
 BBX 6 12 0 -3
@@ -35672,12 +32803,12 @@ BITMAP
 ......
 ......
 ......
-.@....
-@..@..
-@..@.@
-@.@.@.
-@.@.@.
-.@....
+......
+.@@@@.
+...@..
+..@.@.
+...@@.
+....@.
 ......
 ......
 ......
@@ -39577,25 +36708,6 @@ BITMAP
 ..@...
 ......
 ENDCHAR
-STARTCHAR 0xFB29
-ENCODING 2045
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@...
-..@...
-@@@@@.
-......
-......
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x204A
 ENCODING 2046
 SWIDTH 840 0
@@ -40964,348 +38076,6 @@ BITMAP
 ...@..
 ......
 ENDCHAR
-STARTCHAR 0x05BC
-ENCODING 2114
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-.@....
-.@....
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05C1
-ENCODING 2115
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-....@.
-....@.
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05C2
-ENCODING 2116
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-@.....
-@.....
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05B9
-ENCODING 2117
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@....
-.@....
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05C4
-ENCODING 2118
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-..@...
-..@...
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05BF
-ENCODING 2119
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-.@@@..
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0xFB1E
-ENCODING 2120
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-.@..@.
-..@@..
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05B4
-ENCODING 2121
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-..@...
-......
-ENDCHAR
-STARTCHAR 0x05B5
-ENCODING 2122
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-.@.@..
-......
-ENDCHAR
-STARTCHAR 0x05BD
-ENCODING 2123
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-..@...
-..@...
-..@...
-ENDCHAR
-STARTCHAR 0x05B7
-ENCODING 2124
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-.@@@@.
-......
-ENDCHAR
-STARTCHAR 0x05B8
-ENCODING 2125
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-.@@@..
-..@...
-ENDCHAR
-STARTCHAR 0x05B6
-ENCODING 2126
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-......
-@...@.
-..@...
-ENDCHAR
-STARTCHAR 0x05BB
-ENCODING 2127
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-@.....
-..@...
-....@.
-ENDCHAR
-STARTCHAR 0x05B0
-ENCODING 2128
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-..@...
-......
-..@...
-ENDCHAR
-STARTCHAR 0x05B2
-ENCODING 2129
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-....@.
-@@@...
-....@.
-ENDCHAR
-STARTCHAR 0x05B3
-ENCODING 2130
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-....@.
-@@@...
-.@..@.
-ENDCHAR
-STARTCHAR 0x05B1
-ENCODING 2131
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-......
-......
-......
-......
-......
-....@.
-@.@...
-.@..@.
-ENDCHAR
 STARTCHAR 0x0307
 ENCODING 2132
 SWIDTH 840 0
@@ -43244,44 +40014,6 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05F3
-ENCODING 2233
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-....@.
-...@..
-..@...
-......
-......
-......
-......
-......
-......
-ENDCHAR
-STARTCHAR 0x05F4
-ENCODING 2234
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-..@.@.
-.@.@..
-@.@...
-......
-......
-......
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x0022
 ENCODING 2235
 SWIDTH 840 0
@@ -43757,25 +40489,6 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05C3
-ENCODING 2255
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-......
-..@@..
-..@@..
-......
-..@@..
-..@@..
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x10FB
 ENCODING 2256
 SWIDTH 840 0
@@ -44061,25 +40774,6 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05BE
-ENCODING 2267
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-.@@@@.
-......
-......
-......
-......
-......
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x058A
 ENCODING 2268
 SWIDTH 840 0
@@ -44365,25 +41059,6 @@ BITMAP
 ......
 ......
 ENDCHAR
-STARTCHAR 0x05C0
-ENCODING 2282
-SWIDTH 840 0
-DWIDTH 6 0
-BBX 6 12 0 -3
-BITMAP
-......
-......
-......
-...@..
-...@..
-...@..
-...@..
-...@..
-...@..
-......
-......
-......
-ENDCHAR
 STARTCHAR 0x0028
 ENCODING 2283
 SWIDTH 840 0
diff --git a/resources/ttyp0/font_hebrew.bit b/resources/ttyp0/font_hebrew.bit
new file mode 100644
index 000000000..d0afc37f0
--- /dev/null
+++ b/resources/ttyp0/font_hebrew.bit
@@ -0,0 +1,1751 @@
+STARTFONT 2.1
+COMMENT EasyRPG ttyp0 - Hebrew (unused)
+COMMENT Based on the UW ttyp0, the original license is below:
+COMMENT
+COMMENT Copyright (C) 2012-2015 Uwe Waldmann
+COMMENT
+COMMENT Permission is hereby granted, free of charge, to any person obtaining
+COMMENT a copy of this font software and associated files (the "Software"),
+COMMENT to deal in the Software without restriction, including without
+COMMENT limitation the rights to use, copy, modify, merge, publish,
+COMMENT distribute, embed, sublicense, and/or sell copies of the Software,
+COMMENT and to permit persons to whom the Software is furnished to do so,
+COMMENT subject to the following conditions:
+COMMENT
+COMMENT (1) The above copyright notice, this permission notice, and the
+COMMENT     disclaimer below shall be included in all copies or substantial
+COMMENT     portions of the Software.
+COMMENT
+COMMENT (2) If the design of any glyphs in the fonts that are contained in the
+COMMENT     Software or generated during the installation process is modified
+COMMENT     or if additional glyphs are added to the fonts, the fonts
+COMMENT     must be renamed. The new names may not contain the word "UW",
+COMMENT     irrespective of capitalisation; the new names may contain the word
+COMMENT     "ttyp0", irrespective of capitalisation, only if preceded by a
+COMMENT     foundry name different from "UW".
+COMMENT
+COMMENT THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+COMMENT OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+COMMENT MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+COMMENT IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+COMMENT CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+COMMENT TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+COMMENT SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+COMMENT
+FONT -EasyRPG-Ttyp0-Medium-R-Normal--12-110-75-75-C-60-UW-Fontspecific
+SIZE 12 75 75
+FONTBOUNDINGBOX 6 12 0 -3
+STARTPROPERTIES 19
+FONTNAME_REGISTRY ""
+FOUNDRY "EasyRPG"
+FAMILY_NAME "Ttyp0"
+WEIGHT_NAME "Medium"
+SLANT "R"
+SETWIDTH_NAME "Normal"
+ADD_STYLE_NAME ""
+PIXEL_SIZE 12
+POINT_SIZE 110
+RESOLUTION_X 75
+RESOLUTION_Y 75
+SPACING "C"
+AVERAGE_WIDTH 60
+CHARSET_REGISTRY "UW"
+CHARSET_ENCODING "Fontspecific"
+DEFAULT_CHAR 0
+FONT_DESCENT 3
+FONT_ASCENT 9
+COPYRIGHT "Copyright (C) 2012-2015 Uwe Waldmann"
+ENDPROPERTIES
+CHARS 3001
+STARTCHAR 0x05D0
+ENCODING 1240
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@.@..
+.@..@.
+..@@..
+.@.@..
+.@..@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D1
+ENCODING 1241
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@...
+...@..
+...@..
+...@..
+...@..
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D2
+ENCODING 1242
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@...
+...@..
+...@..
+...@..
+..@.@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D3
+ENCODING 1243
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+...@..
+...@..
+...@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D4
+ENCODING 1244
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+....@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D5
+ENCODING 1245
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+...@..
+...@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D6
+ENCODING 1246
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+..@...
+..@...
+..@...
+..@...
+..@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D7
+ENCODING 1247
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D8
+ENCODING 1248
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@..@@.
+@...@.
+@...@.
+@...@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05D9
+ENCODING 1249
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+...@..
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05DB
+ENCODING 1250
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+....@.
+....@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05DA
+ENCODING 1251
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@@.
+....@.
+....@.
+....@.
+....@.
+....@.
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0x05DC
+ENCODING 1252
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@....
+.@....
+.@@@@.
+....@.
+....@.
+....@.
+...@..
+..@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05DE
+ENCODING 1253
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@.@@..
+.@@.@.
+.@..@.
+.@..@.
+@...@.
+@.@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05DD
+ENCODING 1254
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E0
+ENCODING 1255
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+...@@.
+....@.
+....@.
+....@.
+....@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05DF
+ENCODING 1256
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+......
+ENDCHAR
+STARTCHAR 0x05E1
+ENCODING 1257
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E2
+ENCODING 1258
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@..@.
+.@..@.
+..@.@.
+..@@..
+...@..
+.@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E4
+ENCODING 1259
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+.@..@.
+.@@.@.
+....@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E3
+ENCODING 1260
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+.@..@.
+.@@.@.
+....@.
+....@.
+....@.
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0x05E6
+ENCODING 1261
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@..@.
+.@..@.
+..@@..
+...@..
+....@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E5
+ENCODING 1262
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@..@.
+.@..@.
+.@.@..
+.@@...
+.@....
+.@....
+.@....
+.@....
+......
+ENDCHAR
+STARTCHAR 0x05E7
+ENCODING 1263
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+.@..@.
+.@.@..
+.@.@..
+.@....
+.@....
+.@....
+......
+ENDCHAR
+STARTCHAR 0x05E8
+ENCODING 1264
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+....@.
+....@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05E9
+ENCODING 1265
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@.@.@.
+@.@.@.
+@.@.@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05EA
+ENCODING 1266
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+@@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4F
+ENCODING 1267
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@....
+.@....
+.@.@..
+.@..@.
+..@@..
+...@..
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05F0
+ENCODING 1268
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@.@@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05F1
+ENCODING 1269
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@.@@.
+.@..@.
+.@..@.
+....@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05F2
+ENCODING 1270
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@.@@.
+.@..@.
+.@..@.
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2A
+ENCODING 1271
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+....@.
+....@.
+......
+@.@.@.
+@.@.@.
+@.@.@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2B
+ENCODING 1272
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@.....
+@.....
+......
+@.@.@.
+@.@.@.
+@.@.@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB1D
+ENCODING 1273
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+...@..
+......
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2E
+ENCODING 1274
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@.@..
+.@..@.
+..@@..
+.@.@..
+.@..@.
+.@@.@.
+......
+.@@@@.
+......
+ENDCHAR
+STARTCHAR 0xFB1F
+ENCODING 1275
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@.@@.
+.@..@.
+.@..@.
+......
+.@@@@.
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2F
+ENCODING 1276
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@.@..
+.@..@.
+..@@..
+.@.@..
+.@..@.
+.@@.@.
+......
+.@@@..
+..@...
+ENDCHAR
+STARTCHAR 0xFB30
+ENCODING 1277
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@.@..
+.@..@.
+..@@..
+.@.@..
+.@@.@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB31
+ENCODING 1278
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@...
+...@..
+.@.@..
+.@.@..
+...@..
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB32
+ENCODING 1279
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@...
+...@..
+.@.@..
+.@.@..
+..@.@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB33
+ENCODING 1280
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+...@..
+.@.@..
+.@.@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB34
+ENCODING 1281
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+....@.
+.@.@@.
+.@.@@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB35
+ENCODING 1282
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+.@.@..
+.@.@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB36
+ENCODING 1283
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+..@...
+@.@...
+@.@...
+..@...
+..@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB38
+ENCODING 1284
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@..@@.
+@...@.
+@.@.@.
+@.@.@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB39
+ENCODING 1285
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+...@..
+.@.@..
+.@....
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB3B
+ENCODING 1286
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+..@.@.
+..@.@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB3A
+ENCODING 1287
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@@.
+....@.
+..@.@.
+..@.@.
+....@.
+....@.
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0xFB3C
+ENCODING 1288
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@....
+.@....
+.@@@@.
+....@.
+.@..@.
+.@..@.
+...@..
+..@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB3E
+ENCODING 1289
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@.@@..
+.@@.@.
+.@.@@.
+.@.@@.
+@...@.
+@.@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB40
+ENCODING 1290
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+...@@.
+....@.
+..@.@.
+..@.@.
+....@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB41
+ENCODING 1291
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@@.
+.@..@.
+.@.@@.
+.@.@@.
+.@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB44
+ENCODING 1292
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+@...@.
+@.@.@.
+..@.@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB43
+ENCODING 1293
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+@...@.
+@.@.@.
+..@.@.
+....@.
+....@.
+....@.
+....@.
+......
+ENDCHAR
+STARTCHAR 0xFB46
+ENCODING 1294
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@..@.
+..@.@.
+.@.@..
+.@.@..
+....@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB47
+ENCODING 1295
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+.@@.@.
+.@@@..
+.@.@..
+.@....
+.@....
+.@....
+......
+ENDCHAR
+STARTCHAR 0xFB48
+ENCODING 1296
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@..
+....@.
+..@.@.
+..@.@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB49
+ENCODING 1297
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@.@.@.
+@.@@@.
+@.@@@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2C
+ENCODING 1298
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+....@.
+....@.
+......
+@.@.@.
+@.@@@.
+@.@@@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB2D
+ENCODING 1299
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@.....
+@.....
+......
+@.@.@.
+@.@@@.
+@.@@@.
+@@..@.
+@..@..
+@@@...
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4A
+ENCODING 1300
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@@@@..
+.@..@.
+.@@.@.
+.@@.@.
+.@..@.
+@@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4B
+ENCODING 1301
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@...
+..@...
+......
+..@@..
+...@..
+...@..
+...@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4C
+ENCODING 1302
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@@..
+......
+.@@...
+...@..
+...@..
+...@..
+...@..
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4D
+ENCODING 1303
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@@..
+......
+.@@@..
+....@.
+....@.
+....@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB4E
+ENCODING 1304
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@@..
+......
+@@@@..
+.@..@.
+.@@.@.
+....@.
+....@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB29
+ENCODING 2045
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@...
+..@...
+@@@@@.
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05BC
+ENCODING 2114
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+.@....
+.@....
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05C1
+ENCODING 2115
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+....@.
+....@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05C2
+ENCODING 2116
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+@.....
+@.....
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05B9
+ENCODING 2117
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@....
+.@....
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05C4
+ENCODING 2118
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@...
+..@...
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05BF
+ENCODING 2119
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@@..
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0xFB1E
+ENCODING 2120
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@..@.
+..@@..
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05B4
+ENCODING 2121
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+..@...
+......
+ENDCHAR
+STARTCHAR 0x05B5
+ENCODING 2122
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+.@.@..
+......
+ENDCHAR
+STARTCHAR 0x05BD
+ENCODING 2123
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+..@...
+..@...
+..@...
+ENDCHAR
+STARTCHAR 0x05B7
+ENCODING 2124
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+.@@@@.
+......
+ENDCHAR
+STARTCHAR 0x05B8
+ENCODING 2125
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+.@@@..
+..@...
+ENDCHAR
+STARTCHAR 0x05B6
+ENCODING 2126
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+@...@.
+..@...
+ENDCHAR
+STARTCHAR 0x05BB
+ENCODING 2127
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+@.....
+..@...
+....@.
+ENDCHAR
+STARTCHAR 0x05B0
+ENCODING 2128
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+..@...
+......
+..@...
+ENDCHAR
+STARTCHAR 0x05B2
+ENCODING 2129
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+....@.
+@@@...
+....@.
+ENDCHAR
+STARTCHAR 0x05B3
+ENCODING 2130
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+....@.
+@@@...
+.@..@.
+ENDCHAR
+STARTCHAR 0x05B1
+ENCODING 2131
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+....@.
+@.@...
+.@..@.
+ENDCHAR
+STARTCHAR 0x05F3
+ENCODING 2233
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+....@.
+...@..
+..@...
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05F4
+ENCODING 2234
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@.@.
+.@.@..
+@.@...
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05C3
+ENCODING 2255
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+..@@..
+......
+..@@..
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05BE
+ENCODING 2267
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@@@@.
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x05C0
+ENCODING 2282
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+...@..
+...@..
+...@..
+...@..
+...@..
+...@..
+......
+......
+......
+ENDCHAR
+ENDFONT
diff --git a/resources/ttyp0/font_thai.bit b/resources/ttyp0/font_thai.bit
new file mode 100644
index 000000000..419527953
--- /dev/null
+++ b/resources/ttyp0/font_thai.bit
@@ -0,0 +1,1694 @@
+STARTFONT 2.1
+COMMENT EasyRPG ttyp0 - Thai (unused)
+COMMENT Based on the UW ttyp0, the original license is below:
+COMMENT
+COMMENT Copyright (C) 2012-2015 Uwe Waldmann
+COMMENT
+COMMENT Permission is hereby granted, free of charge, to any person obtaining
+COMMENT a copy of this font software and associated files (the "Software"),
+COMMENT to deal in the Software without restriction, including without
+COMMENT limitation the rights to use, copy, modify, merge, publish,
+COMMENT distribute, embed, sublicense, and/or sell copies of the Software,
+COMMENT and to permit persons to whom the Software is furnished to do so,
+COMMENT subject to the following conditions:
+COMMENT
+COMMENT (1) The above copyright notice, this permission notice, and the
+COMMENT     disclaimer below shall be included in all copies or substantial
+COMMENT     portions of the Software.
+COMMENT
+COMMENT (2) If the design of any glyphs in the fonts that are contained in the
+COMMENT     Software or generated during the installation process is modified
+COMMENT     or if additional glyphs are added to the fonts, the fonts
+COMMENT     must be renamed. The new names may not contain the word "UW",
+COMMENT     irrespective of capitalisation; the new names may contain the word
+COMMENT     "ttyp0", irrespective of capitalisation, only if preceded by a
+COMMENT     foundry name different from "UW".
+COMMENT
+COMMENT THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+COMMENT OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+COMMENT MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+COMMENT IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+COMMENT CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+COMMENT TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+COMMENT SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+COMMENT
+FONT -EasyRPG-Ttyp0-Medium-R-Normal--12-110-75-75-C-60-UW-Fontspecific
+SIZE 12 75 75
+FONTBOUNDINGBOX 6 12 0 -3
+STARTPROPERTIES 19
+FONTNAME_REGISTRY ""
+FOUNDRY "EasyRPG"
+FAMILY_NAME "Ttyp0"
+WEIGHT_NAME "Medium"
+SLANT "R"
+SETWIDTH_NAME "Normal"
+ADD_STYLE_NAME ""
+PIXEL_SIZE 12
+POINT_SIZE 110
+RESOLUTION_X 75
+RESOLUTION_Y 75
+SPACING "C"
+AVERAGE_WIDTH 60
+CHARSET_REGISTRY "UW"
+CHARSET_ENCODING "Fontspecific"
+DEFAULT_CHAR 0
+FONT_DESCENT 3
+FONT_ASCENT 9
+COPYRIGHT "Copyright (C) 2012-2015 Uwe Waldmann"
+ENDPROPERTIES
+CHARS 3001
+STARTCHAR 0x0E01
+ENCODING 1759
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+..@.@.
+..@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E02
+ENCODING 1760
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+..@.@.
+..@.@.
+..@.@.
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E03
+ENCODING 1761
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@@@.@.
+@.@.@.
+..@.@.
+...@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E04
+ENCODING 1762
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E05
+ENCODING 1763
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@.@..
+@.@.@.
+@...@.
+@@@.@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E06
+ENCODING 1764
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@@@.@.
+@.@.@.
+..@@@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E07
+ENCODING 1765
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+...@@.
+...@@.
+.@..@.
+..@.@.
+...@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E08
+ENCODING 1766
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+....@.
+..@.@.
+..@@@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E09
+ENCODING 1767
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+....@.
+.@@.@.
+..@@@.
+..@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E0A
+ENCODING 1768
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+..@.@.
+..@@..
+..@.@.
+..@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E0B
+ENCODING 1769
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@@@.@.
+@.@@..
+..@.@.
+..@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E0C
+ENCODING 1770
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@..@
+@..@.@
+@..@.@
+@.@@@@
+@.@@.@
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E0D
+ENCODING 1771
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@..@.
+@.@.@.
+@.@.@.
+@.@.@.
+@..@..
+......
+..@.@.
+...@..
+ENDCHAR
+STARTCHAR 0x0E0E
+ENCODING 1773
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+..@.@.
+..@.@.
+....@.
+....@.
+..@@..
+ENDCHAR
+STARTCHAR 0x0E0F
+ENCODING 1774
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+..@.@.
+..@.@.
+....@.
+..@.@.
+.@@@..
+ENDCHAR
+STARTCHAR 0x0E10
+ENCODING 1775
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@@.
+...@..
+..@.@.
+...@@.
+....@.
+......
+..@.@.
+.@@@..
+ENDCHAR
+STARTCHAR 0x0E11
+ENCODING 1777
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@@@@@.
+@.@.@.
+..@.@.
+..@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E12
+ENCODING 1778
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@.@.@
+@@@@.@
+@..@.@
+@@.@.@
+@.@@@@
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E13
+ENCODING 1779
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@..@.
+@.@.@.
+@.@.@.
+@.@@@@
+@.@.@@
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E14
+ENCODING 1780
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@..@.
+.@@.@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E15
+ENCODING 1781
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@.@..
+@.@.@.
+@...@.
+@@..@.
+@@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E16
+ENCODING 1782
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+@...@.
+@@..@.
+.@..@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E17
+ENCODING 1783
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@@..@.
+@@.@@.
+.@@.@.
+.@..@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E18
+ENCODING 1784
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@@.
+.@....
+..@@..
+..@.@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E19
+ENCODING 1785
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@@.@..
+.@.@..
+.@.@..
+.@@@@.
+.@.@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1A
+ENCODING 1786
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+.@@.@.
+..@.@.
+..@.@.
+..@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1B
+ENCODING 1787
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@.
+....@.
+....@.
+.@@.@.
+.@@.@.
+..@.@.
+..@.@.
+..@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1C
+ENCODING 1788
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@@..@.
+@...@.
+@.@.@.
+@@.@@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1D
+ENCODING 1789
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@.
+....@.
+....@.
+@@..@.
+@...@.
+@.@.@.
+@@.@@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1E
+ENCODING 1790
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@.@.@.
+@@.@@.
+@@.@@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E1F
+ENCODING 1791
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@.
+....@.
+....@.
+@.@.@.
+@.@.@.
+@@.@@.
+@@.@@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E20
+ENCODING 1792
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+..@.@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E21
+ENCODING 1793
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+..@.@.
+..@.@.
+.@@@@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E22
+ENCODING 1794
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+.@..@.
+.@@.@.
+.@..@.
+.@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E23
+ENCODING 1795
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@@.
+.@....
+.@@@..
+...@..
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E24
+ENCODING 1796
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+@...@.
+@@..@.
+.@..@.
+.@@.@.
+....@.
+....@.
+....@.
+ENDCHAR
+STARTCHAR 0x0E25
+ENCODING 1797
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+....@.
+..@.@.
+.@.@@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E26
+ENCODING 1798
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+.@@.@.
+..@.@.
+.@@.@.
+....@.
+....@.
+....@.
+ENDCHAR
+STARTCHAR 0x0E27
+ENCODING 1799
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+....@.
+...@@.
+...@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E28
+ENCODING 1800
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@@.
+.@..@.
+.@@@@.
+.@@.@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E29
+ENCODING 1801
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@.@.
+.@@.@.
+..@@@@
+..@.@.
+..@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2A
+ENCODING 1802
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@.@
+...@@.
+..@.@.
+.@.@@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2B
+ENCODING 1803
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@@.@@.
+.@.@@.
+.@.@..
+.@@.@.
+.@..@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2C
+ENCODING 1804
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+...@@.
+...@@@
+@...@.
+@.@.@.
+@@.@@.
+@@.@@.
+@...@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2D
+ENCODING 1805
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+....@.
+.@@.@.
+.@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2E
+ENCODING 1806
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@@@
+....@.
+.@@.@.
+.@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E2F
+ENCODING 1807
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@..@.
+.@.@@.
+..@.@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E5A
+ENCODING 1808
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@.@.@.
+@.@.@.
+.@@.@.
+..@.@.
+..@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E46
+ENCODING 1809
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@.@..
+@.@.@.
+@...@.
+@@..@.
+....@.
+....@.
+....@.
+...@..
+ENDCHAR
+STARTCHAR 0x0E45
+ENCODING 1810
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+....@.
+....@.
+....@.
+....@.
+....@.
+....@.
+ENDCHAR
+STARTCHAR 0x0E32
+ENCODING 1811
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@@..
+.@..@.
+....@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E33
+ENCODING 1812
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+@@....
+@@....
+......
+..@@..
+.@..@.
+....@.
+....@.
+....@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E40
+ENCODING 1813
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+..@...
+..@...
+..@...
+..@@..
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E41
+ENCODING 1814
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+@..@..
+@..@..
+@..@..
+@@.@@.
+@@.@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E42
+ENCODING 1815
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+..@@@.
+.@....
+..@...
+...@..
+...@..
+...@..
+...@@.
+...@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E43
+ENCODING 1816
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+.@@...
+@..@..
+@@.@..
+@@.@..
+...@..
+...@..
+...@@.
+...@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E44
+ENCODING 1817
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+@.@...
+@@.@..
+.@.@..
+...@..
+...@..
+...@..
+...@@.
+...@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E30
+ENCODING 1818
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@..@.
+.@@@..
+......
+.@..@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E31
+ENCODING 1819
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+...@..
+...@@@
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E34
+ENCODING 1820
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+.@@@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E35
+ENCODING 1821
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@.
+.@@@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E36
+ENCODING 1822
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+...@@.
+.@@@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E37
+ENCODING 1823
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+..@.@.
+.@@.@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E47
+ENCODING 1824
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@@..
+.@....
+.@@@..
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4D
+ENCODING 1825
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@@
+....@@
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4E
+ENCODING 1826
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+....@@
+...@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E48
+ENCODING 1827
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+....@.
+....@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E49
+ENCODING 1828
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+..@@.@
+...@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4A
+ENCODING 1829
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.@@@.@
+.@.@@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4B
+ENCODING 1830
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+....@.
+...@@@
+....@.
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4C
+ENCODING 1831
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+.....@
+..@@@@
+..@@..
+......
+......
+......
+......
+......
+......
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E38
+ENCODING 1832
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+...@@.
+....@.
+ENDCHAR
+STARTCHAR 0x0E39
+ENCODING 1833
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+.@@.@.
+..@@@.
+ENDCHAR
+STARTCHAR 0x0E3A
+ENCODING 1834
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+......
+......
+......
+......
+......
+......
+...@@.
+...@@.
+ENDCHAR
+STARTCHAR 0x0E50
+ENCODING 1835
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+@...@.
+@...@.
+@...@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E51
+ENCODING 1836
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@@@..
+@...@.
+@.@.@.
+@.@.@.
+.@....
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E52
+ENCODING 1837
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+@.....
+@..@..
+@.@.@.
+@.@.@.
+@...@.
+@@@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E53
+ENCODING 1838
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+......
+.@.@..
+@@@@@.
+@...@.
+@@..@.
+.@.@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E54
+ENCODING 1839
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+....@.
+.@@@..
+@.....
+@.@@..
+@.@@..
+.@.@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E55
+ENCODING 1840
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+@@....
+@.@.@.
+.@@@..
+@.....
+@.@@..
+@.@@..
+.@.@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E56
+ENCODING 1841
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+@.....
+@.....
+@@@@..
+....@.
+....@.
+@@..@.
+.@@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E57
+ENCODING 1842
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+....@.
+....@.
+.@..@.
+@@@.@.
+@.@.@.
+@.@.@.
+@.@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E58
+ENCODING 1843
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+....@.
+.@@@..
+@.....
+@..@@.
+@@.@@.
+@.@@@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E59
+ENCODING 1844
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+....@.
+.@..@.
+@.@@..
+@..@..
+@@..@.
+.@@.@.
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E4F
+ENCODING 1845
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+..@@..
+.@..@.
+@.@@.@
+@.@@.@
+.@..@.
+..@@..
+......
+......
+......
+ENDCHAR
+STARTCHAR 0x0E5B
+ENCODING 1846
+SWIDTH 840 0
+DWIDTH 6 0
+BBX 6 12 0 -3
+BITMAP
+......
+......
+......
+.@....
+@..@..
+@..@.@
+@.@.@.
+@.@.@.
+.@....
+......
+......
+......
+ENDCHAR
+ENDFONT
diff --git a/src/generated/bitmapfont_ttyp0.h b/src/generated/bitmapfont_ttyp0.h
index eb521cc8a..49c3e373c 100644
--- a/src/generated/bitmapfont_ttyp0.h
+++ b/src/generated/bitmapfont_ttyp0.h
@@ -7,7 +7,7 @@
 #include <array>
 #include "bitmapfont_glyph.h"
 
-constexpr const std::array<BitmapFontGlyph,3074> BITMAPFONT_TTYP0 = {{
+constexpr const std::array<BitmapFontGlyph,2899> BITMAPFONT_TTYP0 = {{
   { 0, false, { 0, 22, 16, 2, 18, 18, 16, 2, 26, 0, 0, 0 } },
   { 32, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
   { 33, false, { 0, 8, 8, 8, 8, 8, 0, 8, 8, 0, 0, 0 } },
@@ -1257,145 +1257,7 @@ constexpr const std::array<BitmapFontGlyph,3074> BITMAPFONT_TTYP0 = {{
   { 1417, false, { 0, 0, 0, 0, 12, 12, 0, 12, 12, 0, 0, 0 } },
   { 1418, false, { 0, 0, 0, 0, 0, 18, 14, 0, 0, 0, 0, 0 } },
   { 1423, false, { 0, 12, 18, 18, 56, 16, 56, 16, 16, 0, 0, 0 } },
-  { 1456, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4 } },
-  { 1457, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 5, 18 } },
-  { 1458, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 7, 16 } },
-  { 1459, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 7, 18 } },
-  { 1460, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0 } },
-  { 1461, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 } },
-  { 1462, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 4 } },
-  { 1463, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0 } },
-  { 1464, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 4 } },
-  { 1465, false, { 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1467, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 16 } },
-  { 1468, false, { 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0 } },
-  { 1469, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4 } },
-  { 1470, false, { 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1471, false, { 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1472, false, { 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0 } },
-  { 1473, false, { 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1474, false, { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1475, false, { 0, 0, 0, 0, 12, 12, 0, 12, 12, 0, 0, 0 } },
-  { 1476, false, { 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 1488, false, { 0, 0, 0, 10, 18, 12, 10, 18, 22, 0, 0, 0 } },
-  { 1489, false, { 0, 0, 0, 6, 8, 8, 8, 8, 30, 0, 0, 0 } },
-  { 1490, false, { 0, 0, 0, 6, 8, 8, 8, 20, 18, 0, 0, 0 } },
-  { 1491, false, { 0, 0, 0, 31, 8, 8, 8, 8, 8, 0, 0, 0 } },
-  { 1492, false, { 0, 0, 0, 31, 16, 18, 18, 18, 18, 0, 0, 0 } },
-  { 1493, false, { 0, 0, 0, 12, 8, 8, 8, 8, 8, 0, 0, 0 } },
-  { 1494, false, { 0, 0, 0, 31, 4, 4, 4, 4, 4, 0, 0, 0 } },
-  { 1495, false, { 0, 0, 0, 31, 18, 18, 18, 18, 18, 0, 0, 0 } },
-  { 1496, false, { 0, 0, 0, 25, 17, 17, 17, 9, 7, 0, 0, 0 } },
-  { 1497, false, { 0, 0, 0, 12, 8, 8, 0, 0, 0, 0, 0, 0 } },
-  { 1498, false, { 0, 0, 0, 30, 16, 16, 16, 16, 16, 16, 16, 0 } },
-  { 1499, false, { 0, 0, 0, 14, 16, 16, 16, 16, 14, 0, 0, 0 } },
-  { 1500, false, { 0, 2, 2, 30, 16, 16, 16, 8, 4, 0, 0, 0 } },
-  { 1501, false, { 0, 0, 0, 31, 18, 18, 18, 18, 30, 0, 0, 0 } },
-  { 1502, false, { 0, 0, 0, 13, 22, 18, 18, 17, 29, 0, 0, 0 } },
-  { 1503, false, { 0, 0, 0, 12, 8, 8, 8, 8, 8, 8, 8, 0 } },
-  { 1504, false, { 0, 0, 0, 24, 16, 16, 16, 16, 30, 0, 0, 0 } },
-  { 1505, false, { 0, 0, 0, 31, 18, 18, 18, 18, 12, 0, 0, 0 } },
-  { 1506, false, { 0, 0, 0, 18, 18, 20, 12, 8, 6, 0, 0, 0 } },
-  { 1507, false, { 0, 0, 0, 15, 18, 22, 16, 16, 16, 16, 16, 0 } },
-  { 1508, false, { 0, 0, 0, 15, 18, 22, 16, 16, 14, 0, 0, 0 } },
-  { 1509, false, { 0, 0, 0, 18, 18, 10, 6, 2, 2, 2, 2, 0 } },
-  { 1510, false, { 0, 0, 0, 18, 18, 12, 8, 16, 30, 0, 0, 0 } },
-  { 1511, false, { 0, 0, 0, 14, 16, 18, 10, 10, 2, 2, 2, 0 } },
-  { 1512, false, { 0, 0, 0, 14, 16, 16, 16, 16, 16, 0, 0, 0 } },
-  { 1513, false, { 0, 0, 0, 21, 21, 21, 19, 9, 7, 0, 0, 0 } },
-  { 1514, false, { 0, 0, 0, 15, 18, 18, 18, 18, 19, 0, 0, 0 } },
-  { 1520, false, { 0, 0, 0, 27, 18, 18, 18, 18, 18, 0, 0, 0 } },
-  { 1521, false, { 0, 0, 0, 27, 18, 18, 16, 16, 16, 0, 0, 0 } },
-  { 1522, false, { 0, 0, 0, 27, 18, 18, 0, 0, 0, 0, 0, 0 } },
-  { 1523, false, { 0, 0, 0, 16, 8, 4, 0, 0, 0, 0, 0, 0 } },
-  { 1524, false, { 0, 0, 0, 20, 10, 5, 0, 0, 0, 0, 0, 0 } },
-  { 3585, false, { 0, 0, 0, 0, 12, 18, 22, 20, 20, 0, 0, 0 } },
-  { 3586, false, { 0, 0, 0, 0, 22, 20, 20, 20, 8, 0, 0, 0 } },
-  { 3587, false, { 0, 0, 0, 0, 21, 23, 21, 20, 8, 0, 0, 0 } },
-  { 3588, false, { 0, 0, 0, 0, 12, 18, 22, 18, 18, 0, 0, 0 } },
-  { 3589, false, { 0, 0, 0, 0, 10, 21, 17, 23, 17, 0, 0, 0 } },
-  { 3590, false, { 0, 0, 0, 0, 21, 23, 21, 28, 22, 0, 0, 0 } },
-  { 3591, false, { 0, 0, 0, 0, 24, 24, 18, 20, 24, 0, 0, 0 } },
-  { 3592, false, { 0, 0, 0, 0, 14, 16, 20, 28, 16, 0, 0, 0 } },
-  { 3593, false, { 0, 0, 0, 0, 14, 16, 22, 28, 20, 0, 0, 0 } },
-  { 3594, false, { 0, 0, 0, 0, 22, 20, 12, 20, 28, 0, 0, 0 } },
-  { 3595, false, { 0, 0, 0, 0, 21, 23, 13, 20, 28, 0, 0, 0 } },
-  { 3596, false, { 0, 0, 0, 0, 38, 41, 41, 61, 45, 0, 0, 0 } },
-  { 3597, false, { 0, 0, 0, 0, 18, 21, 21, 21, 9, 0, 20, 8 } },
-  { 3598, false, { 0, 0, 0, 0, 12, 18, 22, 20, 20, 16, 16, 12 } },
-  { 3599, false, { 0, 0, 0, 0, 12, 18, 22, 20, 20, 16, 20, 14 } },
-  { 3600, false, { 0, 0, 0, 0, 30, 8, 20, 24, 16, 0, 20, 14 } },
-  { 3601, false, { 0, 0, 0, 0, 21, 31, 21, 20, 20, 0, 0, 0 } },
-  { 3602, false, { 0, 0, 0, 0, 42, 47, 41, 43, 61, 0, 0, 0 } },
-  { 3603, false, { 0, 0, 0, 0, 18, 21, 21, 61, 53, 0, 0, 0 } },
-  { 3604, false, { 0, 0, 0, 0, 12, 18, 18, 22, 22, 0, 0, 0 } },
-  { 3605, false, { 0, 0, 0, 0, 10, 21, 17, 19, 19, 0, 0, 0 } },
-  { 3606, false, { 0, 0, 0, 0, 14, 17, 19, 18, 22, 0, 0, 0 } },
-  { 3607, false, { 0, 0, 0, 0, 19, 27, 22, 18, 18, 0, 0, 0 } },
-  { 3608, false, { 0, 0, 0, 0, 28, 2, 12, 20, 14, 0, 0, 0 } },
-  { 3609, false, { 0, 0, 0, 0, 11, 10, 10, 30, 26, 0, 0, 0 } },
-  { 3610, false, { 0, 0, 0, 0, 22, 22, 20, 20, 28, 0, 0, 0 } },
-  { 3611, false, { 0, 16, 16, 16, 22, 22, 20, 20, 28, 0, 0, 0 } },
-  { 3612, false, { 0, 0, 0, 0, 19, 17, 21, 27, 17, 0, 0, 0 } },
-  { 3613, false, { 0, 16, 16, 16, 19, 17, 21, 27, 17, 0, 0, 0 } },
-  { 3614, false, { 0, 0, 0, 0, 21, 21, 27, 27, 17, 0, 0, 0 } },
-  { 3615, false, { 0, 16, 16, 16, 21, 21, 27, 27, 17, 0, 0, 0 } },
-  { 3616, false, { 0, 0, 0, 0, 12, 18, 22, 20, 22, 0, 0, 0 } },
-  { 3617, false, { 0, 0, 0, 0, 22, 20, 20, 30, 22, 0, 0, 0 } },
-  { 3618, false, { 0, 0, 0, 0, 22, 18, 22, 18, 30, 0, 0, 0 } },
-  { 3619, false, { 0, 0, 0, 0, 28, 2, 14, 8, 12, 0, 0, 0 } },
-  { 3620, false, { 0, 0, 0, 0, 14, 17, 19, 18, 22, 16, 16, 16 } },
-  { 3621, false, { 0, 0, 0, 0, 14, 16, 20, 26, 18, 0, 0, 0 } },
-  { 3622, false, { 0, 0, 0, 0, 12, 18, 22, 20, 22, 16, 16, 16 } },
-  { 3623, false, { 0, 0, 0, 0, 12, 18, 16, 24, 24, 0, 0, 0 } },
-  { 3624, false, { 0, 0, 0, 0, 28, 18, 30, 22, 18, 0, 0, 0 } },
-  { 3625, false, { 0, 0, 0, 0, 22, 22, 60, 20, 28, 0, 0, 0 } },
-  { 3626, false, { 0, 0, 0, 0, 46, 24, 20, 26, 18, 0, 0, 0 } },
-  { 3627, false, { 0, 0, 0, 0, 27, 26, 10, 22, 18, 0, 0, 0 } },
-  { 3628, false, { 0, 0, 24, 56, 17, 21, 27, 27, 17, 0, 0, 0 } },
-  { 3629, false, { 0, 0, 0, 0, 14, 16, 22, 18, 12, 0, 0, 0 } },
-  { 3630, false, { 0, 0, 0, 0, 62, 16, 22, 18, 12, 0, 0, 0 } },
-  { 3631, false, { 0, 0, 0, 0, 18, 26, 20, 16, 16, 0, 0, 0 } },
-  { 3632, false, { 0, 0, 0, 0, 18, 14, 0, 18, 14, 0, 0, 0 } },
-  { 3633, false, { 0, 8, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3634, false, { 0, 0, 0, 0, 12, 18, 16, 16, 16, 0, 0, 0 } },
-  { 3635, false, { 0, 3, 3, 0, 12, 18, 16, 16, 16, 0, 0, 0 } },
-  { 3636, false, { 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3637, false, { 0, 16, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3638, false, { 0, 24, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3639, false, { 0, 20, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3640, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 16 } },
-  { 3641, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 28 } },
-  { 3642, false, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 24 } },
   { 3647, false, { 0, 8, 30, 42, 42, 30, 42, 42, 30, 8, 0, 0 } },
-  { 3648, false, { 0, 0, 0, 0, 4, 4, 4, 12, 12, 0, 0, 0 } },
-  { 3649, false, { 0, 0, 0, 0, 9, 9, 9, 27, 27, 0, 0, 0 } },
-  { 3650, false, { 0, 28, 2, 4, 8, 8, 8, 24, 24, 0, 0, 0 } },
-  { 3651, false, { 0, 6, 9, 11, 11, 8, 8, 24, 24, 0, 0, 0 } },
-  { 3652, false, { 0, 5, 11, 10, 8, 8, 8, 24, 24, 0, 0, 0 } },
-  { 3653, false, { 0, 0, 0, 0, 12, 18, 16, 16, 16, 16, 16, 16 } },
-  { 3654, false, { 0, 0, 0, 0, 10, 21, 17, 19, 16, 16, 16, 8 } },
-  { 3655, false, { 12, 2, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3656, false, { 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3657, false, { 44, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3658, false, { 46, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3659, false, { 16, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3660, false, { 32, 60, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3661, false, { 0, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3662, false, { 0, 48, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 3663, false, { 0, 0, 0, 12, 18, 45, 45, 18, 12, 0, 0, 0 } },
-  { 3664, false, { 0, 0, 0, 0, 14, 17, 17, 17, 14, 0, 0, 0 } },
-  { 3665, false, { 0, 0, 0, 0, 14, 17, 21, 21, 2, 0, 0, 0 } },
-  { 3666, false, { 0, 0, 0, 1, 9, 21, 21, 17, 31, 0, 0, 0 } },
-  { 3667, false, { 0, 0, 0, 0, 10, 31, 17, 19, 10, 0, 0, 0 } },
-  { 3668, false, { 0, 0, 0, 16, 14, 1, 13, 13, 26, 0, 0, 0 } },
-  { 3669, false, { 0, 0, 3, 21, 14, 1, 13, 13, 26, 0, 0, 0 } },
-  { 3670, false, { 0, 0, 1, 1, 15, 16, 16, 19, 14, 0, 0, 0 } },
-  { 3671, false, { 0, 0, 16, 16, 18, 23, 21, 21, 13, 0, 0, 0 } },
-  { 3672, false, { 0, 0, 0, 16, 14, 1, 25, 27, 29, 0, 0, 0 } },
-  { 3673, false, { 0, 0, 0, 16, 18, 13, 9, 19, 22, 0, 0, 0 } },
-  { 3674, false, { 0, 0, 0, 0, 21, 21, 22, 20, 20, 0, 0, 0 } },
-  { 3675, false, { 0, 0, 0, 2, 9, 41, 21, 21, 2, 0, 0, 0 } },
   { 4304, false, { 0, 0, 0, 0, 4, 8, 16, 18, 12, 0, 0, 0 } },
   { 4305, false, { 0, 4, 8, 8, 12, 18, 18, 18, 12, 0, 0, 0 } },
   { 4306, false, { 0, 0, 0, 0, 4, 10, 8, 12, 18, 18, 18, 12 } },
@@ -3044,43 +2906,6 @@ constexpr const std::array<BitmapFontGlyph,3074> BITMAPFONT_TTYP0 = {{
   { 64260, false, { 0, 60, 42, 42, 47, 42, 42, 42, 42, 0, 0, 0 } },
   { 64261, false, { 0, 12, 18, 58, 18, 18, 18, 18, 50, 0, 0, 0 } },
   { 64262, false, { 0, 16, 16, 60, 18, 18, 20, 20, 50, 0, 0, 0 } },
-  { 64285, false, { 0, 0, 0, 12, 8, 8, 0, 8, 8, 0, 0, 0 } },
-  { 64286, false, { 18, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
-  { 64287, false, { 0, 0, 0, 27, 18, 18, 0, 30, 0, 0, 0, 0 } },
-  { 64297, false, { 0, 0, 0, 0, 4, 4, 31, 0, 0, 0, 0, 0 } },
-  { 64298, false, { 16, 16, 0, 21, 21, 21, 19, 9, 7, 0, 0, 0 } },
-  { 64299, false, { 1, 1, 0, 21, 21, 21, 19, 9, 7, 0, 0, 0 } },
-  { 64300, false, { 16, 16, 0, 21, 29, 29, 19, 9, 7, 0, 0, 0 } },
-  { 64301, false, { 1, 1, 0, 21, 29, 29, 19, 9, 7, 0, 0, 0 } },
-  { 64302, false, { 0, 0, 0, 10, 18, 12, 10, 18, 22, 0, 30, 0 } },
-  { 64303, false, { 0, 0, 0, 10, 18, 12, 10, 18, 22, 0, 14, 4 } },
-  { 64304, false, { 0, 0, 0, 10, 18, 12, 10, 22, 22, 0, 0, 0 } },
-  { 64305, false, { 0, 0, 0, 6, 8, 10, 10, 8, 30, 0, 0, 0 } },
-  { 64306, false, { 0, 0, 0, 6, 8, 10, 10, 20, 18, 0, 0, 0 } },
-  { 64307, false, { 0, 0, 0, 31, 8, 10, 10, 8, 8, 0, 0, 0 } },
-  { 64308, false, { 0, 0, 0, 31, 16, 26, 26, 18, 18, 0, 0, 0 } },
-  { 64309, false, { 0, 0, 0, 12, 8, 10, 10, 8, 8, 0, 0, 0 } },
-  { 64310, false, { 0, 0, 0, 31, 4, 5, 5, 4, 4, 0, 0, 0 } },
-  { 64312, false, { 0, 0, 0, 25, 17, 21, 21, 9, 7, 0, 0, 0 } },
-  { 64313, false, { 0, 0, 0, 12, 8, 10, 2, 0, 0, 0, 0, 0 } },
-  { 64314, false, { 0, 0, 0, 30, 16, 20, 20, 16, 16, 16, 16, 0 } },
-  { 64315, false, { 0, 0, 0, 14, 16, 20, 20, 16, 14, 0, 0, 0 } },
-  { 64316, false, { 0, 2, 2, 30, 16, 18, 18, 8, 4, 0, 0, 0 } },
-  { 64318, false, { 0, 0, 0, 13, 22, 26, 26, 17, 29, 0, 0, 0 } },
-  { 64320, false, { 0, 0, 0, 24, 16, 20, 20, 16, 30, 0, 0, 0 } },
-  { 64321, false, { 0, 0, 0, 31, 18, 26, 26, 18, 12, 0, 0, 0 } },
-  { 64323, false, { 0, 0, 0, 15, 17, 21, 20, 16, 16, 16, 16, 0 } },
-  { 64324, false, { 0, 0, 0, 15, 17, 21, 20, 16, 14, 0, 0, 0 } },
-  { 64326, false, { 0, 0, 0, 18, 20, 10, 10, 16, 30, 0, 0, 0 } },
-  { 64327, false, { 0, 0, 0, 14, 16, 22, 14, 10, 2, 2, 2, 0 } },
-  { 64328, false, { 0, 0, 0, 14, 16, 20, 20, 16, 16, 0, 0, 0 } },
-  { 64329, false, { 0, 0, 0, 21, 29, 29, 19, 9, 7, 0, 0, 0 } },
-  { 64330, false, { 0, 0, 0, 15, 18, 22, 22, 18, 19, 0, 0, 0 } },
-  { 64331, false, { 4, 4, 0, 12, 8, 8, 8, 8, 8, 0, 0, 0 } },
-  { 64332, false, { 0, 14, 0, 6, 8, 8, 8, 8, 30, 0, 0, 0 } },
-  { 64333, false, { 0, 14, 0, 14, 16, 16, 16, 16, 14, 0, 0, 0 } },
-  { 64334, false, { 0, 14, 0, 15, 18, 22, 16, 16, 14, 0, 0, 0 } },
-  { 64335, false, { 0, 2, 2, 10, 18, 12, 8, 16, 16, 0, 0, 0 } },
   { 65533, false, { 0, 28, 54, 54, 48, 24, 8, 0, 8, 28, 8, 0 } },
 }};
 

From 03cfe75d582cc8965e8bfbd70ddfabf7eb4c0f75 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:12:22 -0300
Subject: [PATCH 162/222] Spawn Map Event - Support renaming an event

---
 src/game_interpreter.cpp | 8 +++++---
 src/game_map.cpp         | 4 +++-
 src/game_map.h           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 8d2441d3b..7bfba8dc4 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -5009,20 +5009,22 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 
 	if (flag_name == "rpg2k-battle")
 		lcf::Data::system.easyrpg_use_rpg2k_battle_system = flag_value;
-	
+
 	return true;
 }
 
 bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
-	int src_map = ValueOrVariable(com.parameters[0], com.parameters[1]);	
+	int src_map = ValueOrVariable(com.parameters[0], com.parameters[1]);
 	int src_event = ValueOrVariable(com.parameters[2], com.parameters[3]);
 	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
 	int target_y = ValueOrVariable(com.parameters[6], com.parameters[7]);
 	int target_event = ValueOrVariable(com.parameters[8], com.parameters[9]);
 
+	std::string target_name = ToString(CommandStringOrVariable(com, 10, 11));
+
 	if (src_map == 0) src_map = Game_Map::GetMapId();
 
-	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y, target_event);
+	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y, target_event, target_name);
 	return true;
 }
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 7c9f3a05f..53ede7425 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -386,7 +386,7 @@ void Game_Map::Caching::MapCache::Clear() {
 	}
 }
 
-bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id = 0) {
+bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id = 0, std::string target_name = "") {
 	std::unique_ptr<lcf::rpg::Map> source_map;
 
 	if (src_map_id == GetMapId()) source_map = std::make_unique<lcf::rpg::Map>(GetMap());
@@ -418,6 +418,8 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 	new_event.x = target_x;
 	new_event.y = target_y;
 
+	if (!target_name.empty()) new_event.name = lcf::DBString(target_name);
+
 	map->events.push_back(new_event);
 
 	events.emplace_back(GetMapId(), &map->events.back());
diff --git a/src/game_map.h b/src/game_map.h
index d098053bc..99ae9e9d8 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -96,7 +96,7 @@ namespace Game_Map {
 	/** Disposes Game_Map. */
 	void Dispose();
 
-	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id);
+	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, std::string target_name);
 	bool DestroyMapEvent(const int event_id);
 
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);

From da28e0444c3998b72aeec16e7fd3cf856160b9ea Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Tue, 14 May 2024 15:08:46 +0200
Subject: [PATCH 163/222] Refactored the AntiLag "MapCache" structure & moved
 it to its own namespace

---
 src/game_map.cpp | 38 +++++++++++-----------------
 src/game_map.h   | 66 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index 51e7cdc01..a202f7d19 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -73,8 +73,7 @@ namespace {
 	std::vector<unsigned char> passages_up;
 	std::vector<Game_Event> events;
 	std::vector<Game_CommonEvent> common_events;
-	std::unordered_map<int, MapEventCache> events_cache_by_switch;
-	std::unordered_map<int, MapEventCache> events_cache_by_variable;
+	std::unique_ptr<Game_Map::Caching::MapCache> map_cache;
 
 	std::unique_ptr<lcf::rpg::Map> map;
 
@@ -115,6 +114,7 @@ void Game_Map::Init() {
 	SetNeedRefresh(true);
 
 	interpreter.reset(new Game_Interpreter_Map(true));
+	map_cache.reset(new Caching::MapCache());
 
 	InitCommonEvents();
 
@@ -135,8 +135,6 @@ void Game_Map::InitCommonEvents() {
 
 void Game_Map::Dispose() {
 	events.clear();
-	events_cache_by_switch.clear();
-	events_cache_by_variable.clear();
 	map.reset();
 	map_info = {};
 	panorama = {};
@@ -146,6 +144,7 @@ void Game_Map::Quit() {
 	Dispose();
 	common_events.clear();
 	interpreter.reset();
+	map_cache.reset();
 }
 
 int Game_Map::GetMapSaveCount() {
@@ -359,6 +358,9 @@ void Game_Map::SetupCommon() {
 		InitCommonEvents();
 	}
 
+	map_cache->Clear();
+	using Op = Caching::ObservervedVarOps;
+
 	// Create the map events
 	events.reserve(map->events.size());
 	for (auto& ev : map->events) {
@@ -366,24 +368,22 @@ void Game_Map::SetupCommon() {
 
 		for (const auto& pg : ev.pages) {
 			if (pg.condition.flags.switch_a) {
-				AddEventToSwitchCache(ev, pg.condition.switch_a_id);
+				map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_a_id, ev);
 			}
 			if (pg.condition.flags.switch_b) {
-				AddEventToSwitchCache(ev, pg.condition.switch_b_id);
+				map_cache->AddEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_b_id, ev);
 			}
 			if (pg.condition.flags.variable) {
-				AddEventToVariableCache(ev, pg.condition.variable_id);
+				map_cache->AddEventAsRefreshTarget<Op::VarSet>(pg.condition.variable_id, ev);
 			}
 		}
 	}
 }
 
-void Game_Map::AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id) {
-	events_cache_by_switch[switch_id].AddEvent(ev);
-}
-
-void Game_Map::AddEventToVariableCache(lcf::rpg::Event& ev, int var_id) {
-	events_cache_by_variable[var_id].AddEvent(ev);
+void Game_Map::Caching::MapCache::Clear() {
+	for (int i = 0; i < static_cast<int>(ObservervedVarOps_END); i++) {
+		refresh_targets_by_varid[i].clear();
+	}
 }
 
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
@@ -1549,25 +1549,17 @@ void Game_Map::SetNeedRefresh(bool refresh) {
 	need_refresh = refresh;
 }
 
-void MapEventCache::AddEvent(lcf::rpg::Event& ev) {
-	auto id = ev.ID;
-
-	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
-		event_ids.emplace_back(id);
-	}
-}
-
 void Game_Map::SetNeedRefreshForSwitchChange(int switch_id) {
 	if (need_refresh)
 		return;
-	if (events_cache_by_switch.find(switch_id) != events_cache_by_switch.end())
+	if (map_cache->GetNeedRefresh<Caching::ObservervedVarOps::SwitchSet>(switch_id))
 		SetNeedRefresh(true);
 }
 
 void Game_Map::SetNeedRefreshForVarChange(int var_id) {
 	if (need_refresh)
 		return;
-	if (events_cache_by_variable.find(var_id) != events_cache_by_variable.end())
+	if (map_cache->GetNeedRefresh<Caching::ObservervedVarOps::VarSet>(var_id))
 		SetNeedRefresh(true);
 }
 
diff --git a/src/game_map.h b/src/game_map.h
index e9ea966e2..2abd928a8 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -74,14 +74,6 @@ class MapUpdateAsyncContext {
 	bool message = false;
 };
 
-class MapEventCache {
-public:
-	void AddEvent(lcf::rpg::Event& ev);
-
-private:
-	std::vector<int> event_ids;
-};
-
 /**
  * Game_Map namespace
  */
@@ -688,13 +680,43 @@ namespace Game_Map {
 
 	FileRequestAsync* RequestMap(int map_id);
 
+	namespace Caching {
+		class MapEventCache {
+		public:
+			void AddEvent(lcf::rpg::Event& ev);
+
+		private:
+			std::vector<int> event_ids;
+		};
+
+		using MapEventCacheData_t = std::unordered_map<int, MapEventCache>;
+
+		enum ObservervedVarOps {
+			SwitchSet = 0,
+			VarSet,
+
+			ObservervedVarOps_END
+		};
+
+		class MapCache {
+		public:
+			template <ObservervedVarOps Op>
+			void AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev);
+
+			template <ObservervedVarOps Op>
+			bool GetNeedRefresh(int var_id);
+
+			void Clear();
+		private:
+			MapEventCacheData_t refresh_targets_by_varid[ObservervedVarOps_END];
+		};
+	}
+
 	void SetNeedRefreshForSwitchChange(int switch_id);
 	void SetNeedRefreshForVarChange(int var_id);
 	void SetNeedRefreshForSwitchChange(std::initializer_list<int> switch_ids);
 	void SetNeedRefreshForVarChange(std::initializer_list<int> var_ids);
 
-	void AddEventToSwitchCache(lcf::rpg::Event& ev, int switch_id);
-	void AddEventToVariableCache(lcf::rpg::Event& ev, int var_id);
 
 	namespace Parallax {
 		struct Params {
@@ -847,4 +869,28 @@ inline bool MapUpdateAsyncContext::IsActive() const {
 	return GetAsyncOp().IsActive();
 }
 
+inline void Game_Map::Caching::MapEventCache::AddEvent(lcf::rpg::Event& ev) {
+	auto id = ev.ID;
+
+	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
+		event_ids.emplace_back(id);
+	}
+}
+
+template <Game_Map::Caching::ObservervedVarOps Op>
+inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev) {
+	static_assert(static_cast<int>(Op) >= 0 && Op < ObservervedVarOps_END);
+
+	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
+	events_cache[var_id].AddEvent(ev);
+}
+
+template <Game_Map::Caching::ObservervedVarOps Op>
+inline bool Game_Map::Caching::MapCache::GetNeedRefresh(int var_id) {
+	static_assert(static_cast<int>(Op) >= 0 && Op < ObservervedVarOps_END);
+
+	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
+	return events_cache.find(var_id) != events_cache.end();
+}
+
 #endif

From 8f1f1e8f4d7438ad5cab450bd7315149ae6b4452 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 30 May 2024 11:55:39 +0200
Subject: [PATCH 164/222] Refactored several Interpreter related code segments:

- Implemented template method "DecodeTargetEvaluationMode".
  (This logic is shared between ControlVariables, ControlSwitches & ControlStrings but the actual implementation for several special access modes differs between implementations. Support for these modes is evaluated at compile time.)
- Moved some common helper functions into a new file "game_interpreter_shared.cpp" (CheckOperator, ValueOrVariable / CommandStringOrVariable & variants)
- Refactored "ValueOrVariable" & "ValueOrVariableBitfield" into template methods
- Moved some commonly used member function declarations which are needed for certain command argument evaluation methods from Game_Interpreter into a new abstract base class
  (namespace "Game_Interpreter_Shared" is agnostic to the actual implementation of the interpreter)
---
 CMakeLists.txt                             |   2 +
 Makefile.am                                |   2 +
 src/game_event.cpp                         |  30 +---
 src/game_interpreter.cpp                   | 173 ++++---------------
 src/game_interpreter.h                     |  16 +-
 src/game_interpreter_control_variables.cpp |   3 +-
 src/game_interpreter_control_variables.h   |   4 +-
 src/game_interpreter_map.cpp               |   2 +
 src/game_interpreter_shared.cpp            | 187 +++++++++++++++++++++
 src/game_interpreter_shared.h              | 163 ++++++++++++++++++
 src/game_strings.h                         |  32 ++--
 src/maniac_patch.cpp                       |   4 +-
 src/maniac_patch.h                         |   4 +-
 13 files changed, 422 insertions(+), 200 deletions(-)
 create mode 100644 src/game_interpreter_shared.cpp
 create mode 100644 src/game_interpreter_shared.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac41b7dad..f3e659fca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/game_interpreter.h
 	src/game_interpreter_map.cpp
 	src/game_interpreter_map.h
+	src/game_interpreter_shared.cpp
+	src/game_interpreter_shared.h
 	src/game_map.cpp
 	src/game_map.h
 	src/game_message.cpp
diff --git a/Makefile.am b/Makefile.am
index 016e1fa74..444e7c90f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,6 +157,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/game_interpreter_control_variables.h \
 	src/game_interpreter_map.cpp \
 	src/game_interpreter_map.h \
+	src/game_interpreter_shared.cpp \
+	src/game_interpreter_shared.h \
 	src/game_map.cpp \
 	src/game_map.h \
 	src/game_message.cpp \
diff --git a/src/game_event.cpp b/src/game_event.cpp
index 52cba0887..598afb494 100644
--- a/src/game_event.cpp
+++ b/src/game_event.cpp
@@ -256,33 +256,9 @@ bool Game_Event::AreConditionsMet(const lcf::rpg::EventPage& page) {
 			return false;
 		}
 	} else {
-		if (page.condition.flags.variable) {
-			switch (page.condition.compare_operator) {
-			case 0: // ==
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) == page.condition.variable_value))
-					return false;
-				break;
-			case 1: // >=
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) >= page.condition.variable_value))
-					return false;
-				break;
-			case 2: // <=
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) <= page.condition.variable_value))
-					return false;
-				break;
-			case 3: // >
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) > page.condition.variable_value))
-					return false;
-				break;
-			case 4: // <
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) < page.condition.variable_value))
-					return false;
-				break;
-			case 5: // !=
-				if (!(Main_Data::game_variables->Get(page.condition.variable_id) != page.condition.variable_value))
-					return false;
-				break;
-			}
+		if (page.condition.flags.variable && page.condition.compare_operator >= 0 && page.condition.compare_operator <= 5) {
+			if (!Game_Interpreter_Shared::CheckOperator(Main_Data::game_variables->Get(page.condition.variable_id), page.condition.variable_value, page.condition.compare_operator))
+				return false;
 		}
 	}
 
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 84dc8748f..c1bc38ed6 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -69,6 +69,8 @@
 #include "algo.h"
 #include "rand.h"
 
+using namespace Game_Interpreter_Shared;
+
 enum BranchSubcommand {
 	eOptionBranchElse = 1
 };
@@ -1062,12 +1064,20 @@ bool Game_Interpreter::CommandInputNumber(lcf::rpg::EventCommand const& com) { /
 }
 
 bool Game_Interpreter::CommandControlSwitches(lcf::rpg::EventCommand const& com) { // code 10210
-	if (com.parameters[0] >= 0 && com.parameters[0] <= 2) {
-		// Param0: 0: Single, 1: Range, 2: Indirect
-		// For Range set end to param 2, otherwise to start, this way the loop runs exactly once
+	{
+		int start, end;
+		bool target_eval_result = DecodeTargetEvaluationMode<
+			/* validate_patches */ true,
+			/* support_range_indirect */ false,
+			/* support_expressions */ false,
+			/* support_bitmask */ false,
+			/* support_scopes */ false
+		>(com, start, end);
+		if (!target_eval_result) {
+			Output::Warning("ControlSwitches: Unsupported target evaluation mode {}", com.parameters[0]);
+			return true;
+		}
 
-		int start = com.parameters[0] == 2 ? Main_Data::game_variables->Get(com.parameters[1]) : com.parameters[1];
-		int end = com.parameters[0] == 1 ? com.parameters[2] : start;
 		int val = com.parameters[3];
 
 		if (start == end) {
@@ -1086,7 +1096,6 @@ bool Game_Interpreter::CommandControlSwitches(lcf::rpg::EventCommand const& com)
 			Game_Map::SetNeedRefresh(true);
 		}
 	}
-
 	return true;
 }
 
@@ -1270,41 +1279,20 @@ bool Game_Interpreter::CommandControlVariables(lcf::rpg::EventCommand const& com
 			return true;
 	}
 
-	int target = com.parameters[0];
-	if (target >= 0 && target <= 4) {
-		// For Range set end to param 2, otherwise to start, this way the loop runs exactly once
-
-		int start, end;
-		if (target == 0) {
-			// Single
-			start = com.parameters[1];
-			end = start;
-		} else if (target == 1) {
-			// Range
-			start = com.parameters[1];
-			end = com.parameters[2];
-		} else if (target == 2) {
-			// Indirect
-			start = Main_Data::game_variables->Get(com.parameters[1]);
-			end = start;
-		} else if (target == 3 && Player::IsPatchManiac()) {
-			// Range Indirect (Maniac)
-			start = Main_Data::game_variables->Get(com.parameters[1]);
-			end = Main_Data::game_variables->Get(com.parameters[2]);
-		} else if (target == 4 && Player::IsPatchManiac()) {
-			// Expression (Maniac)
-			int idx = com.parameters[1];
-			start = ManiacPatch::ParseExpression(MakeSpan(com.parameters).subspan(idx + 1, com.parameters[idx]), *this);
-			end = start;
-		} else {
-			return true;
-		}
-
-		if (Player::IsPatchManiac() && end < start) {
-			// Vanilla does not support end..start, Maniac does
-			std::swap(start, end);
-		}
+	int start, end;
+	bool target_eval_result = DecodeTargetEvaluationMode<
+		/* validate_patches */ true,
+		/* support_range_indirect */ true,
+		/* support_expressions */ true,
+		/* support_bitmask */ false,
+		/* support_scopes */ false
+	>(com, start, end);
+	if (!target_eval_result) {
+		Output::Warning("ControlVariables: Unsupported target evaluation mode {}", com.parameters[0]);
+		return true;
+	}
 
+	{
 		int operation = com.parameters[3];
 		if (EP_UNLIKELY(operation >= 6 && !Player::IsPatchManiac())) {
 			Output::Warning("ControlVariables: Unsupported operation {}", operation);
@@ -1749,77 +1737,6 @@ bool Game_Interpreter::CommandChangeLevel(lcf::rpg::EventCommand const& com) { /
 	return true;
 }
 
-int Game_Interpreter::ValueOrVariable(int mode, int val) {
-	if (mode == 0) {
-		return val;
-	} else if (mode == 1) {
-		return Main_Data::game_variables->Get(val);
-	} else if (Player::IsPatchManiac()) {
-		// Maniac Patch does not implement all modes for all commands
-		// For simplicity it is enabled for all here
-		if (mode == 2) {
-			// Variable indirect
-			return Main_Data::game_variables->GetIndirect(val);
-		} else if (mode == 3) {
-			// Switch (F = 0, T = 1)
-			return Main_Data::game_switches->GetInt(val);
-		} else if (mode == 4) {
-			// Switch through Variable (F = 0, T = 1)
-			return Main_Data::game_switches->GetInt(Main_Data::game_variables->Get(val));
-		}
-	}
-	return -1;
-}
-
-int Game_Interpreter::ValueOrVariableBitfield(int mode, int shift, int val) {
-	return ValueOrVariable((mode & (0xF << shift * 4)) >> shift * 4, val);
-}
-
-int Game_Interpreter::ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) {
-	assert(static_cast<int>(com.parameters.size()) > val_idx);
-
-	if (!Player::IsPatchManiac()) {
-		return com.parameters[val_idx];
-	}
-
-	assert(mode_idx != val_idx);
-
-	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
-		return ValueOrVariableBitfield(com.parameters[mode_idx], shift, com.parameters[val_idx]);
-	}
-
-	return com.parameters[val_idx];
-}
-
-StringView Game_Interpreter::CommandStringOrVariable(lcf::rpg::EventCommand const& com, int mode_idx, int val_idx) {
-	if (!Player::IsPatchManiac()) {
-		return com.string;
-	}
-
-	assert(mode_idx != val_idx);
-
-	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
-		return Main_Data::game_strings->GetWithMode(ToString(com.string), com.parameters[mode_idx], com.parameters[val_idx], *Main_Data::game_variables);
-	}
-
-	return com.string;
-}
-
-StringView Game_Interpreter::CommandStringOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) {
-	if (!Player::IsPatchManiac()) {
-		return com.string;
-	}
-
-	assert(mode_idx != val_idx);
-
-	if (static_cast<int>(com.parameters.size()) >= std::max(mode_idx, val_idx) + 1) {
-		int mode = com.parameters[mode_idx];
-		return Main_Data::game_strings->GetWithMode(ToString(com.string), (mode & (0xF << shift * 4)) >> shift * 4, com.parameters[val_idx], *Main_Data::game_variables);
-	}
-
-	return com.string;
-}
-
 bool Game_Interpreter::CommandChangeParameters(lcf::rpg::EventCommand const& com) { // Code 10430
 	int value = OperateValue(
 		com.parameters[2],
@@ -4811,18 +4728,9 @@ bool Game_Interpreter::CommandManiacControlStrings(lcf::rpg::EventCommand const&
 	//		Flags, such as: extract, hex... There is also an edge case where the last argument of exRep is here
 	//
 	//*parameters 4..n - arguments
-	int string_mode = com.parameters[0] & 15;
-	int string_id_0 = com.parameters[1];
-	int string_id_1 = com.parameters[2]; //for ranges
-
-	int is_range = string_mode & 1;
-
-	if (string_mode >= 2) {
-		string_id_0 = Main_Data::game_variables->Get(string_id_0);
-	}
-	if (string_mode == 3) {
-		string_id_1 = Main_Data::game_variables->Get(string_id_1);
-	}
+	bool is_range = com.parameters[0] & 1;
+	int string_id_0, string_id_1;
+	DecodeTargetEvaluationMode<false, true, false, true, false>(com, string_id_0, string_id_1);
 
 	int op = (com.parameters[3] >>  0) & 255;
 	int fn = (com.parameters[3] >>  8) & 255;
@@ -5155,25 +5063,6 @@ bool Game_Interpreter::IsWaitingForWaitCommand() const {
 	return (_state.wait_time > 0) || _state.wait_key_enter;
 }
 
-bool Game_Interpreter::CheckOperator(int val, int val2, int op) const {
-	switch (op) {
-		case 0:
-			return val == val2;
-		case 1:
-			return val >= val2;
-		case 2:
-			return val <= val2;
-		case 3:
-			return val > val2;
-		case 4:
-			return val < val2;
-		case 5:
-			return val != val2;
-		default:
-			return false;
-	}
-}
-
 bool Game_Interpreter::ManiacCheckContinueLoop(int val, int val2, int type, int op) const {
 	switch (type) {
 		case 0: // Infinite loop
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index 731aadf5c..c2e640f72 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -25,6 +25,7 @@
 #include "async_handler.h"
 #include "game_character.h"
 #include "game_actor.h"
+#include "game_interpreter_shared.h"
 #include <lcf/dbarray.h>
 #include <lcf/rpg/fwd.h>
 #include <lcf/rpg/eventcommand.h>
@@ -40,7 +41,7 @@ class PendingMessage;
 /**
  * Game_Interpreter class
  */
-class Game_Interpreter
+class Game_Interpreter : public Game_BaseInterpreterContext
 {
 public:
 	using Cmd = lcf::rpg::EventCommand::Code;
@@ -94,13 +95,13 @@ class Game_Interpreter
 	lcf::rpg::SaveEventExecState GetSaveState();
 
 	/** @return Game_Character of the passed event_id */
-	Game_Character* GetCharacter(int event_id) const;
+	Game_Character* GetCharacter(int event_id) const override;
 
 	/** @return the event_id of the current frame */
 	int GetCurrentEventId() const;
 
 	/** @return the event_id used by "ThisEvent" in commands */
-	int GetThisEventId() const;
+	int GetThisEventId() const override;
 
 	/** @return the event_id of the event at the base of the call stack */
 	int GetOriginalEventId() const;
@@ -119,7 +120,7 @@ class Game_Interpreter
 	static constexpr int call_stack_limit = 1000;
 	static constexpr int subcommand_sentinel = 255;
 
-	const lcf::rpg::SaveEventExecFrame& GetFrame() const;
+	const lcf::rpg::SaveEventExecFrame& GetFrame() const override;
 	lcf::rpg::SaveEventExecFrame& GetFrame();
 	const lcf::rpg::SaveEventExecFrame* GetFramePtr() const;
 	lcf::rpg::SaveEventExecFrame* GetFramePtr();
@@ -175,12 +176,6 @@ class Game_Interpreter
 	 * @param id actor ID (mode = 1) or variable ID (mode = 2).
 	 */
 	static std::vector<Game_Actor*> GetActors(int mode, int id);
-	static int ValueOrVariable(int mode, int val);
-	static int ValueOrVariableBitfield(int mode, int shift, int val);
-	// Range checked, conditional version (slower) of ValueOrVariableBitfield
-	static int ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx);
-	static StringView CommandStringOrVariable(lcf::rpg::EventCommand const& com, int mode_idx, int val_idx);
-	static StringView CommandStringOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx);
 
 	/**
 	 * When current frame finishes executing we pop the stack
@@ -341,7 +336,6 @@ class Game_Interpreter
 		void toSave(lcf::rpg::SaveEventExecState& save) const;
 	};
 
-	bool CheckOperator(int val, int val2, int op) const;
 	bool ManiacCheckContinueLoop(int val, int val2, int type, int op) const;
 	int ManiacBitmask(int value, int mask) const;
 
diff --git a/src/game_interpreter_control_variables.cpp b/src/game_interpreter_control_variables.cpp
index d8c0590dd..6e08bcb89 100644
--- a/src/game_interpreter_control_variables.cpp
+++ b/src/game_interpreter_control_variables.cpp
@@ -15,6 +15,7 @@
  * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "game_interpreter_shared.h"
 #include "game_interpreter_control_variables.h"
 #include "game_actors.h"
 #include "game_enemyparty.h"
@@ -154,7 +155,7 @@ int ControlVariables::Party(int op, int party_idx) {
 	return ControlVariables::Actor(op, actor->GetId());
 }
 
-int ControlVariables::Event(int op, int event_id, const Game_Interpreter& interpreter) {
+int ControlVariables::Event(int op, int event_id, const Game_BaseInterpreterContext& interpreter) {
 	auto character = interpreter.GetCharacter(event_id);
 	if (character) {
 		switch (op) {
diff --git a/src/game_interpreter_control_variables.h b/src/game_interpreter_control_variables.h
index a534b83b7..c1d7da11c 100644
--- a/src/game_interpreter_control_variables.h
+++ b/src/game_interpreter_control_variables.h
@@ -21,14 +21,14 @@
 
 #include <lcf/rpg/eventcommand.h>
 
-class Game_Interpreter;
+class Game_BaseInterpreterContext;
 
 namespace ControlVariables {
 	int Random(int value, int value2);
 	int Item(int op, int item);
 	int Actor(int op, int actor_id);
 	int Party(int op, int party_idx);
-	int Event(int op, int event_id, const Game_Interpreter& interpreter);
+	int Event(int op, int event_id, const Game_BaseInterpreterContext& interpreter);
 	int Other(int op);
 	int Enemy(int op, int enemy_idx);
 	int Pow(int arg1, int arg2);
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index e0d4f4257..bcd829708 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -76,6 +76,8 @@ enum InnSubcommand {
 	eOptionInnNoStay = 1,
 };
 
+using namespace Game_Interpreter_Shared;
+
 void Game_Interpreter_Map::SetState(const lcf::rpg::SaveEventExecState& save) {
 	Clear();
 	_state = save;
diff --git a/src/game_interpreter_shared.cpp b/src/game_interpreter_shared.cpp
new file mode 100644
index 000000000..96ff559d5
--- /dev/null
+++ b/src/game_interpreter_shared.cpp
@@ -0,0 +1,187 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "game_interpreter_shared.h"
+#include "game_actors.h"
+#include "game_enemyparty.h"
+#include "game_ineluki.h"
+#include "game_map.h"
+#include "game_party.h"
+#include "game_player.h"
+#include "game_switches.h"
+#include "game_system.h"
+#include "maniac_patch.h"
+#include "main_data.h"
+#include "output.h"
+#include "player.h"
+#include "rand.h"
+#include "util_macro.h"
+#include "utils.h"
+#include "audio.h"
+#include "baseui.h"
+#include <cmath>
+#include <cstdint>
+#include <lcf/rpg/savepartylocation.h>
+
+using Main_Data::game_switches, Main_Data::game_variables, Main_Data::game_strings;
+
+template<bool validate_patches, bool support_range_indirect, bool support_expressions, bool support_bitmask, bool support_scopes, bool support_named>
+inline bool Game_Interpreter_Shared::DecodeTargetEvaluationMode(lcf::rpg::EventCommand const& com, int& id_0, int& id_1, Game_BaseInterpreterContext const& interpreter) {
+	int mode = com.parameters[0];
+
+	if constexpr (support_bitmask) {
+		mode = com.parameters[0] & 15;
+	}
+
+	switch (mode) {
+		case TargetEvalMode::eTargetEval_Single:
+			id_0 = com.parameters[1];
+			id_1 = id_0;
+			break;
+		case TargetEvalMode::eTargetEval_Range:
+			id_0 = com.parameters[1];
+			id_1 = com.parameters[2];
+			break;
+		case TargetEvalMode::eTargetEval_IndirectSingle:
+			id_0 = game_variables->Get(com.parameters[1]);
+			id_1 = id_0;
+			break;
+		case TargetEvalMode::eTargetEval_IndirectRange:
+			if constexpr (!support_range_indirect) {
+				return false;
+			}
+			if constexpr (validate_patches) {
+				if (!Player::IsPatchManiac()) {
+					return false;
+				}
+			}
+			id_0 = game_variables->Get(com.parameters[1]);
+			id_1 = game_variables->Get(com.parameters[2]);
+			break;
+		case TargetEvalMode::eTargetEval_Expression:
+			if constexpr (!support_expressions) {
+				return false;
+			}
+			if constexpr (validate_patches) {
+				if (!Player::IsPatchManiac()) {
+					return false;
+				}
+			}
+			{
+				// Expression (Maniac)
+				int idx = com.parameters[1];
+				id_0 = ManiacPatch::ParseExpression(MakeSpan(com.parameters).subspan(idx + 1, com.parameters[idx]), interpreter);
+				id_1 = id_0;
+				return true;
+			}
+			break;
+	}
+
+	if constexpr (validate_patches) {
+		if (Player::IsPatchManiac() && id_1 < id_0) {
+			// Vanilla does not support end..start, Maniac does
+			std::swap(id_0, id_1);
+		}
+	} else {
+		if (id_1 < id_0) {
+			std::swap(id_0, id_1);
+		}
+	}
+
+	return true;
+}
+
+template<bool validate_patches, bool support_indirect_and_switch, bool support_scopes, bool support_named>
+int Game_Interpreter_Shared::ValueOrVariable(int mode, int val, Game_BaseInterpreterContext const& interpreter) {
+	if (mode == ValueEvalMode::eValueEval_Constant) {
+		return val;
+	} else if (mode == ValueEvalMode::eValueEval_Variable) {
+		return game_variables->Get(val);
+	} else {
+		if constexpr (support_indirect_and_switch) {
+			if constexpr (validate_patches) {
+				if (!Player::IsPatchManiac())
+					return -1;
+			}
+			// Maniac Patch does not implement all modes for all commands
+			// For simplicity it is enabled for all here
+			if (mode == ValueEvalMode::eValueEval_VariableIndirect) {
+				// Variable indirect
+				return game_variables->GetIndirect(val);
+			} else if (mode == ValueEvalMode::eValueEval_Switch) {
+				// Switch (F = 0, T = 1)
+				return game_switches->GetInt(val);
+			} else if (mode == ValueEvalMode::eValueEval_SwitchIndirect) {
+				// Switch through Variable (F = 0, T = 1)
+				return game_switches->GetInt(game_variables->Get(val));
+			}
+		}
+	}
+	return -1;
+}
+
+template<bool validate_patches, bool support_indirect_and_switch, bool support_scopes, bool support_named>
+int Game_Interpreter_Shared::ValueOrVariableBitfield(int mode, int shift, int val, Game_BaseInterpreterContext const& interpreter) {
+	return ValueOrVariable<validate_patches, support_indirect_and_switch, support_scopes, support_named>((mode & (0xF << shift * 4)) >> shift * 4, val, interpreter);
+}
+
+template<bool validate_patches, bool support_indirect_and_switch, bool support_scopes, bool support_named>
+int Game_Interpreter_Shared::ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx, Game_BaseInterpreterContext const& interpreter) {
+	assert(com.parameters.size() > val_idx);
+
+	if (!Player::IsPatchManiac()) {
+		return com.parameters[val_idx];
+	}
+
+	assert(mode_idx != val_idx);
+
+	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
+		int mode = com.parameters[mode_idx];
+		return ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(com.parameters[mode_idx], shift, com.parameters[val_idx], interpreter);
+	}
+
+	return com.parameters[val_idx];
+}
+
+StringView Game_Interpreter_Shared::CommandStringOrVariable(lcf::rpg::EventCommand const& com, int mode_idx, int val_idx) {
+	if (!Player::IsPatchManiac()) {
+		return com.string;
+	}
+
+	assert(mode_idx != val_idx);
+
+	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
+		return game_strings->GetWithMode(ToString(com.string), com.parameters[mode_idx], com.parameters[val_idx], *game_variables);
+	}
+
+	return com.string;
+}
+
+StringView Game_Interpreter_Shared::CommandStringOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) {
+	if (!Player::IsPatchManiac()) {
+		return com.string;
+	}
+
+	assert(mode_idx != val_idx);
+
+	if (com.parameters.size() >= std::max(mode_idx, val_idx) + 1) {
+		int mode = com.parameters[mode_idx];
+		return game_strings->GetWithMode(ToString(com.string), (mode & (0xF << shift * 4)) >> shift * 4, com.parameters[val_idx], *game_variables);
+	}
+
+	return com.string;
+}
diff --git a/src/game_interpreter_shared.h b/src/game_interpreter_shared.h
new file mode 100644
index 000000000..223cd48bf
--- /dev/null
+++ b/src/game_interpreter_shared.h
@@ -0,0 +1,163 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef EP_GAME_INTERPRETER_SHARED
+#define EP_GAME_INTERPRETER_SHARED
+
+#include <lcf/rpg/eventcommand.h>
+#include <lcf/rpg/saveeventexecframe.h>
+#include <string_view.h>
+
+class Game_Character;
+
+class Game_BaseInterpreterContext {
+public:
+	virtual ~Game_BaseInterpreterContext() {}
+
+	virtual int GetThisEventId() const = 0;
+	virtual Game_Character* GetCharacter(int event_id) const = 0;
+	virtual const lcf::rpg::SaveEventExecFrame& GetFrame() const = 0;
+
+protected:
+	template<bool validate_patches, bool support_range_indirect, bool support_expressions, bool support_bitmask, bool support_scopes, bool support_named = false>
+	inline bool DecodeTargetEvaluationMode(lcf::rpg::EventCommand const& com, int& id_0, int& id_1) const {
+		return Game_Interpreter_Shared::DecodeTargetEvaluationMode<validate_patches, support_range_indirect, support_expressions, support_bitmask, support_scopes, support_named>(com, id_0, id_1, *this);
+	}
+
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariable(int mode, int val) const {
+		return Game_Interpreter_Shared::ValueOrVariable<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, val, *this);
+	}
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariableBitfield(int mode, int shift, int val) const {
+		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, shift, val, *this);
+	}
+
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) const {
+		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(com, mode_idx, shift, val_idx, *this);
+	}
+};
+
+namespace Game_Interpreter_Shared {
+
+	/*
+	* Indicates how the target of an interpreter operation (lvalue) should be evaluated.
+	*/
+	enum TargetEvalMode : std::int8_t { // 4 bits
+		eTargetEval_Single = 0,			// v[x]
+		eTargetEval_Range = 1,			// v[x...y]
+		eTargetEval_IndirectSingle = 2, // v[v[x]]
+		eTargetEval_IndirectRange = 3,	// v[v[x]...v[y]] (ManiacPatch)
+		eTargetEval_Expression = 4		// ManiacPatch expression
+	};
+
+	/*
+	* Indicates how an operand of an interpreter operation (rvalue) should be evaluted.
+	*/
+	enum ValueEvalMode : std::int8_t { // 4 bits
+		eValueEval_Constant = 0,				// Constant value is given
+		eValueEval_Variable = 1,
+		eValueEval_VariableIndirect = 2,
+		eValueEval_Switch = 3,
+		eValueEval_SwitchIndirect = 4
+	};
+
+	/*
+	* Decodes how the target of an interpreter operation (or 'lvalue' in programming terms) should be evaluated
+	* and returns the extracted variable ids.
+	*
+	* @tparam validate_patches Indicates if this template variant should validate for patch support (Maniac, EasyRPG-Commands)
+	* @tparam support_range_indirect Indicates if indirect range operations should be supported (ManiacPatch)
+	* @tparam support_expressions Indicates if Expressions (Mode=4) should be supported (ManiacPatch)
+	* @tparam support_bitmask Indicates if the target mode should be derived from a bitmask (LSB bits) of the mode parameter
+		(ManiacPatch string command encodes more info about other arguments in com.parameters[0])
+	* @tparam support_scopes Indicates if ScopedVariables should be supported (EasyRPG-Commands - not implemented yet)
+	* @tparam support_named Indicates if NamedVariables should be supported (EasyRPG-Commands - not implemented yet)
+	* @param com \
+	*	com.parameters[0]: Modifier for the operation target (lvalue) -> @see TargetEvalMode
+	*	com.parameters[1]: The value from which id_0 (start) is decoded. This can be a constant, a variable id, or for special modes, packed information about scoped or named variables.
+	*	com.parameters[2]: The value from which id_1 (end) is decoded, in case the operation is a range op. (see com.parameters[1])
+	* @param id_0 Output parameter for the decoded, first variable id
+	* @param id_1 Output parameter for the decoded, second variable id (for range operations)
+	* @return True if the the parameters were successfully decoded
+	*/
+	template<bool validate_patches, bool support_range_indirect, bool support_expressions, bool support_bitmask, bool support_scopes, bool support_named = false>
+	bool DecodeTargetEvaluationMode(lcf::rpg::EventCommand const& com, int& id_0, int& id_1, Game_BaseInterpreterContext const& interpreter);
+
+	/*
+	* Decodes how an operand of an interpreter operation (or 'rvalue' in programming terms) should be evaluated
+	* and returns the its value
+	*
+	* @tparam validate_patches Indicates if this template variant should validate for patch support (Maniac, EasyRPG-Commands)
+	* @tparam support_indirect_and_switch Indicates if indirect and switch evaluation should be supported (ManiacPatch)
+	* @tparam support_scopes Indicates if ScopedVariables should be supported (EasyRPG-Commands - not implemented yet)
+	* @tparam support_named Indicates if NamedVariables should be supported (EasyRPG-Commands - not implemented yet)
+	* @param mode Modifier for the operand target (rvalue) -> @see ValueEvalMode
+	* @param val The raw value extracted from the interpreter command which is to be evaluated
+	*/
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	int ValueOrVariable(int mode, int val, Game_BaseInterpreterContext const& interpreter);
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	int ValueOrVariableBitfield(int mode, int shift, int val, Game_BaseInterpreterContext const& interpreter);
+	// Range checked, conditional version (slower) of ValueOrVariableBitfield
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	int ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx, Game_BaseInterpreterContext const& interpreter);
+
+	StringView CommandStringOrVariable(lcf::rpg::EventCommand const& com, int mode_idx, int val_idx);
+	StringView CommandStringOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx);
+
+	bool CheckOperator(int val, int val2, int op);
+}
+
+inline bool Game_Interpreter_Shared::CheckOperator(int val, int val2, int op) {
+	switch (op) {
+		case 0:
+			return val == val2;
+		case 1:
+			return val >= val2;
+		case 2:
+			return val <= val2;
+		case 3:
+			return val > val2;
+		case 4:
+			return val < val2;
+		case 5:
+			return val != val2;
+		default:
+			return false;
+	}
+}
+
+//explicit declarations for target evaluation logic shared between ControlSwitches/ControlVariables/ControlStrings
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, false, true, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+
+//common variant for suggested "Ex" commands
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, true, true, true, true>(lcf::rpg::EventCommand const&, int&, int&) const;
+
+//explicit declarations for default value evaluation logic
+template int Game_Interpreter_Shared::ValueOrVariable<true, true, false, false>(int, int, const Game_BaseInterpreterContext&);
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(int, int, int, const Game_BaseInterpreterContext&);
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(lcf::rpg::EventCommand const&, int, int, int, const Game_BaseInterpreterContext&);
+
+//variant for "Ex" commands
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<false, true, true, true>(int, int, int, const Game_BaseInterpreterContext&);
+
+#endif
diff --git a/src/game_strings.h b/src/game_strings.h
index ac7f0302e..d630bc8ab 100644
--- a/src/game_strings.h
+++ b/src/game_strings.h
@@ -41,6 +41,12 @@ class Game_Strings {
 		int string_id = 0, hex = 0, extract = 0;
 	};
 
+	enum StringEvalMode : std::int8_t { // 4 bits
+		eStringEval_Text = 0, // String is taken from com.string
+		eStringEval_Direct = 1, // String is referenced directly by string id
+		eStringEval_Indirect = 2 // String is referenced indirectly by variable id
+	};
+
 	Game_Strings() = default;
 
 	void SetData(Strings_t s);
@@ -158,9 +164,9 @@ inline StringView Game_Strings::GetIndirect(int id, const Game_Variables& variab
 
 inline StringView Game_Strings::GetWithMode(StringView str_data, int mode, int arg, const Game_Variables& variables) const {
 	switch (mode) {
-	case 1: // direct string reference
+	case StringEvalMode::eStringEval_Direct:
 		return Get(arg);
-	case 2: // indirect string reference
+	case StringEvalMode::eStringEval_Indirect:
 		return GetIndirect(arg, variables);
 	default:
 		return str_data;
@@ -170,16 +176,16 @@ inline StringView Game_Strings::GetWithMode(StringView str_data, int mode, int a
 inline StringView Game_Strings::GetWithModeAndPos(StringView str_data, int mode, int arg, int* pos, const Game_Variables& variables) {
 	StringView ret;
 	switch (mode) {
-	case 0:
-		assert(pos);
-		ret = str_data.substr(*pos, arg);
-		*pos += arg;
-		return ret;
-	case 1: // direct string reference
-		return Get(arg);
-	case 2: // indirect string reference
-		return GetIndirect(arg, variables);
-	default:
-		return ret;
+		case StringEvalMode::eStringEval_Text:
+			assert(pos);
+			ret = str_data.substr(*pos, arg);
+			*pos += arg;
+			return ret;
+		case StringEvalMode::eStringEval_Direct:
+			return Get(arg);
+		case StringEvalMode::eStringEval_Indirect:
+			return GetIndirect(arg, variables);
+		default:
+			return ret;
 	}
 }
diff --git a/src/maniac_patch.cpp b/src/maniac_patch.cpp
index 0b8875269..7619adc55 100644
--- a/src/maniac_patch.cpp
+++ b/src/maniac_patch.cpp
@@ -117,7 +117,7 @@ namespace {
 	};
 }
 
-int process(std::vector<int32_t>::iterator& it, std::vector<int32_t>::iterator end, const Game_Interpreter& ip) {
+int process(std::vector<int32_t>::iterator& it, std::vector<int32_t>::iterator end, const Game_BaseInterpreterContext& ip) {
 	int value = 0;
 	int imm = 0;
 	int imm2 = 0;
@@ -413,7 +413,7 @@ int process(std::vector<int32_t>::iterator& it, std::vector<int32_t>::iterator e
 	}
 }
 
-int32_t ManiacPatch::ParseExpression(Span<const int32_t> op_codes, const Game_Interpreter& interpreter) {
+int32_t ManiacPatch::ParseExpression(Span<const int32_t> op_codes, const Game_BaseInterpreterContext& interpreter) {
 	std::vector<int32_t> ops;
 	for (auto &o: op_codes) {
 		auto uo = static_cast<uint32_t>(o);
diff --git a/src/maniac_patch.h b/src/maniac_patch.h
index 179b19c28..789834fcf 100644
--- a/src/maniac_patch.h
+++ b/src/maniac_patch.h
@@ -25,10 +25,10 @@
 
 #include "game_strings.h"
 
-class Game_Interpreter;
+class Game_BaseInterpreterContext;
 
 namespace ManiacPatch {
-	int32_t ParseExpression(Span<const int32_t> op_codes, const Game_Interpreter& interpreter);
+	int32_t ParseExpression(Span<const int32_t> op_codes, const Game_BaseInterpreterContext& interpreter);
 
 	std::array<bool, 50> GetKeyRange();
 

From b9a7ecc209a88e3358df88b7f67798e3dbcb98fb Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 30 May 2024 12:17:56 +0200
Subject: [PATCH 165/222] Refactor: Moved a few other helper functions from
 Game_Interpreter to Game_Interpreter_Shared

---
 src/game_interpreter.cpp        | 67 ---------------------------------
 src/game_interpreter.h          |  5 ---
 src/game_interpreter_shared.cpp | 52 +++++++++++++++++++++++++
 src/game_interpreter_shared.h   | 36 +++++++++++++++---
 4 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index c1bc38ed6..f6919ea5c 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -573,56 +573,6 @@ void Game_Interpreter::SkipToNextConditional(std::initializer_list<Cmd> codes, i
 	}
 }
 
-int Game_Interpreter::DecodeInt(lcf::DBArray<int32_t>::const_iterator& it) {
-	int value = 0;
-
-	for (;;) {
-		int x = *it++;
-		value <<= 7;
-		value |= x & 0x7F;
-		if (!(x & 0x80))
-			break;
-	}
-
-	return value;
-}
-
-const std::string Game_Interpreter::DecodeString(lcf::DBArray<int32_t>::const_iterator& it) {
-	std::ostringstream out;
-	int len = DecodeInt(it);
-
-	for (int i = 0; i < len; i++)
-		out << (char)*it++;
-
-	std::string result = lcf::ReaderUtil::Recode(out.str(), Player::encoding);
-
-	return result;
-}
-
-lcf::rpg::MoveCommand Game_Interpreter::DecodeMove(lcf::DBArray<int32_t>::const_iterator& it) {
-	lcf::rpg::MoveCommand cmd;
-	cmd.command_id = *it++;
-
-	switch (cmd.command_id) {
-	case 32:	// Switch ON
-	case 33:	// Switch OFF
-		cmd.parameter_a = DecodeInt(it);
-		break;
-	case 34:	// Change Graphic
-		cmd.parameter_string = lcf::DBString(DecodeString(it));
-		cmd.parameter_a = DecodeInt(it);
-		break;
-	case 35:	// Play Sound Effect
-		cmd.parameter_string = lcf::DBString(DecodeString(it));
-		cmd.parameter_a = DecodeInt(it);
-		cmd.parameter_b = DecodeInt(it);
-		cmd.parameter_c = DecodeInt(it);
-		break;
-	}
-
-	return cmd;
-}
-
 // Execute Command.
 bool Game_Interpreter::ExecuteCommand() {
 	auto& frame = GetFrame();
@@ -5063,23 +5013,6 @@ bool Game_Interpreter::IsWaitingForWaitCommand() const {
 	return (_state.wait_time > 0) || _state.wait_key_enter;
 }
 
-bool Game_Interpreter::ManiacCheckContinueLoop(int val, int val2, int type, int op) const {
-	switch (type) {
-		case 0: // Infinite loop
-			return true;
-		case 1: // X times
-		case 2: // Count up
-			return val <= val2;
-		case 3: // Count down
-			return val >= val2;
-		case 4: // While
-		case 5: // Do While
-			return CheckOperator(val, val2, op);
-		default:
-			return false;
-	}
-}
-
 int Game_Interpreter::ManiacBitmask(int value, int mask) const {
 	if (Player::IsPatchManiac()) {
 		return value & mask;
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index c2e640f72..b2cc5bc71 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -293,10 +293,6 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 	bool CommandManiacCallCommand(lcf::rpg::EventCommand const& com);
 	bool CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com);
 
-	int DecodeInt(lcf::DBArray<int32_t>::const_iterator& it);
-	const std::string DecodeString(lcf::DBArray<int32_t>::const_iterator& it);
-	lcf::rpg::MoveCommand DecodeMove(lcf::DBArray<int32_t>::const_iterator& it);
-
 	void SetSubcommandIndex(int indent, int idx);
 	uint8_t& ReserveSubcommandIndex(int indent);
 	int GetSubcommandIndex(int indent) const;
@@ -336,7 +332,6 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 		void toSave(lcf::rpg::SaveEventExecState& save) const;
 	};
 
-	bool ManiacCheckContinueLoop(int val, int val2, int type, int op) const;
 	int ManiacBitmask(int value, int mask) const;
 
 	lcf::rpg::SaveEventExecState _state;
diff --git a/src/game_interpreter_shared.cpp b/src/game_interpreter_shared.cpp
index 96ff559d5..8e5b5ef87 100644
--- a/src/game_interpreter_shared.cpp
+++ b/src/game_interpreter_shared.cpp
@@ -36,6 +36,7 @@
 #include <cmath>
 #include <cstdint>
 #include <lcf/rpg/savepartylocation.h>
+#include <lcf/reader_util.h>
 
 using Main_Data::game_switches, Main_Data::game_variables, Main_Data::game_strings;
 
@@ -185,3 +186,54 @@ StringView Game_Interpreter_Shared::CommandStringOrVariableBitfield(lcf::rpg::Ev
 
 	return com.string;
 }
+
+
+int Game_Interpreter_Shared::DecodeInt(lcf::DBArray<int32_t>::const_iterator& it) {
+	int value = 0;
+
+	for (;;) {
+		int x = *it++;
+		value <<= 7;
+		value |= x & 0x7F;
+		if (!(x & 0x80))
+			break;
+	}
+
+	return value;
+}
+
+const std::string Game_Interpreter_Shared::DecodeString(lcf::DBArray<int32_t>::const_iterator& it) {
+	std::ostringstream out;
+	int len = DecodeInt(it);
+
+	for (int i = 0; i < len; i++)
+		out << (char)*it++;
+
+	std::string result = lcf::ReaderUtil::Recode(out.str(), Player::encoding);
+
+	return result;
+}
+
+lcf::rpg::MoveCommand Game_Interpreter_Shared::DecodeMove(lcf::DBArray<int32_t>::const_iterator& it) {
+	lcf::rpg::MoveCommand cmd;
+	cmd.command_id = *it++;
+
+	switch (cmd.command_id) {
+		case 32:	// Switch ON
+		case 33:	// Switch OFF
+			cmd.parameter_a = DecodeInt(it);
+			break;
+		case 34:	// Change Graphic
+			cmd.parameter_string = lcf::DBString(DecodeString(it));
+			cmd.parameter_a = DecodeInt(it);
+			break;
+		case 35:	// Play Sound Effect
+			cmd.parameter_string = lcf::DBString(DecodeString(it));
+			cmd.parameter_a = DecodeInt(it);
+			cmd.parameter_b = DecodeInt(it);
+			cmd.parameter_c = DecodeInt(it);
+			break;
+	}
+
+	return cmd;
+}
diff --git a/src/game_interpreter_shared.h b/src/game_interpreter_shared.h
index 223cd48bf..4d8742e46 100644
--- a/src/game_interpreter_shared.h
+++ b/src/game_interpreter_shared.h
@@ -20,6 +20,7 @@
 #define EP_GAME_INTERPRETER_SHARED
 
 #include <lcf/rpg/eventcommand.h>
+#include <lcf/rpg/movecommand.h>
 #include <lcf/rpg/saveeventexecframe.h>
 #include <string_view.h>
 
@@ -60,18 +61,18 @@ namespace Game_Interpreter_Shared {
 	* Indicates how the target of an interpreter operation (lvalue) should be evaluated.
 	*/
 	enum TargetEvalMode : std::int8_t { // 4 bits
-		eTargetEval_Single = 0,			// v[x]
-		eTargetEval_Range = 1,			// v[x...y]
-		eTargetEval_IndirectSingle = 2, // v[v[x]]
-		eTargetEval_IndirectRange = 3,	// v[v[x]...v[y]] (ManiacPatch)
-		eTargetEval_Expression = 4		// ManiacPatch expression
+		eTargetEval_Single = 0,				// v[x]
+		eTargetEval_Range = 1,				// v[x...y]
+		eTargetEval_IndirectSingle = 2,		// v[v[x]]
+		eTargetEval_IndirectRange = 3,		// v[v[x]...v[y]] (ManiacPatch)
+		eTargetEval_Expression = 4			// ManiacPatch expression
 	};
 
 	/*
 	* Indicates how an operand of an interpreter operation (rvalue) should be evaluted.
 	*/
 	enum ValueEvalMode : std::int8_t { // 4 bits
-		eValueEval_Constant = 0,				// Constant value is given
+		eValueEval_Constant = 0,			// Constant value is given
 		eValueEval_Variable = 1,
 		eValueEval_VariableIndirect = 2,
 		eValueEval_Switch = 3,
@@ -123,6 +124,12 @@ namespace Game_Interpreter_Shared {
 	StringView CommandStringOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx);
 
 	bool CheckOperator(int val, int val2, int op);
+
+	int DecodeInt(lcf::DBArray<int32_t>::const_iterator& it);
+	const std::string DecodeString(lcf::DBArray<int32_t>::const_iterator& it);
+	lcf::rpg::MoveCommand DecodeMove(lcf::DBArray<int32_t>::const_iterator& it);
+
+	bool ManiacCheckContinueLoop(int val, int val2, int type, int op);
 }
 
 inline bool Game_Interpreter_Shared::CheckOperator(int val, int val2, int op) {
@@ -144,6 +151,23 @@ inline bool Game_Interpreter_Shared::CheckOperator(int val, int val2, int op) {
 	}
 }
 
+inline bool Game_Interpreter_Shared::ManiacCheckContinueLoop(int val, int val2, int type, int op) {
+	switch (type) {
+		case 0: // Infinite loop
+			return true;
+		case 1: // X times
+		case 2: // Count up
+			return val <= val2;
+		case 3: // Count down
+			return val >= val2;
+		case 4: // While
+		case 5: // Do While
+			return CheckOperator(val, val2, op);
+		default:
+			return false;
+	}
+}
+
 //explicit declarations for target evaluation logic shared between ControlSwitches/ControlVariables/ControlStrings
 template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
 template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;

From 4e8110ba379fdac81cfaa76ccbdad142bdd3c399 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 30 May 2024 13:13:30 +0200
Subject: [PATCH 166/222] game_interpreter_shared: Moved explicit
 instantiations to .cpp & moved definition of "Game_BaseInterpreterContext" to
 the bottom of header file

---
 src/game_interpreter_shared.cpp | 16 ++++++++
 src/game_interpreter_shared.h   | 67 +++++++++++++--------------------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/game_interpreter_shared.cpp b/src/game_interpreter_shared.cpp
index 8e5b5ef87..3e7cbf743 100644
--- a/src/game_interpreter_shared.cpp
+++ b/src/game_interpreter_shared.cpp
@@ -237,3 +237,19 @@ lcf::rpg::MoveCommand Game_Interpreter_Shared::DecodeMove(lcf::DBArray<int32_t>:
 
 	return cmd;
 }
+
+//explicit declarations for target evaluation logic shared between ControlSwitches/ControlVariables/ControlStrings
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, false, true, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+
+//common variant for suggested "Ex" commands
+template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, true, true, true, true>(lcf::rpg::EventCommand const&, int&, int&) const;
+
+//explicit declarations for default value evaluation logic
+template int Game_Interpreter_Shared::ValueOrVariable<true, true, false, false>(int, int, const Game_BaseInterpreterContext&);
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(int, int, int, const Game_BaseInterpreterContext&);
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(lcf::rpg::EventCommand const&, int, int, int, const Game_BaseInterpreterContext&);
+
+//variant for "Ex" commands
+template int Game_Interpreter_Shared::ValueOrVariableBitfield<false, true, true, true>(int, int, int, const Game_BaseInterpreterContext&);
diff --git a/src/game_interpreter_shared.h b/src/game_interpreter_shared.h
index 4d8742e46..cbb11cb17 100644
--- a/src/game_interpreter_shared.h
+++ b/src/game_interpreter_shared.h
@@ -25,35 +25,7 @@
 #include <string_view.h>
 
 class Game_Character;
-
-class Game_BaseInterpreterContext {
-public:
-	virtual ~Game_BaseInterpreterContext() {}
-
-	virtual int GetThisEventId() const = 0;
-	virtual Game_Character* GetCharacter(int event_id) const = 0;
-	virtual const lcf::rpg::SaveEventExecFrame& GetFrame() const = 0;
-
-protected:
-	template<bool validate_patches, bool support_range_indirect, bool support_expressions, bool support_bitmask, bool support_scopes, bool support_named = false>
-	inline bool DecodeTargetEvaluationMode(lcf::rpg::EventCommand const& com, int& id_0, int& id_1) const {
-		return Game_Interpreter_Shared::DecodeTargetEvaluationMode<validate_patches, support_range_indirect, support_expressions, support_bitmask, support_scopes, support_named>(com, id_0, id_1, *this);
-	}
-
-	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
-	inline int ValueOrVariable(int mode, int val) const {
-		return Game_Interpreter_Shared::ValueOrVariable<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, val, *this);
-	}
-	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
-	inline int ValueOrVariableBitfield(int mode, int shift, int val) const {
-		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, shift, val, *this);
-	}
-
-	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
-	inline int ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) const {
-		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(com, mode_idx, shift, val_idx, *this);
-	}
-};
+class Game_BaseInterpreterContext;
 
 namespace Game_Interpreter_Shared {
 
@@ -168,20 +140,33 @@ inline bool Game_Interpreter_Shared::ManiacCheckContinueLoop(int val, int val2,
 	}
 }
 
-//explicit declarations for target evaluation logic shared between ControlSwitches/ControlVariables/ControlStrings
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, false, true, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+class Game_BaseInterpreterContext {
+public:
+	virtual ~Game_BaseInterpreterContext() {}
 
-//common variant for suggested "Ex" commands
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, true, true, true, true>(lcf::rpg::EventCommand const&, int&, int&) const;
+	virtual int GetThisEventId() const = 0;
+	virtual Game_Character* GetCharacter(int event_id) const = 0;
+	virtual const lcf::rpg::SaveEventExecFrame& GetFrame() const = 0;
 
-//explicit declarations for default value evaluation logic
-template int Game_Interpreter_Shared::ValueOrVariable<true, true, false, false>(int, int, const Game_BaseInterpreterContext&);
-template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(int, int, int, const Game_BaseInterpreterContext&);
-template int Game_Interpreter_Shared::ValueOrVariableBitfield<true, true, false, false>(lcf::rpg::EventCommand const&, int, int, int, const Game_BaseInterpreterContext&);
+protected:
+	template<bool validate_patches, bool support_range_indirect, bool support_expressions, bool support_bitmask, bool support_scopes, bool support_named = false>
+	inline bool DecodeTargetEvaluationMode(lcf::rpg::EventCommand const& com, int& id_0, int& id_1) const {
+		return Game_Interpreter_Shared::DecodeTargetEvaluationMode<validate_patches, support_range_indirect, support_expressions, support_bitmask, support_scopes, support_named>(com, id_0, id_1, *this);
+	}
 
-//variant for "Ex" commands
-template int Game_Interpreter_Shared::ValueOrVariableBitfield<false, true, true, true>(int, int, int, const Game_BaseInterpreterContext&);
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariable(int mode, int val) const {
+		return Game_Interpreter_Shared::ValueOrVariable<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, val, *this);
+	}
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariableBitfield(int mode, int shift, int val) const {
+		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(mode, shift, val, *this);
+	}
+
+	template<bool validate_patches = true, bool support_indirect_and_switch = true, bool support_scopes = false, bool support_named = false>
+	inline int ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx) const {
+		return Game_Interpreter_Shared::ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(com, mode_idx, shift, val_idx, *this);
+	}
+};
 
 #endif

From 4318f8ac017e11bc06cc7b95cf80a76c17a3d4b8 Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Thu, 30 May 2024 13:29:35 +0200
Subject: [PATCH 167/222] Refactor explicit template instantiations: Looks like
 MSVC does some implicit instantiations here while GCC fails

---
 src/game_interpreter_shared.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game_interpreter_shared.cpp b/src/game_interpreter_shared.cpp
index 3e7cbf743..3a176aca7 100644
--- a/src/game_interpreter_shared.cpp
+++ b/src/game_interpreter_shared.cpp
@@ -239,12 +239,12 @@ lcf::rpg::MoveCommand Game_Interpreter_Shared::DecodeMove(lcf::DBArray<int32_t>:
 }
 
 //explicit declarations for target evaluation logic shared between ControlSwitches/ControlVariables/ControlStrings
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&) const;
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, false, true, false>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_Interpreter_Shared::DecodeTargetEvaluationMode<true, false, false, false, false>(lcf::rpg::EventCommand const&, int&, int&, Game_BaseInterpreterContext const&);
+template bool Game_Interpreter_Shared::DecodeTargetEvaluationMode<true, true, true, false, false>(lcf::rpg::EventCommand const&, int&, int&, Game_BaseInterpreterContext const&);
+template bool Game_Interpreter_Shared::DecodeTargetEvaluationMode<false, true, false, true, false>(lcf::rpg::EventCommand const&, int&, int&, Game_BaseInterpreterContext const&);
 
 //common variant for suggested "Ex" commands
-template bool Game_BaseInterpreterContext::DecodeTargetEvaluationMode<false, true, true, true, true, true>(lcf::rpg::EventCommand const&, int&, int&) const;
+template bool Game_Interpreter_Shared::DecodeTargetEvaluationMode<false, true, true, true, true, true>(lcf::rpg::EventCommand const&, int&, int&, Game_BaseInterpreterContext const&);
 
 //explicit declarations for default value evaluation logic
 template int Game_Interpreter_Shared::ValueOrVariable<true, true, false, false>(int, int, const Game_BaseInterpreterContext&);

From 5e244342d296317d6b3b84ba489185f17ee65c7f Mon Sep 17 00:00:00 2001
From: florianessl <github@iessl.at>
Date: Fri, 19 Jul 2024 12:07:58 +0200
Subject: [PATCH 168/222] Rebase: Re-apply warning fixes for moved code
 segments

---
 src/game_interpreter_shared.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game_interpreter_shared.cpp b/src/game_interpreter_shared.cpp
index 3a176aca7..7d1b5b990 100644
--- a/src/game_interpreter_shared.cpp
+++ b/src/game_interpreter_shared.cpp
@@ -142,7 +142,7 @@ int Game_Interpreter_Shared::ValueOrVariableBitfield(int mode, int shift, int va
 
 template<bool validate_patches, bool support_indirect_and_switch, bool support_scopes, bool support_named>
 int Game_Interpreter_Shared::ValueOrVariableBitfield(lcf::rpg::EventCommand const& com, int mode_idx, int shift, int val_idx, Game_BaseInterpreterContext const& interpreter) {
-	assert(com.parameters.size() > val_idx);
+	assert(static_cast<int>(com.parameters.size()) > val_idx);
 
 	if (!Player::IsPatchManiac()) {
 		return com.parameters[val_idx];
@@ -150,7 +150,7 @@ int Game_Interpreter_Shared::ValueOrVariableBitfield(lcf::rpg::EventCommand cons
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
+	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
 		int mode = com.parameters[mode_idx];
 		return ValueOrVariableBitfield<validate_patches, support_indirect_and_switch, support_scopes, support_named>(com.parameters[mode_idx], shift, com.parameters[val_idx], interpreter);
 	}
@@ -165,7 +165,7 @@ StringView Game_Interpreter_Shared::CommandStringOrVariable(lcf::rpg::EventComma
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() > std::max(mode_idx, val_idx)) {
+	if (static_cast<int>(com.parameters.size()) > std::max(mode_idx, val_idx)) {
 		return game_strings->GetWithMode(ToString(com.string), com.parameters[mode_idx], com.parameters[val_idx], *game_variables);
 	}
 
@@ -179,7 +179,7 @@ StringView Game_Interpreter_Shared::CommandStringOrVariableBitfield(lcf::rpg::Ev
 
 	assert(mode_idx != val_idx);
 
-	if (com.parameters.size() >= std::max(mode_idx, val_idx) + 1) {
+	if (static_cast<int>(com.parameters.size()) >= std::max(mode_idx, val_idx) + 1) {
 		int mode = com.parameters[mode_idx];
 		return game_strings->GetWithMode(ToString(com.string), (mode & (0xF << shift * 4)) >> shift * 4, com.parameters[val_idx], *game_variables);
 	}

From 7d0401b300bf2eb222eee8f7a4a7a920e0341e79 Mon Sep 17 00:00:00 2001
From: Tool Man <gchristin2000@bell.net>
Date: Wed, 24 Jul 2024 17:34:55 -0400
Subject: [PATCH 169/222] Remove scaling restrictions when using special
 effects

From Maniac Patch version 240423:
[RPG_RT.exe]
Support for different magnification rates for special drawing of pictures (rotation, waveform, angle).

+ Added check if sprite's width/height is at zero. If so, skip the draw routine (helps avoid a glitchy sprite at the top-left when rotating an infinitely thin picture)
- Removed check for effect mode when setting zoom or width/height.

One thing to note when comparing Maniac and EasyRPG: the former doesn't seem to properly clip the sprite in the corners, when rotating the sprite.
---
 src/game_interpreter.cpp | 8 ++++----
 src/sprite_picture.cpp   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 84dc8748f..8e2aebf1e 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2857,9 +2857,9 @@ bool Game_Interpreter::CommandShowPicture(lcf::rpg::EventCommand const& com) { /
 		}
 
 		params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
-		if (Player::IsPatchManiac() && com.parameters.size() > 31 && com.parameters[20] >= 16 && params.effect_mode == 0) {
+		if (Player::IsPatchManiac() && com.parameters.size() > 31 && com.parameters[20] >= 16) {
 			// The >= 16 check is needed because this bit is set when independent width/height scaling is used
-			// When using special effects on Maniacs, Height is set to Width
+			// Since version 240423, Maniacs supports width/height scaling for special effects pictures.
 			params.magnify_height = ValueOrVariableBitfield((com.parameters[20] >> 1), 1, com.parameters[31]);
 		} else {
 			params.magnify_height = params.magnify_width;
@@ -2984,9 +2984,9 @@ bool Game_Interpreter::CommandMovePicture(lcf::rpg::EventCommand const& com) { /
 			}
 
 			params.magnify_width = ValueOrVariableBitfield(com.parameters[20], 0, params.magnify_width);
-			if (Player::IsPatchManiac() && com.parameters.size() > 18 && com.parameters[20] >= 16 && params.effect_mode == 0) {
+			if (Player::IsPatchManiac() && com.parameters.size() > 18 && com.parameters[20] >= 16) {
 				// The >= 16 check is needed because this bit is set when independent width/height scaling is used
-				// When using special effects on Maniacs, Height is set to Width
+				// Since version 240423, Maniacs supports width/height scaling for special effects pictures.
 				params.magnify_height = ValueOrVariableBitfield((com.parameters[20] >> 1), 1, com.parameters[18]);
 			} else {
 				params.magnify_height = params.magnify_width;
diff --git a/src/sprite_picture.cpp b/src/sprite_picture.cpp
index 2932d6025..891c8edc7 100644
--- a/src/sprite_picture.cpp
+++ b/src/sprite_picture.cpp
@@ -165,6 +165,10 @@ void Sprite_Picture::Draw(Bitmap& dst) {
 	SetFlipY((data.easyrpg_flip & lcf::rpg::SavePicture::EasyRpgFlip_y) == lcf::rpg::SavePicture::EasyRpgFlip_y);
 	SetBlendType(data.easyrpg_blend_mode);
 
+	// Don't draw anything if zoom is at zero, helps avoid a glitchy rotated sprite in the top left corner
+	if (GetZoomX() <= 0.0 || GetZoomY() <= 0.0) {
+		return;
+	}
 	Sprite::Draw(dst);
 }
 

From 87f20508cab5fb66b46b258b8f9b6a76ea6eaf63 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Thu, 25 Jul 2024 07:49:59 -0300
Subject: [PATCH 170/222] Maniacs Patch - Call System Functions

In Maniacs, CommandOpenSaveMenu is renamed to "Call System Function".
I implemented what is closer to our code.

Also expanded the code to cover our custom submenus (Cases 8 to 12).

Update game_interpreter_map.cpp
---
 src/game_interpreter_map.cpp | 53 +++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 8cdaa8cdc..bb889e7f9 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -49,6 +49,7 @@
 #include "scene_load.h"
 #include "scene_name.h"
 #include "scene_shop.h"
+#include "scene_debug.h"
 #include "scene_gameover.h"
 #include "scene.h"
 #include "graphics.h"
@@ -716,7 +717,7 @@ bool Game_Interpreter_Map::CommandPlayMovie(lcf::rpg::EventCommand const& com) {
 	return true;
 }
 
-bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& /* com */) { // code 11910
+bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& com) { // code 11910
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
@@ -725,6 +726,56 @@ bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& /*
 	auto& index = frame.current_command;
 
 	Scene::instance->SetRequestedScene(std::make_shared<Scene_Save>());
+
+	const int current_system_function = com.parameters[0];
+
+	// Handle save menu (default behavior)
+	if (!Player::IsPatchManiac() || current_system_function <= 0) {
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Save>());
+		++index;
+		return false;
+	}
+
+	// Parse common parameters
+	const int fullscreen_mode = com.parameters[1]; // Broken in Maniac.
+	const int pause_while_debugging = com.parameters[1]; // unused in our ingame debug screen.
+
+	const int actor_index = ValueOrVariable(com.parameters[1], com.parameters[2]);
+	const bool is_db_actor = ValueOrVariable(com.parameters[3], com.parameters[4]);
+
+	switch (current_system_function) {
+	case 1: // Load menu
+		return CommandOpenLoadMenu(com);
+	case 2: // Game menu
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Menu>());
+		break;
+	case 3: // Toggle fullscreen
+		// TODO? Implement fullscreen mode once maniacs supports it
+		return CommandToggleFullscreen(com);
+	case 4: // Settings menu
+		return CommandOpenVideoOptions(com);
+	case 5: // Debug menu
+		Scene::instance->SetRequestedScene(std::make_shared<Scene_Debug>());
+		break;
+	case 6: // License information menu
+		// TODO? Implement license information menu
+		return true;
+	case 7: // Reset game
+		return CommandReturnToTitleScreen(com);
+	case 8: // EASYRPG Inventory menu
+		return RequestMainMenuScene(1);
+	case 9: // EASYRPG Skills menu
+		return RequestMainMenuScene(2, actor_index, is_db_actor);
+	case 10: // EASYRPG Equip menu
+		return RequestMainMenuScene(3, actor_index, is_db_actor);
+	case 11: // EASYRPG Status menu
+		return RequestMainMenuScene(4, actor_index, is_db_actor);
+	case 12: // EASYRPG Reorder Party menu
+		return RequestMainMenuScene(5);
+	default:
+		return true;
+	}
+
 	++index;
 	return false;
 }

From 7b1cef76771aed5fbed732a78786d7e3d57cd43a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 00:43:57 +0200
Subject: [PATCH 171/222] WaitForSingleMovement: Guard with EasyRpg Extension
 Check

---
 src/game_interpreter_map.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index c16623309..dd1b016f7 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -785,6 +785,10 @@ bool Game_Interpreter_Map::CommandEasyRpgTriggerEventAt(lcf::rpg::EventCommand c
 }
 
 bool Game_Interpreter_Map::CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCommand const& com) {
+	if (!Player::HasEasyRpgExtensions()) {
+		return true;
+	}
+
 	_state.easyrpg_parameters.resize(3);
 
 	int& event_id = _state.easyrpg_parameters[0];

From a72c18a3ad7046a1c8343eae644a197b2a234c3a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 00:51:24 +0200
Subject: [PATCH 172/222] Proper casing for LoadMapFile and make RequestMap
 request always important

---
 src/game_map.cpp    | 8 +++++---
 src/game_map.h      | 2 +-
 src/game_player.cpp | 3 +--
 src/player.cpp      | 4 +---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index 53ede7425..4d62e4688 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -291,7 +291,7 @@ void Game_Map::SetupFromSave(
 	Game_Map::Parallax::ChangeBG(GetParallaxParams());
 }
 
-std::unique_ptr<lcf::rpg::Map> Game_Map::loadMapFile(int map_id) {
+std::unique_ptr<lcf::rpg::Map> Game_Map::LoadMapFile(int map_id) {
 	std::unique_ptr<lcf::rpg::Map> map;
 
 	// Try loading EasyRPG map files first, then fallback to normal RPG Maker
@@ -391,7 +391,7 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 
 	if (src_map_id == GetMapId()) source_map = std::make_unique<lcf::rpg::Map>(GetMap());
 	else {
-		source_map = Game_Map::loadMapFile(src_map_id);
+		source_map = Game_Map::LoadMapFile(src_map_id);
 
 		if (source_map == nullptr) {
 			Output::Warning("CloneMapEvent: Invalid source map ID {}", src_map_id);
@@ -1873,7 +1873,9 @@ FileRequestAsync* Game_Map::RequestMap(int map_id) {
 	Player::translation.RequestAndAddMap(map_id);
 #endif
 
-	return AsyncHandler::RequestFile(Game_Map::ConstructMapName(map_id, false));
+	auto* request = AsyncHandler::RequestFile(Game_Map::ConstructMapName(map_id, false));
+	request->SetImportantFile(true);
+	return request;
 }
 
 // Parallax
diff --git a/src/game_map.h b/src/game_map.h
index 99ae9e9d8..145e852a5 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -112,7 +112,7 @@ namespace Game_Map {
 	 * @param map_id the id of the map to load
 	 * @return the map, or nullptr if it couldn't be loaded
 	 */
-	std::unique_ptr<lcf::rpg::Map> loadMapFile(int map_id);
+	std::unique_ptr<lcf::rpg::Map> LoadMapFile(int map_id);
 
 	/**
 	 * Setups a new map.
diff --git a/src/game_player.cpp b/src/game_player.cpp
index 48091e967..3f46674ed 100644
--- a/src/game_player.cpp
+++ b/src/game_player.cpp
@@ -78,7 +78,6 @@ void Game_Player::ReserveTeleport(int map_id, int x, int y, int direction, Telep
 	teleport_target = TeleportTarget(map_id, x, y, direction, tt);
 
 	FileRequestAsync* request = Game_Map::RequestMap(map_id);
-	request->SetImportantFile(true);
 	request->Start();
 }
 
@@ -152,7 +151,7 @@ void Game_Player::MoveTo(int map_id, int x, int y) {
 
 		ResetAnimation();
 
-		auto map = Game_Map::loadMapFile(GetMapId());
+		auto map = Game_Map::LoadMapFile(GetMapId());
 
 		Game_Map::Setup(std::move(map));
 		Game_Map::PlayBgm();
diff --git a/src/player.cpp b/src/player.cpp
index 95a5753ed..1cb57fe30 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1083,7 +1083,7 @@ void Player::LoadFonts() {
 }
 
 static void OnMapSaveFileReady(FileRequestResult*, lcf::rpg::Save save) {
-	auto map = Game_Map::loadMapFile(Main_Data::game_player->GetMapId());
+	auto map = Game_Map::LoadMapFile(Main_Data::game_player->GetMapId());
 	Game_Map::SetupFromSave(
 			std::move(map),
 			std::move(save.map_info),
@@ -1181,7 +1181,6 @@ void Player::LoadSavegame(const std::string& save_name, int save_id) {
 
 	FileRequestAsync* map = Game_Map::RequestMap(map_id);
 	save_request_id = map->Bind([save=std::move(*save)](auto* request) { OnMapSaveFileReady(request, std::move(save)); });
-	map->SetImportantFile(true);
 
 	Main_Data::game_system->ReloadSystemGraphic();
 
@@ -1233,7 +1232,6 @@ void Player::SetupPlayerSpawn() {
 
 	FileRequestAsync* request = Game_Map::RequestMap(map_id);
 	map_request_id = request->Bind(&OnMapFileReady);
-	request->SetImportantFile(true);
 	request->Start();
 }
 

From 31e32c7c4ddc20490af9a1a5e31f4fa9af1dac43 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 01:24:32 +0200
Subject: [PATCH 173/222] SpawnMapEvent: Add Async handling, Cleanup

---
 src/game_event.h         |  1 +
 src/game_interpreter.cpp | 16 ++++++++++++++-
 src/game_map.cpp         | 42 +++++++++++++++++++++++-----------------
 src/game_map.h           | 14 +++++++-------
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/game_event.h b/src/game_event.h
index 017a54fc6..94139a7a9 100644
--- a/src/game_event.h
+++ b/src/game_event.h
@@ -39,6 +39,7 @@ class Game_Event : public Game_EventBase {
 	 */
 	Game_Event(int map_id, const lcf::rpg::Event* event);
 
+	/** @param ev Event referenced */
 	void SetUnderlyingEvent(const lcf::rpg::Event* ev) {
 		event = ev;
 	}
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 7bfba8dc4..3dfa0b2a4 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -5014,6 +5014,10 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 }
 
 bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
+	if (!Player::HasEasyRpgExtensions()) {
+		return true;
+	}
+
 	int src_map = ValueOrVariable(com.parameters[0], com.parameters[1]);
 	int src_event = ValueOrVariable(com.parameters[2], com.parameters[3]);
 	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
@@ -5022,9 +5026,19 @@ bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
 
 	std::string target_name = ToString(CommandStringOrVariable(com, 10, 11));
 
-	if (src_map == 0) src_map = Game_Map::GetMapId();
+	if (src_map == 0) {
+		src_map = Game_Map::GetMapId();
+	} else {
+		auto* request = Game_Map::RequestMap(src_map);
+		if (!request->IsReady()) {
+			// Download the map and try again
+			_async_op = AsyncOp::MakeYieldRepeat();
+			return true;
+		}
+	}
 
 	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y, target_event, target_name);
+
 	return true;
 }
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 4d62e4688..a8cbd7ce1 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -364,7 +364,7 @@ void Game_Map::CreateMapEvents() {
 	}
 }
 
-void Game_Map::AddEventToCache(lcf::rpg::Event& ev) {
+void Game_Map::AddEventToCache(const lcf::rpg::Event& ev) {
 	using Op = Caching::ObservedVarOps;
 
 	for (const auto& pg : ev.pages) {
@@ -387,42 +387,52 @@ void Game_Map::Caching::MapCache::Clear() {
 }
 
 bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id = 0, std::string target_name = "") {
-	std::unique_ptr<lcf::rpg::Map> source_map;
+	std::unique_ptr<lcf::rpg::Map> source_map_storage;
+	const lcf::rpg::Map* source_map;
 
-	if (src_map_id == GetMapId()) source_map = std::make_unique<lcf::rpg::Map>(GetMap());
-	else {
-		source_map = Game_Map::LoadMapFile(src_map_id);
+	if (src_map_id == GetMapId()) {
+		source_map = &GetMap();
+	} else {
+		source_map_storage = Game_Map::LoadMapFile(src_map_id);
+		source_map = source_map_storage.get();
 
-		if (source_map == nullptr) {
+		if (source_map_storage == nullptr) {
 			Output::Warning("CloneMapEvent: Invalid source map ID {}", src_map_id);
-			return true;
+			return false;
 		}
 
 		if (!Tr::GetCurrentTranslationId().empty()) {
-			TranslateMapMessages(src_map_id, *source_map);
+			TranslateMapMessages(src_map_id, *source_map_storage);
 		}
 	}
 
 	const lcf::rpg::Event* source_event = FindEventById(source_map->events, src_event_id);
 	if (source_event == nullptr) {
 		Output::Warning("CloneMapEvent: Event ID {} not found on source map {}", src_event_id, src_map_id);
-		return true;
+		return false;
 	}
 
 	lcf::rpg::Event new_event = *source_event;
 	if (target_event_id > 0) {
 		DestroyMapEvent(target_event_id);
 		new_event.ID = target_event_id;
+	} else {
+		new_event.ID = GetNextAvailableEventId();
 	}
-	else new_event.ID = GetNextAvailableEventId();
 	new_event.x = target_x;
 	new_event.y = target_y;
 
-	if (!target_name.empty()) new_event.name = lcf::DBString(target_name);
+	if (!target_name.empty()) {
+		new_event.name = lcf::DBString(target_name);
+	}
 
 	map->events.push_back(new_event);
+	std::sort(map->events.begin(), map->events.end(), [](const auto& e, const auto& e2) {
+		return e.ID < e2.ID;
+	});
 
 	events.emplace_back(GetMapId(), &map->events.back());
+
 	FixUnderlyingEventReferences();
 
 	AddEventToCache(new_event);
@@ -455,7 +465,6 @@ bool Game_Map::DestroyMapEvent(const int event_id) {
 	//		}
 	//	}
 
-
 	// Remove event from events vector
 	auto it = events.end();
 	for (auto iter = events.begin(); iter != events.end(); ++iter) {
@@ -492,7 +501,8 @@ void Game_Map::TranslateMapMessages(int mapId, lcf::rpg::Map& map) {
 }
 
 
-inline void Game_Map::FixUnderlyingEventReferences() {
+void Game_Map::FixUnderlyingEventReferences() {
+	// Update references because modifying the vector can reallocate
 	size_t idx = 0;
 	for (auto& ev : events) {
 		ev.SetUnderlyingEvent(&map->events.at(idx++));
@@ -509,11 +519,7 @@ const lcf::rpg::Event* Game_Map::FindEventById(const std::vector<lcf::rpg::Event
 }
 
 int Game_Map::GetNextAvailableEventId() {
-	int maxEventId = 0;
-	for (const auto& ev : map->events) {
-		maxEventId = std::max(maxEventId, ev.ID);
-	}
-	return maxEventId + 1;
+	return map->events.back().ID + 1;
 }
 
 void Game_Map::PrepareSave(lcf::rpg::Save& save) {
diff --git a/src/game_map.h b/src/game_map.h
index 145e852a5..64992538f 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -101,9 +101,9 @@ namespace Game_Map {
 
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
 	void CreateMapEvents();
-	inline void FixUnderlyingEventReferences();
-	void AddEventToCache(lcf::rpg::Event& ev);
-	const lcf::rpg::Event* FindEventById(const std::vector<lcf::rpg::Event>& events, int eventId);
+	void FixUnderlyingEventReferences();
+	void AddEventToCache(const lcf::rpg::Event& ev);
+	const lcf::rpg::Event* FindEventById(const std::vector<lcf::rpg::Event>& events, int event_id);
 	int GetNextAvailableEventId();
 
 	/**
@@ -691,7 +691,7 @@ namespace Game_Map {
 	namespace Caching {
 		class MapEventCache {
 		public:
-			void AddEvent(lcf::rpg::Event& ev);
+			void AddEvent(const lcf::rpg::Event& ev);
 
 		private:
 			std::vector<int> event_ids;
@@ -709,7 +709,7 @@ namespace Game_Map {
 		class MapCache {
 		public:
 			template <ObservedVarOps Op>
-			void AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev);
+			void AddEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev);
 
 			template <ObservedVarOps Op>
 			bool GetNeedRefresh(int var_id);
@@ -877,7 +877,7 @@ inline bool MapUpdateAsyncContext::IsActive() const {
 	return GetAsyncOp().IsActive();
 }
 
-inline void Game_Map::Caching::MapEventCache::AddEvent(lcf::rpg::Event& ev) {
+inline void Game_Map::Caching::MapEventCache::AddEvent(const lcf::rpg::Event& ev) {
 	auto id = ev.ID;
 
 	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
@@ -886,7 +886,7 @@ inline void Game_Map::Caching::MapEventCache::AddEvent(lcf::rpg::Event& ev) {
 }
 
 template <Game_Map::Caching::ObservedVarOps Op>
-inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev) {
+inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev) {
 	static_assert(static_cast<int>(Op) >= 0 && Op < ObservedVarOps_END);
 
 	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];

From 7d0b4ec03826104e0d5ea1f63d2eb01dc9c733ea Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 15:40:50 +0200
Subject: [PATCH 174/222] SpawnMapEvent: Suspend the interpreter using Async to
 avoid crashes when the event vector is altered.

Renamed to CloneMapEvent
---
 src/async_op.h           | 87 +++++++++++++++++++++++++++++++++++++++-
 src/game_interpreter.cpp | 20 ++++++---
 src/game_interpreter.h   |  2 +-
 src/game_map.cpp         | 15 ++++---
 src/game_map.h           |  2 +-
 src/scene_map.cpp        |  4 ++
 6 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/src/async_op.h b/src/async_op.h
index f68fa3d3e..cddc65c17 100644
--- a/src/async_op.h
+++ b/src/async_op.h
@@ -18,6 +18,8 @@
 #ifndef EP_ASYNC_OP_H
 #define EP_ASYNC_OP_H
 
+#include "string_view.h"
+#include <string>
 #include <utility>
 #include <cassert>
 
@@ -42,7 +44,8 @@ class AsyncOp {
 			eSave,
 			eLoad,
 			eYield,
-			eYieldRepeat
+			eYieldRepeat,
+			eCloneMapEvent
 		};
 
 		AsyncOp() = default;
@@ -80,6 +83,9 @@ class AsyncOp {
 		/** @return a Yield for one frame and repeat the command to e.g. fetch an important asset */
 		static AsyncOp MakeYieldRepeat();
 
+		/** @return a clone map event async operation */
+		static AsyncOp MakeCloneMapEvent(std::string name, int src_event_id, int target_event_id, int map_id, int x, int y);
+
 		/** @return the type of async operation */
 		Type GetType() const;
 
@@ -128,13 +134,52 @@ class AsyncOp {
 		 **/
 		int GetSaveResultVar() const;
 
+		/**
+		 * @return the event id of the event being cloned
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		int GetSourceEventId() const;
+
+		/**
+		 * @return the event id of the event being created
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		int GetTargetEventId() const;
+
+		/**
+		 * @return the map id where the event is cloned from
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		int GetMapId() const;
+
+		/**
+		 * @return the x coordinate where to spawn the event
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		int GetX() const;
+
+		/**
+		 * @return the y coordinate where to spawn the event
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		int GetY() const;
+
+		/**
+		 * @return the new name of the event
+		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 */
+		StringView GetEventName() const;
+
 	private:
 		Type _type = eNone;
-		int _args[3] = {};
+		int _args[5] = {};
+		std::string _str_arg;
 
 		template <typename... Args>
 		explicit AsyncOp(Type type, Args&&... args);
 
+		template <typename... Args>
+		explicit AsyncOp(Type type, std::string str_arg, Args&&... args);
 };
 
 inline AsyncOp::Type AsyncOp::GetType() const {
@@ -180,12 +225,46 @@ inline int AsyncOp::GetSaveResultVar() const {
 	return _args[1];
 }
 
+inline int AsyncOp::GetSourceEventId() const {
+	assert(GetType() == eCloneMapEvent);
+	return _args[0];
+}
+
+inline int AsyncOp::GetTargetEventId() const {
+	assert(GetType() == eCloneMapEvent);
+	return _args[1];
+}
+
+inline int AsyncOp::GetMapId() const {
+	assert(GetType() == eCloneMapEvent);
+	return _args[2];
+}
+
+inline int AsyncOp::GetX() const {
+	assert(GetType() == eCloneMapEvent);
+	return _args[3];
+}
+
+inline int AsyncOp::GetY() const {
+	assert(GetType() == eCloneMapEvent);
+	return _args[4];
+}
+
+inline StringView AsyncOp::GetEventName() const {
+	assert(GetType() == eCloneMapEvent);
+	return _str_arg;
+}
 
 template <typename... Args>
 inline AsyncOp::AsyncOp(Type type, Args&&... args)
 	: _type(type), _args{std::forward<Args>(args)...}
 {}
 
+template <typename... Args>
+inline AsyncOp::AsyncOp(Type type, std::string str_arg, Args&&... args)
+	: _type(type), _args{std::forward<Args>(args)...}, _str_arg(std::move(str_arg))
+{}
+
 inline AsyncOp AsyncOp::MakeShowScreen(int transition_type) {
 	return AsyncOp(eShowScreen, transition_type);
 }
@@ -230,4 +309,8 @@ inline AsyncOp AsyncOp::MakeYieldRepeat() {
 	return AsyncOp(eYieldRepeat);
 }
 
+inline AsyncOp AsyncOp::MakeCloneMapEvent(std::string name, int src_event_id, int target_event_id, int map_id, int x, int y) {
+	return AsyncOp(eCloneMapEvent, name, src_event_id, target_event_id, map_id, x, y);
+}
+
 #endif
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 3dfa0b2a4..d7c744ac3 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -787,8 +787,8 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacCallCommand(com);
 		case Cmd::EasyRpg_SetInterpreterFlag:
 			return CommandEasyRpgSetInterpreterFlag(com);
-		case static_cast<Cmd>(2056): //EasyRPG_SpawnMapEvent
-			return CommandSpawnMapEvent(com);
+		case static_cast<Cmd>(2056): //EasyRPG_CloneMapEvent
+			return CommandCloneMapEvent(com);
 		default:
 			return true;
 	}
@@ -5013,16 +5013,24 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 	return true;
 }
 
-bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
+bool Game_Interpreter::CommandCloneMapEvent(lcf::rpg::EventCommand const& com) {
 	if (!Player::HasEasyRpgExtensions()) {
 		return true;
 	}
 
+	if (com.parameters.size() < 8) {
+		return true;
+	}
+
 	int src_map = ValueOrVariable(com.parameters[0], com.parameters[1]);
 	int src_event = ValueOrVariable(com.parameters[2], com.parameters[3]);
 	int target_x = ValueOrVariable(com.parameters[4], com.parameters[5]);
 	int target_y = ValueOrVariable(com.parameters[6], com.parameters[7]);
-	int target_event = ValueOrVariable(com.parameters[8], com.parameters[9]);
+
+	int target_event = 0;
+	if (com.parameters.size() >= 10) {
+		target_event = ValueOrVariable(com.parameters[8], com.parameters[9]);
+	}
 
 	std::string target_name = ToString(CommandStringOrVariable(com, 10, 11));
 
@@ -5030,6 +5038,8 @@ bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
 		src_map = Game_Map::GetMapId();
 	} else {
 		auto* request = Game_Map::RequestMap(src_map);
+		request->Start();
+
 		if (!request->IsReady()) {
 			// Download the map and try again
 			_async_op = AsyncOp::MakeYieldRepeat();
@@ -5037,7 +5047,7 @@ bool Game_Interpreter::CommandSpawnMapEvent(lcf::rpg::EventCommand const& com) {
 		}
 	}
 
-	Game_Map::CloneMapEvent(src_map, src_event, target_x, target_y, target_event, target_name);
+	_async_op = AsyncOp::MakeCloneMapEvent(target_name, src_event, target_event, src_map, target_x, target_y);
 
 	return true;
 }
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index 71d17c647..7d9ef2939 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -292,7 +292,7 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 	bool CommandManiacControlStrings(lcf::rpg::EventCommand const& com);
 	bool CommandManiacCallCommand(lcf::rpg::EventCommand const& com);
 	bool CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com);
-	bool CommandSpawnMapEvent(lcf::rpg::EventCommand const& com);
+	bool CommandCloneMapEvent(lcf::rpg::EventCommand const& com);
 
 	void SetSubcommandIndex(int indent, int idx);
 	uint8_t& ReserveSubcommandIndex(int indent);
diff --git a/src/game_map.cpp b/src/game_map.cpp
index a8cbd7ce1..6ead7e5a0 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -386,7 +386,7 @@ void Game_Map::Caching::MapCache::Clear() {
 	}
 }
 
-bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id = 0, std::string target_name = "") {
+bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, StringView target_name) {
 	std::unique_ptr<lcf::rpg::Map> source_map_storage;
 	const lcf::rpg::Map* source_map;
 
@@ -432,6 +432,9 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 	});
 
 	events.emplace_back(GetMapId(), &map->events.back());
+	std::sort(events.begin(), events.end(), [](const auto& e, const auto& e2) {
+		return e.GetId() < e2.GetId();
+	});
 
 	FixUnderlyingEventReferences();
 
@@ -466,16 +469,12 @@ bool Game_Map::DestroyMapEvent(const int event_id) {
 	//	}
 
 	// Remove event from events vector
-	auto it = events.end();
-	for (auto iter = events.begin(); iter != events.end(); ++iter) {
-		if (iter->GetId() == event_id) {
-			it = iter;
+	for (auto it = events.begin(); it != events.end(); ++it) {
+		if (it->GetId() == event_id) {
+			events.erase(it);
 			break;
 		}
 	}
-	if (it != events.end()) {
-		events.erase(it);
-	}
 
 	// Remove event from map
 	for (auto it = map->events.begin(); it != map->events.end(); ++it) {
diff --git a/src/game_map.h b/src/game_map.h
index 64992538f..107da355d 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -96,7 +96,7 @@ namespace Game_Map {
 	/** Disposes Game_Map. */
 	void Dispose();
 
-	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, std::string target_name);
+	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, StringView target_name);
 	bool DestroyMapEvent(const int event_id);
 
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
diff --git a/src/scene_map.cpp b/src/scene_map.cpp
index 4267f4568..d296d3002 100644
--- a/src/scene_map.cpp
+++ b/src/scene_map.cpp
@@ -413,6 +413,10 @@ void Scene_Map::OnAsyncSuspend(F&& f, AsyncOp aop, bool is_preupdate) {
 		Player::LoadSavegame(save_name, aop.GetSaveSlot());
 	}
 
+	if (aop.GetType() == AsyncOp::eCloneMapEvent) {
+		Game_Map::CloneMapEvent(aop.GetMapId(), aop.GetSourceEventId(), aop.GetX(), aop.GetY(), aop.GetTargetEventId(), aop.GetEventName());
+	}
+
 	auto& transition = Transition::instance();
 
 	if (aop.GetType() == AsyncOp::eEraseScreen) {

From 128aa11dc9fe78babadabb00a07adba53d80eda1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 16:05:28 +0200
Subject: [PATCH 175/222] DestroyMapEvent: Implemented

---
 src/async_op.h           | 14 +++++++++++---
 src/game_interpreter.cpp | 27 ++++++++++++++++++++++++---
 src/game_interpreter.h   |  3 ++-
 src/scene_map.cpp        |  4 ++++
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/async_op.h b/src/async_op.h
index cddc65c17..3d5265e21 100644
--- a/src/async_op.h
+++ b/src/async_op.h
@@ -45,7 +45,8 @@ class AsyncOp {
 			eLoad,
 			eYield,
 			eYieldRepeat,
-			eCloneMapEvent
+			eCloneMapEvent,
+			eDestroyMapEvent
 		};
 
 		AsyncOp() = default;
@@ -86,6 +87,9 @@ class AsyncOp {
 		/** @return a clone map event async operation */
 		static AsyncOp MakeCloneMapEvent(std::string name, int src_event_id, int target_event_id, int map_id, int x, int y);
 
+		/** @return a destroy map event async operation */
+		static AsyncOp MakeDestroyMapEvent(int target_event_id);
+
 		/** @return the type of async operation */
 		Type GetType() const;
 
@@ -142,7 +146,7 @@ class AsyncOp {
 
 		/**
 		 * @return the event id of the event being created
-		 * @pre If GetType() is not eCloneMapEvent, the return value is undefined.
+		 * @pre If GetType() is not eCloneMapEvent or eDestroyMapEvent, the return value is undefined.
 		 */
 		int GetTargetEventId() const;
 
@@ -231,7 +235,7 @@ inline int AsyncOp::GetSourceEventId() const {
 }
 
 inline int AsyncOp::GetTargetEventId() const {
-	assert(GetType() == eCloneMapEvent);
+	assert(GetType() == eCloneMapEvent || GetType() == eDestroyMapEvent);
 	return _args[1];
 }
 
@@ -313,4 +317,8 @@ inline AsyncOp AsyncOp::MakeCloneMapEvent(std::string name, int src_event_id, in
 	return AsyncOp(eCloneMapEvent, name, src_event_id, target_event_id, map_id, x, y);
 }
 
+inline AsyncOp AsyncOp::MakeDestroyMapEvent(int target_event_id) {
+	return AsyncOp(eDestroyMapEvent, 0, target_event_id);
+}
+
 #endif
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index d7c744ac3..fe315044d 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -788,7 +788,9 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 		case Cmd::EasyRpg_SetInterpreterFlag:
 			return CommandEasyRpgSetInterpreterFlag(com);
 		case static_cast<Cmd>(2056): //EasyRPG_CloneMapEvent
-			return CommandCloneMapEvent(com);
+			return CommandEasyRpgCloneMapEvent(com);
+		case static_cast<Cmd>(2057): //EasyRPG_DestroyMapEvent
+			return CommandEasyRpgDestroyMapEvent(com);
 		default:
 			return true;
 	}
@@ -808,7 +810,10 @@ bool Game_Interpreter::OnFinishStackFrame() {
 	if (is_base_frame && event_id > 0) {
 		Game_Event* evnt = Game_Map::GetEvent(event_id);
 		if (!evnt) {
-			Output::Error("Call stack finished with invalid event id {}. This can be caused by a vehicle teleport?", event_id);
+			if (!Player::HasEasyRpgExtensions()) {
+				// Destroy Map Event triggers this sanity check
+				Output::Error("Call stack finished with invalid event id {}. This can be caused by a vehicle teleport?", event_id);
+			}
 		} else if (main_flag) {
 			evnt->OnFinishForegroundEvent();
 		}
@@ -5013,7 +5018,7 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 	return true;
 }
 
-bool Game_Interpreter::CommandCloneMapEvent(lcf::rpg::EventCommand const& com) {
+bool Game_Interpreter::CommandEasyRpgCloneMapEvent(lcf::rpg::EventCommand const& com) {
 	if (!Player::HasEasyRpgExtensions()) {
 		return true;
 	}
@@ -5052,6 +5057,22 @@ bool Game_Interpreter::CommandCloneMapEvent(lcf::rpg::EventCommand const& com) {
 	return true;
 }
 
+bool Game_Interpreter::CommandEasyRpgDestroyMapEvent(lcf::rpg::EventCommand const& com) {
+	if (!Player::HasEasyRpgExtensions()) {
+		return true;
+	}
+
+	if (com.parameters.size() < 2) {
+		return true;
+	}
+
+	int target_event = ValueOrVariable(com.parameters[0], com.parameters[1]);
+
+	_async_op = AsyncOp::MakeDestroyMapEvent(target_event);
+
+	return true;
+}
+
 Game_Interpreter& Game_Interpreter::GetForegroundInterpreter() {
 	return Game_Battle::IsBattleRunning()
 		? Game_Battle::GetInterpreter()
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index 7d9ef2939..412d7eea3 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -292,7 +292,8 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 	bool CommandManiacControlStrings(lcf::rpg::EventCommand const& com);
 	bool CommandManiacCallCommand(lcf::rpg::EventCommand const& com);
 	bool CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand const& com);
-	bool CommandCloneMapEvent(lcf::rpg::EventCommand const& com);
+	bool CommandEasyRpgCloneMapEvent(lcf::rpg::EventCommand const& com);
+	bool CommandEasyRpgDestroyMapEvent(lcf::rpg::EventCommand const& com);
 
 	void SetSubcommandIndex(int indent, int idx);
 	uint8_t& ReserveSubcommandIndex(int indent);
diff --git a/src/scene_map.cpp b/src/scene_map.cpp
index d296d3002..68766c123 100644
--- a/src/scene_map.cpp
+++ b/src/scene_map.cpp
@@ -417,6 +417,10 @@ void Scene_Map::OnAsyncSuspend(F&& f, AsyncOp aop, bool is_preupdate) {
 		Game_Map::CloneMapEvent(aop.GetMapId(), aop.GetSourceEventId(), aop.GetX(), aop.GetY(), aop.GetTargetEventId(), aop.GetEventName());
 	}
 
+	if (aop.GetType() == AsyncOp::eDestroyMapEvent) {
+		Game_Map::DestroyMapEvent(aop.GetTargetEventId());
+	}
+
 	auto& transition = Transition::instance();
 
 	if (aop.GetType() == AsyncOp::eEraseScreen) {

From 2f7daeb4b6bc0245c12892dfd42d75307053508b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 17:17:47 +0200
Subject: [PATCH 176/222] DestoryMapEvent: Set the main interpreter event ID to
 0 when the event running is destroyed.

Prevents triggering the sanity check about an invalid event on the main interpreter.

Fix operator= of Game_CharacterDataStorage.
---
 src/game_character.h     |  3 +++
 src/game_interpreter.cpp |  5 +----
 src/game_interpreter.h   | 12 ++++++++++++
 src/game_map.cpp         |  5 +++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/game_character.h b/src/game_character.h
index 541c6edcb..152262723 100644
--- a/src/game_character.h
+++ b/src/game_character.h
@@ -1379,6 +1379,9 @@ inline Game_CharacterDataStorage<T>::Game_CharacterDataStorage(Game_CharacterDat
 template <typename T>
 inline Game_CharacterDataStorage<T>& Game_CharacterDataStorage<T>::operator=(Game_CharacterDataStorage&& o) noexcept
 {
+	auto* base = static_cast<Game_Character*>(this);
+	*base = std::move(o);
+
 	if (this != &o) {
 		_data = std::move(o._data);
 		Game_Character::_data = &this->_data;
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index fe315044d..0f4312d8f 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -810,10 +810,7 @@ bool Game_Interpreter::OnFinishStackFrame() {
 	if (is_base_frame && event_id > 0) {
 		Game_Event* evnt = Game_Map::GetEvent(event_id);
 		if (!evnt) {
-			if (!Player::HasEasyRpgExtensions()) {
-				// Destroy Map Event triggers this sanity check
-				Output::Error("Call stack finished with invalid event id {}. This can be caused by a vehicle teleport?", event_id);
-			}
+			Output::Error("Call stack finished with invalid event id {}. This can be caused by a vehicle teleport?", event_id);
 		} else if (main_flag) {
 			evnt->OnFinishForegroundEvent();
 		}
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
index 412d7eea3..7149d59ca 100644
--- a/src/game_interpreter.h
+++ b/src/game_interpreter.h
@@ -106,6 +106,12 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 	/** @return the event_id of the event at the base of the call stack */
 	int GetOriginalEventId() const;
 
+	/**
+	 * Sets the ID of the event at the base of the call stack to 0.
+	 * Used by DestroyMapEvent to prevent triggering a sanity check when the event is destroyed.
+	 */
+	void ClearOriginalEventId();
+
 	/** Return true if the interpreter is waiting for an async operation and needs to be resumed */
 	bool IsAsyncPending();
 
@@ -372,6 +378,12 @@ inline int Game_Interpreter::GetOriginalEventId() const {
 	return !_state.stack.empty() ? _state.stack.front().event_id : 0;
 }
 
+inline void Game_Interpreter::ClearOriginalEventId() {
+	if (!_state.stack.empty()) {
+		_state.stack.front().event_id = 0;
+	}
+}
+
 inline int Game_Interpreter::GetLoopCount() const {
 	return loop_count;
 }
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 6ead7e5a0..5eaa6d6a8 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -486,6 +486,11 @@ bool Game_Map::DestroyMapEvent(const int event_id) {
 
 	FixUnderlyingEventReferences();
 
+	if (GetInterpreter().GetOriginalEventId() == event_id) {
+		// Prevent triggering "invalid event on stack" sanity check
+		GetInterpreter().ClearOriginalEventId();
+	}
+
 	Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
 	scene->spriteset->Refresh();
 	SetNeedRefresh(true);

From fc4568ace275532d45ad89965e7f0ce109d5387d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 1 Aug 2024 19:39:16 +0200
Subject: [PATCH 177/222] Call System Functions: Move EasyRPG Extensions to a
 higher ID to prevent conflicts

Minor enhancements
---
 src/game_interpreter.cpp     |  2 +-
 src/game_interpreter_map.cpp | 45 ++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 1779e5c7d..516637061 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -785,7 +785,7 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacControlStrings(com);
 		case Cmd::Maniac_CallCommand:
 			return CommandManiacCallCommand(com);
-		case Cmd::EasyRpg_SetInterpreterFlag: //Cmd::EasyRpg_SetInterpreterFlag
+		case Cmd::EasyRpg_SetInterpreterFlag:
 			return CommandEasyRpgSetInterpreterFlag(com);
 		default:
 			return true;
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index bb889e7f9..37269f0b6 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -736,48 +736,43 @@ bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& com
 		return false;
 	}
 
-	// Parse common parameters
-	const int fullscreen_mode = com.parameters[1]; // Broken in Maniac.
-	const int pause_while_debugging = com.parameters[1]; // unused in our ingame debug screen.
-
-	const int actor_index = ValueOrVariable(com.parameters[1], com.parameters[2]);
-	const bool is_db_actor = ValueOrVariable(com.parameters[3], com.parameters[4]);
-
+	// Command "Call System Functions"
 	switch (current_system_function) {
 	case 1: // Load menu
 		return CommandOpenLoadMenu(com);
 	case 2: // Game menu
-		Scene::instance->SetRequestedScene(std::make_shared<Scene_Menu>());
-		break;
+		return CommandOpenMainMenu(com);
 	case 3: // Toggle fullscreen
-		// TODO? Implement fullscreen mode once maniacs supports it
+		// TODO Implement fullscreen mode once maniacs supports it
+		// const int fullscreen_mode = com.parameters[1]; // Broken in Maniac.
 		return CommandToggleFullscreen(com);
 	case 4: // Settings menu
 		return CommandOpenVideoOptions(com);
 	case 5: // Debug menu
+		// const int pause_while_debugging = com.parameters[1]; // unused in our ingame debug screen.
 		Scene::instance->SetRequestedScene(std::make_shared<Scene_Debug>());
-		break;
+		++index;
+		return false;
 	case 6: // License information menu
-		// TODO? Implement license information menu
+		// TODO Implement license information menu
 		return true;
 	case 7: // Reset game
 		return CommandReturnToTitleScreen(com);
-	case 8: // EASYRPG Inventory menu
-		return RequestMainMenuScene(1);
-	case 9: // EASYRPG Skills menu
-		return RequestMainMenuScene(2, actor_index, is_db_actor);
-	case 10: // EASYRPG Equip menu
-		return RequestMainMenuScene(3, actor_index, is_db_actor);
-	case 11: // EASYRPG Status menu
-		return RequestMainMenuScene(4, actor_index, is_db_actor);
-	case 12: // EASYRPG Reorder Party menu
-		return RequestMainMenuScene(5);
 	default:
-		return true;
+		if (Player::HasEasyRpgExtensions() && current_system_function >= 200 && current_system_function < 210) {
+			const int actor_index = ValueOrVariable(com.parameters[1], com.parameters[2]);
+			const bool is_db_actor = ValueOrVariable(com.parameters[3], com.parameters[4]);
+
+			if (RequestMainMenuScene(current_system_function - 200, actor_index, is_db_actor)) {
+				++index;
+				return false;
+			}
+		} else {
+			Output::Warning("CommandOpenSaveMenu: Unsupported scene {}", current_system_function);
+		}
 	}
 
-	++index;
-	return false;
+	return true;
 }
 
 bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const&) { // code 11950

From e1487dec7fc2f03313764571a09ead148a197a5b Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Wed, 24 Jul 2024 05:54:56 -0300
Subject: [PATCH 178/222] Local Settings - First Commit

If you have a copy of config.ini saved at the same folder as the player app, it will load the game settings from it, instead of the global folder.

-------------------------------------
Update game_config.cpp
---
 src/game_config.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/game_config.cpp b/src/game_config.cpp
index 5e502ec38..b74e1a0c2 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -94,6 +94,9 @@ Game_Config Game_Config::Create(CmdlineParser& cp) {
 	if (!config_path.empty()) {
 		config_file = FileFinder::MakePath(config_path, config_name);
 	}
+	else if (FileFinder::Root().Exists(config_name)) {
+		config_file = ToString(config_name);
+	}
 
 	auto cli_config = FileFinder::Root().OpenOrCreateInputStream(config_file);
 	if (!cli_config) {

From 9a818b47728032cbb49ea09c533dd3b60447d796 Mon Sep 17 00:00:00 2001
From: gameblabla <gameblabla@protonmail.com>
Date: Sun, 11 Aug 2024 13:59:03 +0200
Subject: [PATCH 179/222] Fix compiling OpenDingux and SDL 1.2

Otherwise, it will complain about undefined references to GetSdlAxis.
---
 src/platform/opendingux/opendingux_input_buttons.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/platform/opendingux/opendingux_input_buttons.cpp b/src/platform/opendingux/opendingux_input_buttons.cpp
index 2fc069c99..2d8e492a5 100644
--- a/src/platform/opendingux/opendingux_input_buttons.cpp
+++ b/src/platform/opendingux/opendingux_input_buttons.cpp
@@ -45,4 +45,12 @@ Input::KeyNamesArray Input::GetInputKeyNames() {
 
 void Input::GetSupportedConfig(Game_ConfigInput& cfg) {}
 
+
+#include "platform/sdl/axis.h"
+SdlAxis Input::GetSdlAxis() {
+	return {
+		0, 1, 2, 3, 4, 5, false, false
+	};
+}
+
 #endif

From 4d45f8ed028482ff3ad3ade60d008d9115694398 Mon Sep 17 00:00:00 2001
From: xiaodao <lychees67@gmail.com>
Date: Mon, 12 Aug 2024 00:06:32 +0800
Subject: [PATCH 180/222] Refactor: Always check isMessageActive() at the
 beginning in game_Interpreter _map.

---
 src/game_interpreter_map.cpp | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index e0d4f4257..3f3a604be 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -267,13 +267,13 @@ bool Game_Interpreter_Map::CommandRecallToLocation(lcf::rpg::EventCommand const&
 }
 
 bool Game_Interpreter_Map::CommandEnemyEncounter(lcf::rpg::EventCommand const& com) { // code 10710
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	BattleArgs args;
 
 	args.troop_id = ValueOrVariable(com.parameters[0], com.parameters[1]);
@@ -364,13 +364,13 @@ bool Game_Interpreter_Map::CommandEndBattle(lcf::rpg::EventCommand const& /* com
 }
 
 bool Game_Interpreter_Map::CommandOpenShop(lcf::rpg::EventCommand const& com) { // code 10720
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	bool allow_buy = false;
 	bool allow_sell = false;
 
@@ -392,7 +392,7 @@ bool Game_Interpreter_Map::CommandOpenShop(lcf::rpg::EventCommand const& com) {
 	auto shop_type = com.parameters[1];
 
 	// Not used, but left here for documentation purposes
-	//bool has_shop_handlers = com.parameters[2] != 0;
+	// bool has_shop_handlers = com.parameters[2] != 0;
 
 	std::vector<int> goods;
 	for (auto it = com.parameters.begin() + 4; it < com.parameters.end(); ++it) {
@@ -542,13 +542,13 @@ bool Game_Interpreter_Map::CommandEndInn(lcf::rpg::EventCommand const& /* com */
 }
 
 bool Game_Interpreter_Map::CommandEnterHeroName(lcf::rpg::EventCommand const& com) { // code 10740
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	auto actor_id = com.parameters[0];
 	auto charset = com.parameters[1];
 	auto use_default_name = com.parameters[2];
@@ -713,26 +713,26 @@ bool Game_Interpreter_Map::CommandPlayMovie(lcf::rpg::EventCommand const& com) {
 }
 
 bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& /* com */) { // code 11910
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	Scene::instance->SetRequestedScene(std::make_shared<Scene_Save>());
 	++index;
 	return false;
 }
 
 bool Game_Interpreter_Map::CommandOpenMainMenu(lcf::rpg::EventCommand const&) { // code 11950
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	int subscreen_id = -1, actor_index = 0;
 	bool is_db_actor = false;
 
@@ -748,13 +748,13 @@ bool Game_Interpreter_Map::CommandOpenLoadMenu(lcf::rpg::EventCommand const& /*
 		return true;
 	}
 
-	auto& frame = GetFrame();
-	auto& index = frame.current_command;
-
 	if (Game_Message::IsMessageActive()) {
 		return false;
 	}
 
+	auto& frame = GetFrame();
+	auto& index = frame.current_command;
+
 	Scene::instance->SetRequestedScene(std::make_shared<Scene_Load>());
 	++index;
 	return false;

From 371b85d409842ab077c7fca34ccbd8da6d00dcb5 Mon Sep 17 00:00:00 2001
From: xiaodao <lychees67@gmail.com>
Date: Mon, 12 Aug 2024 00:17:16 +0800
Subject: [PATCH 181/222] Refactor: check out_of_bounds before calc map_draw_xy

---
 src/tilemap_layer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tilemap_layer.cpp b/src/tilemap_layer.cpp
index b9736d48d..df8c62c43 100644
--- a/src/tilemap_layer.cpp
+++ b/src/tilemap_layer.cpp
@@ -259,9 +259,6 @@ void TilemapLayer::Draw(Bitmap& dst, uint8_t z_order, int render_ox, int render_
 			if (loop_h) map_x = mod(map_x, width);
 			if (loop_v) map_y = mod(map_y, height);
 
-			int map_draw_x = x * TILE_SIZE - mod_ox;
-			int map_draw_y = y * TILE_SIZE - mod_oy;
-
 			bool out_of_bounds =
 				map_x < 0 || map_x >= width ||
 				map_y < 0 || map_y >= height;
@@ -270,6 +267,9 @@ void TilemapLayer::Draw(Bitmap& dst, uint8_t z_order, int render_ox, int render_
 				continue;
 			}
 
+			int map_draw_x = x * TILE_SIZE - mod_ox;
+			int map_draw_y = y * TILE_SIZE - mod_oy;
+
 			// Get the tile data
 			TileData &tile = GetDataCache(map_x, map_y);
 

From db86e373352097ddcc382eb65512085afff98a24 Mon Sep 17 00:00:00 2001
From: xiaodao <lychees67@gmail.com>
Date: Mon, 12 Aug 2024 00:56:02 +0800
Subject: [PATCH 182/222] Refactor:  remove GetEventsXY() since the code is
 broken and never been used now.

---
 src/game_map.cpp | 8 --------
 src/game_map.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index 51e7cdc01..127ff90ab 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -981,14 +981,6 @@ int Game_Map::GetTerrainTag(int x, int y) {
 	return terrain_data[chip_index];
 }
 
-void Game_Map::GetEventsXY(std::vector<Game_Event*>& events, int x, int y) {
-	for (Game_Event& ev : GetEvents()) {
-		if (ev.IsInPosition(x, y) && ev.IsActive()) {
-			events.push_back(&ev);
-		}
-	}
-}
-
 Game_Event* Game_Map::GetEventAt(int x, int y, bool require_active) {
 	auto& events = GetEvents();
 	for (auto iter = events.rbegin(); iter != events.rend(); ++iter) {
diff --git a/src/game_map.h b/src/game_map.h
index e9ea966e2..eb35fa727 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -577,8 +577,6 @@ namespace Game_Map {
 	 */
 	std::vector<Game_CommonEvent>& GetCommonEvents();
 
-	void GetEventsXY(std::vector<Game_Event*>& events, int x, int y);
-
 	/**
 	 * @param x x position on the map
 	 * @param y y position on the map

From d4663aad5ae5e11caae48cfb53cc30e9bc306f15 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 25 Aug 2024 16:54:04 +0200
Subject: [PATCH 183/222] Android: Use different save paths when multiple games
 are in one archive

---
 .../org_easyrpg_player_game_browser.cpp       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
index aeb06ea3c..cb88dd316 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
@@ -201,9 +201,10 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass,
 
 	jmethodID jgame_constructor = env->GetMethodID(jgame_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;[B)V");
 
+	std::string root_path = FileFinder::GetFullFilesystemPath(root);
 	bool game_in_main_dir = false;
 	if (fs_list.size() == 1) {
-		if (FileFinder::GetFullFilesystemPath(root) == FileFinder::GetFullFilesystemPath(fs_list[0])) {
+		if (root_path == FileFinder::GetFullFilesystemPath(fs_list[0])) {
 			game_in_main_dir = true;
 		}
 	}
@@ -224,13 +225,24 @@ Java_org_easyrpg_player_game_1browser_GameScanner_findGames(JNIEnv *env, jclass,
 		std::string save_path;
 		if (!fs.IsFeatureSupported(Filesystem::Feature::Write)) {
 			// Is an archive and needs a redirected save path
-			save_path = game_dir_name;
+			// Get archive name
+			save_path = jstring_to_string(env, jmain_dir_name);
 
-			// compatibility with original GameScanner Java code (everything after the extension dot is removed)
-			size_t ext = save_path.find('.');
+			// Compatibility with original GameScanner Java code
+			// Everything after the extension is removed
+			size_t ext = save_path.find_last_of('.');
 			if (ext != std::string::npos) {
 				save_path = save_path.substr(0, ext);
 			}
+
+			// Append subdirectory when the archive contains more than one game
+			if (fs_list.size() > 1) {
+				save_path += FileFinder::GetFullFilesystemPath(fs).substr(root_path.size());
+			}
+
+			// Recursion is annoying in SAF so flatten the path
+			// SAF already does this replacement but better do not rely on this implementation detail
+			save_path = Utils::ReplaceAll(save_path, "/", "_");
 		}
 
 		/* Obtaining of the game_dir_name image */

From 387301c8f72c3183b6fc846dd51b6e5c77ba162b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 25 Aug 2024 16:54:18 +0200
Subject: [PATCH 184/222] Android: Bump to SDK 34

---
 builds/android/app/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/builds/android/app/build.gradle b/builds/android/app/build.gradle
index 5eca60e3c..1ee3155a1 100644
--- a/builds/android/app/build.gradle
+++ b/builds/android/app/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 android {
     namespace "org.easyrpg.player"
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
     ndkVersion '21.4.7075529'
     assetPacks = [":assets"]
     defaultConfig {
         applicationId "org.easyrpg.player"
+        compileSdk 34
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionName VERSION_NAME
         versionCode Integer.parseInt(VERSION_CODE)
     }

From e6e8cc371c4b678f1dca1187f4dae7301ba3833c Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 25 Aug 2024 18:00:27 +0200
Subject: [PATCH 185/222] Android: Update deps and gradle to 8.10

---
 builds/android/app/build.gradle               |   6 +--
 builds/android/build.gradle                   |   2 +-
 .../android/gradle/wrapper/gradle-wrapper.jar | Bin 54213 -> 43462 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 builds/android/gradlew                        |  41 ++++++++++++------
 builds/android/gradlew.bat                    |  35 ++++++++-------
 6 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/builds/android/app/build.gradle b/builds/android/app/build.gradle
index 1ee3155a1..b00b9396a 100644
--- a/builds/android/app/build.gradle
+++ b/builds/android/app/build.gradle
@@ -74,10 +74,10 @@ allprojects {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'org.ini4j:ini4j:0.5.4'
diff --git a/builds/android/build.gradle b/builds/android/build.gradle
index 2c911c6ff..5facda44e 100644
--- a/builds/android/build.gradle
+++ b/builds/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/builds/android/gradle/wrapper/gradle-wrapper.jar b/builds/android/gradle/wrapper/gradle-wrapper.jar
index 2b338a935b508eb6286ed4b84a91176ee5fb93c5..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 54213
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
W0pC&I?SueJAtDe^1>pYz0sTMJrJ5N4

diff --git a/builds/android/gradle/wrapper/gradle-wrapper.properties b/builds/android/gradle/wrapper/gradle-wrapper.properties
index fae08049a..9355b4155 100644
--- a/builds/android/gradle/wrapper/gradle-wrapper.properties
+++ b/builds/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/builds/android/gradlew b/builds/android/gradlew
index 1b6c78733..1aa94a426 100755
--- a/builds/android/gradlew
+++ b/builds/android/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/builds/android/gradlew.bat b/builds/android/gradlew.bat
index 107acd32c..25da30dbd 100644
--- a/builds/android/gradlew.bat
+++ b/builds/android/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 59c2c8be9d8ccd69ec04779d43a6f562ac317a11 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 00:26:23 +0200
Subject: [PATCH 186/222] When loading a save remove active BattleAnimations

They can reference stale event data and crash.

Fix #3255
---
 src/game_screen.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/game_screen.cpp b/src/game_screen.cpp
index 789035714..a80a88cc9 100644
--- a/src/game_screen.cpp
+++ b/src/game_screen.cpp
@@ -45,6 +45,8 @@ Game_Screen::~Game_Screen() {
 
 void Game_Screen::SetSaveData(lcf::rpg::SaveScreen screen)
 {
+	CancelBattleAnimation();
+
 	data = std::move(screen);
 }
 

From 31331ab88438993383cb23cf08fb3c32c83543eb Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 00:34:47 +0200
Subject: [PATCH 187/222] Equipment: Fix another missed change from actor.GetId
 to actor.

Detected by ASAN, somehow does not crash without.

Fix #3235
---
 src/scene_equip.cpp      | 2 +-
 src/window_equipitem.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scene_equip.cpp b/src/scene_equip.cpp
index 49149646d..a5390f2a6 100644
--- a/src/scene_equip.cpp
+++ b/src/scene_equip.cpp
@@ -50,7 +50,7 @@ void Scene_Equip::Start() {
 	equip_window->SetIndex(equip_index);
 
 	for (int i = 0; i < 5; ++i) {
-		item_windows.push_back(std::make_shared<Window_EquipItem>(Player::menu_offset_x, Player::menu_offset_y + menu_help_height + menu_equip_status_height, MENU_WIDTH, MENU_HEIGHT - menu_help_height - menu_equip_status_height,actor.GetId(), i));
+		item_windows.push_back(std::make_shared<Window_EquipItem>(Player::menu_offset_x, Player::menu_offset_y + menu_help_height + menu_equip_status_height, MENU_WIDTH, MENU_HEIGHT - menu_help_height - menu_equip_status_height, actor, i));
 	}
 
 	// Assign the help windows
diff --git a/src/window_equipitem.cpp b/src/window_equipitem.cpp
index 457341c95..487c011dc 100644
--- a/src/window_equipitem.cpp
+++ b/src/window_equipitem.cpp
@@ -22,7 +22,7 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 
-Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight,  const Game_Actor& actor, int equip_type) :
+Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor, int equip_type) :
 	Window_Item(ix, iy, iwidth, iheight),
 	actor(actor) {
 	this->equip_type = equip_type;

From e57161b7d9e7c0a0abac1c3b4895d5bcabe1f6b1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 00:38:32 +0200
Subject: [PATCH 188/222] Emscripten: Expose FS Module again.

Was lost when moving to MODULARIZE.

Fix #3243
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e1cdd57..579202f88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1151,6 +1151,7 @@ if(${PLAYER_BUILD_EXECUTABLE} AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL(1|2)$"
 			"-sALLOW_MEMORY_GROWTH -sMINIFY_HTML=0 -sMODULARIZE -sEXPORT_NAME=createEasyRpgPlayer \
 			 -sEXIT_RUNTIME --bind --pre-js ${PLAYER_JS_PREJS} --post-js ${PLAYER_JS_POSTJS} \
 			 -sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=['$autoResumeAudioContext','$dynCall'] \
+			 -sEXPORTED_RUNTIME_METHODS=['FS'] \
 			 -sEXPORTED_FUNCTIONS=_main,_malloc,_free")
 		set_source_files_properties("src/platform/sdl/main.cpp" PROPERTIES
 			OBJECT_DEPENDS "${PLAYER_JS_PREJS};${PLAYER_JS_POSTJS};${PLAYER_JS_SHELL}")

From f6481010db8ad9c79e74ab73234b1b35e0b00083 Mon Sep 17 00:00:00 2001
From: gameblabla <gameblabla@protonmail.com>
Date: Sun, 11 Aug 2024 13:57:51 +0200
Subject: [PATCH 189/222] Fix compilation errors when resampling is disabled

---
 src/audio_midi.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/audio_midi.cpp b/src/audio_midi.cpp
index e4b027a3a..f63e6eb13 100644
--- a/src/audio_midi.cpp
+++ b/src/audio_midi.cpp
@@ -18,6 +18,7 @@
 // Headers
 #include "audio_midi.h"
 #include "audio_decoder_midi.h"
+#include "audio.h"
 #include "decoder_fluidsynth.h"
 #include "decoder_fmmidi.h"
 #include "decoder_wildmidi.h"
@@ -25,8 +26,6 @@
 
 #ifdef USE_AUDIO_RESAMPLER
 #include "audio_resampler.h"
-#include "audio.h"
-
 #endif
 
 void MidiDecoder::GetFormat(int& freq, AudioDecoderBase::Format& format, int& channels) const {

From b48d673b36f610d9268cba5682b9bfcbafe46f20 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 14:07:49 +0200
Subject: [PATCH 190/222] SpawnMapEvent: Update BattleAnimation reference

Prevents crashes...

Had to add multiple player includes as a header was removed.
---
 src/battle_animation.cpp | 12 ++++++++----
 src/battle_animation.h   |  3 ++-
 src/game_map.cpp         | 22 +++++++++++++---------
 src/game_map.h           | 11 +++++------
 src/game_screen.cpp      | 13 +++++++++++++
 src/game_screen.h        |  7 ++++++-
 src/scene_item.cpp       |  1 +
 src/scene_order.cpp      |  1 +
 src/scene_skill.cpp      |  1 +
 src/sprite_character.cpp |  1 +
 10 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/battle_animation.cpp b/src/battle_animation.cpp
index ee0fe7b38..3d854f9e5 100644
--- a/src/battle_animation.cpp
+++ b/src/battle_animation.cpp
@@ -230,10 +230,14 @@ static int CalculateOffset(int pos, int target_height) {
 /////////
 
 BattleAnimationMap::BattleAnimationMap(const lcf::rpg::Animation& anim, Game_Character& target, bool global) :
-	BattleAnimation(anim), target(target), global(global)
+	BattleAnimation(anim), target(&target), global(global)
 {
 }
 
+void BattleAnimationMap::SetTarget(Game_Character& target) {
+	this->target = &target;
+}
+
 void BattleAnimationMap::Draw(Bitmap& dst) {
 	if (IsOnlySound()) {
 		return;
@@ -263,8 +267,8 @@ void BattleAnimationMap::DrawSingle(Bitmap& dst) {
 		return;
 	}
 	const int character_height = 24;
-	int x_off = target.GetScreenX();
-	int y_off = target.GetScreenY(false);
+	int x_off = target->GetScreenX();
+	int y_off = target->GetScreenY(false);
 	if (Scene::instance->type == Scene::Map) {
 		x_off += static_cast<Scene_Map*>(Scene::instance.get())->spriteset->GetRenderOx();
 		y_off += static_cast<Scene_Map*>(Scene::instance.get())->spriteset->GetRenderOy();
@@ -276,7 +280,7 @@ void BattleAnimationMap::DrawSingle(Bitmap& dst) {
 }
 
 void BattleAnimationMap::FlashTargets(int r, int g, int b, int p) {
-	target.Flash(r, g, b, p, 0);
+	target->Flash(r, g, b, p, 0);
 }
 
 void BattleAnimationMap::ShakeTargets(int /* str */, int /* spd */, int /* time */) {
diff --git a/src/battle_animation.h b/src/battle_animation.h
index 0a756e6be..f30963408 100644
--- a/src/battle_animation.h
+++ b/src/battle_animation.h
@@ -108,6 +108,7 @@ class BattleAnimation : public Sprite {
 class BattleAnimationMap : public BattleAnimation {
 public:
 	BattleAnimationMap(const lcf::rpg::Animation& anim, Game_Character& target, bool global);
+	void SetTarget(Game_Character& target);
 	void Draw(Bitmap& dst) override;
 protected:
 	void FlashTargets(int r, int g, int b, int p) override;
@@ -115,7 +116,7 @@ class BattleAnimationMap : public BattleAnimation {
 	void DrawSingle(Bitmap& dst);
 	void DrawGlobal(Bitmap& dst);
 
-	Game_Character& target;
+	Game_Character* target;
 	bool global = false;
 };
 
diff --git a/src/game_map.cpp b/src/game_map.cpp
index 5eaa6d6a8..f5dfa40e9 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -414,7 +414,7 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 
 	lcf::rpg::Event new_event = *source_event;
 	if (target_event_id > 0) {
-		DestroyMapEvent(target_event_id);
+		DestroyMapEvent(target_event_id, false);
 		new_event.ID = target_event_id;
 	} else {
 		new_event.ID = GetNextAvailableEventId();
@@ -436,7 +436,7 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 		return e.GetId() < e2.GetId();
 	});
 
-	FixUnderlyingEventReferences();
+	UpdateUnderlyingEventReferences();
 
 	AddEventToCache(new_event);
 
@@ -447,7 +447,7 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 	return true;
 }
 
-bool Game_Map::DestroyMapEvent(const int event_id) {
+bool Game_Map::DestroyMapEvent(const int event_id, bool update_references) {
 	const lcf::rpg::Event* event = FindEventById(map->events, event_id);
 
 	if (event == nullptr) {
@@ -484,17 +484,19 @@ bool Game_Map::DestroyMapEvent(const int event_id) {
 		}
 	}
 
-	FixUnderlyingEventReferences();
+	if (update_references) {
+		UpdateUnderlyingEventReferences();
+
+		Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
+		scene->spriteset->Refresh();
+		SetNeedRefresh(true);
+	}
 
 	if (GetInterpreter().GetOriginalEventId() == event_id) {
 		// Prevent triggering "invalid event on stack" sanity check
 		GetInterpreter().ClearOriginalEventId();
 	}
 
-	Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
-	scene->spriteset->Refresh();
-	SetNeedRefresh(true);
-
 	return true;
 }
 
@@ -505,12 +507,14 @@ void Game_Map::TranslateMapMessages(int mapId, lcf::rpg::Map& map) {
 }
 
 
-void Game_Map::FixUnderlyingEventReferences() {
+void Game_Map::UpdateUnderlyingEventReferences() {
 	// Update references because modifying the vector can reallocate
 	size_t idx = 0;
 	for (auto& ev : events) {
 		ev.SetUnderlyingEvent(&map->events.at(idx++));
 	}
+
+	Main_Data::game_screen->UpdateUnderlyingEventReferences();
 }
 
 const lcf::rpg::Event* Game_Map::FindEventById(const std::vector<lcf::rpg::Event>& events, int eventId) {
diff --git a/src/game_map.h b/src/game_map.h
index 107da355d..15eba930f 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -24,6 +24,7 @@
 #include <vector>
 #include <string>
 #include <unordered_set>
+#include "async_op.h"
 #include "system.h"
 #include "game_commonevent.h"
 #include "game_event.h"
@@ -38,8 +39,6 @@
 #include <lcf/rpg/savepartylocation.h>
 #include <lcf/rpg/savevehiclelocation.h>
 #include <lcf/rpg/savecommonevent.h>
-#include "async_op.h"
-#include <player.h>
 
 class FileRequestAsync;
 struct BattleArgs;
@@ -97,11 +96,11 @@ namespace Game_Map {
 	void Dispose();
 
 	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, StringView target_name);
-	bool DestroyMapEvent(const int event_id);
+	bool DestroyMapEvent(const int event_id, bool update_references = true);
 
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
 	void CreateMapEvents();
-	void FixUnderlyingEventReferences();
+	void UpdateUnderlyingEventReferences();
 	void AddEventToCache(const lcf::rpg::Event& ev);
 	const lcf::rpg::Event* FindEventById(const std::vector<lcf::rpg::Event>& events, int event_id);
 	int GetNextAvailableEventId();
@@ -681,10 +680,10 @@ namespace Game_Map {
 	 * Construct a map name, either for EasyRPG or RPG Maker projects
 	 *
 	 * @param map_id The ID of the map to construct
-	 * @param isEasyRpg Is the an easyrpg (emu) project, or an RPG Maker (lmu) one?
+	 * @param is_easyrpg Is the an easyrpg (emu) project, or an RPG Maker (lmu) one?
 	 * @return The map name, as Map<map_id>.<map_extension>
 	 */
-	std::string ConstructMapName(int map_id, bool isEasyRpg);
+	std::string ConstructMapName(int map_id, bool is_easyrpg);
 
 	FileRequestAsync* RequestMap(int map_id);
 
diff --git a/src/game_screen.cpp b/src/game_screen.cpp
index a80a88cc9..016ed4fab 100644
--- a/src/game_screen.cpp
+++ b/src/game_screen.cpp
@@ -408,3 +408,16 @@ void Game_Screen::CancelBattleAnimation() {
 	animation.reset();
 }
 
+void Game_Screen::UpdateUnderlyingEventReferences() {
+	if (!IsBattleAnimationWaiting()) {
+		return;
+	}
+
+	auto* chara = Game_Character::GetCharacter(data.battleanim_target, data.battleanim_target);
+	if (!chara) {
+		// Event was deleted
+		CancelBattleAnimation();
+	} else {
+		animation->SetTarget(*chara);
+	}
+}
diff --git a/src/game_screen.h b/src/game_screen.h
index 0a56e4add..e6e11669c 100644
--- a/src/game_screen.h
+++ b/src/game_screen.h
@@ -137,6 +137,11 @@ class Game_Screen {
 	 */
 	bool IsBattleAnimationWaiting();
 
+	/**
+	 * Updates the event reference when the event vector was altered e.g. by SpawnMapEvent.
+	 */
+	void UpdateUnderlyingEventReferences();
+
 	/** @return current pan_x offset for screen effects in 1/16 pixels */
 	int GetPanX() const;
 
@@ -173,7 +178,7 @@ class Game_Screen {
 	void OnMapScrolled(int dx, int dy);
 
 private:
-	std::unique_ptr<BattleAnimation> animation;
+	std::unique_ptr<BattleAnimationMap> animation;
 	std::unique_ptr<Weather> weather;
 
 	lcf::rpg::SaveScreen data;
diff --git a/src/scene_item.cpp b/src/scene_item.cpp
index 5fddba695..42e4fca1b 100644
--- a/src/scene_item.cpp
+++ b/src/scene_item.cpp
@@ -30,6 +30,7 @@
 #include "scene_teleport.h"
 #include "output.h"
 #include "transition.h"
+#include "player.h"
 
 Scene_Item::Scene_Item(int item_index) :
 	item_index(item_index) {
diff --git a/src/scene_order.cpp b/src/scene_order.cpp
index 144d1ad75..e9df69666 100644
--- a/src/scene_order.cpp
+++ b/src/scene_order.cpp
@@ -26,6 +26,7 @@
 #include "game_system.h"
 #include "input.h"
 #include "scene_map.h"
+#include "player.h"
 
 Scene_Order::Scene_Order() :
 	actor_counter(0) {
diff --git a/src/scene_skill.cpp b/src/scene_skill.cpp
index c6077d6a2..d05c6f695 100644
--- a/src/scene_skill.cpp
+++ b/src/scene_skill.cpp
@@ -28,6 +28,7 @@
 #include "scene_actortarget.h"
 #include "scene_teleport.h"
 #include "transition.h"
+#include "player.h"
 
 Scene_Skill::Scene_Skill(std::vector<Game_Actor*> actors, int actor_index, int skill_index) :
 	actors(actors), actor_index(actor_index), skill_index(skill_index) {
diff --git a/src/sprite_character.cpp b/src/sprite_character.cpp
index f0dccc497..c4ac09633 100644
--- a/src/sprite_character.cpp
+++ b/src/sprite_character.cpp
@@ -21,6 +21,7 @@
 #include "game_map.h"
 #include "bitmap.h"
 #include "output.h"
+#include "player.h"
 
 Sprite_Character::Sprite_Character(Game_Character* character, int x_offset, int y_offset) :
 	character(character),

From cc59e7195ff3b167ba6c2550ca71a9eb1e8c3b1d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 14:08:26 +0200
Subject: [PATCH 191/222] SpawnMapEvent: Directly insert sorted. Make
 FindEventById the same as GetEvent but for lcf::rpg::Event.

---
 src/game_map.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index f5dfa40e9..ae9ecd4cc 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -426,15 +426,17 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 		new_event.name = lcf::DBString(target_name);
 	}
 
-	map->events.push_back(new_event);
-	std::sort(map->events.begin(), map->events.end(), [](const auto& e, const auto& e2) {
-		return e.ID < e2.ID;
-	});
-
-	events.emplace_back(GetMapId(), &map->events.back());
-	std::sort(events.begin(), events.end(), [](const auto& e, const auto& e2) {
-		return e.GetId() < e2.GetId();
-	});
+	// sorted insert
+	auto insert_it = map->events.insert(
+		std::upper_bound(map->events.begin(), map->events.end(), new_event, [](const auto& e, const auto& e2) {
+			return e.ID < e2.ID;
+		}), new_event);
+
+	auto game_event = Game_Event(GetMapId(), &*insert_it);
+	events.insert(
+		std::upper_bound(events.begin(), events.end(), game_event, [](const auto& e, const auto& e2) {
+			return e.GetId() < e2.GetId();
+		}), Game_Event(GetMapId(), &*insert_it));
 
 	UpdateUnderlyingEventReferences();
 

From 4304fcfdfbd1e73a55f585c56b83d145ec18789b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 15:04:29 +0200
Subject: [PATCH 192/222] Android: Replace assets with SVG. Works since API 21
 which we require.

Also add asset for "Visit Website" and "Fonts".
---
 .../drawable-hdpi/ic_action_action_autorenew.png | Bin 970 -> 0 bytes
 .../drawable-hdpi/ic_action_action_settings.png  | Bin 803 -> 0 bytes
 .../drawable-hdpi/ic_action_content_clear.png    | Bin 568 -> 0 bytes
 .../ic_action_favorite_off_black.png             | Bin 1209 -> 0 bytes
 .../ic_action_favorite_off_white.png             | Bin 1353 -> 0 bytes
 .../ic_action_favorite_on_black.png              | Bin 852 -> 0 bytes
 .../ic_action_favorite_on_white.png              | Bin 941 -> 0 bytes
 .../drawable-hdpi/ic_action_settings_black.png   | Bin 1074 -> 0 bytes
 .../drawable-hdpi/ic_action_settings_white.png   | Bin 813 -> 0 bytes
 .../res/drawable-hdpi/ic_clear_black_24dp.png    | Bin 207 -> 0 bytes
 .../drawable-hdpi/ic_folder_open_black_36dp.png  | Bin 164 -> 0 bytes
 .../res/drawable-hdpi/ic_gamepad_black_36dp.png  | Bin 218 -> 0 bytes
 .../res/drawable-hdpi/ic_refresh_white_24dp.png  | Bin 387 -> 0 bytes
 .../res/drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 0 bytes
 .../drawable-hdpi/ic_video_label_black_36dp.png  | Bin 202 -> 0 bytes
 .../drawable-hdpi/ic_volume_up_black_36dp.png    | Bin 500 -> 0 bytes
 .../drawable-mdpi/ic_action_action_autorenew.png | Bin 592 -> 0 bytes
 .../drawable-mdpi/ic_action_action_settings.png  | Bin 484 -> 0 bytes
 .../drawable-mdpi/ic_action_content_clear.png    | Bin 308 -> 0 bytes
 .../ic_action_favorite_off_black.png             | Bin 1032 -> 0 bytes
 .../ic_action_favorite_off_white.png             | Bin 1135 -> 0 bytes
 .../ic_action_favorite_on_black.png              | Bin 757 -> 0 bytes
 .../ic_action_favorite_on_white.png              | Bin 779 -> 0 bytes
 .../drawable-mdpi/ic_action_settings_black.png   | Bin 696 -> 0 bytes
 .../drawable-mdpi/ic_action_settings_white.png   | Bin 700 -> 0 bytes
 .../res/drawable-mdpi/ic_clear_black_24dp.png    | Bin 164 -> 0 bytes
 .../drawable-mdpi/ic_folder_open_black_36dp.png  | Bin 138 -> 0 bytes
 .../res/drawable-mdpi/ic_gamepad_black_36dp.png  | Bin 167 -> 0 bytes
 .../res/drawable-mdpi/ic_refresh_white_24dp.png  | Bin 254 -> 0 bytes
 .../res/drawable-mdpi/ic_settings_white_24dp.png | Bin 326 -> 0 bytes
 .../drawable-mdpi/ic_video_label_black_36dp.png  | Bin 151 -> 0 bytes
 .../drawable-mdpi/ic_volume_up_black_36dp.png    | Bin 364 -> 0 bytes
 .../ic_action_action_autorenew.png               | Bin 1297 -> 0 bytes
 .../drawable-xhdpi/ic_action_action_settings.png | Bin 1109 -> 0 bytes
 .../drawable-xhdpi/ic_action_content_clear.png   | Bin 618 -> 0 bytes
 .../ic_action_favorite_off_black.png             | Bin 2165 -> 0 bytes
 .../ic_action_favorite_off_white.png             | Bin 2362 -> 0 bytes
 .../ic_action_favorite_on_black.png              | Bin 1456 -> 0 bytes
 .../ic_action_favorite_on_white.png              | Bin 1544 -> 0 bytes
 .../drawable-xhdpi/ic_action_settings_black.png  | Bin 1484 -> 0 bytes
 .../drawable-xhdpi/ic_action_settings_white.png  | Bin 1509 -> 0 bytes
 .../res/drawable-xhdpi/ic_clear_black_24dp.png   | Bin 235 -> 0 bytes
 .../drawable-xhdpi/ic_folder_open_black_36dp.png | Bin 242 -> 0 bytes
 .../res/drawable-xhdpi/ic_gamepad_black_36dp.png | Bin 224 -> 0 bytes
 .../res/drawable-xhdpi/ic_refresh_white_24dp.png | Bin 509 -> 0 bytes
 .../drawable-xhdpi/ic_settings_white_24dp.png    | Bin 562 -> 0 bytes
 .../drawable-xhdpi/ic_video_label_black_36dp.png | Bin 194 -> 0 bytes
 .../drawable-xhdpi/ic_volume_up_black_36dp.png   | Bin 626 -> 0 bytes
 .../ic_action_action_autorenew.png               | Bin 1909 -> 0 bytes
 .../ic_action_action_settings.png                | Bin 1992 -> 0 bytes
 .../drawable-xxhdpi/ic_action_content_clear.png  | Bin 1300 -> 0 bytes
 .../ic_action_favorite_off_black.png             | Bin 2626 -> 0 bytes
 .../ic_action_favorite_off_white.png             | Bin 2918 -> 0 bytes
 .../ic_action_favorite_on_black.png              | Bin 1823 -> 0 bytes
 .../ic_action_favorite_on_white.png              | Bin 1955 -> 0 bytes
 .../drawable-xxhdpi/ic_action_settings_black.png | Bin 2292 -> 0 bytes
 .../drawable-xxhdpi/ic_action_settings_white.png | Bin 2022 -> 0 bytes
 .../res/drawable-xxhdpi/ic_clear_black_24dp.png  | Bin 309 -> 0 bytes
 .../ic_folder_open_black_36dp.png                | Bin 283 -> 0 bytes
 .../drawable-xxhdpi/ic_gamepad_black_36dp.png    | Bin 315 -> 0 bytes
 .../drawable-xxhdpi/ic_refresh_white_24dp.png    | Bin 734 -> 0 bytes
 .../drawable-xxhdpi/ic_settings_white_24dp.png   | Bin 843 -> 0 bytes
 .../ic_video_label_black_36dp.png                | Bin 308 -> 0 bytes
 .../drawable-xxhdpi/ic_volume_up_black_36dp.png  | Bin 955 -> 0 bytes
 .../ic_action_action_autorenew.png               | Bin 2827 -> 0 bytes
 .../ic_action_action_settings.png                | Bin 2952 -> 0 bytes
 .../drawable-xxxhdpi/ic_action_content_clear.png | Bin 1416 -> 0 bytes
 .../ic_action_favorite_off_black.png             | Bin 5636 -> 0 bytes
 .../ic_action_favorite_off_white.png             | Bin 4949 -> 0 bytes
 .../ic_action_favorite_on_black.png              | Bin 3840 -> 0 bytes
 .../ic_action_favorite_on_white.png              | Bin 3653 -> 0 bytes
 .../ic_action_settings_black.png                 | Bin 3812 -> 0 bytes
 .../ic_action_settings_white.png                 | Bin 4454 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_clear_black_24dp.png | Bin 377 -> 0 bytes
 .../ic_folder_open_black_36dp.png                | Bin 470 -> 0 bytes
 .../drawable-xxxhdpi/ic_gamepad_black_36dp.png   | Bin 326 -> 0 bytes
 .../drawable-xxxhdpi/ic_refresh_white_24dp.png   | Bin 967 -> 0 bytes
 .../drawable-xxxhdpi/ic_settings_white_24dp.png  | Bin 1074 -> 0 bytes
 .../ic_video_label_black_36dp.png                | Bin 387 -> 0 bytes
 .../drawable-xxxhdpi/ic_volume_up_black_36dp.png | Bin 1236 -> 0 bytes
 .../main/res/drawable/ic_action_autorenew.xml    |   9 +++++++++
 .../drawable/ic_action_favorite_off_black.xml    |   9 +++++++++
 .../drawable/ic_action_favorite_off_white.xml    |   9 +++++++++
 .../res/drawable/ic_action_favorite_on_black.xml |   9 +++++++++
 .../res/drawable/ic_action_favorite_on_white.xml |   9 +++++++++
 .../src/main/res/drawable/ic_article_black.xml   |   9 +++++++++
 .../main/res/drawable/ic_folder_open_black.xml   |   9 +++++++++
 .../src/main/res/drawable/ic_gamepad_black.xml   |   9 +++++++++
 .../app/src/main/res/drawable/ic_home_dark.xml   |   9 +++++++++
 .../app/src/main/res/drawable/ic_info.xml        |   9 +++++++++
 .../src/main/res/drawable/ic_refresh_white.xml   |   9 +++++++++
 .../src/main/res/drawable/ic_settings_black.xml  |   9 +++++++++
 .../src/main/res/drawable/ic_settings_white.xml  |   9 +++++++++
 .../main/res/drawable/ic_video_label_black.xml   |   9 +++++++++
 .../src/main/res/drawable/ic_volume_up_black.xml |   9 +++++++++
 .../main/res/layout/activity_settings_inputs.xml |   4 ++--
 .../main/res/layout/activity_settings_main.xml   |  10 +++++-----
 .../res/layout/browser_game_card_landscape.xml   |   2 +-
 .../res/layout/browser_game_card_portrait.xml    |   2 +-
 .../main/res/layout/game_browser_item_list.xml   |   2 +-
 .../layout/settings_input_layout_item_list.xml   |   2 +-
 .../app/src/main/res/menu/game_browser.xml       |   4 ++--
 .../src/main/res/menu/game_browser_drawer.xml    |   6 +++---
 103 files changed, 151 insertions(+), 16 deletions(-)
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_action_autorenew.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_content_clear.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_white.png
 delete mode 100755 builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_folder_open_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_gamepad_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_video_label_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-hdpi/ic_volume_up_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_action_autorenew.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_content_clear.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_white.png
 delete mode 100755 builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_folder_open_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_gamepad_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_video_label_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-mdpi/ic_volume_up_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_autorenew.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_content_clear.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_white.png
 delete mode 100755 builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_folder_open_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_gamepad_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_video_label_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xhdpi/ic_volume_up_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_autorenew.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_content_clear.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_white.png
 delete mode 100755 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_folder_open_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_gamepad_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_video_label_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxhdpi/ic_volume_up_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_autorenew.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_content_clear.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_white.png
 delete mode 100755 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_black.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_white.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_folder_open_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_gamepad_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_video_label_black_36dp.png
 delete mode 100644 builds/android/app/src/main/res/drawable-xxxhdpi/ic_volume_up_black_36dp.png
 create mode 100644 builds/android/app/src/main/res/drawable/ic_action_autorenew.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_action_favorite_off_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_action_favorite_off_white.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_action_favorite_on_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_action_favorite_on_white.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_article_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_folder_open_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_gamepad_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_home_dark.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_info.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_refresh_white.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_settings_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_settings_white.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_video_label_black.xml
 create mode 100644 builds/android/app/src/main/res/drawable/ic_volume_up_black.xml

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_action_autorenew.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_action_autorenew.png
deleted file mode 100644
index 184d154f92246b5b599eb71bd6360fec92f915b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000A#Nkl<ZXhZFp
zOQ=<K6vlraNQpfVO$`zpL}Ca=HIODLfkq9qQHFykYS<t$Qd1Pdn}S_O%`~D(NP|cx
zl@Vl<a9|KZ10{+cP#F<DBt!UQ**dX1oX7s}v-gz?XTjlc&slq|?_2MCubAhed5)hc
zf$N>YX$Gblm@opJmyqo{C4Ds^&Y_Rb1%czho~}sD1%b1`7r;yxB<6}hl)!~9GSL|U
z+lzpkf%hu~+<GQjC186c@F1`bSOwe)+}_uLt!APX0=8EJj{y$>%W6!VcO}i#&>O2V
zF#+3;0?z|W$9nr$;XB}ENnh5~AE`DG0oyx($AJau<!|7Vd<DRtfHM^YpJyZg+y?lt
z(U?F+et!jg0DTKME9puPpzRo=Ap!nXNnf`GzA=HU`PVCDa~e1x>DPX6Nnm8;Z7+^M
zNcyFeT%!!wehJu?&LZ-A2Z4|8Z66&KdE2+dk^{b#^jhZxa#SA6X%jX7f~0Dl{||%h
z<&p;0yzLu-oxoNgbe@&;LkWrE4A|ZdMDvDx0PL^Ue2H`0(fkL1P5Iocq_<0KG$C-P
z;&7Lwk4hX4=#ht`#Pah~l6IHaD<Y8R!5cs<u8=LIDIY)}w)ctrJht>RlK!eoqLjc2
z;7uUjL)JGfpB_NlHvpgI&#^b2mK5)`q?AD1H9=r`T7N*&Keap!QOZ8(4S^q%K<!0W
zO5i3SO6ab{vsKdf6B4MF(D^K(OLc7)5eTEU4+5Lh!EQ;X>N*>wXFDcP42F<yn>Yzn
z$LNQ^zNUSU<?{*<lPF|P#^@bDEVAf>lMy{hmxn}m<){*~y&gCMECep*A}cD%;u6X%
zyqLeR#992u5b$gAY<_ac_e*k#1&NU3k`9-aV^adR0aqmbHZ1bFoYqRZzhB38fZq#j
z$nWBadrng9fg)){V3Y^j*CG$B4ZSLXtoi$Zr(%bsojARtkD{N7rBwoX=*3xZ4SY%f
zjs0;qurXgz^C1EL9Z9pr$n$~L2-v<i&*I*e9)~H)=19}X_l&nfz;@W#7q`(k)H!WF
z2HtB@^ZoW)ArMC6Z=jih-j?q9iu2%i;2Yo^@ad%6yGo)p0u>T_fO{%V9s&N8RQo)r
zk;VU1S|u<j6NAQR3BYl>trO_a#JnU>&4i>U#zk?G?>osr4^Y?t+z3CN5||{ib)TIQ
ss2i!S^rji;DzbI$PBTz9QeEj?1*@qvKo{-f!2kdN07*qoM6N<$g41lo(f|Me

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_action_settings.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
deleted file mode 100644
index 23e0c73bf3ff06eed0160e43d4d838ea6cc891da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008&Nkl<ZXhZFo
zOQ=m@6vuym?_xrVJVJR4B~loY$3!wP5D`Toc~52Pk@D;cbxYEnh>1scCQ76XMR`94
zVuHMvmcGNWJNxc$-@WfWcjv6(IqO?{{nuLGTL1Nlii;}lKP>>w&R{D8tqc^5K&yn3
z0W`A#z>t){ewOsTV9@_LUU~-1Y%?%F#mP=dC;B>oHegnYlXoR;?6UyOY#7iEOiXd|
z39v@ehq6GFT0&+v1vmo?O>yueuwK%`rU5Xs$-p$=o}||`M?&;h0DcF$lA}O}q)&Bc
z#{e^c2a+D;0hcQSX6BJS2+RiF0GEL4z#w1?Fc&iU)lc9ia2)ssECiMTqk!AMZb_c0
zD9H<86|g;F*&TA}7xl%zN<RYF<hjF=&c)h_24H5M<|DwQSmWK)dkk!q^eX0j6aX`G
zy*+@}cyGuBFI7pF^|4q0Uh@Y4Z<8_NW%UAh8k8ph<8qXlx7l5i?qq!|7QiNNe_6)D
z|8K)AxFYGj|7K>xfh9fzfRT}QPD?tOr5g)iJm3>_0Wh!&qwf4ZNw*s5n3;E}y%`|9
zGj#%OlAf0WAVkqg+S-r_Z<|T+vhfabzN?R#*~-w#8g;ENVGy>*lD?=6)Eo*-b2+f1
zK_;F7>uP0_2Exon0A~TuYQ1>m4*?fro%h4J0EA3T2TlQ=k$SlyX<JsxgAH%T^AfsF
zvo}b(A7i7Y^M3)TbO{CLt9gmdtlDkV%(^qku1b0rF0FT-#myXKP9>a1r!6XtX2Qz^
zl^C0YN;sX~Stga}Z8FyZ>@SVXg)*ovovxe2tAXUOath(Jw||}i1oZAg6S9z8DK7)p
zfWcv<oD(tK9jueRW58En5wH{(-Qz1|0O3ph)Uee1Ui@2fEcLz%`%?esX~oRk`I$Yw
z)Mu4QC7x9>sB*O*wn8aY_h~TzsQlw@wV&6sE_&Jj=U!;acA%)e7J#A=EPB3`fua#C
hdcKu`q7f{5{uhG7B|zh8^(z1X002ovPDHLkV1oHoaXkP4

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_content_clear.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_content_clear.png
deleted file mode 100644
index 85f7b680ec8dd97466e0268be1a3e3c87ce5b8e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00061Nkl<ZXhZFn
ztxg0n5XXOmK#=e#U_qflz!PAQI6!a?0`3riLt=OW5TH?D;ZaBs2!@n&lV-D5I&JUB
zCEaArW~Tf9n0BVZoIf(>_-O?G+rj2QbD&UxRzigW7N<7{iX|*upgB+|U~zhp1FE_P
zyo<<Z4iZ&e0#-!iH7DQYWD`);4PXr10XHJ@Z2_UG3&1|G3yehM*^=MIW)bkpUjvJP
z0*}Cjh<v1gP}ODN7})Y6egOwLPUI4B*6;b(t>H-A16O~M@Zb-D9S`2+-nuuZ6tf68
zm3;}E1DgSms1pOqJMd4yiM0faN~lZrfR2FefW)8^6O?}dF8^{ZR+iZg^hk_iPDGR+
zmw+!ig+f(gPWZTf%@-?QrGy4Z3_0P#y3?ks`C{d(6Yv|`9gqDz(K+qFS5tl}1OgJF
z6ThGRX;V%4X%h&WR7b$n>{1$HwN2bRk@_1pETN=kmkPcrfyhzm{*&D7Ea0mVh&3q>
zD5=?5!B-)W(xiM$wAtl=FD76a4=iJcg-rG+;fJ|1OOuK?aXQms&flc^<8)G!n&8B2
z$LWC!jT?!Ro78|4v%S#xjyu0s%Aj$r18+GuDKCP%*{zDmi)G`6vDuqA_lLFf8iCr1
zTGwk1SQV=s-yEo|sCB*OfK{>D@y&tSidxre4p<ed9sdJN7xpp9g628^0000<MNUMn
GLSTYJaRK!J

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_black.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_black.png
deleted file mode 100644
index f350724d334746a5ee4bf02c65ba43a1af34e0dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1209
zcmV;q1V;ObP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DlNkl<ZXhZFo
zSIAvO5XXP9H!QKEPZo%%Bt|77Dxwc!0}&KaqSzi1LI{e25nm$cg9yfe1v_FF3s^AG
z2Q?@fHHe5pEQm;KQ4xFR2fJav%{gb!x%b@f`oTAE_uSpt`R~lm{AXq`#bw46x1VVM
z<M!aR2d0t-b^+!B2LO8l+Xdr)2EGP90oDTF7C`L=90u$M>;Y^a*8c*01$+d&1AO1+
za@vH@w!o>t5x`~zrT+r&0nY$GWNUW@P6G~wV)FP0cnf$I__gWG5`evd3jq)BA|CoM
z@Ilyg5O5CQWpoiQ;T~Xp-KHi0djSguI5eK+Eeb->_>%YPZ1gg21-`6WPzPWeU<oiY
z+q40A4Okaq)cwAV1A%$K?%Ddk!|%<r@81A#Bzg?JsOM;4*KGZFz)iq!Ifyy{X8<Zn
z<yGK0AR3kH@`jHAP6l#=<68GV53C0CP?fm%6yVtGPcQDNHUM@6uF8yfIXtK~@jDB+
zpaO)(-v@lyMo9p1e6rU4*8@MM`>Q-~T*wx2ow29;>Tayco)dwSvOit`UTSH)%k-#W
z>|2atc6+4+;3B|VjPe+;ro+K5-4Zx2@q)Ma0Ptr=Jx2m(C42PV-6a5qj}I!!brm_i
zqa6b;H+?Tnc3a#Gqm5D(Le~OYhZTm6fXou(5be|8n1X)?t|<Xn2AD>bDGA_8K)&*S
z2%(*TtGkBK{J>Y@J|Ew^<A@(%c1Q;Ccnjzqr4Tv_I5Sx!IlF&M0P@Rx5m;FQutRWL
ztfr>G8vx7sWQsKAimV{606s4P@PEmd+&_vTWGGFhSVs(@DE10B<_6SpAxYU~8G6IW
zaGDG`1UNrC=%LUsP59hIr%%ram9+L|Kt?)Bk%=zOX#8iuEmifX3BXps<ylqMjVfyF
zl7>KM!?Q57tWk~hV|i#>H&I>c$n1YF&04^ZfxCdehA^~h>lVPp!2a2vj{|SkomB$h
zKDl{HYyI|qNUdEMY7<_mf+_RhY|-n$lT91j05F~E1*Zt9ybV0s15eV1vw_1i{W8yc
zOEkU>0QFiM7FD#EwuMg&0mAbwnzo~<nCou`{wRfMTL9{DhGUZ-=QvUKpdjjucgAEB
z@4TrfT>z+T-w;muc*H@J;nem`81sfrS}fHs-`Dtjrc?{0D}V^%l4LR$mHV)*)}`!Z
zwz10Q4_2dZ>q=P$0ieMSynNWcjZ{prHtw5@Kf)sW3>*GDRm!uB`Bvk^^uR#@#5W-b
zIeRK!ggWt4_Fb^%`F*nQ7Dp-aglR)D_``x>0I0&=SrBOh<ag=DoeAxb9vF7{z{+f6
zQFO37kPHjJL+fr<55x(Ala4&xY)%ZfVybLH)&~If*TuF?xDtm1(H80XBP||$(JOrc
z@F26xxqwu-NgNSAJw)-Fpu0~1DmK46SG6t8#nH?vz_zeA=^H>a?1V5{jQTBbk}|7y
zuQDnC8aXFaTW|isz+ihdUS*>Mpne&w06y*A@}O|k07hl^M!nMjMt;SG1ExJNZV&ti
XRGrN+geHsV00000NkvXXu0mjfd5$c*

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_white.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_off_white.png
deleted file mode 100644
index e09bac46e14b18d2e15a23d46feb31f435f77d03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1353
zcmV-P1-AN$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FLNkl<ZXhZFp
zd&u5n7{@<fhb1`^DP}@*Oy=+pnQd7%g=Wk)Tg++AA)+M_jdG4MbIKuXm{y395u%79
zY0ig@BBva-<hV=Uz4uS|``hz8zu)t|&-2Xcz5aWj-*sR2^}Vj^zD}>$z)2gp{tN+F
z-yR(Dzy{-ih!_D(2gU*W0^29$e*iuJUI7+K`lJ=8h}a9528;&w0d`3IKLYOqF9HiC
zt*B$1$`Fc(ZGjtr(|}DXgsuUW0GCMmGUttm;lNG6iNHn`a{dM$0Om^isTFTa01<H@
z@D$+7+o7L<8Iqp%p@=vZco^8G9U*{?aGa!fo1JS4AR-P(VPOvpglxqb>EJ^(yw~gw
zdtkJr_Zl%Y1P~Eh1MdL4mkxajEC7}PD`9ONF^}KH*}%vW|DWmaVWr<c0`5-n{)L?c
z>;@bS%mMZ+@tfx$NxzgqGy`xOa9)Y|7T{7zg;M=KN5sa!g}}AIrcKQ0vzGz4O8Tb}
zPed5(b-+cX@AD;{UkM;0b_SdQa;x1aX>Of3iiioolMO)p1spHw*_v{$_an}D4Ss~A
zZ}Ri&cpxG!PT8X1bL@?h<e08S5pg+ib&2^3N!Qd8(D(42@!kgf77KEAySWO$Gr+`*
z=?qEt)xFq!5wSV&Xyyf5{}f5TwJB#7aBp^IsU&B#|EQ4%96o+f1r3+<RXZ1ViZ>#5
zO{ugHxl)n~YD)mCfGrY-!)BNyXNjIuMA*QN{i1-bmb7IR0H><05|cB90l32UoDu+s
zpEI0km83$qwLdfpp^pLgEB}WO+6BnNcZH;WwW$$+$AQTifGLs|_uTw_$>3z*vFz?;
zlEzns&}`t2jA@Ca98k}&L`2z`^CVqa1z^YIwxW<Z21iPAIqw-oghRzGM_$zrlk`?g
z0R9*eZoW><7#B;L(lhP*ba3c6gbG?NY5%eg&3Yj>Wv;+E`pJ^q>vx?ZVp5tb^1G%>
zT2u=_@`9T;H)jR8tvyuIXWc{)5qkg*le~?89XPyEJ!&-%xR}`sdF5LU93jaAOUEf9
zJn*~*?3W35`*DaQkFD!a)kHQn_5S$?_%bj-((j!_5D}XJ?o^K|$vsn2-VgQrTxTXO
zx3w1V1aMM29cnAEsq=KoJfXz5K+?Ib&ej3ohx`I?WJ%D2!0Cf+Ga|y?y&sralD{;~
z4=vmHN&x9WyEeShV8px!IA@^EUg~x30?sNa??*gV((0-(tpy-~*c*5?+v60n4Pth?
zo=BFzvw`v-+S`)8uTtLMYXe9i4o;7{ys2>En^pHsq?q@RRBSB@T|J9f`P%bGTL3Z;
z&jZ_)EaZnhwJJNMZ1YHi2kRZs7)hVkv3$YPHh=`e3onE4+sNr9D<<jJMoL74dwByL
zQ~GYD$JJdY=4S^4AbS(u54mU0$%FVrN#Eu_M#N5lGs~zFzl-B|Nnf{P`9XQ0I2;k4
zoed%%fc)9*#xat-2y<iRMb&eF+k~9nOklm(9S{xJ0~v^Bmi-PWHVEEyl*7%yC)G)n
zt&j~GK(er7+smwS8{h?jsox+Dc*2`0>5l=KJv-D9011S9nT57$g;KWz7qnY9n#t@K
zfCR$ZgZVCO4KDO*<|;|^25a^Fd`AIf@4^dQuMrFRUeC;t<c)MksVe}IH>Rd0%{!%O
zlAQlLPF(|#K=}V)Yb3dc>I!ugKvy&_2^|8^3oEy}W5@&R+XMds%W9lJJabCs00000
LNkvXXu0mjfi%WTs

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_black.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_black.png
deleted file mode 100644
index 2e1df8b4dec074925f19f342d6f37db2095f9236..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009UNkl<ZXhZFp
zOXv?#6vsb*??(yAV<8enl1RkD3L6TgJT_j*qeNL*u#uD^3#B}hl2TGw*eH}N#DZes
zu_4dA^3JPo-T607Gjs3Ez4M#-)$c5SzkAR5e$P2`?mg#r(dN?C=J@Fls5^q42((iK
zh5*xn@xTaRfC2v%cmq5I?g8&Cq=o_0fN{WZV4zw54R{Sa2JQkMT%6;QLj8e-zzm>=
zMd?4_K5!ZMm{>a)SOiP~Yw`FC+ySlt-}7wR2#f;O0y17iWb_>H&}^CntN`SUA|fZ8
z0$yfq$|Eom*j&PBWJ_KY35melqL+nH&Nu?RN?VXcpdYXu7+S<#DQo|j-+FrLc@G={
zekAo|5m*Au@iZEG`z_$23xPqvPQce|p$RCO`+(1J#c2_kYpO+P03r0Ly4|o5SO-iD
zVXXokkARal0!kkpT1^xkZc3wWNlT$UK;I^!2Yv#(+L?gL=x!T<CZ~|@S^I4SHUJYE
znnJo~ov{&E0L*JBfeXNG8-dZl)&>&LLADq8Vk4mccbGeWlX$2{h%Se@WmJEv;aJ%q
z^z!~e;H}GDNNaRHYyrkJgv3qYQW}=Len9QsHlTOSBy{>70DcuEp!G9>Wi=8|i+arT
z$*C}GEu}Us1!mVo;=1XJGtIjYP%F5mh8yZL;3yDvb)_SqjeUTPfX;|kh+4?Q$(mp0
z8;I}G{6<Z_KJF?-b0#(Mnl)L)C57TjG+q&js`>>@AoS5bw<0$SiW1N^O)55(m=)PD
zX)<@b2>9s0vMEmcUlGtZ;X8JTbnAX2&u0#>vOt!JK%`643thc6C-sp}2E0?wCk^=!
zkS+~)*LzeaH7N4D(;(Nk3T1g&C3ba*Cg=rl!lhK^h1WL%k?vl=a$u@sE<FKGr;Q37
z_jfM~MIb5&iycOi4}i14@1kI<N};4)wWISh-T>4NYQCw-br1;|fjFR9<`Ni<)OD-8
z3S0|<I;Ny50x~ffSY;w{-aJ2r#&3P<@ijQsJZ$LwtP-g*0+j#`eUP;TWGl{r+K6;g
es5aLd!~X%ZaB?w8P8eMP0000<MNUMnLSTZyFL+S^

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_white.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_favorite_on_white.png
deleted file mode 100644
index ff9d1dc74b5bd65681b6d7509bc91c397b8e56b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AYNkl<ZXhZFp
zO~{UE6vuymL``Ibg(;sk@|i4Xlvs#Du@DPyN;HcZEJRkCW;PZ+N<Ly?A-t~*7Q#Xq
zU)d-m!elW+O5~e`7>-U|uO5%*{=RN{>piQd=ef@RfBx6G?sH$~Jfe%6x_JC_3;5m{
z?9M=!$$*)S0NQ|Az&K!F2>uCh8#oViNV=OQ%FKQSmI5<@vB03P{wZ(^I0Ljx`Y+Gs
zWF8?i8vtwumIJ*qKtBRUf%TH^H?B3aVZc^k5zr$8=YL>7utC!Ew6&=M%xn^H9B}d?
z_5xTY>4ZC(*?iy-@M94Wz&Bxmr0Yq3i2}@QVmKC_fimX1xGXpx%#pn$4$r_$NjF+8
zXeq$V`UBU1k!2!p@Oc+L_pXTZFECls%VwM;0Xu=!6-i^e?~=48Q-GNb0lWfK-L=>P
zJewmVJ!}O2Dg$P=E>w%y0mQ)b>b5OQz)4_U47M6DPD%2L_Ssrxz>m-H8pvZn-jn1n
z)Kmelfxa==YQT6Ssb7|WSHKsGY6zq(<SR*D;!`u=HTR1&m1V2J@2;fLSprT2vuhxa
z0eM8y;w%Aw0e{3`s{!LTNqe&dOaU&}KwcHnUt~iiJx&$iKbqN1V0=}^$o_{UbzTmW
zAL1au8;<tK0aSr|4@{KwPcul;WzN691Wc>K8qs&Vq_wT^()xihz!l(!h=G)Wx(7^<
z^rn!2aFkX8`^vCJ^6?gRjwJ7sTUwr;csKBSq=1UTY>~7f%_)xnZ{)o%o?Dc?;`)m|
z0g>bnaH3@j2uH~;cYg!^j`$Yl*O_0MYkuKppwYq11_KuWf4J*3pEJ#n<g=zs%awsn
z6f+wdMAUWJ^9jUkNnZVOSs?-8IE@0%mY5Y~1@tUboZP`XU||74glE7@n~RBIe!uZ@
znK-~oA}J*xi1-Qct9R8q(}Qqq?v&Yy(gK1AAMl<6rj{WGd=Tts-ru&Rtdf8r!b|M2
z5>3!mpMFSsR4Ve|R9Qd}(FZsHEXf(nIbfkA@4qWq6ahhmkIZ)ft1=?;Y_&;xTPgCG
z8E6c|%)A}_GoiwHJGffXhZw<^E~8oGX7($v2k05r8n98)rYzs0zehVl&BSK55I7wE
zjaeb7qiAq>*4HK=JQveF3zGc*vs$cH0kuTj1lld&TkLWgM|TFkcLqKI?5pZAgvNvy
P00000NkvXXu0mjf+Sjc7

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_black.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_black.png
deleted file mode 100755
index dffd0a4fe30c98ae106624f9bb4ed4aae99d5c18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000B|Nkl<ZXhZE;
z-D^}w6hCL~ZUWLKQPD1WswLHjY<B0)rJ)}nfm-Q{4_ZM4L4EKoEr<yH7mA3Wz6oum
zrG+AGseLG=LMn(Fxp(evHV<n2cnYf!yGun#cJCY+$<nZ9cV@G@O|E8OU-q2&o%1_$
zX6DSf2r(ZRbN^wTz-q7H`U<>CD}b)+?qQ6*+lZ7>>aLXXG5}Dgh<7Z7Mn^|CM^SW=
zh&DBH4iTR?j&o{qa&m6X5fDNQA>s)la+(l`i0E_>1T$-n0O$NY#@I2FV@jzDVHn;r
z>DkIVmO|NVcDLg=`%Q+UD7uu(<^DA3*~+a5jE#*YN~Kb|QmGWDr>Bec;GX9tiRcgj
zd|+YtdS74PcM}s6)q36G;o(#=nM@4~3>21=FNbYKfO9^^7(0lFiiqw2z*R)d`@UcC
zJWmkOJ^<Ki;rt5~MASj})%X2ik$i?Rwo@s!LyL*%2Px&>Hh4w?BO@aldwP0~6H%%T
zu!M+nMD&g}YGbTUM*+Y+0N4Tm150I^;KIVfnW?F%e@wVW!$Jrh-A_$GU6B6~1i{ZH
z+@=IL=WjE{z5swXOh8?bKUGSd4a4wZGwfyr9M1Vs#@J{VoU?)?qMK66Zvh}`c(*hX
zxURd4G4@%ri>Zkhx>P6;(Njd!tEY3^n6CABh!`oQE=eh`v`jz<@f84Uv<lUKN)<%B
zR;g6}%IEWsYky}lnXSoWau*SO1OUlaFm?Ii`~H_L6L4L3CnD|vfPNc;i1@5ptzOLK
za<Y+rHk)-5iNs+d+F*kT0A(V&ETz2KG66lob=^V6m^Qf0V33qjKZapAVREc?r<hU-
z5g#a}E=nn9SGtK`%o`jW+>lD84gkRWjf^7V?Q*$%er9H7-b7$%XsEZpzki&F^rf}j
z(EI0lu~__Rc6Roe3D0(8G1qm+5i#8W@V6icem5Db$%PO)HTCbMK|}>9<#_<m7oBm~
z5&+NhbgA4ZYF`IIaKmVAQGs**A!F>wa{78TecwNAi}l(Nh;ItTdK1U`7>)f!)=nug
zKR<t^P$)dAoh0dW`mNsH-jDy+Qi5~-iQ_o?+9>998SpP6zPVVASf6+`;%yak0I=%i
zv{Gs^48w0$R8H$CWHOm;iA3V_)q2oWtJQP)eEvaOwNR{|l$v?7M?DeEA>v9O^+ZJX
z5pi=@AN88V(zXgB-cd@`+A38cgaClOEw)wk3H3{TTZM?W6A|lZTSXJljjeLIJgggA
zOOMA|ZnoOkLd5TNPpLk)yVlsUsSMY2Yte>4?3=r>Z?DJx1BZSu$NCeK%|7XdPRj*W
sH=Jk(bDcmt(d)$A^%dwu6x+dg4v@VqPk6iB<^TWy07*qoM6N<$f^vTOssI20

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_white.png b/builds/android/app/src/main/res/drawable-hdpi/ic_action_settings_white.png
deleted file mode 100644
index d2b6e3e698c2fde173ffb40cc5f3aec7ee328018..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008?Nkl<ZXhZFp
zOQ=p!6vuym+<^h^L}G$O8Au@!-H4Ha0p&FzuK^-ALq-g5L>Rc-+=*8)FfbxFuOyTV
z6bTcOiO0aeV`;HJoj%`p&i>AKy6oINI(63TzaMM=*V-cSp~T~72*BT7!Ae)a%&r6T
z3P9bJw74qZl>sobF~IxCz&a&;h?LD0s}jI$;C^IKb0j^8lpQnxtATToL9LN=K2mnj
z0PF?!M+UV|(t$|XK?86aSRWZwzoZS3vh4vdvn9Y8;2O{i3`nw?RWln6>;ZNG{v9(u
z0*8Tvl71h2GxIaK2-pI+-*uAQZ_|-`h|R16cmzz(Sa=4U1p0ybz;R%FOw<iz-U2&-
zn_=}f15-0{Pk@<{zBIF61Yoz%QWNE`z=)E8*Q@2(>Xvk<WdLS27I+GDRup7eGrq;9
zNqX1FK+_d4vlC%2mUUdEUazFB(E!YB7H|(3US$+**!l*{mGrRQ#vdyXGQkaCVH*x>
zs_xiF6%%m_=*nh5H{1xo3gBWJ!9NcN{|fLb*qI0{1G<4JZP;EZ=~7m|5rE|ZK$#5F
z=V?*W=SD%A*+}3hu(1RP&r}ZJaxMV>X=Z+zIIkJkf}=i3n_}e6>{N>&{JwDhG*Ea3
zY65090k{AxhzQEJ&5UL<U#}ll;&J45x(%$7^g22VWkC2%+ym?^0I^+?-^kI!%(el?
z3KWhwO(}g7XMi|&8I|K~vZR;M(f`_}lYkdFI-evJa;vC<#>~Dq%2>g<r^=4{^i~8W
zq-*Cm%~GsM8dhZIzX6cu77BDa%|o1Y8cq5lGqbd*gqbBz<~+5gOQ!>wOShoO(1&zO
z%CHJ)7xe)|x^0yJAg{6It;DWSVYO2DWck?}z-jdzz*~*gHnsu?Z}FW4t~O~cdf&)v
z-7>Ak9!bu#evZ1<;!<F3Tdl<+Dx3XpX8&e$Hx`7MCEs38{(&R;C#JL?`9c;+_n9^J
ruvaY?Rn%AQv`TwJ0IHnLGPZsIF4Isz6u(Pk00000NkvXXu0mjfO5|^G

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png
deleted file mode 100644
index 1a9cd75a0d2692fa380f367bdb41c2420df310b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpG*1`DkP61PSG>8J9RwIIzPh7b
zJflYMsk(bE^P@Beu4=(eGmA7oyR_x~a$D?{a5p37g|Cs|p&E~Q4@@WZu3cW0RzKfl
zOG4W1`7<rjzc~9@CSNI%iRiF;JjK{+?eT+CHH@6DO6**0r98#B^hN&uYw<r+LK-=x
z=P)g94o;{k(CP_bJ;t_t$BlC<pY$DneQ8zgpQNAtZt-*3r-keNYU~2KkipZ{&t;uc
GLK6TsDN>gJ

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_folder_open_black_36dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_folder_open_black_36dp.png
deleted file mode 100644
index f7d4fecf5e5e5e9a043874a1920224a8950132a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+Y)==*kP61P*9>_N7zj8A`fI*b
z>L~H>cYL6fF)d0isGhlE*V_p}Ry(;{*|zUiT=i|jwCoGV1-}%Q6qOWB$y;b(Hlyb0
zkz1V~-`|+t#L6wE6R{zoN{7FnBl?{B)+aZPWHYyl#hDrw<Y_Kt|0C_pw?O{4B+yz0
MPgg&ebxsLQ0H<C$TL1t6

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_gamepad_black_36dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_gamepad_black_36dp.png
deleted file mode 100644
index 785307a7e1a765bb754b7c2a3f2a7531d3241cae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+g`O^sAr*{oZye-gQ50~w*mbgl
z=je$e9X^TQ_thlw$0`I}-EMh?`Q^sh7Y}>xI<~ONcH0-rE4w(k#dIPzR31sQy|!iI
zt*l8ClTRJE8W78!z3Oj)kEw4R^V!{nISsus_DiKY{+<^MZ7^gHVLc`jz$#JTAewx}
z@age)_HOmfKcfGi>%UbHds9E@f5*=H3ZtWQ${$uH<nsVcH#pqCDSUDb<Fy3;Zy#l%
Rdw`B*@O1TaS?83{1OVOtS!4hJ

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index ffa7be9337df524557807b421e8f0c5a5f53ed08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003>Nkl<ZNDb}5
zy)Hv>9LM4B;APNAOe8{k>Ka6ZdoY+NjnQBvqLY`~Fj)kHsiE3P+(RRg*h+08!O+I(
zho6SjasKC2x=Ei$>e7EgnjA%{)Oq895;;7zU`O%rIKd~#=a8g6u?vdBGOxHivmmj@
z2SsC(rUrR3c=XakiVOw5T<}RzSf;7Wqym`bmKJiu;}uh4Kp`07j&E|~7*l3Iq1dB^
zTu9>s4JH+eU4D=YIZR%m*dahJ6fqfvV4Gj$LKWkwQ`9lN>J)WMpE|`oCaq3U#4ITW
zE0|Ncu!T8O42qaFxsbxgOeq30m^#C9;|Oz2LJkaagV|RUlDuFpNhkz^Twxv=Q8Y3%
zT{Eo!X1Kxl%qbr0d^sn}1pV|eL6!nd4OZ127J0_yiFvh;aSrhbdgFjm{S`?zDNvzC
hjS6RMFs3g3C-2Jk?*l<_)DHjv002ovPDHLkV1oL9pSu76

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 97ded33b5558a0efbd7812296a52325b4170076e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004#Nkl<ZNDbw|
zKWkG_9LM2rn&J)EKcX)|QBxA7DuOQcHHaV%A}Aykq)R{@96NOoL5d)CX~99T;JZjm
zkfPwyrL&^snmhHL^kWIaIX(SdXz$wRkxnK)5?WPR>=4>kIV21T<&3Kg>clSSXlU}7
zNsTbZb7CDT8exhj%*e(#KY#)6xy}u?uzckjH(4PAzEPEh1-w0q?BPAtVVvU+$MuUd
zim^-?Z*&k19JY)eT?W{4>I$)hC8bSG`$%Zf$FisplYAzY(o}#3ePW-OP>dHiLTyE8
z5z6Vv#(lhunj$1*cz0EVJ9s@A*ucB3BFy1+WndHUmWuEIZ$P35H8Q+=vQXg_LqaV@
zm?z|TsTk9IA=am%09Qzftuv(%OIZ4}NVJa{^Q2f76=H@QTgC>PWY~7OsDpS*8Lt)N
zEWbIfpG@m8p5YBC;_%wCP~|(2vdmRx>0#;8WR`dQ1-2NIjXDoGtr048h%M+pCV0dp
z9SxU>omUy0Vn}G0s>)%9(6-8A4Tr<waO8Z@$@CACWH@6@>6%Lb0000<MNUMnLSTYt
CFvc?g

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_video_label_black_36dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_video_label_black_36dp.png
deleted file mode 100644
index eb0aeb43c971b9534e8c159282e36d99a59e2106..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+iJmTwAr*{oXKZI|4iGr{q~`So
zM&}#Rj``;kqYiQOI6s|JtYW{i>A&Mw*{LoajC}9rmr4{gKb*Yr%t0Rc$4w2XeQa|K
z6K8Ht?mJV|?`tXaHh$@jdb7L#EgyMos-OBH-LF0`z{l{YNHB!h_$TB|tY~*pzpE;5
wb8FwuO8yVUdIo#$gbB-qJ-W2CrX_-LqT}Vi366%6K*uq7y85}Sb4q9e0MQvwbpQYW

diff --git a/builds/android/app/src/main/res/drawable-hdpi/ic_volume_up_black_36dp.png b/builds/android/app/src/main/res/drawable-hdpi/ic_volume_up_black_36dp.png
deleted file mode 100644
index 757ee1a0775ccf77f075c3c4c2aebad039a29f75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0005INkl<ZcmeH~
zzspi#6vsc_LYI<=3JVH?f`}TlXi5m88X9V-pdoT-ZZ1h^XlO`quK%HeK++81h4&qV
zHxQa?>lgh6kw5YTA%}CdTY=9JlKVN^;VU1I=ef^0q^uMv?`d$7B_Y3RlPhF!N3?pJ
zA~^RGWWtySYz?atEKeC&A+OjGQYFMG@Q`mt*JpP)l`zi%URoXbP%7bfWVpjb6D^`J
zDj|vMj5TvFj7mtRqL~rLLa2m4QP<R30M%b)S^Angzo=?f_JRU&%9?w<sA^UweBn42
z^cqY!yr^ncCVXW-mUEh{l7Rek&Ht*4CF0Yxzu_ShE@OE-?GDI!$U0bVYX5|XY)l@7
zqV}(P$b>QqyR>`TM|KT`tahs_AUnOhzj4HN6iU7aq=lv8d-N}2dE$Ag+gKt#>*p%?
zhxj9Vv0TvP-Ox|W2aXV@txwFMu#e|+_7LZc=Gxw4L5{bYJL^60G&I%q9_4OnX2?<B
zA@v47&~xZJe%H+S-6Zl`EDq8^wBE4IYh~KUBfeu*JH3{{XABWjP4dfGb4S$Jf+M1}
qP6<y`*5eWx+<8ZxA}J~V6+Z#g2(7*d_(x^{0000<MNUMnLSTaO-QubM

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_action_autorenew.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_action_autorenew.png
deleted file mode 100644
index c122e733094e8e2e254211bbc295f2a7d6efded1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006PNkl<ZSV!%a
zIcpVR7=@psg@RFBz)I{~z{*BQu=5`%LI}jINCXYIblRkem6$>;f{;X%L~!{Bb}m@i
zxmJRWg(5D6A|83=3k;V#cfOgq5`^6HyEAj1dCxiTy<(X^T4sG#0RI08*dCFz&@@Y}
zCt&+2aJ4B!V*uN$fDORI^!5)VP1T)5Z2;T5fJ49@U@Ne>AbMHSVjYNV0NVq=ao{kp
zu0$lPnD0A45}yHf17Crgz$4%t5E=Ld%t)H8BOcdgO~Cd9a13}4OiFsbBxL(phy(MI
zeizOMBz>y_ssu=$-vHv_XN%(TaN8%kh;IR|08^6Q^n%C%xR643P10P|8zrbw;0$nI
z(xt`#scN^9_rsFjW&-R4q7AQr(V{h-_xGHD?Tx_QRJB1#KQjT=0*`@D(Hcpg%kIko
zxCd+kh9v#S1Xu$+=?6e;yCxRw0PX-Ufg_DANP$`k;k2aNnG=YGb-Hy36F>y&B5+R9
z$3o9n11BY2FGAVg3rwdSGbZVE;}(=H72AKsfuoZ46|M{MNnjf=+X>eVq;d~*yUF&c
z5C;Ne2-ptnPiO0s_v4bjS6NmY!1g#WR`TFjy;0k_9P#Ymf)0;Ifb)g3==ulXMG9R{
z&ucBBvhmrDP##R*9{|4es#@z1mgFENF(GNN%IALqkSf~h4{4(ew0YaU)v%uswQJZ<
e@f8bV0)GHowZS2{!w{7K0000<MNUMnLSTXf@dp+F

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_action_settings.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
deleted file mode 100644
index 52d23eadd286b3e50addf4ff11a7ecf9895a1990..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800052Nkl<ZSV!%a
zy-OWY5XFDTuR>B<YN3t2mDuDz5JZd+&?t7IjfH5XR(=#Vf}LPe1XL2i{~%4k#@<R1
zOUsbLuOk=s!Ft(!k2Oy(0k^z6Gw0lyxpPJ&{*)M>cLM)s25h$g9Z~<>N_wo?Q!mPZ
z?MYxP0y~oQ?X3uG10N%>Uy>G@P9UT^POa_lKz{^wF6ndrtjISeShobWL!DQFR^SJ4
z0ek``fc7ZZ9q<)60{Vba;2v0$bX%60Mg*pS`JA(%;p~WQb|mdrCSbc0I0m|^)-|%f
z0Y)VKEs9f`0o&uiVjb{n;4J$;0Cd-}-IR1#mB0|N4tywZ+zs`X6l#p^HsA{|TVVSK
zSeEp=5`ir6Ag~1V<ebCJM{D4<^Nd7j)O;qcfDK8fm3tr;cqY2piKMlnfVNkF;oQGn
zNqhBrsNp2EosNL*bS1Ezwh5d347Vg5RC)!;2T}G6r-8X7qc|f_6Qi(z`~)tuJ)lgC
z!afkhs5cX%hahGz7Nd+rIyo*IAhzFbAt{-7$yc(pOX)xE2hZFaYC$u>Dh;C72Cl__
a&%hHbyt*L@4V16|0000<MNUMnLSTYj^wl5$

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_content_clear.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_content_clear.png
deleted file mode 100644
index 14bbbbf0e1deaff9960b8c446869c25839eaf74c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002{Nkl<ZSV!%Z
zu?@m75Jlggff5QDW?%`{ASE>oLWqW%64qb|W}u;fk{J$JG7>~qY)3#qa!T8|dwzGh
zh>jn1oSy<v3={+ZVZhA#Km}|i-I`{Hne~7fu#<F+&6y+vX0`$*z!{iJI)wt8*$CJG
zL*O83`7Qu=tDO(*Aga0vfAhvOA($is?#0^ej=<sp;ghd{am-R3A{oF#I1?|4e87kH
z7qFOqx1R;@1o5oeExVcrOA~|01_+eHEj2c06U6@k1iJluB?xu<*P5`?&oE`kq?~Cz
zh<;%d4}fXr&uA~{@{u_Z3!1avY7XQih@C9}#XvF8xq&-rj)Wo2yobX80000<MNUMn
GLSTZuZGB7t

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_black.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_black.png
deleted file mode 100644
index 5c06d3988efc87df5e0f12d5a090e20609613d02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000BeNkl<ZSV!%b
zNsCrj5Qd+2o;6A|V#MGOhlmkDvk`TnQIRBS5{L;z7g_id6u}50x^|aEL=*>bmZ&(a
zL<E(H3Q=Pma6%lSMx3X})6{Kl-~R45c0(^L_-Jn5bE@7`^`5ut*3rtWu9e~8J)lw*
zDV3piK>zr41=<2HfcwC8;89M19>74LH_#Dy13Uq4#qV_<uwsC8HVYU8bOr>cy#-zZ
zPk|G_k$Co92Vf#F9_SL!ZDOAwo&i^ZJ#nZexC#N%!C>Ggz^oLr|AD`N-LdFv;4>)6
zO|!KDxEu#;h>->4^Dy9hpl7Ul9vlA!JY}~iM_)kjg1QiEKMgQu@lKTWab&ko9JEuc
z{SVjz{1ZOv|D6S7Mt%f_#ye}iE9!2U3}oqCHxBqR1uF69nghVe;Ejh6xaE|O-^5=J
zauL`V>k0xI2`mUO4<oJCJkQ1g-v)7ABjL9Jr;6;6lhUDAWM(aJE?J+=kl8Vab`Us}
zPG^B2o_abkD&Cz1_NPc*2$wOZ0@LE9;LTFO3@rveh<B^<ZbBxCH!$IaeDfxiGH>vr
zSo8o`nFnYE&_1{#IP2UJW|jmYw_X8D@&NrBgcZor;6zIRvee6itLoXZJU|QMYWn^+
z;8IJVi5SMxZUC$E08IgA2J+*;_N;I<13=3(2lyg<9R~i$1N0H_3t%r&xV(}#n*l`H
z#ek3&g;#C+9k`MQNJ1-I_9D$*Wm|A#bC}%u3YZX8_#4<1eX-tup<eb$2$v^NWfeMA
zx7HhHEY)2hRqd4seV<OBG_Sc%24<vg!4BX|4WNuOCb;7ipdF2_@3n8Ryz#@*%>zcq
zO8F$g&sPD;7$bnWsfMi|)!8gHvSRa)iakFXq3iAfo1=qQ!Y2o{AAk?zFb;O><I*(o
zQw&ftihLK1(9O4jofYWQ5MVaYFCsgVY>gqUASX+Wuxf@*e@=CD$5+Yd=#WQr{W`)(
zVEdNlT(l-+B=>@p0+giG!ONjdeR7YW9Il-Bvd(?)#OZp$_}&I8XRej1b-94dl(Ui}
zYBCK-^nGz{9pW`V0zMD5PbN;wq?Vachqt0uE+Cx<N|lx9W=gX$IvpO1XWM~OWOB9d
z0qcT$W$9QYfRdBhUX%p?x?deJQ<{BH$uPL(QH3pU*;Wl8_k0{JKvmb$CG%OG*;`3w
z62#R2a<BWk2XTjIj_*k7hk>6u6<f7{l0c5H>Wpo{GW{9tpos#Pi>y{a#_>CCQUG$c
zsVXzImMnW<iL5nhl;vh6y{<VjR88F6J?{aPO6NO5|HdV8!Rsvm0000<MNUMnLSTZ9
C71p-^

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_white.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_off_white.png
deleted file mode 100644
index f9fd017bd5110e2ac3940cdb6cccf02f17eeeacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000CwNkl<ZSV!%b
zYwXr@7{)&ra<-gJatNEv$cA2Ija71{W@|{^WF2OvOvno}%-F1~m~wo932jadg@$Ym
znO3I52s3OU6Us5SUAceu^!%US^ZWh(&-0=e-P?cvJ<s=aeXsla-q-zz9W1ni;bAAB
zs*JQ{C?fU*1_LJphXT6+zW`qV%O!o=>VSwC01N>J0s8@e1K$B31FIzcUIwfbP(*mM
zdx0~6{(!-GzBk_tYy=($=1BV02Smiaz;(a`;2>b1yhH#7u?biP+$hPH>JdEvMTA*6
z3z!caQbF-Qz)QfioOd5E2H2%y-S@y1z&nzB!T)1BKoQ~3qw?lQ<SgH6Dezg|@~}+D
ziNLNV23VYP&rKG$0;`=?U_-KdJaA^R?djhnlW$1!9^0ZBkQsRz7@1=$GX>7Q)8d1i
zI;Z0*;Eo1R#eTl=ZNQV6R;S9qola|U4sc3dWC<`%k{N3W=tAJ-r2H$>D#<x-84+RH
zA4=hRjs-tilG9zbW+?Csa1`K_Un1$1GC*d>hd6HcUn8B(Cq#rrdna&ljx7Xkm1NPE
z0diK%p#L26C5<ZsWaS@|gU3nwylms*`-s@TK^L1O{ZwPkvB3JA_oXDi=xx!gA>VB8
z)Jng0>{K1vZag2)U#YDvlFW2VKrUVuwpHI>k~Puw$a?j260%X!!DWEn&Kl(L;gbBh
z>k$#IbH&~tN^(_i$<R%}J&F8LV2UI^^{z!kxCG1vCg!FyB~32_bQ177a5(TaFj~?_
zT|@Jqy_}lWePCM9`I6o(17tzZ2ChyW*{iNEysA@RSte{R-rx4J2pBKPzSuKm{w5-Z
zW#O`Q`~ge?o|5Du*5`-_0~ilH4D69cJ4w=WjhnVISLfJTx+}HxBXA9{ps%13%vj(-
z;J^g%0C2OUEo}iMOM96W;L@CIBb*Gp+S}TcHRpn~n8L7M11^{3r@vja>xYg8UQ8qO
zymdBINp|qs5fOgUHrf-?yFLKMO7f%W5$ymu=WazF0glX-ZYi#n^i~~25iuNaYTT+g
z*5q?vR>pKy3u`@%0G`kG!JFFOrT}l2ZJKF18<+>!w;Xl>r*1_%E!O(g5fSHP)8<~;
zYiz=9Q<pYxo&t6w=8|F4v<-Rwm6G18Vzw?Ix3w1mt|3J?V4>dvJS*wXd<?q-mjQPJ
zg@D%rQ-LLQs(vj%d6?688t?*OrW`H_?rYqnIs6jcM-@-|(|oC`>z0h#fC{Q3!fmKa
zf^Eja{|%Ut<Mu(93>VS&vkF)CRE=ru3m~sK9he2Usyp1<IQr#(*BKYrPkLLodJQPk
z=XEyV$AI&igzA2JYGdPGCFG76YFr!<2LSiG(B*4-0+`;a0@nrACx)6p`6u=b+4jzo
z^h4dlTg~ejP^QpAMv?{IQFH}RM+ll0?*vrE=D)M)VKkz?O0oa|002ovPDHLkV1nkc
B8!rF=

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_black.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_black.png
deleted file mode 100644
index 444f956456e005e03d517e5938ddf6f5f652ead6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0008KNkl<ZSV!&G
z&8wAF6bA6$HNP_P3n?N$Ff<hh2GOYK53r~~IZ#8w=FP>44WfU+fddt^K@IvKqFF?<
zCJ{!Y6-h;oN=*wbQy$spa60$A=Y8LO5boe^IB?&)*T=J;wf0(T&skt=Zh_&k2&gS0
zZ452NqviJy9>7ifj-PR@!ND4A#s;jwZQQ_b<@awBuxWr|?0Ia(g9x~+|8NU`;Y)l`
zzO%O+&*EvUD&I?rUO@bfOZd1PY96jhfMVcr970%`w(j5?d{~5D#2#96Gi;s3kL7?v
zALD@Xy#xEPwk_UeKcFs@zn|y;W?=Rz-o-`4#=SKTD2yD$_8x{~XJD``Cr8g1o$qn3
z<kv(%yYX62Fdd1UC>Bts@NE-AVdu$NJXGj@RalzH&{3?fFglCMA9%Zop|`MX7V8zd
z|KL~?pyQ=}RM@RnNeOtf3D6tZRBgIWF}3JK6QCFHT%Fx2t=zIt@L3a}ZFs$u{3;JU
zmC_4O;&Kz9^q&LR+0$^1c-ToV`~XSpiPt{=+>4j7vc^jfowSbhv!6zFCYAbJ`+az(
zhw;9mVdvA5JDDDatEu;domA~zeLZ!QKaY1tLp3dAgS~ZlwG3K)n&vc2VJ1V`X{18W
zThkn6FT>d@c(~)q+r+Nmz44KwOUOnUd<;jhy3Je5en#Ij_+fk~>jP*YyQSn*8gJk5
zB}}O|8O8>KTqE|b#xvGtXv>J&H+;#JjJTP3{&%DL=Fqr&z(0b+*w`_AVI~RuYZoxF
z*_EMD|9Oq1nkS4+`Uz9oL9X_&Ep$0V4WI#2DV|MrD%JNR{4zSg-!DJ|yLk}2G-2fZ
zt|aiEeZka*Z1kY1=y^;&Rl@f*-Y*ZrE`;<dj9m?esmxFb<>$EGRdLo^HqB3-*#R^h
nBWgj_Bz3K?PI`-g+Gx59@mg^uLAw~U00000NkvXXu0mjf`=fA%

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_white.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_favorite_on_white.png
deleted file mode 100644
index 4014ef3bfc1c0561923e1ea54b080f6e31c752de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0008gNkl<ZSV!%b
z%Zrau7{@<fEabXyS&%|0mncP~M9D2BEW}W1WI3)W3x9xXVo9tpN)fq>QnDEqE_)*}
zWk|xXz@uk6^z;7S%Xw$~-exh+YUcNz^PJE5KIc5ob3`9A^)Vj$fr=uMtB{!u24(>>
zfw90K;4|<NXp{6dZ2>bI2h0T~0mFeGz&qeM@J!P8EU-)<GjnH$fd#-wz~OwnJO2uN
z0L}m>Bz^G(%xoC29cTtd0Yk$k3~-1~z$0L<B;Qn>)d88AtFQ=Y1;!Le{0q1O><r_M
z0c(H(1@k(Ajlcs*zQMot50IJp|4YNp#}~yreD~eo4u3BXD#lEG6O_Cw$$fNN637)f
z4=gF+xI0>D{tBpk&OM+>k}H-9v<kQyA$g1fF=IUBt0i5}0&;acwpCiIq^2w&Klu}@
zqygF``HfBunP2B26$5oi^7N1j^giT|Dw#SZdD2Y<Y6Ip}NfUC>;w+#ez@7?${Oa$M
zbSMjGA#gLK{3^IQfMt?iWC3~oISZ_)fX3B14eXHAl?voPn%R2bWGJYO<nq$7LDIw8
zMbe6^U;6_<O9N?Ko&CT;Nk4Oef=VNR3&6?-L0twmN&1%bpVtpf04|0`tEiob<#uJB
zdW$0IRobLHAphpg*(qRJ?1}~BUIW_zZ#lfM)>%;t>&naqZiE)LH(cITt^@8T&rRVO
zO0H^V^MP}rM=twP@i2Ms-7M)&(T<{=o7uq7v>gYg7CB9PZwGb(*OKjO>5$b<Ff$L|
zbl?&&B@)V&SqnVL3sdQkCBP<!Y(6iiv-AV&<zTZUfBHmQRLBxQK4%8t1u-j6dG_56
zJg#lvW2j04{c&n${vhx(m27!$0b7BNvM}zu$3Qh1-5--%f-g^`Es{RQsL`uKowb0O
zjSk`Qn|M@`Kbd=My;7(qeBICNwAxgb?7sk&T{LfeKTwgHzX5#a&n3Y0zYzcc002ov
JPDHLkV1oY$U+Mq=

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_black.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_black.png
deleted file mode 100755
index 789f4e7690012e68642e8efa54682f0a21d26a7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007iNkl<ZSV!$v
zJ%|%g5T1FPxH%08cp@IgE3^qNxPOp379LhsT3Fhsg@xF7g(!-}*&GNKT3K3nm6hZQ
zQwQE|R#-@L%@Of9R4_!%-rl~El^i57+3dzUx4GB8c{AV4d~fDMNcmvO@!=3a;tD8=
zawM0_EdxMyq<uTRUhkRfx;shQItzePvMfIt7sT_thpy{x9Vh_9FfIVVoe4o+SeEs1
zUjUR!rMY}Qf3($VeI0bDs_K#?Nms`O5kkCeHk<2%cja<<zT55oY`5FL#=V);0;cQw
z4MeN}z$Ot{LWnKK*b*Y11(^7I2mm&O5H&<x000va&k#|=w(ZvdAVxuq1)%G?${4#v
zM45pHq4T($8L~yhT_MCP+qRvl02D<zF3a*g063YXmoaR&J<nTpUH99d?Oz#bns$vb
zb}5F#Fv}l(yJK;xLqs*(w$~y77>4n5O7=uV>)CAfL!;67L(od4GVlBTMMMmNN406&
zvaAP@08G<7Cxp0;h>K%ci)eGsUjjf_fgxX}Y2GFxecU@D+GLEq;hb+o0thdw)oP~G
z>0AbYD<jUnXEK?Uz05}gnWlL{2(gTag^{~=g+k$dy<Xp)O2Rz@RaH+*lJsZ@Euzag
ze;&mT!!Ygw!1+O&AP62ij`JzW9Dq~-{7Van=so}xXKq32B#iqF8Dn+M`Ij)$KKZKq
z@(oiTM5&MBu%w!%X_6$}Ol2AM**mn38DqBZ`=8^k;~)saQN1992&dv=;&mK?2n9*8
zSezT(UQvQ12!b`oacYBKa8^MwaoGJgNj3?AqA2N#(g<1Z_j<jR1DEA7gi0clxEe2!
e(<H`+0Dc4GuTn6Z2zLPh0000<MNUMnLSTZdzBT9o

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_white.png b/builds/android/app/src/main/res/drawable-mdpi/ic_action_settings_white.png
deleted file mode 100644
index a17c9773a82b047252183de90234b46e6e11e930..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007mNkl<ZSV!HM
zO{h&_6o#LdfrR|TElG-$e>Y*kh=DRQA_Fs}6!JGyQf6GbS1Dy?AVy}&fDr>E|CA_6
z3i%1ifTdU8(Z1*Iea_kUa{5?xCg*&6t#^IvUGG}^h|Elx;o<)P6cJA3EU=;ChA#k{
zB}Lr|4C{s>ViIs2m|GF>39wSqhi(Cy2V4SXRs?(jtdsP(TY%O8=YVMy0p9?dBwhJq
zfFfckumZR$=~2URL`(+u0lR^*6#>5j$ALac?+VY(2UY_&B;6@{wv<B=G1@?YCBR$Y
z8gL>x=mQo4<J)Ba8E_(dfgivQU==VGxNBgNzBl_A0w^Lz0XtKM#q)OR^K~1+o#v1I
z7R@(2Ajy7zTN$85fZKLX-TK!&|J1S}>3$`kh!_JLPW*7${-(KH=Gg&B-x`4i-B2R(
zMPPb|NKD?>z^8P60?^Zf?9Fap0qctdZw6%I^>@e<6Lui!(eo5(mh~rb&>hvz%&lFL
z8Vxg;pb;?xI09@0T9wRTwg9)9$3q$`%YZXLD^M=kd0@Y!m!&21mk}`zI0S43CYGe=
zGVK9QRn4jdY8!B@qI@5L)4)MVUs`rq0_7Gpppzvx<?^hR^sH4qB4Rdh8E_ek=9}4W
zK+P@hLzS8m5etBOCHmnu?JX0vV$>wAw*kvY(X2a*B|R)l=-&X8)H;unWku@j+CCz(
z6GrbqS&fdohHDbVeAbVGO6RknB~WE6tS7s__X_Kw*~tp~Ak96yb&~a0*oK@(L@%(s
zWXYeB_T)~M{G*cI7koCB{F{<IR)$#J{rH!Ii0J-nP@74f-HT#&uhMz_+0brL9?9>+
iBK1fDwtF@^KtBOQB_}jIrkh0o0000<MNUMnLSTYUIy%q*

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png
deleted file mode 100644
index 40a1a84e34f4fb9c31b1dccf1b2bd7f5a50ac00d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iY)==*kP619lQs%6EAp^x=L~Fl
z``+Hk)n<pB%!Iph+z+<r>=Dm!pL5PtJwWQDwD%^7mKX72vfc*YT)xac;A{}-v*=ps
zr9JO5s)Jrvt$1~wJ<6?Hv?}9?*Yy)i*G<&jSt@L~vF4xM{qD^_8RvC6y^4F&G81Sm
NgQu&X%Q~loCIAp8KMVi>

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_folder_open_black_36dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_folder_open_black_36dp.png
deleted file mode 100644
index 4f90c63104aba086b4dc5c6a69a7720fc5c262b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8pr?ytNCo5D%Nuzc3`CeOMhm#+
z9ND4bJws08z%M74Pdn@9dIoR5bn&cNTv<|$*NV0vQPt$;Fy_uU)|bpLG8>s#KP{}^
lTOV=e+)_958Lge(><tr(wSN9l=?5Cl;OXk;vd$@?2>`jQFBkv-

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_gamepad_black_36dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_gamepad_black_36dp.png
deleted file mode 100644
index 16d5090559a1a03a06320219fc0bc3922f76d4c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8o~MgrNCo5DD;xP*4LDjKe$MEz
z36r1w*6P*y1TDpK&Gwa?e}zJ>%#8fCG>Vz`i{&x~VI$GU{8~?{lQ-xDnkVlR=W~1D
z8vbEQ^?k*lnK#=#8Z{l3ocQAWckx&IH@{xL|F7^``_ucSbL~@3IjBEly0yRJ!ObZJ
Rwm_R1JYD@<);T3K0RZK*L6iUh

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 97e42b5251a984f151a3fc469c583c360763aa17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iqn<8~Ar^vn58C=20?J;<7d+)D
z!|^{xU``;1V%Y-~zhmA4){=|W3l^Ae^mp#jTxxh`k9c8Y&l00n|Cv_|_|7cq>|2|>
zG$hGy&ZUnnds{bdo7Op%Nx$xhX7rv{ZmkRX*#pyC_U6eHJ`TU)xv@j}**}-LJdalx
z1PhjOZFyV+!t)F}KkqyqYqH^3?iERmr&WQ;3qCxx^7H(-OkVWYy^TF;Lj5OneM?oA
zg%#QC=t>h>85EkiR`kE&hK-Z8-{gFG#8k`7Qt>7y-mx$k=phDAS3j3^P6<r_WD;j9

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 8909c3553600d7e8148df21f8ef8a8ca655ade7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmV-M0lEH(P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003ENkl<Zcmc)I
zJxT*n6i4wpNjg7T5pflw;3`BAEewjd0}BI!jR+#i6hc5O1TlrKKnq3CLL2Kaq>>O6
zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N
zVwqbWh<vb#`o{Q^H7sD9ce1=PYQZ61lPWb5ynPGGbTLO15QHLi%m*tL2(z?NP4sh3
z64VPb{l9e=RYkDHs0uPDsO1ah>7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m
zvtW!jvUC`+K-kE98fAa!h<mPBV3Jc(f*vPKu*fxcL_<AqzYBu%d_jfucRjZ91b)K@
YKgwm|dz3YOX#fBK07*qoM6N<$f*NXnlK=n!

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_video_label_black_36dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_video_label_black_36dp.png
deleted file mode 100644
index e5faf83bd49301f450616214307e7052af75b245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8oTrOpNCo5DsoO<e6a|<=6{c)i
zCiQB;rr-BcZ@e+_GB|Bxv`|WD;fFpAB|8-zX3zKe(+;x8yx4g1L*J9fYabox?_J#d
z{jH3kt4N?rVEsRrC5M&fM!P>|wOqc5SxZqnQf-Uu#W~MF)-rgy`njxgN@xNA%xE?2

diff --git a/builds/android/app/src/main/res/drawable-mdpi/ic_volume_up_black_36dp.png b/builds/android/app/src/main/res/drawable-mdpi/ic_volume_up_black_36dp.png
deleted file mode 100644
index 159d9c2787a3a3e3946c636198cd1eb84181eb8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003qNkl<ZcmeIz
zyGjE=6vpvCO4ciaO^9eA*os<N*lJ-aA3`(`5Pbw23&Ch(BPsL&1PcpG3+-$I77}d4
zLV}VPNLG*VajFR7&TL_k-!yyXzz2Jov*fJrnM3A?hhd~#P$I}aIP=wJBP7OfEKsMb
zs4sT2#~9+~X<%BFtTBdjBV22@%SyHwqgTSM_L~f4i7|dE@}bUNmKXzf#U!|jI<E}=
zJ;uNp4aPwVys5WF5Bp^~U7vxgsXh)3N|^>(SA8EEWNd@XsA`1=9f1^7b^bxnRzA1Z
zVG5)i_pndFov5ybeUJ}~f+V!mTMaoPmrQ`Gs`J7?+@USeR%a(}j0|(9{U?%`!8XQ?
zzrW>}QM<&W$8UxY|3%J874k_nkKfTdWn%cquTvyalLKby3-k@)_AuR&OJC9e0000<
KMNUMnLSTYh!I?_{

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_autorenew.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_autorenew.png
deleted file mode 100644
index 2d3f96c4bcd705c1b447881a20590fdc39237080..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1297
zcmV+s1@8KZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000EoNkl<ZcwX(A
zY3OHT6vsbbdr}gEtVOm&Bx5fjl2B5%Vwjn-Z^H|+E2*IjGKL{bmKVG*6Op8Bi8P92
zsd-^ZmPjG{(fNCRdR+JSyZ3jWyVdWWxA$4j`99xso^#G~#f*z)+<pcC1_sPH0)q?8
zI01$rIJiL9E?{QsO8T=aJvwKAnVkSU+Z70X0N`!l5n#EbKiXzO9{_j<_z`#txTkF<
z^aTJv_`iUg+jfUO0WbogRd?tF05jVF*c8|hcqZfbt-3>N0GQb(z`nrVz^=d+z{bE1
zIf1V=cW4{{GusO|2{;<qXo@KBAUqTTqfIeys-cYmU}l>GX8}h7TTi9cKZAb)R!DlR
z!ranR8Uet}b_Om34l1q5{|7Duo|N=k!WxBBYX`v04hNP1+hlfkN`C;n26*!GIq*I3
zR%V=^{7OlF8#FGp0uWCAj*Rhc_$R;<z?+i3iLEj-PlQI|#y<!=-t@_jHmnVR;PW@;
z(EcT0nWQiBjxz&5E3}XGs1tz8fip5j78(=)C{24aTMyVt(#Li9M=bz^tM1k)+B@xE
z2CgZhvYEY7miAsc1Lp$=1Gh+eFBOEk0Jt9TvUVgN0auQreI^E+Sti;C<BtQb1=ayp
zNphD<l4JlvhWA30<oM~|Bx!Y$W|_(1c3B#X_piSI$4K(jxw6y&z+r$#{*k;7T#=3T
zl{E|#&CHXj+kxGqwJw$PYRcMm0B`|tPNc-WlI~AYYTR5iI}cbCefNA}dCFc%0EDW}
zX?bX*#6n5$rYJQ5057IiM&Dl#vF6vR`=tUfFVH`xrTgW#RTY{v&&;+0o{PqO2)G;k
zC%Kwt?^FP`2kr*8i#DC#R9nl;*7s~O+RM}F3nhIvjnVPgQ~-7a?gF-r7ClhX?^P8l
zV1VZVaqaLaaFHYjqLQQnkmmx&O8UBzHU*Q+%=de~PcGmsEf0c+L`p4^w5A~d_5mJ<
z*7nNM6Ryf7a}onwk({gPK1nMY0$?$4Zf~x^06;bo@|xchp|9!$!OXS<ZUgp=*6l?i
z<ju}(D!fFJ7df?wnH>*Y*Sl0WuwYaSmG0)6nRkR2OY)L=qL`WAG9GJoiw3TibVJeH
zqVLHuAOPT<->ZQ)$~<oc<2`*oU6Pl!V<lvp{$g}QboyTcSM{bG4j_21e{GouPBXg%
zIK>}EB<(lO`e6L2fRB&mQAu$DR&>x~zt_Tmvb&FH4|oq?PR0QcXn!$qRAzmz{=D4&
zuI#>(#<d1OO#AR8mJ2|L_6Go`0lP%B_wn9W^vJ)q4&&zzpst0A)`@AK89N`?EYuVG
z1AeXUkuiK^{L<9=KdWcs0OZlW2&|m%PWwCSJo$fJu!1tBr<j@d?iK=P$FwiK0C=?b
zw)(?$`FyJk2#rinT^Hm~dJ+!a?|Tt=x{j-^(;%4B&CTlLCGF3EH&ML7;XTDQsm;!^
zENeUlxFS(M|75^Z=U7ezyruO+N>x|Z;8tBA-YmT6cvI7J0FMp1*I-pcs?KYL0VCz|
z++k8CSk<U$=Cukyo;%DO009Jl;GA;@NuK<4Cap6d>kg7ub!L5=sc@c=UH>TUI(5c?
zE>At)djOy>C()H20|UB3zAyU@4Cu>Abfw3@fUc15%f5dDy&b4fIWm%z00000NkvXX
Hu0mjfGYwy!

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
deleted file mode 100644
index f1d378050e63a838132d51741edc9f27349826bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1109
zcmV-b1giUqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CWNkl<ZcwX(A
zOUPAK6vu!66s$BVn?&NE*CY(02SgD_AkON`8q}Z+Dd?qT6g`Z@3N>`_6-Ed_SP%_L
zs;MAKAVM0|pawlODrizBS{alp7VQfkx9^;@_dfTY``vra9v=2yYwiDD?{!4Wms);*
zIsiHiXgLC%3A9`RIw#nfKxYCiN1#y?FtY`~SrwT7De14K-lZ`B%<N2HJ#b~k<-P!>
zC7o&lgeC#F6nGW5u;OAr1M4JxJ81wc2VMr|S6u9G;3-M_CJlf)fhQv`wN28yk$Y=x
zYtjTB1MZHL_H9Yik$Y=x8wddI;HsRKnfZloij?+aNe)=yis2c<t2O{;b{+6A@D1<@
za6r<D9&<Ch1h^Tv3pg)EDBw5XEnvT-qcdoo1KbEWPj{+2Bpr&RIqSAs0GQcgU<+_<
zpne)~f%X9I#I6SJ11`@L@@rrx@Hya4bVcBGMxf__KP&0iO#1bTAv5#KJy^ipy?K?#
zkCnTO*6Whqh$Ym&FIxl5?6UCsuHvIy-vQ4^auZBmbpY51+>*?3I0rtGv?+&l764{;
z1+WX~*<udwL7s8nbC0C2Qi&!5U}o;gHw4d~%5UcW-+^P{!}-9%I>dmzz)O;jr_jj(
zU?uQE4F~5T@;%^F;HMz$k`OWO06f&?EO(U8N%9C3y>bA!J^*k*G?)K2x|)6fye7%x
z{Qp+aF3%~ZGR*52;CV?0Q{>74U><Ny$m>%gz;3`pR%y%*xrK+;RS6gINU#k!Ea{(w
zbNP9InRzDW#f@iWRm;_Ws_5nW4+l+fZHX}lPlmjB$||3eHDIQ&X6D@;f2l_S*Nmd|
zrlcKJDD}}^2dpkR<1g*?#qO#)q>OJZ0GzOy`NiD>FDhW<-u`Jx2ND7B!f7*bcEP!m
z9*I&_zMocY00IcEhDABSkD<f!eIfwvUtR$&DmZsqQjGbPvh4s!d6k0D)m{?_PVlzi
z1j{PF94ELIxVPkiJn?Z88I2Rn2!prArm1FjF7V-;41>Yzdm{8i=*q-e(J&Js&jGeK
zk_eeu-Bj4yShE%^;pHEh>#498LoZe&K4n_rS>gM@XTT3(<5J)%;PyzhpN+mJMjM(a
zh6Ys*|It?t7bQHgCe}<j91@?o*brGQ>C0HOdi$~yAv0@lODt%CH$}Gs7pI~=;Qga%
ziUttw2OcQ6&}6s80{~Tn5g(YWsW}+&p1-%x=H6f=fZ!F`Lt!-LQ=vhP#@_KVThfu9
zhMAc+NNxzzA)hvlb~H9au=Wl|V;!2AP40L+1_U!}{SOkY|3#+tKS}v-a*qScDokcF
zf0GL#v%Nn`#yHAR?8z>MMj`Alcy<5`1J!Y&*=fKyz1A>f?KEH*sE!lOP6Nj2wT2;U
b>owqC2y}u_A)^$@00000NkvXXu0mjfX~Fv9

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_content_clear.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_content_clear.png
deleted file mode 100644
index 972993e41a9b98b4b2157da4b402e3cf48be83f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 618
zcmV-w0+s!VP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006pNkl<ZcwX(9
zu}TCn5Qe{KXXR_?s|cbmU}vF?pp}A^pp}A+7IwbC9fGf-uVH1Ukw6xf<#u;2nLUqW
zw%uHI=9~Y|<Pt~akE=X?41g)1asp<7$^~GHpjp5yP&om!K;;6kE?^cg3sg=(-2&eG
zO~5<nel^*8?>7MFocqz7R~3NwehWAUK7qMbuo3D3ume0e=f1Tdr~!z{9|K3g7x3tu
zd(#Nid%q8y0o%YU@S+7l1wgFOC2-hEI9T8Ycu!SAoOchn27(2eX9nD*&f6}E7Jv|3
zNd7cdsrg1w!ZR>iHrSYanDb=8oKJDi>~%&3K*)BWT1j^3$i4xZt*Wji)c`aT=LW6~
za%>Hn0zhbkebODY!-(vYth90fId;fZ&segH-m5F1{Sj$GtCqcb7w97|k#ziRl4VjV
zKKUZp{lHjt<M?KiGudk22WwIb2<;GtwKq9QZ8KF3s|3*39on%cZ=BX1z({upuhlm>
z5-2NEK=l9yIzk;57}yh(y$Dv_2CLr)Rl5})lYQS&nG~3$y-CNYw?T>Q`%Z^)ek)CQ
z^8W(4RZLaSzXQ+?JQt)Ch>8W`rA57mqOtl{K)Ae6`%62ZsyT4G>`C*aCqh+Uj5K5;
zgbUzfqN}l8;9l!iD8#L@26PTS>b)G5uDt6sPF(@(l$<0M10bPP@)%P<$<>wQW(tr{
zDtU}4pycXGax(=;D3v_M6i{+?CApabB$P@XQ@sNI0JS<wP<vgF<^TWy07*qoM6N<$
Ef@H-Hb^rhX

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_black.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_black.png
deleted file mode 100644
index cd35cfd55e6efa81bf2f9b09720efdf02e4a5e80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2165
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

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_white.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_off_white.png
deleted file mode 100644
index 64f0ef6daa2de661afefcf109790cd7ed5a2e3d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2362
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

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_black.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_black.png
deleted file mode 100644
index 0c2ef930145f3400dabefe7141d682b72c1ccf63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1456
zcmV;h1yA~kP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000GdNkl<ZcwX(B
zN2o1D5J1m2=bXi?h*=CMMpX2h14b|{T!^^Ry@=r2g$S+{b3nzs5KJ2dQABZ}V$M0|
zz=68({Qf)LJ=6EzdG}4h+q~P;U45peySl1+8G|$uST^u!CNKa>SjYfq0Mu;}87ye9
zpuvK=5g06}8^5k=(5k?Cz^1@%!1lmq@jrk23-}TE68Hdk8~7af3HY;6_0@oNfh~Yt
zfbAN_dLMWb_$tO%k5<wa&?>;Tz`g-yOF$qg`5X8Gcnf$PcsB!-V0Hxd0(J#92OK{o
zLisE}y$XB;IDV0|0kk@B6mSTzA<(9ef5M7{^f>VI7_HX<P6{|$PusD+16}~01^y@@
zR5GA#*9Xo7_AVJD(bl(oH}LU-H>`zh1Dp?NowejO;6dOAz?YPiTtK$-lR7=jJ=t+#
zgKvRH0VkmN0!{%oD(okxxu5kz@j{Z2ash1sTo`b2pUF{nVH+3oyW$@g#6n-%M^1a8
z2<dj<`_uzDlXa0i57<A|S%u$!jXu_@&{wL9SAcs`n?wqbzaJUqo@$#?sBgb(Nq*MP
zHLXXfNpB5Y3T)E1*;Uf#Yv2~(lX3ku0dglfF8*@-j!HUDwHy7Sr{Zs=K2j4PxAaSZ
z9j2=C^apznxHY!^|Bc=RNLT&}z(snV#UsznaTF>7baX7v^9*M+x5t2|S2ocm3-a@-
z=`r^iv<|ADS&;=@4Q$otSyj~SQ{aYDK-Wfip`sqW?aJ`Wb)|rOVC~*csjgzb02)Nm
zCw5Jo-s`H;&)z(fU0(|5DnL(qDaePwjirD*Vi?6+3i49Kq>4VV;{pGcg4_qZSZYBA
z;V;XK|1M^TzX3Nz{JO}3HU=)A<CFXdhMAVzB1T>WXiebkDFw=AWr3Ye^D2EPa2jAH
zV;;rr-6Mv1w3SLKVCHA$I%KkL9>v|u1$t~^F$Kuq507ldya94?_Wbot)5KDMeAZ~<
zm67V57f7x>CM=&xO(+MDee4uzAJaecAnshIeM~hqN-iMt?#8E&$;`p0#+~Kw9!&3z
z+JI__LnmZz{9<6|S<bHG*aFdGejvAyA=iRNdYLCT!@5`lY460gZu}=pN&(raS&oaM
zvLkDdo-}f|(&w=ZCR^G7@|lBxQx{P{?f1x{S^`s4Bh&_v^i2inADy^J7VYPOCjdbe
zNn1c8NapRA_x!~FGH`zzI8L$)AfI0YI611#a!T-u-d@MX?pT)k-I?R>j2o*fAp6yM
z6w(15Csg}!51?Ak*usRI0c!wq9J3#1^(ZtV6stDexsuLc6R28%9K(XkbAUZ(xF!k1
za$}DXjfc=2>#4B@tvHT#MAjDWldC}Gc187vIb+wfpwW0*l0miua}=o9Mlbn}s5|WR
zSuNCQ5`gUA8bcwua8G)7)A6&a-csV^>AduXObU>Cctyd}zYgUjE7Yu_H@4%ogX%I#
zKqEituy7`8Thi!cZf%btjETsk0jaddk|Tg)<I}4#5v#%sTWC3kPA4YQ0HpF}MGgi|
z2zQ{%goI<L)bibNcRafE|DR{41;{~Nhjx!#TiejBhs}opvk|4&saipsCLk4bygh(3
z08>gOVvy^}__T^b7A1qM*ml~0Mv%M^r$gxlnH=%5i|dU$R_n`gIRo_p&`1Zvx2Cqe
zEY~Dnz%$5hJ##e&Fc;P=ENG!_Uf(=-%q=2eSX}9ed~9ksccN|E%^Hw;du!2Kh5Ie=
zx?N-5h$x^J?q()^0OaI7zv%*a%~PG+r3{gJGjOKT7eGSLS90Oj9eAW|h_p7%J^^xW
zqvOa_cd90+eFIe606O<K07@Vn01be;ePx3M4Hh(5P&WdJr~d`U3foDHba8S30000<
KMNUMnLSTX#QnL^M

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_white.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_favorite_on_white.png
deleted file mode 100644
index f38e4aa907679cdc81decaaa7cd38c94e6bef890..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1544
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

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_black.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_black.png
deleted file mode 100755
index 1efa404f35d38ba73931a1046e13fc8b11a4206e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1484
zcmV;-1vC1IP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000G(Nkl<ZcwX&V
z-D@0G6hG(gY&S{sQCkU^Mo_FZcI#wjr%@qQqqK@3ic+N_)mpFx#drS&UxhxjLao*>
z)IL}QzpBKxL8_g-lWDeAjp#$H8nu|jCbJ(iM=nfY3C-R+o9u4l?0ubc&-vZooO|xM
z_Z)<n4~+Txp-Di~17glVa|^`W0h&RuE?Zz=VBq>72p$4}HU*EHEtN_qMn^|~Rghh>
zNL>gpO>+k#KB0=1h~DFzpH!7!id?-2*oBDqs{$pW&p78FsLC%zt{w!SX`1^G@eWm>
zM0A#OegptWbxyT%H7B62uWv(JTiXEuxFG__UuI`#4_&-?@$U$8suHa^0lKc=m`o-Q
z5Yc*7got>#SS%iLUH50zIn~P5oB+cxj6@=_pNKS7kce3FegClIIF9O^YULsmFf=rz
zO;1m6K}4~jpKRNnTFm&SO`B339UTuKqBsI04I=ueP$+zo%jF7-O|&el3jl5+qEcsP
z=Y`?n;Zh_c0MQd6!!U*zV^4~?i0Bj11OV7XWOL5{5`in7PPeC0shx;;4-u)H{a3|}
zh%*3i+Vi}Vxm@mFVbe6tYZ1{RqHT<^jYO0XHi_tM&iPk0B_N$nuSum+`vE{NH&jN%
zcR>*R&KTQ@h(;8*UkrG-9kM|XoYypMBLLirh`r&$%cr^deEx7HkGYzSNL!%4zu(j}
zZ7&hERsbx#Lj09w9U;k!>P5u4QmJ%wbaa$QF|160*l$4)JdKFAMKMrMSt2^m7<;2q
zTv~`ni2xDIy1Ke{6VYHj7gUWcL>!r#ntFG9d_1o*Ux@(IG`At*Qvk45MQMX&t^mNB
z*=*KU!67BUFpPDKvAqDWMMdFCkU_+p@B6Pij`NQUkCXs$lVglMwj2??42(G2r-;Zy
z#1;S$=lL2LSk>?1<OqV`IOqHe*&HbWnM~$o0Juh`NcLT%w?uRX5nbE1F9AS#(xO?G
z)k8!&B5se8Hdi=}F59;Kk`$LrAd|_w5T5%|vKG@tMAN?Szwf&4H<BA3>bib=B9V9;
z5j$nrDts5WNH?3!9+c^jE=t$+?qo9gpvb%cASF|HmG4&&@q}&LrvSiLn4hpL>uw@?
zxXPfLN5pf*V)0|wbth%^qyz{BVQRY_0PX{Tbuy)8-zf-!lf`23!zdY=$T*Y9<Rgr+
z9TC%Y5%j*y=ksU6)L9BuiGX=6gM)(|b8~aM0N_qVVCN<$Cyz}`Ow37<ED-4J?QQMu
z?%o3c!t-Q9xct|xt*ysLMn=T_L3u<XAoPayEiEnkh-kCKiun8QIF2){jAntLWm)$U
z(QX;pi1>r&c}H@&+~ugYA`>7Cn5MZ05$~#G3=wC2-#_R$&W}++&CB=q_ixrT?RnXa
zl88=o&W}}Nrz!$6napzlFd#AbXQ5DdWo&Hhk7|I0ME5YpUL>Lo5*^=Wv)NaxvC|}=
z8rEXH1=8uX2!hWN(Jd<|2!8K*-fJ}vg0VdYbzNVpX_|=ot0EC9l}e{w*A>@d>5vA&
z*r&p=zYNvlIt&26*|uGr_fN~Rk^pesio6aRhOsk|NIV+b2a(nIBnAK%f*?4$EKg!#
zO1i2ZMTzJw&iOg%5g@x|%`1rgv$!B4EJQv-L|avuZG=qC3L|CFIs*WLg!q-l!p9J4
zaTEY95s|?d)0gAq5Kr7hB>Dtg0O)CGaa53?QXUWQ45B<P9yhBlj{|^6XHVtx`Og=Y
z$HlHJs}k3zJT3^BZ;<ePKhfUaK3?e!ZmA6tGcz-vR;uv{qCL;MxvmWoQG?t6u0<v)
z0kLnAihY}0*w+)^M#(Uhj&-Z7s3XL?SvvOZ@=;HYddf@R1nUW=5w@BHG=lY&WV7i3
mE9q}E0!z~a8o~NXviTnprA}^E(q9<>0000<MNUMnLSTXkxv=Q~

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_white.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_action_settings_white.png
deleted file mode 100644
index 03ebf2f7c5370eb375bebca9a4775456a615d735..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1509
zcmV<B1seK^P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000H7Nkl<ZcwX(C
zSE!vu5XXOG#e!l13yKXDK~U5eOHedXQC}3JF9yX1mM9WpG%*@`L&Xj@l=z|seNnNa
z*j|h%2$F~m#R5i&Sg?-#y?es-aL>0p-#Pd5=CT8q`|!=|&i;3HcV>3>7?m0ku!>JJ
z0u`W)g;anlK*Mb!)q<v)1-bjazyrV@!MR-toM~q71?7ff@6>|aUHx4GTn(%n)ch}C
zF>r&Kc~G`Bd)EMM2;2gk*HYuVfq7>3TTA({Sl0k;4m<>$5Y}`|;7Q<gGh5wKJ}lNX
zK-;829u(GeOyDhnYi8fJln;w_4bV=&E5NQ{O~(X20S-5_&s)le#kvM)FW?<u<FKY<
z0>1zUnAwLd<-=lK19SxNQdrCX3d}UKmxpYlSiEb1&Ij%+)^1|Pxn_3PkZlx;hXHc;
z&4BBGqk(0>W5B1t>WTalcV7qC3YZ04(ZWIOAIu71N!rW4Gqb<@8Ir%H6LS~fWZ*>L
zIbflg{aB0+&;}rN_#m)J>Sz`41|YN7-wHF6Q-{0D?~!t60EYnUN0e*e{Ue=d4{L(V
z?AO$voX<T0EoJ?wPfd>KXX#;Pn$Thj0hFxgePHJadXV#`<5yta3w#CKlq^S9HyQL(
zvZQ&yw!k?F6uA?coPPQY*e7B|#Q?ecdTGEH6^vA7uUVc*$pY~(izY|bspXub+klJB
z?9UvdzDEF(xjvC*s-*3y%JU5{+stI?St<g^-8Tj908TBOrEJIlBZI8_5#Rzd(-Li@
zQh*Kxo(2TebRYq9oSD6r8%!3UWIZnc2j&`E%f7!29GSDC5`ZoRu8r(hYY9-wDJ?Ry
z>znj#1jya@2A&0W>}b$Er?2ER8ih(<0LPfw2ZI_L2#~vPlq_d1pd)@VNDk%4fYPXn
z(0h3vdBKYOm7d+LMfR~&R~_{VePl`hI-C8}1dvh^uLIkc_7>#(I)x0{-@aF*-t$e8
z&!vceOYIYhZ@XaorR;KOXPB8%DItI~b8iCjN=Hd@>J-r{0WY5<OYSZ&S&9Ccli+;H
z`#;#sWXU0bHUN$Xu1xVwb|3`|0_T3<ax?p(fPW2(yKezp1)McPkQDeTfPTu%eh&d8
zW_MTcr=@lua9CtO19+bS=0w5iwUt0x3LHBEU0wywR+h3CT!#S~r<gX)8-Y{CMe$J`
zwdd?tx~v8@o|fCYK-)b@QT?O9f|BHa)(;v7k|Ods>0WDxAUZm&&NVYx;?U&on)!QL
zoNiz0UJY1U8qpU6G;Yc5pOn-8QqryHQD&xe!_egJO1C^8OujAGBmv8tmQ=rTA%MnN
z(}lpzfdts&+FVO#Er(#rOKGz|DaV_>EA=wp%x*8_U&GcGpoQuBxYXknm`ZmR<zRAy
zNPd#izVmau>AO7i#bzd%5VZwJN2Bt>B_!o^tSg=y8M*tSbnKT-(h@V1%MzjrPzJ8H
z0M#Yd1gyK)O?o1Ll4o6y`2pZmM{&@ya`zf)G%TqatPTLDraPJv@$Oy|W*LBL$~6N}
zP1@(~y6Ux0LGgmS*NekUSfTs)di9(EsTMC3SWzv1$$(S~s4@W661-e4vapC#_xUQ~
z)V1=hdO9$Pg;y%+eKF;xRYRa6&Kc>tyxStq9(e9Ps0>*5?J5IaIj#&?&ZhWJ1N4Ap
zlx4uGF;qG7vflHkl&{i5J(U3K9>3c%V1d+ENUowz)g9};tErHD>tsnvnnzz6_8YeD
z*wl_JXH}+<T=!?1pxK=jlINCTW*?jWPZ5R$NM^5@ABJX`*{}~{iu-SMt5Mu~AEUe1
z=TMm?Rv*-50IE+iGXT{`y%~V&v+xW+IusTF*R&{pQW4f=s&t#SKP-?OP1Qcj1KvG&
z8h(@>#7*CyrU(KuCD=RlgQmoYgGy9@GJsWpDnP+C)yG~fD1+ZWMWI+{rmkPl00000
LNkvXXu0mjfA+pa7

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png
deleted file mode 100644
index 6bc437298ab7bfbfbf128acdf5849e304b3c6903..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DO`a}}Ar*{or)}gqq9DL3|6^j{
z=hBm&C)~N@b{5Sp4w$_m*}geiNBekToKL{TWpQP5xqRwZuPjq53pI^Z3A|FbUaRcY
z{O^J0fmhZ3y?R?;$@JP$iP2W!Cd>8DEZ3V|*s2`1aV~kzx#D@}&nn~61<yHG#mh(7
zE3I3f=I(nvzf0xdSALCyU(F^idwFn~>{Xzi+b(jKntiPo%%5fP`-@uPgu|~7wTA~r
iR9eY#70Eo`TEl2=&Qt5V_=GOd^$eb_elF{r5}E*W<X(IL

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_folder_open_black_36dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_folder_open_black_36dp.png
deleted file mode 100644
index ac4de2cafeebce7f86777e227a8ac96038d9374e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawc6z!vhEy=Vz2V5!6d=<2u>Q-P
zW<5if=@(u#g$TuZ3UoBTGF#jD?1`;@(Z9`&`85GvnoIe@7d$z|e0ziO#nUg%9VSg=
zGUxg1Y?U}e{SxbE*Imi`Jp6TTrdeefg;ghZng{)0l4L$8eqzO*#;E)SnbI0%_f;DE
zn5(!|F61+Ds!RYP2M`S;o^YE~?@rzo>%iN6b$5f8*lCH$#Z^q&qCB0Jmi4DrWXxO?
ktS05f#O|%RbjmM=BQ4vwv}Z8P1bTwO)78&qol`;+00w_q(*OVf

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_gamepad_black_36dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_gamepad_black_36dp.png
deleted file mode 100644
index d3d33362cae322616fd61331410a8559f6be46fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawmV3H5hEy=Vy<y1JU?9SBv3|;(
z{~<d&r-d0QtkyA_eeF@B;m!9`j!6`M_+{!bLBX+!g;Pi+Lpi;kJIdkK=Cmpg{i24D
zgN#8_4ojCZzI?_R!Bgdt<i~SF<=GNPha^8K7AQjwDDuS7C&^EYWl6VkM||Y}W$*sK
z`OSaq-|EHxi*i@Uv$E>OC+hyRVY|xP^>^`>dV7#XU>kc3SuGiLB_6FYnN!RLbTWgd
LtDnm{r-UW||7=r?

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 1989184b14751617cf6e19e833810f91563f7522..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005RNkl<ZSPAXH
zL2rw30LSs)o^91_9dR=nk*dT=yoloBxHX8w-idWJS{x(}rR=hBkT`h}6H7=l=go{+
zE5t!lX-U3he@{x==lTDO=k|O)QY;p8!Za7T&l(@;@SRV*V3|woS05HMEKaaYi$PjE
zAgkX{01bl)Zt;yU9d3}+9v1mY?#S{A7wcpsitLdqPSc=kgC%mzkYJQUoT1EHx*AmZ
zMQ+H_z_-aPo_a9GJiGLf3no~{x5A_XaFD0;kPFKAN(zNXjX%haEFFv$Sx}^h?5JXF
zGO17$=_4CbG%@BBibV#H4S9?WJcXdZK(e8Nv7`_b2p}6)F>(sT0)b>h9b-n(poNi8
zG-zQY6b*JU4l5e0V&oJJDj3%k4Q4T3<H-?Yyu&yz8>VPt<mHHYjL#%x$32WKrsRMF
z>|orM3o^7Z9?FUlo?v_>EjL`pcT=Gl;SRnlaz&CFzDJ}KfN37%TVq`A$WX`kh6{M=
z!6=v6#<xRS!{HQly0$2BmNfeq=LqL0vrX4~PHK2$sNv!zNA-6|QldkcHdjgLUvQi%
zO$PZwg=6|3NRj6*&uGx5!v~&IVUCnyv6zz|xDIBu=FRP200000NkvXXu0mjfG=1C*

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 5caedc8e57497ba9d32c3a1798f7394bd8ca7cff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005`Nkl<ZSPAXH
z&r6eW0LSsqNZUYNsmR>lpy;7r2s24Mgk2IZK^^iBh`<h8dMF~1I@F<4m+CMY+aD1L
zRv>hXFsLp$Hi^-XdC<l7?yw#9JkR(0IP`lFe7&S&M+6`7+mJgXF&UOCOk$FfD=c7g
zQ?9Ur$wRq90h7EAf>|o$nN|w}JYolv9aiaA3)AHJ#jL^+<vUHAEHc1#DunsTH3qrE
z7n;5iRT%Elu0|(nw9CkjBvlTpN>Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@
zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<zbmk{w+<
z!7nWfmhgMb3GIgpUL&$#46m{}K^?ECEQsOtPo1ESS5y|n@T#d3RPY*=1><;?v>&>8
zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO
zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z-
zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP&
zE12AuD=c7gL#~j*<bqsb7?VM{!v=oubnJ-u5AU{D#xB%{vj6}907*qoM6N<$g3Yb*
AWB>pF

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_video_label_black_36dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_video_label_black_36dp.png
deleted file mode 100644
index d593d30aa5146ffa749710e3a62f866be3c9e18a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawIz3$+Ln;{G-n3*qVjyrdK+;vf
zO2%B~%<;L~&)hvW-Gt%US9xROYW)q9PE6s~pWMMB7j;8pYF_fgpcMx#C+fL+J?)<3
zb=9#mc&C*{@hX{jhwuI85>oM)py1fV!iivn{08w>d@?oHH8J03V&{KV?nB*Lzd6g9
iHeTZRGjHb1zl?|eo|iLc{InA2C<aegKbLh*2~7ayct>{t

diff --git a/builds/android/app/src/main/res/drawable-xhdpi/ic_volume_up_black_36dp.png b/builds/android/app/src/main/res/drawable-xhdpi/ic_volume_up_black_36dp.png
deleted file mode 100644
index c1e9affbafaef32b8efbafe2c8c9d430536ba8ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006xNkl<ZcmeI1
zzi*9E7{@>FZPkEWDolnB21APuB3+~+1|dz<(hkJJ#UM2_#8f0$B?hS<ga1J!9bAhT
z)NhegxQ!0PqKQGdZ9EpkbIyHlBjSCYcQ~JCJl}KkN#1*M&Up?NBoc{4qK}dxd}5Ma
zWRwK?Q!^Z6B`!>$5mj@HdgurmiK<SIwN5M)*EdFNbp*{1B&V*B+35(HDo2^lQMyCL
zN=ImAFHd77?vmN)2zgW(<9noZ*+xfbM<4H^<cNii(4O@?j#k{};&p`OSQ9DLi`NmB
zr<?ad`f$-Yf~G<%y)3BoN4kpD5j4*kpp`R0{#3C#f<{>495EfdRQVaQB6afivTMZb
z3uf%$FOh$$yk9s=%riCPmc7st1BBGnj4xEIg@hMmXsRr#(SCa&;UFP(z0y2{?h|rR
zjotPTYO)&5klsQ(goNE_dez9Rk5CQGIyLguN9a77F8w*nCiD}4^vMR>{;3;2%YIec
zW&glK=pG@L^!Dl@G(^ZlHFm;YXqpVo+F*0tW-YYH4nj_<8K3QsA7jMmL+qsW5%wxE
z2Z9-cmWTW%r-|w0jmp2ZyaqjDJFScd`QvsM#eB8~ZL9_>e6P|Qm<`gSzRiYe)K8o8
zZO3fnNsyeU$FpJ8Pa{em@@wgJFwR1xbHT6axt~`^R5yLv!rjzzWP}@*ooY=pN9Gq3
zWqMkeXShs{FH>wP&-2s=hH*s;z2*p=;EyoJb#_u3wvb395{duCZ*dvEM$7kCH~;_u
M07*qoM6N<$f=QhsL;wH)

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_autorenew.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_autorenew.png
deleted file mode 100644
index 0b322ffb95e6f5a5e04c0e06dc86b03903d31497..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1909
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
IZp`fe0+7^I!vFvP

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
deleted file mode 100644
index 7cb7726a1d853ac62e95b3bf8b8f68640d4a9cd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1992
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

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_content_clear.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_content_clear.png
deleted file mode 100644
index 0b295f3de2b3271e974d286fbe11f745e051773b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1300
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V7cw-;uum9_jb1Z3Q>2FWBY}_
z9JS{N+otI%$l@5ta`2dy?}iOr8Hq~;Rk<E%hlu<)-N(Xx(1|(fc4Vh-N0I>dLBB1V
zd;g2}%go?D{OjGlnR|DCK3i)Ueg56dpLNw~&u$xQf9PJ-5U{wqz=GkE_X7qQhDgSu
zit`NY4q**4_lyrPP7qaS|ISmukivT6p)E6c(m(8(1Fk+*`ZRN8<0?JjiTZ2oE*Lq4
znloFlJ`flDc}mD3G@mI#U}C*Q?E;2?tFjDw3=y0UEF1nRecHE#Vbw3?hSv;c3_lni
zEa|wTf0MmCRK`KzKTpHfiwXbP3SwODO%ZSi4QH@mPY4%zZ-3fDurgo~|6&PO#+J-<
z#sjNd*?w{y5EQI52O5<XSuS<po$I3-mVyWuIli0iKW-jnxY5M@z^q|@l+k<524-j7
zu5AyPc5o%!mS_|`pv_S2`Xrc>1E?q=<SRSFc7`?if)7j^=KmH`=%`OW#Qni2hpX#t
zR~Hk9Kn~Xqjss$k3a=+K?C(5r+wR^WgSRn^8@8(c{>NI7@j`Qh<-A7>Of1pN=a_HY
zRN8R%@bP7_GeS*Or>(VjU*3E5Y3f3T4uwCQ3BjkMGpmcEXXMVFQQNw9Sz}+h_1Wh(
z%mot^?NX(s`t8n~E@xbm9r)cfe6yI(wPVxLZ*ME_@3`@<z38G*f=N{9T;>n#4Z6DA
z#nU3QXRIkq-eP{AN5QwIip@nJj6M0vHZ_%*TMgA#pZw+-QP3^1f7_Ks=?*Lh#ZI5r
ztuD#Fm32*R#+pEl+i!31b?eocN(wk`@MoznHO!V&%Z`7!_L)zL1B>GAHCMAX1%-Xh
zTDIWWJB^!b7&rLe44t)RCab{D7Lm<qtaG;=ot?HRP0FDyGFw{xYRXxg28M(C68wy^
zyL+eRZJNf?z>qj8GP`dp*W|4!3@jX)X=i7JC2yK0)v(Pg%;uWX)U6_g!M8$o^5&M=
z9859Im)x>xno>^I>{pB`v(~(y!6>n0(=@G|tlg^^Rl+viI(92NRX6m?oU*G-Csw3H
zeysU$DynaVW$tR03Bf11<}0zSUGtP<*6nR!3}rC}J13czr0RxWne#1_amKPqrY@<v
z?kCpeu4cU8uIe2cd?qR=b?xc}JHLlAE;#QM7O`jfsx?o$EPSi28dxTqTItP*ImvbN
z%F0b<y)$CpEoJgBiJaTVZPf4htYHBokP|E`&STgm*L+6s{;eQ}lo@MQ_H(Npd-YTz
zW!(=E21~Wo>lZ6CI!#SmTfw%WkNaBIwJt^uraK(}Qv&<A(`Iaq|NYNC@y?eJo`zC~
z(Cy4SMC#6Ee_QFHn%xw+nZJ7f^gsS<G=L%b@9Zr04QfgOUv@l@*qrA2XR}h#`qN3b
zzJk-2_4@qux-~cQ{->zUUbBul_uh4b?6Pec`?ma;5_`deBXq0$Q@<(y)V0|JXKu|_
zT|RdQ{}i4Mg)>v5-W*Hq(>-&>E`afi>D)7)ie(sP&SR!5-{aN&pUvgOg@Q+|3*~{O
O9fPN<pUXO@geCx}u_`qH

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_black.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_black.png
deleted file mode 100644
index 273a508d98708cba54f349588b5a2edaff746689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2626
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

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_white.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_off_white.png
deleted file mode 100644
index 63b98a2ada95cba1dcecd28cf28cf49b8bea2bf6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2918
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
QjQ{`u07*qoM6N<$f=&Hb{{R30

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_black.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_black.png
deleted file mode 100644
index 8bc0088daa179c2aaa193da964c5a8ef13db254f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1823
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
N002ovPDHLkV1jkdSQ-ET

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_white.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_favorite_on_white.png
deleted file mode 100644
index 72bd1b81a40e00dec7ad7541e712362f1e0856e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1955
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

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_black.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_black.png
deleted file mode 100755
index 6c9dd340a6b044028e82c699ee7146eb613a5448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2292
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

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_white.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
deleted file mode 100644
index 8fe9e5f95b9ae347bfddf3254bbe80a42d3fe819..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2022
zcmV<C2O0Q@P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000NANkl<ZcwX&Y
zS?s>U6@DJI#1gv;#8NvKsA!Z6BDNMOiM{rv2#L0-CM0$e62y{_T5Dh11VKuOa6ubV
ztqc3sin?eiQpEbm<3At2-}m?X-g#%{{oeP-oU1SSX3m^B&n#!onK>^}saFlK*Vb#}
zr~vdl2r2*-fSxtbbMtiuQ~-L`K+nzB8BhWEb`40{1;AwhR?5`T+W?Ly`9LP0PO1-f
z21t4Vzy^hS{UXT?3-Kz-W{?0#S_Z)TK(TX*04z)L|3$S|fZ0$1*bKnm3-oU$i_J;?
zqcG2Gc0&bVZvb~@_ii?WeMtVXFwbmuLj~X@0Ow}+ZZ?CHNuF1jXEwW`0&oq0BeHup
zo58gtk1WhHo83?Wcoe|4*}a?1;4zZh73P`EZm0nK8^EgBy_?P8Et0Dh=9$fIZ~$~*
zf{v6lNK<r(0CZu3jzAckDLO;|x-daU01VC)Edqd~EdX2(V3A<I+v50F+XYh6&H&B=
zuvOc-k>&pa;1rS%N0$G(n4~p>WwsB1F8~}$@^5YVjF-;_K+>WBe8Svh2J_DW*!gu8
zfO|=PHc3!PKLKzdfNgR+6j}cX06rJk+M1I>-*yM^O8|Bb{$NJoX8~;1)VC&iN&s*I
zfJ-Jc^cH|W0Jw(at24_<S^>cM01gkcr%B$D|9exu4ZyER{%1_CbpZIxV7Vq)W3GE?
zj!;<uNLm@divX<1Ci1lP)c35o8^BKCcWHC8NsjUV{~Jd5{Q&j|zjufn5dX8smZW(k
zQ7!<#2XIV6%NBh3g5J&q5oT5KY<M?vAdR<m1<7Mm1xN-!(&hl38e11r<(SX)yx(m}
zGRb?J13(w<g82$WvYR6b07?4-xP88At0TGhBY8(#-mL+Uv=o5n0N5_B^o<65?%9~+
zhi#OS0>BvnPH)r5_o(cdB(0xlY6U<z4SMu@7F1eT10MaJ1<_uBwg7nD_xfLHZVlW)
za=%ywMFSwo!Hh=+WV^@qaoXj4rr5s8%`p-x3IIv=f!OA^?LQRq$@-%p%#x8O*J;V_
zGl9<rJ|j$|SO9$5^{KZ{^7?ug0J{vH1n@e^Pb`q6#R04h;Ku-V1+eD;_Nik@UeTnm
zSO8uJuvQbZj{g4uzy$y<CTVv;BT2HG<JSOA1h8~tg>DM`lcWblkr^=Z-8Atl{r_J9
z97yt&6vmR)1#okR@r6lZy-TvuNf|o>ei~f2%cUqHv5sBEhmrg^vHn-pBrO5pIsp6U
z@M&51J-0{l&rS8B00<pfAAoO`ZQ8`N!2h=bIEbV-+H8{KNZm~U4#;NK%-|USdy{;r
zxoFGFufYxBjpd*i=80vz>};1i^2gf_Gr<nTuEL#e(jXtx#vKto17>ze(s2MT0$}T-
zBzePim@jF~ZxSTz2@ao@-k5ET{f6Y_O)`xCp9DZyk{rji_iv51jZP@v+LzL{ZAqnl
zS#Q`oK+*yK)|3oD0AUpXUauX(%O%_StH+v}sf`5__02-(1cz7;7>_Bpku3{=0D@1+
zX9Mt!<{W;vkUX%B@Tp}b*);t{YJD450DRN>)R@!mq;_%?HjA$$@A~Uybjntb71KFM
zGSJ>IQ|V=rwhFVUBmh38=A08YB<UL#os%TLJ@Xs1RC<r3Putm45&&BQizP~Adw<E1
zZzqvQbhY3+vLnyugB1FdWDyInBmiC)Q|SYeewa5klH><_$>u1@BDyQW#9EV70Z14=
zB>|{QP|pC=O}J+Osu|h`03lpi4`K<*ca^L?KvH!@^yP|>WVfzgvsY&v;HOV^qqnA{
z8BpEP3+Z_}?&uJZ@$HC%TSFaRVLk_BZUo@l5YhKTqi295JKFv<rI4iK!4Afk3`yG2
zH;uTkLy~)ud^u*!MFAkGkD$Ec42S22CPOIFZ`7s{4<6~fY*1cOy_OO)oM)FQdM%}1
z%xVun(TiF2YGQi;ie62umvh?zQ1)_ea5vZM>2V;Gzn(s7S5keT(F{U24>ZCo@WZ_N
zL}_jix_zP)Kq!5&sd-GzpAxMvmPH-JX7;~6Q=M}(Oy`+um<9Er_QE(!=b`qD4Y{T&
z_y&aOrYZ=tpeE~B06;&<IsynaT@BDrx|#q$+k{OIg(OY)0Qebzs{xotpX7{QM**;G
zKMx6;c8t6=*Kfk6076sBGACgjr7U}G%%XBk+3C*gr*CbMWuoR-gXQ`iNh|VelJvtF
zDa$4$d+j%6SpZ;C(!MJJ+}D)YF1*5bvhJ-jl^R?9aR9$<dQ=gT_U#7X=)orK3m`ac
z<qcsJJ5cWgeSSI8iX?gJpVQ$xE{8i$Bl%z}!4_P-^yLF5@^jis`+E)<MB2)>9cd~r
zsU~i1Qc{=yhg@_|chts@Qggd?B+t}0zQ%sk<lT)b>b`)an!dh!HP79Gq%PbX$?k$K
zbun$*JE|{|>L*O1G}TcdN%bQ>9qBfTZAYf);JzJTWejx*vZuAQDLOb4bjSeIPZ>t7
z6&)6m^gMu4AK-j}<VGEeo6LHUOHlAH`HK}!|FU9o?-o>i2f%UlbGDgU{H|6X><sv>
zDtx?O6@Z?Rt^ia3de%VC&DR-F0q9u+JvU!xK+gbt3DZx)f9>t2o&W#<07*qoM6N<$
Ef*;7W!2kdN

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png
deleted file mode 100644
index 51b4401ca053ca8cad6e9903646709a2f44444df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw{&>1LhEy=Vy<yFF$UwmLV))FX
zs)>sgJ$~x+g}6OvsxLimbaeN-!xQItoH=3nd`|H@dF!kYp_dChV`b9AudQLRn7yg2
zv~UiON9*MGOYAy6D=_*g@;c3(5`S(Hi^X<huBlrXE*Z1OSSv8{sT%UBug&L=pK7t(
zuCv&pv-s5{i}uL^?UU{53W6WasStYJGTB0X+LZ~PA6Ee-z^V>;wk8Ms*3SMP^!WTf
z-E_DAd$kLMWY`Z`);MuKF9=d$?_mzLoFj7Xp~|_3ODg!(3;AT&wLoS^O+0tsvcZJ&
zD(m_$dNm(!9@n+CTyDa$w$*a^-$!>qK3P{4end8+qbAwoFEAV!JYD@<);T3K0RXh>
Be)#|Z

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_folder_open_black_36dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_folder_open_black_36dp.png
deleted file mode 100644
index 1eb3365e090b4bdc3c2837b4815d93b0e68706ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq%^N1iT@Ar*{oZ|%)xN)&LtD8BJZ
z!V@9E4z3t^`%Mn(SaZ$zIun`g+@9~_@-w>VGD*dAl8SELTxY$R!Q9^_Km2v>zS5-y
zTfR15?Jo0JYIR9(<-9GHS0{%7saIaB*TIQK^XGGFm&I*3o_F(0OX#}DuPvcvv5Cvq
zZKw{9Xl&eDnUIjbijxN)ICGsrLPFxkov(tQ{|IhKo|pGua6|6Ayi>Uq*Yd+E7y7Pi
w-n{QqQgE5&Q@aNzEz)L(f?Vo(>Cit$pWi%PUF<AMK;JTWy85}Sb4q9e0MR>dcK`qY

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_gamepad_black_36dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_gamepad_black_36dp.png
deleted file mode 100644
index c32339a09e342a3f9e359cde16acae5feb9169a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^IUvl!3?yqky#4_xp#Yx{S0IfB9%xH00t&H~1o;Is
zG;r*w2!3qS0~EOI>Eakt5%>1mM!qHk3D?BjM|zy^RQ5D_${#o=%e3$RYKxben_`OH
z-`Q7x64c7|Z=ZkW?bS1LbZ)*^@t*ePX4>jGy}4!6HwUep*68r;Knb7E^8^1LvAnrs
z`1ixZ1E&@zue<+dQ~krGO}XMJx6)_NZwggxW)?QGFi>n>EDoliJY-6<nfbHvU&X)S
zkMtY%-$^Jq7Ju_!!I$$_Zi@WTJ#qiTm$z4MoatSB*kZ+=WI>*Dwx9lTx7E)*dDI|s
eQ_9IcyP4)+j~PrC)LwKD6a=2GelF{r5}E)T*?(gI

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 1692d8a242162dc878d42fb1b112e918cc25c3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007|Nkl<ZXa()T
zPiW3@0LSsq#N#yS*<!=N!8V23;xMGNgSgQY&rp_-<==r;yV#x`750Rb+=v6$vD8we
zWQ8j;%4OIi_IS3oJ<r}G`Tn-Y^XL2hJv@i~UN0#S2m}IwIg4sqh|$L&aVANVV2FNV
z>}R?1pi{*}C8ro5mjO-_Ru*)DiiH)#7^4tLdZ<zcy7)=OK!^^K*htXMe0dP%7x_mW
zuW<348vRC;-{cp~ByjbW9r}rG{*XVkktWk1SBOwgm=N<=%vvH`<{g<*9Hbi$`N1(}
zOL3D%Wx*EiGEGi$M>A<=>SdMkpq|I%AXn6pz$;0s3PKrYm?8_gA;c@ZhG~!mn)t?F
z$qgNN4O1ga+~BX|f)yk&k~GK?-DDvb#PDjBCA!H<_NZhGqgR%Ql7sAV3M0iTSs_YJ
zvc~|%O<AFfJY<V%yc%VJF7lEsS}@+o0-Y2<wuoU|QNie>AhJatMnt8@AV$4Pk2pqH
zrN<;jNTtUlMo6Vc93!mKV-TZWrAHq|M5RX$##I#o*D*R}iwMSB`9>KZFt*DURd{Wb
zPi)1Qpj`HNj&VyqaS!9ZTyPR2MXh{b9chdMazO=2j0bW?8T}X|ER-8A;dMxkIDywW
zxnddLF~(Rg2W(;jBhDhZqaCl0)X5U-7{TkX{9pku@%qFDS)h^6cs-&_{!mK-uW^p3
zK(sNA*C&?CKX#F3riZLn9;~6CnI>pbad4E`Qru><vS2fJNHbHKy(%7#k|xs-*VxB;
zDp^Q~3L4nQRo;_nioGf>b~1{qINMZw)bIiqPg$vdg9V)BJ2t*?ntA${sOADm3Ngxg
zD)c{4!Ev53O*Yd!;W*{`zgWT^F4D^zJ~P22UwF-ZF0h-W3IqayKw!@L0j`rmsrdc?
QM*si-07*qoM6N<$f&f-ZIRF3v

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index eabb0a2ba41bbe0e109263ee9b0d6ada40a6e792..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 843
zcmV-R1GM~!P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009LNkl<ZXa()T
zU1-&10LSs)^c<zM(B^cK9+!xvA|hQVk`NJe7X*z&5}8<-kX?8y<iedZLlNIngu$Q`
zW<vCKnW#x<(WXO^5G1!|`JSHR@$Jv~cC*1@JpbqApbuW0&qu1Ot9wc@pFz?L@Umi~
z1Dnl?jl<X+RBZHN^Q&T`h|NvKMKdmqiizd8ELBXb!DW?VB9BYE9xujlglp_)u|{D$
zAMrOX1FU1bM&VTsaFs(eC=_cM@f&NIpkb_F0AH7QPs5nVhy2cn)e6J&T%p=+zF-l}
z{79(pnaX1JbBAh|nWzwK!=y|t%9s@7kGVYLNxRQ%`Qis+_(pzsi&)-}8yWr}mVU;{
zg-?iSz3iC6En>RPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%`
zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d
z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3?
zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(<JpFGizS*yaafIl&-kdp^m
zs9<)Uc?!b{N~9~u16xT~q*cDivJ<-!IXTcm8N2Od<i>P<#_c#+Sul>1xE*7f>{!k}
z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$Q<RQ9gsO0s
zZVD9Wrk@I-cF2YoxIs+Um?S$sCZ=_AA;URhIl~ya@g}jnE<b!r3`gXPIXvJ=yT?oN
z$LE-os6`Qz4u#-3{-xS2cCvsbz9ZCO8d=D0{-fFu6BLFujQEAsJfmT>auHt_cw57G
zmNrf?VwFPCz(EGt%|eYrmJb-f<uBUEXcQK)m&<%fgB~yPxU?%K+HiSaG4UEMOB55$
zxHKv*?qG9MvC)goX~jklHeV?=wqWzAV&fGql8}&)kdTm&kdTn@hzrb7U0vN%>VG|Z
VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_video_label_black_36dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_video_label_black_36dp.png
deleted file mode 100644
index 700d0bcbd794a386392d846b5802f7b9e0a5c9b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq%^-<~dxAr*{o@0ibQHWXlc_)@Q{
zo7bu0$bp-Cc%B}45cEF4y8Kpc+P+I4SvT0Hfk4@-sb0zFl0KZx42i2;acG+Sx5jUW
zryZKRtmGTx^_h3l{%+>qRlh7|<%OH<amx!f>i&LkyFhOJpO*H&A5KM1t!)ZDm!+A|
zyZKpq{;iD?HM=+ew|Tzi=*`(;J$I)5*YTNQka(ztQ&<fTBc}zXKu{g7>`f=<?Bxw-
zFUuWUYMbg)T{G)TjK$l=@^h2_cphulsF}O*oL0^u+iywECx0yvG6n%_hDw3Zpfr^^
RrNCfd@O1TaS?83{1OS6MhjRb`

diff --git a/builds/android/app/src/main/res/drawable-xxhdpi/ic_volume_up_black_36dp.png b/builds/android/app/src/main/res/drawable-xxhdpi/ic_volume_up_black_36dp.png
deleted file mode 100644
index 9242456f3bcfa9c4d752c67d3aba1bdcf777964e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 955
zcmV;s14R6ZP)<h;3K|Lk000e1NJLTq003+N003+V1ONa4C2yZb000AmNkl<ZcmeI3
zO-OB36vuzp?$x3KDF`XBFH~xflolZ+77nD3N10D6Zx&$)kr6~h17Fd!8rY<468ME^
zZ<3WwqJ$a*LY6N~LkA5EBDJfMnjb5u;aU3}&voElm;GDQ%^!X!`<`>wS_Hf%5C{YU
zfj}Uz$`FrGLCGQiRe_IbE=95b>k_?Gl%kj*tkF+-Nr)-6LI>s%M}5i77~rkcV!}3k
z{%c9Bn7b}g>9<y~V!|@F`>f>_yMuRFi&ZPo>aUg%N0x5pW7Phk(^oAanRb44svVK{
zQ%g7rIbP#$huR_Mebf?8N-f_x)b@D5KP}<pWO>)2wn43LT0%Oy*i+ROxymmsAuTNw
z)SPj@w1o6D@RypD_eo1AhWpeza+4~5w1nb#lw&1p(jP6MSO(Oz2Yt~hUM$0BO4<)(
z{Lm7Lr;2qYugecD;WRw0<Smf#LCY=nIk%9^tdjV!4_a<9VTWFlxRWF0tB40$NpH{}
zavAYVMG}v>@$9vd#Dq`C631Oi=7qD@N){7_iRY_G=FexLm0nDEJ@wsKM=Ip>Rg~BP
zcjM-AHY2I8*bozbioHZeBdOC?#Do`c^OW+WpRppg8uK^1MtRn+wIU{*!_6=HGouZ$
zDcp=iPQPhKY=;~!UX7d{wIe1p;o^zN*;z|sFX5sga(2m**dQ)$h@AbylGr3JDkEoi
zEs4$GBB%6W(uxJK@UIvyj~8*#X#2XqH^mS1H+ICf$)<Ru8nGibk?K|Rf*rAkaI+LS
z-DyQ^nKE2ltGsB|SP|>NO}El+&)5)~qYO7=k<?GYg4jOwxVb{<Nxy94gK0l;<dxJK
z3!k`$i05miM`oZYF-942G%A?`{<o0^6SUx>^1@Q>cjIr19+GHOe!;%*yHz{QO(gTJ
zlGtXyx&DljH*bF&;(9ieybk*VEHg^l92x5)M{lcX&DMv++SMVkaqDA!E$k{u>s)7h
z5c3|k)TAeEkIuHTt>z5d9(K;NuWDW5O1tCfIo?Oq`jcDjE)?9x_YSRH?zg%EQo$SS
zIkXOV%<9rkC##5~4(YPEW|iYv77%Cc^EiO5#khLj<98&cHfTY|^eW>bb?BI0KAqrd
zbPTTx7kD1SxU{CJhEfw-;v71L#eSoY9F&&Wk36SK*%jO5Bbq2FR``H6$_WGl_6Y<6
dfk40j{{l8Uxz9{kZdm{T002ovPDHLkV1n>#$ddp7

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_autorenew.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_autorenew.png
deleted file mode 100644
index ea913dbc4aae4749129fbc0bbf4cdcc32dc83a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2827
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

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
deleted file mode 100644
index 6f4ae03ff45c6c8d73ad3801f806c8e117d3d256..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2952
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

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_content_clear.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_content_clear.png
deleted file mode 100644
index 94b505a407c15008ec5ea58994abe5aaff11db3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1416
zcmc(f>r;{m9EE=f_<{-1MPTwZt!A?Io|nS$5~!P*CAMDI^%_k!1R-G)Yl(!V*~J>u
zZM<dCY}#syt6;f9;#SfGnuBR7mTpbErGl+nXhY=MU(ttio)72iGp8&*E}G=9&H(^O
zF}tFESf=!A2=>eUAUsD0fM>@<u@c3Zruvw3YgzO&lXE!vk+q3~0b2+jO|<v+=1`fl
zmg=->ADVpaVb#==i%nCVdAGO6N8u0!iCD%p{QjH2f3xSzC2^aoYS?8-=R2vR`x~yW
zRNC##P@gLWw^Ak$;3)pF?ke`%(DzSF1fdqwQZqKUdLV_cVY>T~UQ!@vI{^^{Bc=}j
z{;@t&Obb-`p3b9azJmq*?3I7E{bBD`|G5_8V9|ccQQDPR@0RfiflyG8G$Nq&&o-wJ
zChRB?qqIlZyp|0wb727!x~(ILEia*L0|t3&wKVLaN{!3Y>chp{xh8KP%&wF#AM@V`
zxC9zR#j2;h$rYyPuJIM0J3b}jJ_bp3>tAbJfTP-Bk_*=$Yj{OzwHbY<Ji+kdOAxpR
z%pQFw^m|}w3|b;eo!Dxu03KS<nBX2IUiPcD*U{MU?1L)|V8wsG+dSd~n}#C@r7&Ty
z5P7lPi6LS%Ut#M}M?jXLP&ee5>->Sz1{cgtDKI+_e?Y-_n`13jdPg=ck%dI&x;<qS
z)IvqV_)BN1ZPOwd)#ls<;`7BdydGi_5xm04+zy)@-cu0em_!I(o@B1lR)L{=k+~|{
zehl6JE9IEfeAI7L;tee)P{pXk3A{FvQ+Yk>V8oL=%Inz)1zJ{3OLb>O?)a9LnRZ)i
zq}Cj5Ct9)l(~F<Yz^uDfzdVgpwi?@Q>FS-@B&-G%QW_7xwj21-^?5>f2D{+cszI+N
zp?gC}Ro%_3Bvn=rgcTrsxR5-b$gvJ%2Ls4`tfmo5HM|`UImAu4V;Ta#Xf%;;<-x;i
zasLVLsPva6SKc2CY}|LAajW~tROR~K#n)-UX&!b*6X#Fv(YD)Swx9BGjr@t--<&Tk
z=UDj#$u7t+W{|VHizHnvR0`uaflyT9!?Cva%zfF~iSD+d2_$gg7x6D6n&VF|-S`-M
zJ42FyhcI4IzrlH^_nrtzdc^XEe5Gx%(mXyYnY?{KP@9;4Z$4T}B{8#%+dInG?+S`M
z?mZ<QvF>dLJ;yp^p-peCN<WEKI%?9F{dkgnzW5cS3XBaH+00&#@s_X!s~l2Ko4OdR
zbg#5ybJqiby5Fi7#^WGzES!VhMY4Apb1xLH2KqD0*ei`U=v0NjF!G2}#F$%#ZG*dt
z!V*Rv!c6N68W$9ei2DrBO$&7)V$Q*KlTUanY!P?7o#@@jr@kmDB;?Sf&QLzU80qh}
zkwr+GA?`0%V<3J0L<-r@BlNTatGUxDTI?%vi|w+lR~IkJn~%dlb#?O<*Tc(p@lpvn
zJESY{_x%rsl3#gp%r#@y4Q;a%OK+%B94ml4F)As2c`DW@P)!B_QAS5nAhb?Z;eOR}
zqdZn!JoIm7-%S$@&y+EJ%hM@pvr9JX*v!+-cpL;f*fHU<Co}Ut`mHEMr8^wXsv39?
S4((fhScv&PE~+&mTlPQlZCP6Y

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_black.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_black.png
deleted file mode 100644
index 06b126805391b3739722e244960e6ee4b3c6cf1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5636
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
MK5^EJdfb!rKTmrNm;e9(

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_white.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_off_white.png
deleted file mode 100644
index 7b203e489b333c73730c58ca57a1b316705b22a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4949
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
SfrjUIOL|&HnpGN((f<WVkk5z!

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_black.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_black.png
deleted file mode 100644
index 08e80657abf78fdf9916c2a019c9f84ff516fafa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3840
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

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_white.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_on_white.png
deleted file mode 100644
index 52dca5aa1c52015c2ffdcc4e1a437d5ac69d65b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3653
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
V_^s#2S8e`FIojb4SJ?)p{2x6yPAvcc

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_black.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_black.png
deleted file mode 100755
index 708dd7b55bab291382f744933dc9db7eb06b354e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3812
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
AQ2+n{

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_white.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_action_settings_white.png
deleted file mode 100644
index a966d5edb0e77620b2b7bfb196b1f193701c76a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4454
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
Wd|W1=c<1nEgYE?*t<v*XV*Urp^xDS&

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png
deleted file mode 100644
index df42feecb812b02df59b016f4d9ba995be1da82a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!06!V;uuoF`1aP_Or}5)*N1l-
zmd#l`*P1uuRG{<>g~}cLi3<F6%!<`_*{;osx0o{}$V+o6h<G}^Cgo(ugE`)OasQ38
z-$^?BpJ{qsX79gWa~ZzGKcA+2Z9b<%y_(10nG9bd4^8@dyfTI1@Ab$}Wo~i`iLaWg
zxrG|+JOqB(HNO7Mvi7~OpM!kiEw2X<{<`<VTlV=|FxMWb)CS1|`8)Rc10@+>NSnFL
zkGQYSP&@m;*IK6Q-#O#%t5^JG`{BMqf8+n2Z|={&zE4otx%%IU37m2NTYWzKGCBDA
zGRyk&LVN6HtbDhUpKVe#i0?1F$Iko1uY_g0mfJ~qyju(6`+^n!Z*4i<wr{7w^gVNv
z^LDSj9aHR4!W308>z5hh+Bv?p(-%zt$M-+!?Iw6Q#P16<$f#A@_7oVT44$rjF6*2U
FngA8*uUr5C

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_folder_open_black_36dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_folder_open_black_36dp.png
deleted file mode 100644
index 11bc67e56dede6790062cf84365ff36f0ac29ee4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 470
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFwXUKaSW+oe0#?>PuNlB*u(Eq
z948}-HI@kMU=j*a`FycJc-M!}fXN-*7nGdc9mSlk-PGY-^f}_j?KAH_SNngcUy`Xl
zNyQV2{%t+;Ip#_BE*|B#scONK%U^Dn?Ruf|_M5Vxt)^_pi@Ln+^6fA3>ZbTPe_2%`
zw#fSCls=~~J8Fa$@jq=AsMVX_{G$4&giCIl=R39gpEUK0^x3}|A6|0(dF`}@Q`w(6
zF05P2@b;Fo!_%#q3{$_WRe#BLa{x(IbFJ7@?C^9g<J9ev{42h-ZG5+Dl^BPBf<prX
z<F8m<2!p8v&bkuH%>t3mUB$`-VdlYEzp@$`7(t>7Zo^rO5HqCgK}IsMtT=73xb)}y
zYx|CCmOpG>T6ErM$}{t$YJYPoewo}{ynQpH)#*6drE^)&r;6R&JUNm<_IZP!`uXBn
z%+(W4bK0+a+;c%`{bhf?<>w>CB-bup^T{y2DAv|zdg-~%Uc#`jRPn6;&Fo)sV~2|U
SQ6FG@F?hQAxvX<aXaWFE621xm

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_gamepad_black_36dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_gamepad_black_36dp.png
deleted file mode 100644
index f075f37f12b99d789bd1aff5babc47d338864e4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^6F``W8A#63;L-+CoB=)|u0R?Bnv-810J4}%g8YIR
z{x`I|+SLQ(zVvi)45?szJI#>mumcZ^uR^Q*r2k7!7A~Fl$p6WH&2yJqQg2>!yItjQ
z_^#)tYdbyX%{PAErpIA=CBWG_K=K7+Nsik6qdjMzZe5VM@UFJv)2S0ad3i*tF4-c~
z9_%689rv^OnWpKA)e3e@-W^6$L<NF2NG;+ERc#UR5^~~F<y35))H1=z)5&9@isF)K
zlN!6S%PzQ_bYxcL1<EvYsj~Y{Dbmn?e)O~Q3I5CR-TNQ>S^1=2uYO;p@)O;svyJnM
zrzCv7IGKNAjf`8fsr<!@8_r*6+ckCVrW(y>udnL7+Wl{}3DBjyrR%21n`p7`K3v8U
P3knTSS3j3^P6<r_PE3J$

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index f5beca2511d275c2f754b38989a1e1e69196da05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000AyNkl<ZcmeIf
zUuczO0LSs)Ia?c>`{$AjijdZyt1MC$Azf957h>3-t3^RKU9_d^!eEr!Ikee|V#8uo
zB-PXcagY>r5oi=j5EdwHm3A>)o13%M6gJwvNrd#g?>T4ZywCH_z3_ZKlIMAz=Xsvz
zd7dNO!jtqc#7V}u%mNEsW{i^z(ajUwq>|97<wA-F=;K$GGQykOucFWiS`Msc7iTEN
z2<_CVAiB6haifvfm?erCGSn##y7-skM4DEnv2mVfNhyR3|51FnlM}dblyx$Y;VQ+2
zr@4eHGd!-V$nZak17-B%+N-2=1z8Mok4lCpWQ_f^vY93tsi2Hnns|^Me8L2U3{p;(
z0J%m5Uy#oveQZ!(q}ap&f055mgvc$@945C>TB%YIXrP0O6iIIJ7P-vPO|?qE^}Nd>
zMUYE8MJ~gvR|Gu77)z2n+|Ddvhp16R+{kg3AXiB9En#nymIbOfLP2tc=Lma8*65}n
zxj_R{1RWwROJrGs+#pNPFg3D7mL<sr>X^Ya$9h>JOA+J(I|=HRB{CF6E-;K~lxkTa
zLy=^U`v_{26*3e}_IMrBBvrCN7bTEAPGjnm1-dASY_XQ04T_8|N+ers!!)MI=%i$_
z#coXd6%n08AX^;7)T&76Bof);IHt`?7S3X7QnE0OsZq(oB}^4c7XHLkp=9A4rbZ<T
z!<d?sEPR9M5hV*BU}{sc@Dip2N*1<a`d!IF0}GfoDp~j*Q@>)udzg;N1$r<|QLPwI
z&n%`F<pOsR^nzkQ2SH78gC8)RW0f4EfhkPK<O*#B?U7^j6VxJCsAdw=Ja@|>HnD(d
zlnS{+2SFp$$Prd^hM?!=5_OCdbeOappo}jG`i)AtMGIjAvPO!J2-_z2I7-+6X<4A0
zeS{rR99YLi!iK0-MAY*+VH2!XJb08`e&!xUz(#%{Y>_RB4|~XEo?cd|1k}>Y-{i7O
zaU#Ws<Tge-)hYrt>|}!6-dEfx=QHw|VlU04lm{uA*~>Kf43bv-DCc7enc!1)u!Y-L
zLnYTy&mBBWI|mr2kbRVCd61$P*Iv=`;xYcfm1(wX`Ee^><HA?mtZRc5&u|_a<Fx47
zqJiC9Ac_lgP^*=I8rnHUDNfN!tyUK9<qdvhk-|>XL$g*c*07zI8RR?8GRYkCOf$*}
p4w7XnH^}om&+|Ob^E}Uye*phd*siKI(OCch002ovPDHLkV1hNcx5WSe

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 507c5edd44bfb5efe41327d5cef511a108d35f13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000B|Nkl<ZcmeIf
zTTIqv0LSs)%P~*Q*2Gt$Oc{5%2^vlgvdq@9n&w3{E0>+t)}?IPi4`?n-BcG{I5ur-
z(S>O`4876<#~6}k=`>Up4hWM~CUltm-)|Ri1Ni>m=Xw7B>2vXZK2lazR#sM4OxVB`
zGWm@s<ST|TF-$@}q8L+m%SY5<YPEdCi<o*vK4J%^K9rBxgQ<P;5kFw+C;5nLm>MM^
z-;l({UGfbz*r=0l*o=*rbn~#1)BM5?7AY+r;d^YHV6D>PUbfT6IjR&Lx6#YE6o*+)
zuBKoO-MHxHK}|s}>p4WgxIShmD&AzWe%_@-6DZ+pqS#BZCQ!mV^fOt5qM?`(rW@k`
zYsq0Fe-hOnJV_2~IlvgxjZ&g0_?+}E6PL@R*DQCeAjPd$B{wAK#0SSo$OW75#b()K
zHUs$LSLVnT+wsW<vcn?&#V7w!DjV#@H~VFd2k_AvnIV@`_~<mbGQq1vmEs6nsHTVl
z3Ybp~^?XZ;s9uu^ekO`BcCuJEKq*ZGMA0J?bmQ&}<qE+v&f@NbOi;lfZVob288C}h
z+zhfzW=PV8y@TY*0Qt0H?>mw*M;;$z=L|Dth}oRO&PU|Q78@DG)EG-;f#n348sTZV
zVF~9kvs0GXg_$1ilRM_pLS`uz%MxXz$ZS8iD;g5KO+dIKazGp50^T5@IM7A7EpotC
z!W~mwxJ0;WIiQwsy^0H?ge#H*l7zdexR6PK98gHOKye|H0y&_NaDn2&2;t_-0ZGDL
zRb044xEeWN72z%_E_4yDUJlqsxMPX~IW&?Y+)+88op1pSBoqyIaEQ!Ol*$riq{ys=
zxpK!+dNI=^OYFwX1(wJSoA?`3V^qijl?0d?Wut77&!^Zq%PbjU4n5fUgnXH!m=5f<
zk}m_~a~ON=BxQz5hH%r$Y-PY44&!E!3Yp*}?#{7XA*iGWcbzi9S)vHoMVW4ZGIkRX
z#g8(<%S4r;jjhy@q>w_AtYRDOq=;&>OpwD#d~}?I%ut7qs$`Bm_@-GlSja#4WRw!w
z;XQoPAY06$A7At_L-u$UUpyrjB<R2gZF0r^q`1`r%H@vFNN<3+43J)vqF@2nnC?1X
z@em0%FicceSVw|~*~fLJyGoIw;dLhK<1H3w0`vKjD868xCQwWRmzb<xQBlZ6#s#$S
zC^?#fS~_siPPL{Wm&f^rfN?$KD>^DU#RVF<M`^K|E^KsCr?gne`<$nna@{;UkBw*K
z8)~qzLcSr1jXUKZ{=(Gn@)0L7)g>RX2UE@R5j!x|C?D|xrk<0JScR#T@)5<DnkPST
s1rvkv73&xxlOY~cR#sM4R#r^@2T4_fd+}U(w*UYD07*qoM6N<$g0!>nxBvhE

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_video_label_black_36dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_video_label_black_36dp.png
deleted file mode 100644
index 769f4b95d3c896c26ed0bfba2f021ef62b55474b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=ECYN(T!A!sU{6_qEl{UWNswPK
zgSdpehi6)P#kA?Wc0d2{`_JDdADKTu+2@`vjv*C{Z*Ol;Jix$n#6c^)^WWe0Qtjt&
z(iwdUxD`4;U|)dwd-qrJr<3RJu2@~RH|0gt?TW1rr>rdQ2%jaFqJ6yL;sm2<wKl75
zQ{U!1%3OU$_v4axlXkAIW}20nU&nMSHNTq4D&>6zlh@7D>I!$e>V38|Ffy@l2q-u-
z5MZp(Iw8N{6kOecDSLIc2VRl$O}jb!^jWW~W$TI#M;}%FkQppxo4j%Dmj3W;vGWzX
qP2R6LdAol7$=i31K37%(f+`l)U$5VAPKas*1*NB}pUXO@geCyG#(&-b

diff --git a/builds/android/app/src/main/res/drawable-xxxhdpi/ic_volume_up_black_36dp.png b/builds/android/app/src/main/res/drawable-xxxhdpi/ic_volume_up_black_36dp.png
deleted file mode 100644
index c44990e20d97894c0175f09f134874522678a6af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq0058x0058(1ONa4O;0K_000D=Nkl<ZcmeI*
zZ)la}8^H1Jv+c}sZZnHkziK5F?VY_4iki`i{zwtd8Jj@_R?@H+g#?*kQ!<MvkRY4d
zf-(xEAZd~Pq5u3|goc6rWv-+$Go5F1O<nHlg)iH6J-0g%JokNl?$`Ho%NKU)Jm);u
zAwAAH=bUrSIp>^n&N=6LXk!{qB?zNz;~vh$DS=L|ar)_?gu(-zT)(lJCR83s5RUR3
z%_OA<jVS9F>p3f(Jc34yRptSzlgMKRvez!=CXlCsK*C?FqZE4{J5c`mf=gr0Q+Xhv
z%z~KnR31o}peNoug604czIcV&IP(aa8g8PGa&V&U)Ww)bu+89pz7I_FIrZ`75%OiU
z^L0?7&zKQg9wAIMOZX)q(R<X!l}8BIzy>CA6TL<jQy$^ev@(#JXiZFcgj3bX8@Y)(
z;>jaS#d1!V*Bs`uSn>!{vyd_Ks$WtYM;>9SS{X90`&1lxgsHoNVdJ_dxH5)3LM5)@
zPvgqFDHT7DP?_7zm+Oa$pGT<FBgVByIH%}&gvz~YTzx~)^9Y&}p&A%euRhMj#m*yW
z2IwTzJmZyUbFuT-w_LY#Az_|YuYa8Li=4*}BphZDA?n$up0KXSc|va5uOTDfUFr!3
zIjx9!!UGALsUlCtPW6n%#mo~PNa!QqBK3^-`IpImxI+I8Ysr(bTYX>F6n`M$cJeGy
zPg#~ipkXe;R;Rwde>a6d!iVJ9q?~e;x)cHlcVN3(J!gIzf%a01rAqxw|A{mL3HM=p
zN!j;lDuKQu!_ukjJ3>_&frRU@T%hi2NhQ!GY`-e|+EWR1fDFr<%D#tF2_#&OWv#NS
zH=RJsuq;(}^`{ePBbFPKT|3hW^a++0W!GRjf%afIPuVq;PM|WDnaZxQbOMcIDXF*3
zf_NbR6Z1c@0WAI^&Bs_;?Em)p|0v$5?An3N-)f{2XwH=0tUjMgpx?=`Y)k!i$3|@X
zQomt#EtclgZ@GShtxMTAlFCi{rP#LUw@6Y5^dluK)%>CCT$e_mPHgkkb8b!{&<Ess
zLH+W=^!NjnX~tI15#^M3Aof5Lw3Fvv^_1@T1Fa@c72m3JVwz(A5@#>@I`xOeWB(d(
zFBy3<cByA{#r;L{M+tGa@mc<~cppU=Vj&?K*{`1P82H01>y4>-|BLf+s6BKMs?8W#
z(HrXnb+v?QWUuis)NFqwbE|RnXZ@kxRptkbXQ%#Hc!xPK=Rts!2Mb(pPVo4O8c2CG
zMJuD`oX)ub=?*t(W7xdz;{fT7$63s=oDrraNOizc#>$*oW{0^1Ak7h7v*^zqUAh1u
z%^`1X{DkDJRRAfD2|R;7BzL_Gklvul8oJpZkmqemklLuyYP$FV30NO79U!G)w~Z`k
z5DCi@=R9CdiCfvi2okv7;&gy?25uih2wyK!gUUy?uR!HP{|_-AmH%wS|Cx=#e|Y3L
zJ=CD^pRU=#92EZJM+fPqib?s;XN~bBGjWr~8RZ$y#Z4OMXI3x^H%Xu|Ugs97`3DbF
yW-E8nz$DyCuA+o<&N=6tbIv*EoO8~(;`$p0wElkC;D`qR0000<MNUMnLSTaD&tZQ6

diff --git a/builds/android/app/src/main/res/drawable/ic_action_autorenew.xml b/builds/android/app/src/main/res/drawable/ic_action_autorenew.xml
new file mode 100644
index 000000000..eb61bab5e
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_action_autorenew.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M204,642q-22,-38 -33,-78t-11,-82q0,-134 93,-228t227,-94h7l-64,-64 56,-56 160,160 -160,160 -56,-56 64,-64h-7q-100,0 -170,70.5T240,482q0,26 6,51t18,49l-60,60ZM481,920 L321,760l160,-160 56,56 -64,64h7q100,0 170,-70.5T720,478q0,-26 -6,-51t-18,-49l60,-60q22,38 33,78t11,82q0,134 -93,228t-227,94h-7l64,64 -56,56Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_action_favorite_off_black.xml b/builds/android/app/src/main/res/drawable/ic_action_favorite_off_black.xml
new file mode 100644
index 000000000..0660d17a3
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_action_favorite_off_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m480,840 l-58,-52q-101,-91 -167,-157T150,512.5Q111,460 95.5,416T80,326q0,-94 63,-157t157,-63q52,0 99,22t81,62q34,-40 81,-62t99,-22q94,0 157,63t63,157q0,46 -15.5,90T810,512.5Q771,565 705,631T538,788l-58,52ZM480,732q96,-86 158,-147.5t98,-107q36,-45.5 50,-81t14,-70.5q0,-60 -40,-100t-100,-40q-47,0 -87,26.5T518,280h-76q-15,-41 -55,-67.5T300,186q-60,0 -100,40t-40,100q0,35 14,70.5t50,81q36,45.5 98,107T480,732ZM480,459Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_action_favorite_off_white.xml b/builds/android/app/src/main/res/drawable/ic_action_favorite_off_white.xml
new file mode 100644
index 000000000..cd319196e
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_action_favorite_off_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m480,840 l-58,-52q-101,-91 -167,-157T150,512.5Q111,460 95.5,416T80,326q0,-94 63,-157t157,-63q52,0 99,22t81,62q34,-40 81,-62t99,-22q94,0 157,63t63,157q0,46 -15.5,90T810,512.5Q771,565 705,631T538,788l-58,52ZM480,732q96,-86 158,-147.5t98,-107q36,-45.5 50,-81t14,-70.5q0,-60 -40,-100t-100,-40q-47,0 -87,26.5T518,280h-76q-15,-41 -55,-67.5T300,186q-60,0 -100,40t-40,100q0,35 14,70.5t50,81q36,45.5 98,107T480,732ZM480,459Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_action_favorite_on_black.xml b/builds/android/app/src/main/res/drawable/ic_action_favorite_on_black.xml
new file mode 100644
index 000000000..c40df29b4
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_action_favorite_on_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m480,840 l-58,-52q-101,-91 -167,-157T150,512.5Q111,460 95.5,416T80,326q0,-94 63,-157t157,-63q52,0 99,22t81,62q34,-40 81,-62t99,-22q94,0 157,63t63,157q0,46 -15.5,90T810,512.5Q771,565 705,631T538,788l-58,52Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_action_favorite_on_white.xml b/builds/android/app/src/main/res/drawable/ic_action_favorite_on_white.xml
new file mode 100644
index 000000000..d4e7acf83
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_action_favorite_on_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m480,840 l-58,-52q-101,-91 -167,-157T150,512.5Q111,460 95.5,416T80,326q0,-94 63,-157t157,-63q52,0 99,22t81,62q34,-40 81,-62t99,-22q94,0 157,63t63,157q0,46 -15.5,90T810,512.5Q771,565 705,631T538,788l-58,52Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_article_black.xml b/builds/android/app/src/main/res/drawable/ic_article_black.xml
new file mode 100644
index 000000000..65aa6380f
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_article_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M280,680h280v-80L280,600v80ZM280,520h400v-80L280,440v80ZM280,360h400v-80L280,280v80ZM200,840q-33,0 -56.5,-23.5T120,760v-560q0,-33 23.5,-56.5T200,120h560q33,0 56.5,23.5T840,200v560q0,33 -23.5,56.5T760,840L200,840ZM200,760h560v-560L200,200v560ZM200,200v560,-560Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_folder_open_black.xml b/builds/android/app/src/main/res/drawable/ic_folder_open_black.xml
new file mode 100644
index 000000000..147578267
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_folder_open_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,800q-33,0 -56.5,-23.5T80,720v-480q0,-33 23.5,-56.5T160,160h240l80,80h320q33,0 56.5,23.5T880,320v400q0,33 -23.5,56.5T800,800L160,800ZM160,720h640v-400L447,320l-80,-80L160,240v480ZM160,720v-480,480Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_gamepad_black.xml b/builds/android/app/src/main/res/drawable/ic_gamepad_black.xml
new file mode 100644
index 000000000..726cd8946
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_gamepad_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,420 L360,300v-220h240v220L480,420ZM660,600L540,480l120,-120h220v240L660,600ZM80,600v-240h220l120,120 -120,120L80,600ZM360,880v-220l120,-120 120,120v220L360,880Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_home_dark.xml b/builds/android/app/src/main/res/drawable/ic_home_dark.xml
new file mode 100644
index 000000000..020b4a395
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_home_dark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,840v-480l320,-240 320,240v480L560,840v-280L400,560v280L160,840Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_info.xml b/builds/android/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 000000000..fbd717f75
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M440,680h80v-240h-80v240ZM480,360q17,0 28.5,-11.5T520,320q0,-17 -11.5,-28.5T480,280q-17,0 -28.5,11.5T440,320q0,17 11.5,28.5T480,360ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_refresh_white.xml b/builds/android/app/src/main/res/drawable/ic_refresh_white.xml
new file mode 100644
index 000000000..1c312cf67
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_refresh_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,800q-134,0 -227,-93t-93,-227q0,-134 93,-227t227,-93q69,0 132,28.5T720,270v-110h80v280L520,440v-80h168q-32,-56 -87.5,-88T480,240q-100,0 -170,70t-70,170q0,100 70,170t170,70q77,0 139,-44t87,-116h84q-28,106 -114,173t-196,67Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_settings_black.xml b/builds/android/app/src/main/res/drawable/ic_settings_black.xml
new file mode 100644
index 000000000..ab81e9457
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_settings_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m370,880 l-16,-128q-13,-5 -24.5,-12T307,725l-119,50L78,585l103,-78q-1,-7 -1,-13.5v-27q0,-6.5 1,-13.5L78,375l110,-190 119,50q11,-8 23,-15t24,-12l16,-128h220l16,128q13,5 24.5,12t22.5,15l119,-50 110,190 -103,78q1,7 1,13.5v27q0,6.5 -2,13.5l103,78 -110,190 -118,-50q-11,8 -23,15t-24,12L590,880L370,880ZM482,620q58,0 99,-41t41,-99q0,-58 -41,-99t-99,-41q-59,0 -99.5,41T342,480q0,58 40.5,99t99.5,41Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_settings_white.xml b/builds/android/app/src/main/res/drawable/ic_settings_white.xml
new file mode 100644
index 000000000..207639d9d
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_settings_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m370,880 l-16,-128q-13,-5 -24.5,-12T307,725l-119,50L78,585l103,-78q-1,-7 -1,-13.5v-27q0,-6.5 1,-13.5L78,375l110,-190 119,50q11,-8 23,-15t24,-12l16,-128h220l16,128q13,5 24.5,12t22.5,15l119,-50 110,190 -103,78q1,7 1,13.5v27q0,6.5 -2,13.5l103,78 -110,190 -118,-50q-11,8 -23,15t-24,12L590,880L370,880ZM482,620q58,0 99,-41t41,-99q0,-58 -41,-99t-99,-41q-59,0 -99.5,41T342,480q0,58 40.5,99t99.5,41Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_video_label_black.xml b/builds/android/app/src/main/res/drawable/ic_video_label_black.xml
new file mode 100644
index 000000000..5532709f0
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_video_label_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,800q-33,0 -56.5,-23.5T80,720v-480q0,-33 23.5,-56.5T160,160h640q33,0 56.5,23.5T880,240v480q0,33 -23.5,56.5T800,800L160,800ZM160,600h640v-360L160,240v360Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/drawable/ic_volume_up_black.xml b/builds/android/app/src/main/res/drawable/ic_volume_up_black.xml
new file mode 100644
index 000000000..64f91a05b
--- /dev/null
+++ b/builds/android/app/src/main/res/drawable/ic_volume_up_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M560,829v-82q90,-26 145,-100t55,-168q0,-94 -55,-168T560,211v-82q124,28 202,125.5T840,479q0,127 -78,224.5T560,829ZM120,600v-240h160l200,-200v640L280,600L120,600ZM560,640v-322q47,22 73.5,66t26.5,96q0,51 -26.5,94.5T560,640Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/builds/android/app/src/main/res/layout/activity_settings_inputs.xml b/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
index 29a6007cf..0e2845595 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_inputs.xml
@@ -172,7 +172,7 @@
                 android:layout_centerVertical="true"
                 android:padding="0dp"
 
-                android:src="@drawable/ic_action_settings_black" />
+                android:src="@drawable/ic_settings_black" />
         </RelativeLayout>
         <RelativeLayout
             android:layout_width="match_parent"
@@ -201,7 +201,7 @@
                 android:layout_centerVertical="true"
                 android:padding="0dp"
 
-                android:src="@drawable/ic_action_settings_black" />
+                android:src="@drawable/ic_settings_black" />
         </RelativeLayout>
         <TextView
             android:layout_width="match_parent"
diff --git a/builds/android/app/src/main/res/layout/activity_settings_main.xml b/builds/android/app/src/main/res/layout/activity_settings_main.xml
index 96d06fc4b..2c4aebd37 100644
--- a/builds/android/app/src/main/res/layout/activity_settings_main.xml
+++ b/builds/android/app/src/main/res/layout/activity_settings_main.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/video"
-        android:drawableStart="@drawable/ic_video_label_black_36dp"
+        android:drawableStart="@drawable/ic_video_label_black"
         style="?android:attr/borderlessButtonStyle" />
 
     <Button
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/audio"
-        android:drawableStart="@drawable/ic_volume_up_black_36dp"
+        android:drawableStart="@drawable/ic_volume_up_black"
         style="?android:attr/borderlessButtonStyle" />
 
     <Button
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/input"
-        android:drawableStart="@drawable/ic_gamepad_black_36dp"
+        android:drawableStart="@drawable/ic_gamepad_black"
         style="?android:attr/borderlessButtonStyle" />
 
     <Button
@@ -32,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/font"
-        android:drawableStart="@drawable/ic_gamepad_black_36dp"
+        android:drawableStart="@drawable/ic_article_black"
         style="?android:attr/borderlessButtonStyle" />
 
     <Button
@@ -40,7 +40,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/easyrpg_folders"
-        android:drawableStart="@drawable/ic_folder_open_black_36dp"
+        android:drawableStart="@drawable/ic_folder_open_black"
         style="?android:attr/borderlessButtonStyle" />
 
 </LinearLayout>
diff --git a/builds/android/app/src/main/res/layout/browser_game_card_landscape.xml b/builds/android/app/src/main/res/layout/browser_game_card_landscape.xml
index e40144b9d..d21dd4fef 100644
--- a/builds/android/app/src/main/res/layout/browser_game_card_landscape.xml
+++ b/builds/android/app/src/main/res/layout/browser_game_card_landscape.xml
@@ -69,7 +69,7 @@
 
         <ImageButton
             android:id="@+id/game_browser_thumbnail_option_button"
-            android:src="@drawable/ic_action_settings_white"
+            android:src="@drawable/ic_settings_white"
             android:background="@android:color/transparent"
 
             android:layout_width="wrap_content"
diff --git a/builds/android/app/src/main/res/layout/browser_game_card_portrait.xml b/builds/android/app/src/main/res/layout/browser_game_card_portrait.xml
index ffc1040f2..91969914e 100644
--- a/builds/android/app/src/main/res/layout/browser_game_card_portrait.xml
+++ b/builds/android/app/src/main/res/layout/browser_game_card_portrait.xml
@@ -47,7 +47,7 @@
             android:layout_below="@+id/title"
             android:padding="4dp"
 
-            android:src="@drawable/ic_action_settings_black"
+            android:src="@drawable/ic_settings_black"
             android:background="@android:color/transparent"
             />
         <ImageButton
diff --git a/builds/android/app/src/main/res/layout/game_browser_item_list.xml b/builds/android/app/src/main/res/layout/game_browser_item_list.xml
index a07d1405e..e09bffaa8 100644
--- a/builds/android/app/src/main/res/layout/game_browser_item_list.xml
+++ b/builds/android/app/src/main/res/layout/game_browser_item_list.xml
@@ -19,6 +19,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_action_settings" />
+        android:src="@drawable/ic_settings_black" />
 
 </RelativeLayout>
diff --git a/builds/android/app/src/main/res/layout/settings_input_layout_item_list.xml b/builds/android/app/src/main/res/layout/settings_input_layout_item_list.xml
index 15646aece..3df73eeb7 100644
--- a/builds/android/app/src/main/res/layout/settings_input_layout_item_list.xml
+++ b/builds/android/app/src/main/res/layout/settings_input_layout_item_list.xml
@@ -29,6 +29,6 @@
         android:layout_centerVertical="true"
         android:padding="0dp"
 
-        android:src="@drawable/ic_action_settings_black" />
+        android:src="@drawable/ic_settings_black" />
 
 </RelativeLayout>
diff --git a/builds/android/app/src/main/res/menu/game_browser.xml b/builds/android/app/src/main/res/menu/game_browser.xml
index d5b8ce319..1b290ebe5 100644
--- a/builds/android/app/src/main/res/menu/game_browser.xml
+++ b/builds/android/app/src/main/res/menu/game_browser.xml
@@ -6,11 +6,11 @@
         android:orderInCategory="100"
         android:title="@string/refresh"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_refresh_white_24dp"/>
+        android:icon="@drawable/ic_refresh_white"/>
     <item
         android:id="@+id/menu"
         android:orderInCategory="100"
         android:title="@string/refresh"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_settings_white_24dp"/>
+        android:icon="@drawable/ic_settings_white"/>
 </menu>
diff --git a/builds/android/app/src/main/res/menu/game_browser_drawer.xml b/builds/android/app/src/main/res/menu/game_browser_drawer.xml
index f93029aa8..5bd319fe7 100644
--- a/builds/android/app/src/main/res/menu/game_browser_drawer.xml
+++ b/builds/android/app/src/main/res/menu/game_browser_drawer.xml
@@ -4,15 +4,15 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_manage"
-            android:icon="@drawable/ic_menu_manage"
+            android:icon="@drawable/ic_settings_black"
             android:title="@string/settings"/>
         <item
             android:id="@+id/nav_help"
-            android:icon="@drawable/ic_menu_slideshow"
+            android:icon="@drawable/ic_info"
             android:title="@string/how_to_use_easy_rpg"/>
         <item
             android:id="@+id/nav_website"
-            android:icon="@drawable/ic_video_label_black_36dp"
+            android:icon="@drawable/ic_home_dark"
             android:title="@string/visit_website"/>
     </group>
 

From 933aadbe573448e05313b51ec70356003f4158a5 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 26 Aug 2024 19:01:50 +0200
Subject: [PATCH 193/222] Android: Bump SDL2 to 2.30.6

---
 .../java/org/libsdl/app/HIDDeviceManager.java    |  9 ++++++++-
 .../app/src/main/java/org/libsdl/app/SDL.java    | 14 +++++++++-----
 .../org/libsdl/app/SDLControllerManager.java     | 16 +++++++++-------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index e7281fdf2..21a1c1d18 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -277,6 +277,7 @@ private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterfa
             0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
+            0x0b05, // ASUS
             0x0e6f, // PDP
             0x0f0d, // Hori
             0x10f5, // Turtle Beach
@@ -590,7 +591,13 @@ public boolean openDevice(int deviceID) {
                 } else {
                     flags = 0;
                 }
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+               }
             } catch (Exception e) {
                 Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                 HIDDeviceOpenResult(deviceID, false);
diff --git a/builds/android/app/src/main/java/org/libsdl/app/SDL.java b/builds/android/app/src/main/java/org/libsdl/app/SDL.java
index 44c21c1c7..139be9d15 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/SDL.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/SDL.java
@@ -38,6 +38,10 @@ public static Context getContext() {
     }
 
     public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
 
         if (libraryName == null) {
             throw new NullPointerException("No library name provided.");
@@ -53,10 +57,10 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
             // To use ReLinker, just add it as a dependency.  For more information, see 
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
-            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
 
             // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
             // they've changed during updates.
@@ -66,7 +70,7 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
 
             // Actually load the library!
             Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
         }
         catch (final Throwable e) {
             // Fall back
diff --git a/builds/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/builds/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
index d6913f157..9d8b20b7b 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -546,13 +546,15 @@ public void pollHapticDevices() {
             if (haptic == null) {
                 InputDevice device = InputDevice.getDevice(deviceIds[i]);
                 Vibrator vib = device.getVibrator();
-                if (vib.hasVibrator()) {
-                    haptic = new SDLHaptic();
-                    haptic.device_id = deviceIds[i];
-                    haptic.name = device.getName();
-                    haptic.vib = vib;
-                    mHaptics.add(haptic);
-                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                if (vib != null) {
+                    if (vib.hasVibrator()) {
+                        haptic = new SDLHaptic();
+                        haptic.device_id = deviceIds[i];
+                        haptic.name = device.getName();
+                        haptic.vib = vib;
+                        mHaptics.add(haptic);
+                        SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                    }
                 }
             }
         }

From dad63629aed72ef579adbd6db535c32046598360 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 6 Jun 2024 00:38:35 +0200
Subject: [PATCH 194/222] SDL2: Swap pixel format with a faster one for pixman
 on Big Endian

Fix WiiU texture copy by manually doing a format conversion.
---
 src/platform/sdl/sdl2_ui.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index f89b5a54b..1024e9b82 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -54,7 +54,11 @@ AudioInterface& Sdl2Ui::GetAudio() {
 #endif
 
 static uint32_t GetDefaultFormat() {
+#ifdef WORDS_BIGENDIAN
+	return SDL_PIXELFORMAT_ABGR32;
+#else
 	return SDL_PIXELFORMAT_RGBA32;
+#endif
 }
 
 /**
@@ -63,7 +67,18 @@ static uint32_t GetDefaultFormat() {
  * We prefer formats which have fast paths in pixman.
  */
 static int GetFormatRank(uint32_t fmt) {
+
 	switch (fmt) {
+#ifdef WORDS_BIGENDIAN
+		case SDL_PIXELFORMAT_RGBA32:
+			return 0;
+		case SDL_PIXELFORMAT_BGRA32:
+			return 0;
+		case SDL_PIXELFORMAT_ARGB32:
+			return 1;
+		case SDL_PIXELFORMAT_ABGR32:
+			return 2;
+#else
 		case SDL_PIXELFORMAT_RGBA32:
 			return 2;
 		case SDL_PIXELFORMAT_BGRA32:
@@ -72,6 +87,7 @@ static int GetFormatRank(uint32_t fmt) {
 			return 1;
 		case SDL_PIXELFORMAT_ABGR32:
 			return 0;
+#endif
 		default:
 			return -1;
 	}
@@ -559,8 +575,23 @@ void Sdl2Ui::ToggleVsync() {
 }
 
 void Sdl2Ui::UpdateDisplay() {
+#ifdef __WIIU__
+	if (vcfg.scaling_mode.Get() == ConfigEnum::ScalingMode::Bilinear && window.scale > 0.f) {
+		// Workaround WiiU bug: Bilinear uses a render target and for these the format is not converted
+		void* target_pixels;
+		int target_pitch;
+
+		SDL_LockTexture(sdl_texture_game, nullptr, &target_pixels, &target_pitch);
+		SDL_ConvertPixels(main_surface->width(), main_surface->height(), GetDefaultFormat(), main_surface->pixels(),
+			main_surface->pitch(), SDL_PIXELFORMAT_RGBA8888, target_pixels, target_pitch);
+		SDL_UnlockTexture(sdl_texture_game);
+	} else {
+		SDL_UpdateTexture(sdl_texture_game, nullptr, main_surface->pixels(), main_surface->pitch());
+	}
+#else
 	// SDL_UpdateTexture was found to be faster than SDL_LockTexture / SDL_UnlockTexture.
 	SDL_UpdateTexture(sdl_texture_game, nullptr, main_surface->pixels(), main_surface->pitch());
+#endif
 
 	if (window.size_changed && window.width > 0 && window.height > 0) {
 		// Based on SDL2 function UpdateLogicalSize

From 349f604a1d18d6a72906459424566eaed57f4de1 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 6 Jun 2024 01:33:32 +0200
Subject: [PATCH 195/222] Custom Filebuf: Also use it for writing

Has the same performance issues
---
 src/filesystem_native.cpp | 21 +++++++++++++---
 src/filesystem_stream.cpp | 50 ++++++++++++++++++++++++++++++++++-----
 src/filesystem_stream.h   | 21 ++++++++++------
 src/system.h              | 10 ++++----
 4 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/src/filesystem_native.cpp b/src/filesystem_native.cpp
index 1ae415fcd..a77bf047c 100644
--- a/src/filesystem_native.cpp
+++ b/src/filesystem_native.cpp
@@ -30,7 +30,7 @@
 #include "output.h"
 #include "platform.h"
 
-#ifdef USE_CUSTOM_FILE_READBUF
+#ifdef USE_CUSTOM_FILEBUF
 #  include <sys/stat.h>
 #  include <fcntl.h>
 #endif
@@ -55,14 +55,14 @@ int64_t NativeFilesystem::GetFilesize(StringView path) const {
 }
 
 std::streambuf* NativeFilesystem::CreateInputStreambuffer(StringView path, std::ios_base::openmode mode) const {
-#ifdef USE_CUSTOM_FILE_READBUF
+#ifdef USE_CUSTOM_FILEBUF
 	(void)mode;
 	int fd = open(ToString(path).c_str(), O_RDONLY);
 	if (fd < 0) {
 		return nullptr;
 	}
 
-	return new Filesystem_Stream::FdStreamBuf(fd);
+	return new Filesystem_Stream::FdStreamBuf(fd, true);
 #else
 	auto buf = new std::filebuf();
 
@@ -84,6 +84,20 @@ std::streambuf* NativeFilesystem::CreateInputStreambuffer(StringView path, std::
 }
 
 std::streambuf* NativeFilesystem::CreateOutputStreambuffer(StringView path, std::ios_base::openmode mode) const {
+#ifdef USE_CUSTOM_FILEBUF
+	int flags = O_TRUNC;
+
+	if ((mode & std::ios_base::app) == std::ios_base::app) {
+		flags = O_APPEND;
+	}
+
+	int fd = open(ToString(path).c_str(), O_WRONLY | O_CREAT | flags, S_IRUSR | S_IWUSR);
+	if (fd < 0) {
+		return nullptr;
+	}
+
+	return new Filesystem_Stream::FdStreamBuf(fd, false);
+#else
 	auto* buf = new std::filebuf();
 	buf->open(
 #ifdef _MSC_VER
@@ -99,6 +113,7 @@ std::streambuf* NativeFilesystem::CreateOutputStreambuffer(StringView path, std:
 	}
 
 	return buf;
+#endif
 }
 
 bool NativeFilesystem::GetDirectoryContent(StringView path, std::vector<DirectoryTree::Entry>& entries) const {
diff --git a/src/filesystem_stream.cpp b/src/filesystem_stream.cpp
index 5d20a5924..180a09895 100644
--- a/src/filesystem_stream.cpp
+++ b/src/filesystem_stream.cpp
@@ -19,7 +19,7 @@
 
 #include <utility>
 
-#ifdef USE_CUSTOM_FILE_READBUF
+#ifdef USE_CUSTOM_FILEBUF
 #  include <unistd.h>
 #endif
 
@@ -127,14 +127,21 @@ Filesystem_Stream::InputMemoryStreamBuf::InputMemoryStreamBuf(std::vector<uint8_
 
 }
 
+#ifdef USE_CUSTOM_FILEBUF
 
-#ifdef USE_CUSTOM_FILE_READBUF
-
-Filesystem_Stream::FdStreamBuf::FdStreamBuf(int fd) : fd(fd) {
-	clear_buffer();
+Filesystem_Stream::FdStreamBuf::FdStreamBuf(int fd, bool is_read) : fd(fd), is_read(is_read) {
+	if (is_read) {
+		clear_buffer();
+	} else {
+		setp(buffer.end(), buffer.end());
+	}
 }
 
 Filesystem_Stream::FdStreamBuf::~FdStreamBuf() {
+	if (!is_read) {
+		sync();
+	}
+
 	close(fd);
 }
 
@@ -152,7 +159,10 @@ Filesystem_Stream::FdStreamBuf::int_type Filesystem_Stream::FdStreamBuf::underfl
 	return traits_type::to_int_type(*gptr());
 }
 
-std::streambuf::pos_type Filesystem_Stream::FdStreamBuf::seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode) {
+std::streambuf::pos_type Filesystem_Stream::FdStreamBuf::seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode mode) {
+	// Not implemented for writing
+	assert(is_read);
+
 	if (dir == std::ios_base::beg) {
 		offset = offset - file_offset + bytes_remaining();
 		dir = std::ios_base::cur;
@@ -199,6 +209,34 @@ std::streambuf::pos_type Filesystem_Stream::FdStreamBuf::seekpos(std::streambuf:
 	return seekoff(pos, std::ios_base::beg, mode);
 }
 
+
+Filesystem_Stream::FdStreamBuf::int_type Filesystem_Stream::FdStreamBuf::overflow(int c) {
+	assert(pptr() == epptr());
+
+	if (c == traits_type::eof() || sync() == -1) {
+		return traits_type::eof();
+	}
+
+	*pptr() = traits_type::to_char_type(c);
+
+	pbump(1);
+	return c;
+}
+
+int Filesystem_Stream::FdStreamBuf::sync() {
+	char *p = pbase();
+	while (p < pptr()) {
+		int written = write(fd, p, pptr() - p);
+		if (written <= 0) {
+			return -1;
+		}
+		p += written;
+	}
+
+	setp(buffer.begin(), buffer.end());
+	return 0;
+}
+
 void Filesystem_Stream::FdStreamBuf::clear_buffer() {
 	setg(buffer.begin(), buffer.end(), buffer.end());
 }
diff --git a/src/filesystem_stream.h b/src/filesystem_stream.h
index 2114f9381..24a1f8b81 100644
--- a/src/filesystem_stream.h
+++ b/src/filesystem_stream.h
@@ -97,26 +97,33 @@ namespace Filesystem_Stream {
 		std::vector<uint8_t> buffer;
 	};
 
-#ifdef USE_CUSTOM_FILE_READBUF
+#ifdef USE_CUSTOM_FILEBUF
 	class FdStreamBuf : public std::streambuf {
 	public:
-		FdStreamBuf(int fd);
+		FdStreamBuf(int fd, bool is_read);
 		FdStreamBuf(FdStreamBuf const& other) = delete;
 		FdStreamBuf const& operator=(FdStreamBuf const& other) = delete;
 		~FdStreamBuf();
 
 	protected:
-		int_type underflow();
-		std::streambuf::pos_type seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode mode);
-		std::streambuf::pos_type seekpos(std::streambuf::pos_type pos, std::ios_base::openmode);
+		// Reading
+		int_type underflow() override;
+		std::streambuf::pos_type seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode mode) override;
+		std::streambuf::pos_type seekpos(std::streambuf::pos_type pos, std::ios_base::openmode) override;
 
+		// Writing
+		int_type overflow(int c = EOF) override;
+		int sync() override;
 	private:
+		// Reading
 		void clear_buffer();
 		ssize_t bytes_remaining() const;
+		off_t file_offset = 0;
 
+		// Both
 		int fd;
-		off_t file_offset = 0;
-		std::array<char, USE_CUSTOM_FILE_READBUF> buffer;
+		bool is_read; // Streams can be read and write but we only always use one mode
+		std::array<char, USE_CUSTOM_FILEBUF> buffer;
 	};
 #endif
 
diff --git a/src/system.h b/src/system.h
index 37d772901..3b8e1aa5f 100644
--- a/src/system.h
+++ b/src/system.h
@@ -60,21 +60,21 @@
 #elif defined(__3DS__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
-#  define USE_CUSTOM_FILE_READBUF 4 * 1024
+#  define USE_CUSTOM_FILEBUF 4 * 1024
 #elif defined(__vita__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
-#  define USE_CUSTOM_FILE_READBUF 4 * 1024
+#  define USE_CUSTOM_FILEBUF 4 * 1024
 #elif defined(__wii__)
 #  include <cstdint>
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
-#  define USE_CUSTOM_FILE_READBUF 4 * 1024
+#  define USE_CUSTOM_FILEBUF 4 * 1024
 #elif defined(__WIIU__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
 #  define SUPPORT_TOUCH
-#  define USE_CUSTOM_FILE_READBUF 16 * 1024
+#  define USE_CUSTOM_FILEBUF 16 * 1024
 #elif defined(_WIN32)
 #  define SUPPORT_ZOOM
 #  define SUPPORT_MOUSE
@@ -85,7 +85,7 @@
 #elif defined(__SWITCH__)
 #  define SUPPORT_JOYSTICK
 #  define SUPPORT_JOYSTICK_AXIS
-#  define USE_CUSTOM_FILE_READBUF 16 * 1024
+#  define USE_CUSTOM_FILEBUF 16 * 1024
 #elif defined(PLAYER_AMIGA) && !defined(__AROS__)
 #  define SUPPORT_ZOOM
 #  define SUPPORT_MOUSE

From 980e242b76586fe378de4d0ebe5d64910891747a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 6 Jun 2024 02:14:19 +0200
Subject: [PATCH 196/222] Wii U: Move teardown code to atexit

---
 src/platform/wiiu/main.cpp | 7 ++++---
 src/platform/wiiu/main.h   | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/platform/wiiu/main.cpp b/src/platform/wiiu/main.cpp
index 16406ec4a..a5746056b 100644
--- a/src/platform/wiiu/main.cpp
+++ b/src/platform/wiiu/main.cpp
@@ -150,10 +150,11 @@ extern "C" int main(int argc, char* argv[]) {
 		args.push_back(working_dir);
 	}
 
+	// Setup teardown code
+	atexit(WiiU_Exit);
+
 	Player::Init(std::move(args));
 	Player::Run();
 
-	WiiU_Exit();
-
-	return EXIT_SUCCESS;
+	return Player::exit_code;
 }
diff --git a/src/platform/wiiu/main.h b/src/platform/wiiu/main.h
index 16f91bb38..35525cf4a 100644
--- a/src/platform/wiiu/main.h
+++ b/src/platform/wiiu/main.h
@@ -16,4 +16,3 @@
  */
 
 bool WiiU_ProcessProcUI();
-void WiiU_Exit();

From 8260bd57dc09453d3e7c55bcc1438a9479cd0a1a Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 6 Jun 2024 02:51:32 +0200
Subject: [PATCH 197/222] CMake: Revert the Wii SDL part because it does not
 work (linker errors)

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c7284616..62bdc5182 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -677,7 +677,9 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "switch")
 		src/platform/switch/ui.h)
 	target_link_libraries(${PROJECT_NAME} switch-assets)
 elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
+	find_package(SDL REQUIRED)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_SDL=1 PLAYER_NINTENDO)
+	target_include_directories(${PROJECT_NAME} PUBLIC ${SDL_INCLUDE_DIR})
 	target_sources(${PROJECT_NAME} PRIVATE
 		src/platform/wii/audio.cpp
 		src/platform/wii/audio.h
@@ -687,7 +689,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
 		src/platform/sdl/axis.h
 		src/platform/sdl/sdl_ui.cpp
 		src/platform/sdl/sdl_ui.h)
-	player_find_package(NAME SDL1 TARGET SDL::SDLmain REQUIRED)
 else()
 	message(FATAL_ERROR "Invalid target platform")
 endif()
@@ -1227,6 +1228,7 @@ elseif(${PLAYER_TARGET_PLATFORM} MATCHES "^(psvita|3ds|switch|wii)$" OR NINTENDO
 		add_executable(easyrpg-player src/platform/wii/main.cpp)
 		target_link_libraries(easyrpg-player
 			${PROJECT_NAME}
+			${SDL_LIBRARIES}
 			-laesnd
 			-lfat
 			-lwiikeyboard)

From f95f35821dfa82dbe6d1ae28e2b60d07ef426622 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 27 Aug 2024 18:50:48 +0200
Subject: [PATCH 198/222] WiiU: Address review comments

- ProdUi renamed
- Fixed save path for bundled games
- Moved ProcessProcUi call to the Ui
---
 CMakeLists.txt               |  2 +-
 src/platform/sdl/sdl2_ui.cpp |  9 +++++++++
 src/platform/wiiu/main.cpp   | 21 ++++++++++++---------
 src/player.cpp               |  8 --------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62bdc5182..bc946bee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -702,7 +702,7 @@ if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|psvita|switch|wii)$" OR NINTENDO_WII
 endif()
 # Make content available (romfs/wuhb bundle)
 if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|switch)$" OR NINTENDO_WIIU)
-	option(PLAYER_BUNDLE "Embedd a directory in the executable" OFF)
+	option(PLAYER_BUNDLE "Embed a directory in the executable" OFF)
 	set(PLAYER_BUNDLE_PATH "content" CACHE PATH "Directory to include in executable")
 	set(BUNDLE_ARG "_IGNORE_ME")
 	if(PLAYER_BUNDLE)
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index 1024e9b82..e7b75cb81 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -30,6 +30,8 @@
 #  include <SDL_system.h>
 #elif defined(EMSCRIPTEN)
 #  include <emscripten.h>
+#elif defined(__WIIU__)
+#  include "platform/wiiu/main.h"
 #endif
 #include "icon.h"
 
@@ -531,6 +533,13 @@ void Sdl2Ui::ToggleZoom() {
 }
 
 void Sdl2Ui::ProcessEvents() {
+#if defined(__WIIU__)
+		if (!WiiU_ProcessProcUI()) {
+			Player::Exit();
+			return;
+		}
+#endif
+
 	SDL_Event evnt;
 
 #if defined(USE_MOUSE) && defined(SUPPORT_MOUSE)
diff --git a/src/platform/wiiu/main.cpp b/src/platform/wiiu/main.cpp
index a5746056b..02a93fc89 100644
--- a/src/platform/wiiu/main.cpp
+++ b/src/platform/wiiu/main.cpp
@@ -35,6 +35,8 @@
 
 using namespace std::chrono_literals;
 
+static bool procUiExited = false;
+
 #ifdef NDEBUG
 // stubbed
 static void initLogging() {}
@@ -48,7 +50,6 @@ static void deinitLogging() {}
 static bool moduleLogInit = false;
 static bool cafeLogInit = false;
 static bool udpLogInit = false;
-static bool prodUiExited = false;
 
 static void initLogging() {
 	if (!(moduleLogInit = WHBLogModuleInit())) {
@@ -92,7 +93,7 @@ static uint32_t SaveCallback(void*) {
 bool WiiU_ProcessProcUI() {
 	ProcUIStatus status = ProcUIProcessMessages(TRUE);
 	if (status == PROCUI_STATUS_EXITING) {
-		prodUiExited = true;
+		procUiExited = true;
 		return false;
 	} else if (status == PROCUI_STATUS_RELEASE_FOREGROUND) {
 		ProcUIDrawDoneRelease();
@@ -101,13 +102,13 @@ bool WiiU_ProcessProcUI() {
 }
 
 void WiiU_Exit() {
-	Output::Debug("Shutdown Reason: {}", prodUiExited ? "HOME Menu" : "Player Exit");
+	Output::Debug("Shutdown Reason: {}", procUiExited ? "HOME Menu" : "Player Exit");
 
-    if (!prodUiExited) {
+    if (!procUiExited) {
 		// Exit was not through the Home Menu
 		// Manually launch the system menu
 		SYSLaunchMenu();
-		Game_Clock::SleepFor(std::chrono::milliseconds(10));
+		Game_Clock::SleepFor(10ms);
 		while (WiiU_ProcessProcUI()) {}
 	}
 
@@ -130,6 +131,9 @@ extern "C" int main(int argc, char* argv[]) {
 
 	const char *default_dir = "fs:/vol/external01/wiiu/apps/easyrpg-player";
 
+	char working_dir[256];
+	getcwd(working_dir, 255);
+
 	// Check if wuhb has some files inside or not
 	if(::access("fs:/vol/content/RPG_RT.lmt", F_OK) == 0) {
 		Output::Debug("Running packaged game from wuhb.");
@@ -138,14 +142,13 @@ extern "C" int main(int argc, char* argv[]) {
 		args.push_back("--project-path");
 		args.push_back(cafe_dir);
 
-		//args.push_back("--save-path");
-		//args.push_back(cafe_dir);
+		// Save directory is where the wuhb is located
+		args.push_back("--save-path");
+		args.push_back(working_dir);
 	} else if(::access(default_dir, F_OK) == 0) {
 		chdir(default_dir);
 	} else {
 		// fall back to current working directory
-		char working_dir[256];
-		getcwd(working_dir, 255);
 		args.push_back("--project-path");
 		args.push_back(working_dir);
 	}
diff --git a/src/player.cpp b/src/player.cpp
index 573fd15e0..ae4120e39 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -31,8 +31,6 @@
 #  include <windows.h>
 #elif defined(EMSCRIPTEN)
 #  include <emscripten.h>
-#elif defined(__WIIU__)
-#  include "platform/wiiu/main.h"
 #endif
 
 #include "async_handler.h"
@@ -218,12 +216,6 @@ void Player::Run() {
 	// libretro invokes the MainLoop through a retro_run-callback
 #else
 	while (Transition::instance().IsActive() || (Scene::instance && Scene::instance->type != Scene::Null)) {
-#if defined(__WIIU__)
-		if (!WiiU_ProcessProcUI()) {
-			Player::Exit();
-			return;
-		}
-#endif
 		MainLoop();
 	}
 #endif

From 8120ecbf9b59e53387ec439e2994e5ca91bc2d5f Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 27 Aug 2024 19:39:09 +0200
Subject: [PATCH 199/222] WiiU: Map the buttons according to an Xbox-Controller
 and then swap them with the swap abxy setting

---
 src/game_config.cpp                 |  6 ++++++
 src/platform/sdl/sdl2_ui.cpp        |  2 ++
 src/platform/wiiu/input_buttons.cpp | 25 +++++++++++++------------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/game_config.cpp b/src/game_config.cpp
index d9fbcd335..0e6f336d8 100644
--- a/src/game_config.cpp
+++ b/src/game_config.cpp
@@ -84,10 +84,16 @@ void Game_ConfigInput::Hide() {
 Game_Config Game_Config::Create(CmdlineParser& cp) {
 	Game_Config cfg;
 
+	// Set platform specific defaults
 #if USE_SDL >= 2
 	cfg.video.scaling_mode.Set(ConfigEnum::ScalingMode::Bilinear);
 #endif
 
+#if defined(__WIIU__)
+	cfg.input.gamepad_swap_ab_and_xy.Set(true);
+#endif
+
+
 	cp.Rewind();
 
 	config_path = GetConfigPath(cp);
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index e7b75cb81..cf91ef4f4 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -1298,6 +1298,8 @@ void Sdl2Ui::vGetConfig(Game_ConfigVideo& cfg) const {
 #elif defined(__WIIU__)
 	// Only makes the screen flicker
 	cfg.fullscreen.SetOptionVisible(false);
+	// WiiU always pauses apps in the background
+	cfg.pause_when_focus_lost.SetOptionVisible(false);
 #endif
 }
 
diff --git a/src/platform/wiiu/input_buttons.cpp b/src/platform/wiiu/input_buttons.cpp
index b90ea8f3c..60eb42b16 100644
--- a/src/platform/wiiu/input_buttons.cpp
+++ b/src/platform/wiiu/input_buttons.cpp
@@ -27,10 +27,10 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{DOWN, Keys::JOY_DPAD_DOWN},
 		{LEFT, Keys::JOY_DPAD_LEFT},
 		{RIGHT, Keys::JOY_DPAD_RIGHT},
-		{DECISION, Keys::JOY_A},
-		{CANCEL, Keys::JOY_B},
-		{CANCEL, Keys::JOY_X},
-		{SHIFT, Keys::JOY_Y},
+		{DECISION, Keys::JOY_B},
+		{CANCEL, Keys::JOY_A},
+		{CANCEL, Keys::JOY_Y},
+		{SHIFT, Keys::JOY_X},
 		{N0, Keys::JOY_LSTICK},
 		{N5, Keys::JOY_RSTICK},
 		{DEBUG_ABORT_EVENT, Keys::JOY_SHOULDER_LEFT},
@@ -65,17 +65,18 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 }
 
 Input::KeyNamesArray Input::GetInputKeyNames() {
-	// FIXME: Wiimote mapping is broken, consider removing
+	// FIXME: The mapping is named in terms of WiiU Gamepad / Controller
+	// For Wiimote the reported buttons change depending whether a Nunchuck is connected
 	return {
-		{Keys::JOY_A, "A"}, // 2 (Wiimote)
-		{Keys::JOY_B, "B"}, // 1 (Wiimote)
-		{Keys::JOY_X, "X"}, // (Pad/CC/Pro) / B (Wiimote) / Z (Wiimote+Nunchuck)
-		{Keys::JOY_Y, "Y"}, // (Pad/CC/Pro) / A (Wiimote) / C (Wiimote+Nunchuck)
+		{Keys::JOY_B, "A"}, // 2 (Wiimote) / A (Wiimote+Nunchuck)
+		{Keys::JOY_A, "B"}, // 1 (Wiimote) / B (Wiimote+Nunchuck)
+		{Keys::JOY_Y, "X"}, // (Pad/CC/Pro) / B (Wiimote) / Z (Wiimote+Nunchuck)
+		{Keys::JOY_X, "Y"}, // (Pad/CC/Pro) / A (Wiimote) / C (Wiimote+Nunchuck)
 		{Keys::JOY_BACK, "-"},
 		{Keys::JOY_START, "+"},
-		{Keys::JOY_GUIDE, "Home"}, // FIXME: not mapped at all, maybe use custom trigger
-		{Keys::JOY_SHOULDER_LEFT, "L"},
-		{Keys::JOY_SHOULDER_RIGHT, "R"},
+		{Keys::JOY_GUIDE, "Home"}, // The Home Key is not notified
+		{Keys::JOY_SHOULDER_LEFT, "L"}, // 1 (Wiimote+Nunchuck)
+		{Keys::JOY_SHOULDER_RIGHT, "R"}, // 2 (Wiimote+Nunchuck)
 		{Keys::JOY_LTRIGGER_FULL, "ZL"},
 		{Keys::JOY_RTRIGGER_FULL, "ZR"},
 

From cd0197484774918f67d5fdda29fa78aa75377344 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 27 Aug 2024 19:39:20 +0200
Subject: [PATCH 200/222] Add a bool to ProcessEvents to signal program exit.

Calling Player::Exit in the Ui can crash because the Ui is deleted by it.
Also the normal teardown codepath is too slow on WiiU and crashes the console when the home button is used.
---
 src/baseui.h                 |  4 +++-
 src/output.cpp               |  6 +++---
 src/platform/3ds/ui.cpp      |  9 ++++++---
 src/platform/3ds/ui.h        |  2 +-
 src/platform/libretro/ui.cpp |  6 ++++--
 src/platform/libretro/ui.h   |  2 +-
 src/platform/psvita/ui.cpp   |  4 +++-
 src/platform/psvita/ui.h     |  2 +-
 src/platform/sdl/sdl2_ui.cpp |  7 ++++---
 src/platform/sdl/sdl2_ui.h   |  2 +-
 src/platform/sdl/sdl_ui.cpp  |  4 +++-
 src/platform/sdl/sdl_ui.h    |  2 +-
 src/platform/switch/ui.cpp   |  4 +++-
 src/platform/switch/ui.h     |  2 +-
 src/player.cpp               | 15 ++++++++++++---
 15 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/baseui.h b/src/baseui.h
index b4877cdf6..cb9eaeaf0 100644
--- a/src/baseui.h
+++ b/src/baseui.h
@@ -68,8 +68,10 @@ class BaseUi {
 
 	/**
 	 * Processes events queue.
+	 *
+	 * @return When false requests an immediate Player shutdown
 	 */
-	virtual void ProcessEvents() = 0;
+	virtual bool ProcessEvents() = 0;
 
 	/**
 	 * Cleans video buffer.
diff --git a/src/output.cpp b/src/output.cpp
index 23129d9a1..ed792352d 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -214,9 +214,9 @@ static void HandleErrorOutput(const std::string& err) {
 #if !defined(USE_LIBRETRO)
 		Game_Clock::SleepFor(1ms);
 #endif
-		DisplayUi->ProcessEvents();
-
-		if (Player::exit_flag) break;
+		if (!DisplayUi->ProcessEvents() || Player::exit_flag) {
+			break;
+		}
 
 		Input::Update();
 	}
diff --git a/src/platform/3ds/ui.cpp b/src/platform/3ds/ui.cpp
index ea4472e36..eab0b9640 100644
--- a/src/platform/3ds/ui.cpp
+++ b/src/platform/3ds/ui.cpp
@@ -217,9 +217,10 @@ CtrUi::~CtrUi() {
 	ToggleBottomScreen(true);
 }
 
-void CtrUi::ProcessEvents() {
-	if (!aptMainLoop())
-		Player::Exit();
+bool CtrUi::ProcessEvents() {
+	if (!aptMainLoop()) {
+		return false;
+	}
 
 	hidScanInput();
 	u32 input = hidKeysHeld();
@@ -324,6 +325,8 @@ void CtrUi::ProcessEvents() {
 		}
 	}
 #endif
+
+	return true;
 }
 
 void CtrUi::UpdateDisplay() {
diff --git a/src/platform/3ds/ui.h b/src/platform/3ds/ui.h
index 9dc42b712..febc4f3aa 100644
--- a/src/platform/3ds/ui.h
+++ b/src/platform/3ds/ui.h
@@ -50,7 +50,7 @@ class CtrUi final : public BaseUi {
 	 */
 	/** @{ */
 	void UpdateDisplay() override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void ToggleStretch() override;
 	void ToggleTouchUi() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
diff --git a/src/platform/libretro/ui.cpp b/src/platform/libretro/ui.cpp
index 0fd56faab..efa65ca6b 100644
--- a/src/platform/libretro/ui.cpp
+++ b/src/platform/libretro/ui.cpp
@@ -138,10 +138,10 @@ bool LibretroUi::vChangeDisplaySurfaceResolution(int new_width, int new_height)
 	return true;
 }
 
-void LibretroUi::ProcessEvents() {
+bool LibretroUi::ProcessEvents() {
 #	if defined(USE_JOYSTICK) && defined(SUPPORT_JOYSTICK)
 	if (CheckInputState == nullptr) {
-		return;
+		return true;
 	}
 
 	LibretroUi::input_poll_cb();
@@ -184,6 +184,8 @@ void LibretroUi::ProcessEvents() {
 	analog_input.trigger_right = normalize(CheckInputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_BUTTON, RETRO_DEVICE_ID_JOYPAD_R2));
 #	endif
 #	endif
+
+	return true;
 }
 
 retro_video_refresh_t LibretroUi::UpdateWindow = nullptr;
diff --git a/src/platform/libretro/ui.h b/src/platform/libretro/ui.h
index 6237d4642..7f9ef8c3c 100644
--- a/src/platform/libretro/ui.h
+++ b/src/platform/libretro/ui.h
@@ -47,7 +47,7 @@ class LibretroUi final : public BaseUi {
 	/** @{ */
 	bool vChangeDisplaySurfaceResolution(int new_width, int new_height) override;
 	void UpdateDisplay() override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
 
 #ifdef SUPPORT_AUDIO
diff --git a/src/platform/psvita/ui.cpp b/src/platform/psvita/ui.cpp
index 397186bfa..91afcc412 100644
--- a/src/platform/psvita/ui.cpp
+++ b/src/platform/psvita/ui.cpp
@@ -207,7 +207,7 @@ Psp2Ui::~Psp2Ui() {
 	vita2d_fini();
 }
 
-void Psp2Ui::ProcessEvents() {
+bool Psp2Ui::ProcessEvents() {
 	SceCtrlData input;
 	SceTouchData touch;
 
@@ -261,6 +261,8 @@ void Psp2Ui::ProcessEvents() {
 			}
 		}
 	}
+
+	return true;
 }
 
 void Psp2Ui::UpdateDisplay() {
diff --git a/src/platform/psvita/ui.h b/src/platform/psvita/ui.h
index 5f5fc59f4..d465f0620 100644
--- a/src/platform/psvita/ui.h
+++ b/src/platform/psvita/ui.h
@@ -49,7 +49,7 @@ class Psp2Ui final : public BaseUi {
 	 */
 	/** @{ */
 	void UpdateDisplay() override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void SetScalingMode(ConfigEnum::ScalingMode) override;
 	void ToggleStretch() override;
 	void ToggleTouchUi() override;
diff --git a/src/platform/sdl/sdl2_ui.cpp b/src/platform/sdl/sdl2_ui.cpp
index cf91ef4f4..7c5d4ad72 100644
--- a/src/platform/sdl/sdl2_ui.cpp
+++ b/src/platform/sdl/sdl2_ui.cpp
@@ -532,11 +532,10 @@ void Sdl2Ui::ToggleZoom() {
 #endif
 }
 
-void Sdl2Ui::ProcessEvents() {
+bool Sdl2Ui::ProcessEvents() {
 #if defined(__WIIU__)
 		if (!WiiU_ProcessProcUI()) {
-			Player::Exit();
-			return;
+			return false;
 		}
 #endif
 
@@ -555,6 +554,8 @@ void Sdl2Ui::ProcessEvents() {
 		if (Player::exit_flag)
 			break;
 	}
+
+	return true;
 }
 
 void Sdl2Ui::SetScalingMode(ConfigEnum::ScalingMode mode) {
diff --git a/src/platform/sdl/sdl2_ui.h b/src/platform/sdl/sdl2_ui.h
index bbade7033..cef74fe1f 100644
--- a/src/platform/sdl/sdl2_ui.h
+++ b/src/platform/sdl/sdl2_ui.h
@@ -65,7 +65,7 @@ class Sdl2Ui final : public BaseUi {
 	void UpdateDisplay() override;
 	void SetTitle(const std::string &title) override;
 	bool ShowCursor(bool flag) override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void SetScalingMode(ConfigEnum::ScalingMode) override;
 	void ToggleStretch() override;
 	void ToggleVsync() override;
diff --git a/src/platform/sdl/sdl_ui.cpp b/src/platform/sdl/sdl_ui.cpp
index 04961a612..29fc05f7d 100644
--- a/src/platform/sdl/sdl_ui.cpp
+++ b/src/platform/sdl/sdl_ui.cpp
@@ -404,7 +404,7 @@ void SdlUi::ToggleZoom() {
 	EndDisplayModeChange();
 }
 
-void SdlUi::ProcessEvents() {
+bool SdlUi::ProcessEvents() {
 	SDL_Event evnt;
 
 	// Poll SDL events and process them
@@ -414,6 +414,8 @@ void SdlUi::ProcessEvents() {
 		if (Player::exit_flag)
 			break;
 	}
+
+	return true;
 }
 
 void SdlUi::UpdateDisplay() {
diff --git a/src/platform/sdl/sdl_ui.h b/src/platform/sdl/sdl_ui.h
index 775957ffa..15c1797db 100644
--- a/src/platform/sdl/sdl_ui.h
+++ b/src/platform/sdl/sdl_ui.h
@@ -63,7 +63,7 @@ class SdlUi final : public BaseUi {
 	void UpdateDisplay() override;
 	void SetTitle(const std::string &title) override;
 	bool ShowCursor(bool flag) override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
 
 #ifdef SUPPORT_AUDIO
diff --git a/src/platform/switch/ui.cpp b/src/platform/switch/ui.cpp
index 1291a1513..1ef3f28bd 100644
--- a/src/platform/switch/ui.cpp
+++ b/src/platform/switch/ui.cpp
@@ -390,7 +390,7 @@ NxUi::~NxUi() {
 	appletUnhook(&applet_hook_cookie);
 }
 
-void NxUi::ProcessEvents() {
+bool NxUi::ProcessEvents() {
 	// handle system events
 	appletMainLoop();
 
@@ -453,6 +453,8 @@ void NxUi::ProcessEvents() {
 			}
 		}
 	}
+
+	return true;
 }
 
 void NxUi::UpdateDisplay() {
diff --git a/src/platform/switch/ui.h b/src/platform/switch/ui.h
index 4c6ccf002..d289f0d02 100644
--- a/src/platform/switch/ui.h
+++ b/src/platform/switch/ui.h
@@ -48,7 +48,7 @@ class NxUi final : public BaseUi {
 	 */
 	/** @{ */
 	void UpdateDisplay() override;
-	void ProcessEvents() override;
+	bool ProcessEvents() override;
 	void ToggleStretch() override;
 	void ToggleTouchUi() override;
 	void vGetConfig(Game_ConfigVideo& cfg) const override;
diff --git a/src/player.cpp b/src/player.cpp
index ae4120e39..7645c3f16 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -229,10 +229,22 @@ void Player::MainLoop() {
 
 	Player::UpdateInput();
 
+	if (!DisplayUi->ProcessEvents()) {
+		Scene::PopUntil(Scene::Null);
+		Player::Exit();
+		return;
+	}
+
 	int num_updates = 0;
 	while (Game_Clock::NextGameTimeStep()) {
 		if (num_updates > 0) {
 			Player::UpdateInput();
+
+			if (!DisplayUi->ProcessEvents()) {
+				Scene::PopUntil(Scene::Null);
+				Player::Exit();
+				return;
+			}
 		}
 
 		Scene::old_instances.clear();
@@ -306,9 +318,6 @@ void Player::UpdateInput() {
 	if (Main_Data::game_quit) {
 		reset_flag |= Main_Data::game_quit->ShouldQuit();
 	}
-
-	// Update Logic:
-	DisplayUi->ProcessEvents();
 }
 
 void Player::Update(bool update_scene) {

From a27661ca45f5ddc89eb270ae9568790b9c0a8b7d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 28 Aug 2024 10:01:21 +0200
Subject: [PATCH 201/222] Fix flickering in Yume2kki on map 3D Underworld (ID
 1884).

The map uses a MoveRoute with a jump and SetVehicleLocation for party movement in a tight loop which causes heavy flickering in our Player.

This fix does not appear to be completely correct as RPG_RT does not reset the jump flag here but the "damage" is reduced because SetVehicleLocation -1 cannot happen without patching the game.

Fix #3254

Co-Authored-By: Viet Dinh <54ckb0y789@gmail.com>
---
 src/game_interpreter.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 84dc8748f..45b6bf34e 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2329,6 +2329,14 @@ bool Game_Interpreter::CommandSetVehicleLocation(lcf::rpg::EventCommand const& c
 				vehicle->MoveTo(map_id, x, y);
 			}
 			Main_Data::game_player->MoveTo(map_id, x, y);
+			if (vehicle_id == 0) {
+				// This fixes a bug in Yume2kki on map 3D Underworld (ID 1884)
+				// The map uses a MoveRoute with a jump and SetVehicleLocation for party movement in a tight loop which
+				// causes heavy flickering in our Player.
+				// TODO: This fix does not appear to be completely correct as RPG_RT does not reset the jump flag here
+				// but the "damage" is reduced because SetVehicleLocation -1 cannot happen without patching the game.
+				Main_Data::game_player->SetJumping(false);
+			}
 			return true;
 		};
 

From 2fa20b91d8263409cbf572cefaded94b0f5acdc4 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 28 Aug 2024 10:13:31 +0200
Subject: [PATCH 202/222] Effects: Use the filename for the cache, not the
 bitmap pointer

The pointer can be reused by a new bitmap and cause wrong animations.

For individual tiles the filename is lost. "filename" in bitmap was renamed
to "id" and gets now filename+tileid in that case.

Fix #3256

Co-Authored-By: Viet Dinh <54ckb0y789@gmail.com>
---
 src/bitmap.cpp |  2 +-
 src/bitmap.h   | 28 +++++++++++++++++++++-------
 src/cache.cpp  | 10 +++++++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/bitmap.cpp b/src/bitmap.cpp
index c7785efbd..cd6d4f2d9 100644
--- a/src/bitmap.cpp
+++ b/src/bitmap.cpp
@@ -129,7 +129,7 @@ Bitmap::Bitmap(Filesystem_Stream::InputStream stream, bool transparent, uint32_t
 
 	original_bpp = image_out.bpp;
 
-	filename = ToString(stream.GetName());
+	id = ToString(stream.GetName());
 }
 
 Bitmap::Bitmap(const uint8_t* data, unsigned bytes, bool transparent, uint32_t flags) {
diff --git a/src/bitmap.h b/src/bitmap.h
index e10fb1426..2e191916d 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -217,12 +217,21 @@ class Bitmap {
 	Color GetShadowColor() const;
 
 	/**
-	 * Gets the filename this bitmap was loaded from.
-	 * This will be empty when the origin was not a file.
+	 * Returns an identifier for the bitmap.
+	 * When the bitmap was loaded from a file this contains the filename.
+	 * In all other cases this is implementation defined (and can be empty).
 	 *
-	 * @return filename
+	 * @return Bitmap identifier
 	 */
-	StringView GetFilename() const;
+	StringView GetId() const;
+
+	/**
+	 * Sets the identifier of the bitmap.
+	 * To avoid bugs the function will reject changing non-empty IDs.
+	 *
+	 * @param id new identifier
+	 */
+	void SetId(std::string id);
 
 	/**
 	 * Gets bpp of the source image.
@@ -608,7 +617,7 @@ class Bitmap {
 	Color bg_color, sh_color;
 	FontRef font;
 
-	std::string filename;
+	std::string id;
 
 	/** Bpp of the source image */
 	int original_bpp;
@@ -689,8 +698,13 @@ inline bool Bitmap::GetTransparent() const {
 	return format.alpha_type != PF::NoAlpha;
 }
 
-inline StringView Bitmap::GetFilename() const {
-	return filename;
+inline StringView Bitmap::GetId() const {
+	return id;
+}
+
+inline void Bitmap::SetId(std::string id) {
+	assert(this->id.empty());
+	this->id = id;
 }
 
 inline FontRef Bitmap::GetFont() const {
diff --git a/src/cache.cpp b/src/cache.cpp
index 9006b07f4..e5c93fef3 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -82,7 +82,7 @@ namespace {
 	std::unordered_map<tile_key_type, std::weak_ptr<Bitmap>> cache_tiles;
 
 	// rect, flip_x, flip_y, tone, blend
-	using effect_key_type = std::tuple<Bitmap*, Rect, bool, bool, Tone, Color>;
+	using effect_key_type = std::tuple<std::string, Rect, bool, bool, Tone, Color>;
 	std::map<effect_key_type, std::weak_ptr<Bitmap>> cache_effects;
 
 	std::string system_name;
@@ -448,13 +448,17 @@ BitmapRef Cache::Tile(StringView filename, int tile_id) {
 		rect.x += sub_tile_id % 6 * 16;
 		rect.y += sub_tile_id / 6 * 16;
 
-		return(cache_tiles[key] = Bitmap::Create(*chipset, rect)).lock();
+		auto bmp = Bitmap::Create(*chipset, rect);
+		bmp->SetId(fmt::format("{}/{}", chipset->GetId(), tile_id));
+		cache_tiles[key] = bmp;
+
+		return bmp;
 	} else { return it->second.lock(); }
 }
 
 BitmapRef Cache::SpriteEffect(const BitmapRef& src_bitmap, const Rect& rect, bool flip_x, bool flip_y, const Tone& tone, const Color& blend) {
 	const effect_key_type key {
-		src_bitmap.get(),
+		src_bitmap->GetId(),
 		rect,
 		flip_x,
 		flip_y,

From b91639f6619e1c6a1f13294d2e5680cd37e56262 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 1 Sep 2024 20:43:01 +0200
Subject: [PATCH 203/222] Fluidsynth: Exhaust the internal synth buffer to
 prevent playing of old samples after long pauses

Fix #3135 (this time for real)
---
 src/decoder_fluidsynth.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/decoder_fluidsynth.cpp b/src/decoder_fluidsynth.cpp
index f171ff7d2..5b048feb0 100644
--- a/src/decoder_fluidsynth.cpp
+++ b/src/decoder_fluidsynth.cpp
@@ -214,7 +214,12 @@ FluidSynthDecoder::~FluidSynthDecoder() {
 	--instances;
 	assert(instances >= 0);
 
-	if (!use_global_synth) {
+	if (use_global_synth) {
+		// Exhaust the internal synth buffer
+		// Prevents that old samples play when a new Midi song starts (even when there was a longer break between them)
+		std::array<uint8_t, 64 * 4> buffer;
+		fluid_synth_write_s16(global_synth.get(), buffer.size() / 4, buffer.data(), 0, 2, buffer.data(), 1, 2);
+	} else {
 		delete_fluid_synth(local_synth);
 	}
 }

From ff4bc646530733e6caa79cdae2c71b4624083a44 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 1 Sep 2024 22:10:45 +0200
Subject: [PATCH 204/222] Android: Forgot to commit SDLActivity.java for the
 SDL2 2.30.6 bump

---
 .../src/main/java/org/libsdl/app/SDLActivity.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index c594704f6..77053ba71 100644
--- a/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -63,7 +63,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 30;
-    private static final int SDL_MICRO_VERSION = 1;
+    private static final int SDL_MICRO_VERSION = 6;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -283,7 +283,7 @@ protected String[] getLibraries() {
     // Load the .so
     public void loadLibraries() {
        for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib);
+          SDL.loadLibrary(lib, this);
        }
     }
 
@@ -1004,8 +1004,8 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
         /* No valid hint, nothing is explicitly allowed */
         if (!is_portrait_allowed && !is_landscape_allowed) {
             if (resizable) {
-                /* All orientations are allowed */
-                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                /* All orientations are allowed, respecting user orientation lock setting */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
             } else {
                 /* Fixed window and nothing specified. Get orientation from w/h of created window */
                 req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@@ -1014,8 +1014,8 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
             /* At least one orientation is allowed */
             if (resizable) {
                 if (is_portrait_allowed && is_landscape_allowed) {
-                    /* hint allows both landscape and portrait, promote to full sensor */
-                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
+                    /* hint allows both landscape and portrait, promote to full user */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
                 } else {
                     /* Use the only one allowed "orientation" */
                     req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);

From 2e671b880f5ed2b97cd268de960c2e82dc3121b2 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 1 Sep 2024 22:41:51 +0200
Subject: [PATCH 205/222] Android: Make title encoding detection more robust
 and filter out UTF16

---
 .../org_easyrpg_player_game_browser.cpp            | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
index cb88dd316..15e1954f3 100644
--- a/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
+++ b/builds/android/app/src/gamebrowser/org_easyrpg_player_game_browser.cpp
@@ -395,8 +395,18 @@ Java_org_easyrpg_player_game_1browser_Game_reencodeTitle(JNIEnv *env, jobject th
 	jstring jencoding = (jstring)env->CallObjectMethod(thiz, jget_encoding_method);
 	std::string encoding = jstring_to_string(env, jencoding);
 	if (encoding == "auto") {
-		lcf::Encoder enc(lcf::ReaderUtil::DetectEncoding(title));
-		enc.Encode(title);
+		auto det_encodings = lcf::ReaderUtil::DetectEncodings(title);
+		for (auto &det_enc: det_encodings) {
+			if (det_enc == "UTF-16BE" || det_enc == "UTF-16LE") {
+				// Skip obviously wrong title encodings
+				continue;
+			}
+
+			if (lcf::Encoder encoder(det_enc); encoder.IsOk()) {
+				encoder.Encode(title);
+				break;
+			}
+		}
 	} else {
 		lcf::Encoder enc(encoding);
 		enc.Encode(title);

From 7bb57b95ff4735433ffa0c2baf2ca1999657aaa8 Mon Sep 17 00:00:00 2001
From: lumiscosity <averyrudelphe@gmail.com>
Date: Sun, 1 Sep 2024 22:44:14 +0200
Subject: [PATCH 206/222] Improve debug image size warnings (#3260)

debug size warning tweaks
---
 src/cache.cpp | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/cache.cpp b/src/cache.cpp
index e5c93fef3..afc411270 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -174,30 +174,30 @@ namespace {
 
 	struct Spec {
 		char const* directory;
+		DummyRenderer dummy_renderer;
 		bool transparent;
 		int min_width , max_width;
 		int min_height, max_height;
-		DummyRenderer dummy_renderer;
 		bool oob_check;
 		bool warn_missing;
 	};
 	constexpr Spec spec[] = {
-		{ "Backdrop", false, 320, 320, 160, 240, DrawCheckerboard<Material::Backdrop>, true, true },
-		{ "Battle", true, 480, 480, 96, 480, DrawCheckerboard<Material::Battle>, true, true },
-		{ "CharSet", true, 288, 288, 256, 256, DrawCheckerboard<Material::Charset>, true, true },
-		{ "ChipSet", true, 480, 480, 256, 256, DrawCheckerboard<Material::Chipset>, true, true },
-		{ "FaceSet", true, 192, 192, 192, 192, DrawCheckerboard<Material::Faceset>, true, true},
-		{ "GameOver", false, 320, 320, 240, 240, DrawCheckerboard<Material::Gameover>, true, true },
-		{ "Monster", true, 16, 320, 16, 160, DrawCheckerboard<Material::Monster>, false, false },
-		{ "Panorama", false, 80, 640, 80, 480, DrawCheckerboard<Material::Panorama>, false, true },
-		{ "Picture", true, 1, 640, 1, 480, DrawCheckerboard<Material::Picture>, false, true },
-		{ "System", true, 160, 160, 80, 80, DummySystem, true, true },
-		{ "Title", false, 320, 320, 240, 240, DrawCheckerboard<Material::Title>, true, true },
-		{ "System2", true, 80, 80, 96, 96, DrawCheckerboard<Material::System2>, true, true },
-		{ "Battle2", true, 640, 640, 640, 640, DrawCheckerboard<Material::Battle2>, true, true },
-		{ "BattleCharSet", true, 144, 144, 384, 384, DrawCheckerboard<Material::Battlecharset>, true, false },
-		{ "BattleWeapon", true, 192, 192, 512, 512, DrawCheckerboard<Material::Battleweapon>, true, false },
-		{ "Frame", true, 320, 320, 240, 240, DrawCheckerboard<Material::Frame>, true, true },
+		{ "Backdrop", DrawCheckerboard<Material::Backdrop>, false, 320, 320, 160, 240, true, true },
+		{ "Battle", DrawCheckerboard<Material::Battle>, true, 96, 480, 96, 480, true, true },
+		{ "CharSet", DrawCheckerboard<Material::Charset>, true, 288, 288, 256, 256, true, true },
+		{ "ChipSet", DrawCheckerboard<Material::Chipset>, true, 480, 480, 256, 256, true, true },
+		{ "FaceSet", DrawCheckerboard<Material::Faceset>, true, 192, 192, 192, 192, true, true},
+		{ "GameOver", DrawCheckerboard<Material::Gameover>, false, 320, 320, 240, 240, true, true },
+		{ "Monster", DrawCheckerboard<Material::Monster>, true, 16, 320, 16, 160, false, false },
+		{ "Panorama", DrawCheckerboard<Material::Panorama>, false, 80, 640, 80, 480, false, true },
+		{ "Picture", DrawCheckerboard<Material::Picture>, true, 1, 640, 1, 480, false, true },
+		{ "System", DummySystem, true, 160, 160, 80, 80, true, true },
+		{ "Title", DrawCheckerboard<Material::Title>, false, 320, 320, 240, 240, true, true },
+		{ "System2", DrawCheckerboard<Material::System2>, true, 80, 80, 96, 96, true, true },
+		{ "Battle2", DrawCheckerboard<Material::Battle2>, true, 640, 640, 640, 640, true, true },
+		{ "BattleCharSet", DrawCheckerboard<Material::Battlecharset>, true, 144, 144, 384, 384, true, false },
+		{ "BattleWeapon", DrawCheckerboard<Material::Battleweapon>, true, 192, 192, 512, 512, true, false },
+		{ "Frame", DrawCheckerboard<Material::Frame>, true, 320, 320, 240, 240, true, true },
 	};
 
 	template<Material::Type T>
@@ -312,9 +312,15 @@ namespace {
 				max_h = min_h = Player::IsRPG2k() ? 160 : 240;
 			}
 
+			// EasyRPG extensions add support for large charsets; size is spoofed to ignore the error
+			if (!filename.empty() && filename.front() == '$' && T == Material::Charset && Player::HasEasyRpgExtensions()) {
+				w = 288;
+				h = 256;
+			}
+
 			if (w < min_w || max_w < w || h < min_h || max_h < h) {
 				Output::Debug("Image size out of bounds: {}/{} ({}x{} < {}x{} < {}x{})",
-							  s.directory, filename, min_w, min_h, w, h, max_w, max_h);
+							s.directory, filename, min_w, min_h, w, h, max_w, max_h);
 			}
 		}
 

From b156826161c7ed568d6d4c89a02b93a89da1149b Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 1 Sep 2024 22:47:50 +0200
Subject: [PATCH 207/222] Android: Remove deprecated package= option from
 Manifest

---
 builds/android/app/src/main/AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builds/android/app/src/main/AndroidManifest.xml b/builds/android/app/src/main/AndroidManifest.xml
index f1a8a6f80..6b69aa1ae 100644
--- a/builds/android/app/src/main/AndroidManifest.xml
+++ b/builds/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.easyrpg.player"
     android:versionCode="1"
     android:versionName="1.0"
     android:installLocation="auto">

From d274f13040318600136444009ee06ea2af799b05 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Sun, 1 Sep 2024 23:16:29 +0200
Subject: [PATCH 208/222] CMake: Replace the verbose warning when nlohmann is
 not found with a one-liner

This verbose warning appears when a library has no find module.
---
 CMakeLists.txt                               |  1 +
 builds/cmake/Modules/PlayerFindPackage.cmake | 26 +++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e1cdd57..b76c257a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -899,6 +899,7 @@ else()
 		CONDITION PLAYER_WITH_NLOHMANN_JSON
 		DEFINITION HAVE_NLOHMANN_JSON
 		TARGET nlohmann_json::nlohmann_json
+		ONLY_CONFIG
 	)
 endif()
 
diff --git a/builds/cmake/Modules/PlayerFindPackage.cmake b/builds/cmake/Modules/PlayerFindPackage.cmake
index 70d6bdb49..ff9232ffa 100644
--- a/builds/cmake/Modules/PlayerFindPackage.cmake
+++ b/builds/cmake/Modules/PlayerFindPackage.cmake
@@ -12,7 +12,7 @@
 #   Name of the library to search. The name must match FindNAME.cmake.
 # ``TARGET`` (list of string)
 #   Targets to import when the library was found.
-#	Searching ends when any of the targets is found.
+#   Searching ends when any of the targets is found.
 #
 # Optional Arguments
 # ^^^^^^^^^^^^^^^^^^
@@ -27,8 +27,13 @@
 # ``VERSION`` (String)
 #   Specifies required version of the library.
 # ``CONFIG_BROKEN`` (without arguments)
-#	Indicates that the config file of the library is known to be broken on certain systems.
+#   Indicates that the config file of the library is known to be broken on
+#   certain systems.
 #   Uses bundled FindXXX.cmake instead.
+# ``ONLY_CONFIG`` (without arguments)
+#   Use this for libraries that only have a config file and no find-module.
+#   This silences a huge warning emitted by CMake in that case and replaces it
+#   with a one-liner.
 #
 # Return variables
 # ^^^^^^^^^^^^^^^^
@@ -37,7 +42,7 @@
 #
 
 function(player_find_package)
-	cmake_parse_arguments(PARSE_ARGV 0 PLAYER_FIND_PACKAGE "REQUIRED;CONFIG_BROKEN" "NAME;CONDITION;DEFINITION;TARGET;VERSION" "")
+	cmake_parse_arguments(PARSE_ARGV 0 PLAYER_FIND_PACKAGE "REQUIRED;CONFIG_BROKEN;ONLY_CONFIG" "NAME;CONDITION;DEFINITION;TARGET;VERSION" "")
 
 	set(IS_REQUIRED "")
 	if(PLAYER_FIND_PACKAGE_REQUIRED)
@@ -49,11 +54,20 @@ function(player_find_package)
 		set(MODULE "MODULE")
 	endif()
 
+	set(ONLY_CONFIG_QUIET "")
+	if(PLAYER_FIND_PACKAGE_ONLY_CONFIG)
+		set(ONLY_CONFIG_QUIET "QUIET")
+	endif()
+
 	# Assume "true" when Condition is empty, otherwise dereference the condition variable
 	if((NOT PLAYER_FIND_PACKAGE_CONDITION) OR (${PLAYER_FIND_PACKAGE_CONDITION}))
-		find_package(${PLAYER_FIND_PACKAGE_NAME} ${PLAYER_FIND_PACKAGE_VERSION} ${IS_REQUIRED} ${MODULE})
+		find_package(${PLAYER_FIND_PACKAGE_NAME} ${PLAYER_FIND_PACKAGE_VERSION} ${IS_REQUIRED} ${MODULE} ${ONLY_CONFIG_QUIET})
+		set(DEP_FOUND FALSE)
+
 		foreach(TARGET_ITEM ${PLAYER_FIND_PACKAGE_TARGET})
 			if (TARGET ${TARGET_ITEM})
+				set(DEP_FOUND TRUE)
+
 				if(${PLAYER_FIND_PACKAGE_NAME}_DIR)
 					message(STATUS "Found ${PLAYER_FIND_PACKAGE_NAME}: ${${PLAYER_FIND_PACKAGE_NAME}_DIR} (${TARGET_ITEM})")
 				endif()
@@ -66,5 +80,9 @@ function(player_find_package)
 				break()
 			endif()
 		endforeach()
+
+		if (PLAYER_FIND_PACKAGE_ONLY_CONFIG AND NOT DEP_FOUND)
+			message(STATUS "Could NOT find ${PLAYER_FIND_PACKAGE_NAME} (missing: ${PLAYER_FIND_PACKAGE_NAME}Config.cmake)")
+		endif()
 	endif()
 endfunction()

From 99838d317bacc35d679f66ad148efe0aee5fd75d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 2 Sep 2024 10:47:24 +0200
Subject: [PATCH 209/222] Fix typo ObservervedVarOps -> ObservedVarOps

---
 src/game_map.cpp |  8 ++++----
 src/game_map.h   | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index a202f7d19..ede506e97 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -359,7 +359,7 @@ void Game_Map::SetupCommon() {
 	}
 
 	map_cache->Clear();
-	using Op = Caching::ObservervedVarOps;
+	using Op = Caching::ObservedVarOps;
 
 	// Create the map events
 	events.reserve(map->events.size());
@@ -381,7 +381,7 @@ void Game_Map::SetupCommon() {
 }
 
 void Game_Map::Caching::MapCache::Clear() {
-	for (int i = 0; i < static_cast<int>(ObservervedVarOps_END); i++) {
+	for (int i = 0; i < static_cast<int>(ObservedVarOps_END); i++) {
 		refresh_targets_by_varid[i].clear();
 	}
 }
@@ -1552,14 +1552,14 @@ void Game_Map::SetNeedRefresh(bool refresh) {
 void Game_Map::SetNeedRefreshForSwitchChange(int switch_id) {
 	if (need_refresh)
 		return;
-	if (map_cache->GetNeedRefresh<Caching::ObservervedVarOps::SwitchSet>(switch_id))
+	if (map_cache->GetNeedRefresh<Caching::ObservedVarOps::SwitchSet>(switch_id))
 		SetNeedRefresh(true);
 }
 
 void Game_Map::SetNeedRefreshForVarChange(int var_id) {
 	if (need_refresh)
 		return;
-	if (map_cache->GetNeedRefresh<Caching::ObservervedVarOps::VarSet>(var_id))
+	if (map_cache->GetNeedRefresh<Caching::ObservedVarOps::VarSet>(var_id))
 		SetNeedRefresh(true);
 }
 
diff --git a/src/game_map.h b/src/game_map.h
index 2abd928a8..c0826884f 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -691,24 +691,24 @@ namespace Game_Map {
 
 		using MapEventCacheData_t = std::unordered_map<int, MapEventCache>;
 
-		enum ObservervedVarOps {
+		enum ObservedVarOps {
 			SwitchSet = 0,
 			VarSet,
 
-			ObservervedVarOps_END
+			ObservedVarOps_END
 		};
 
 		class MapCache {
 		public:
-			template <ObservervedVarOps Op>
+			template <ObservedVarOps Op>
 			void AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev);
 
-			template <ObservervedVarOps Op>
+			template <ObservedVarOps Op>
 			bool GetNeedRefresh(int var_id);
 
 			void Clear();
 		private:
-			MapEventCacheData_t refresh_targets_by_varid[ObservervedVarOps_END];
+			MapEventCacheData_t refresh_targets_by_varid[ObservedVarOps_END];
 		};
 	}
 
@@ -877,17 +877,17 @@ inline void Game_Map::Caching::MapEventCache::AddEvent(lcf::rpg::Event& ev) {
 	}
 }
 
-template <Game_Map::Caching::ObservervedVarOps Op>
+template <Game_Map::Caching::ObservedVarOps Op>
 inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, lcf::rpg::Event& ev) {
-	static_assert(static_cast<int>(Op) >= 0 && Op < ObservervedVarOps_END);
+	static_assert(static_cast<int>(Op) >= 0 && Op < ObservedVarOps_END);
 
 	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
 	events_cache[var_id].AddEvent(ev);
 }
 
-template <Game_Map::Caching::ObservervedVarOps Op>
+template <Game_Map::Caching::ObservedVarOps Op>
 inline bool Game_Map::Caching::MapCache::GetNeedRefresh(int var_id) {
-	static_assert(static_cast<int>(Op) >= 0 && Op < ObservervedVarOps_END);
+	static_assert(static_cast<int>(Op) >= 0 && Op < ObservedVarOps_END);
 
 	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
 	return events_cache.find(var_id) != events_cache.end();

From 3073f375b498570a637d8a9f5f58aa46398245e5 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 2 Sep 2024 15:40:27 +0200
Subject: [PATCH 210/222] Fix 3ds build (wrong var type in
 WaitForSingleMovement)

---
 src/game_interpreter_map.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index ececf983c..8cdaa8cdc 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -793,9 +793,9 @@ bool Game_Interpreter_Map::CommandEasyRpgWaitForSingleMovement(lcf::rpg::EventCo
 
 	_state.easyrpg_parameters.resize(3);
 
-	int& event_id = _state.easyrpg_parameters[0];
-	int& failure_limit = _state.easyrpg_parameters[1];
-	int& output_var = _state.easyrpg_parameters[2];
+	auto& event_id = _state.easyrpg_parameters[0];
+	auto& failure_limit = _state.easyrpg_parameters[1];
+	auto& output_var = _state.easyrpg_parameters[2];
 
 	if (!_state.easyrpg_active) {
 		event_id = ValueOrVariable(com.parameters[0], com.parameters[1]);

From 425da583009b737f858a0b29fd4101980130f591 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 2 Sep 2024 15:41:49 +0200
Subject: [PATCH 211/222] Cast the string constants to char* when tremor is
 used.

Fixes warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]

Tremor never writes to the strings so this is safe to do.
---
 src/decoder_oggvorbis.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/decoder_oggvorbis.cpp b/src/decoder_oggvorbis.cpp
index ddf171658..1a69564fa 100644
--- a/src/decoder_oggvorbis.cpp
+++ b/src/decoder_oggvorbis.cpp
@@ -92,21 +92,29 @@ bool OggVorbisDecoder::Open(Filesystem_Stream::InputStream stream) {
 	vorbis_comment* vc = ov_comment(ovf, -1);
 	if (vc) {
 		// RPG VX loop support
-		const char* str = vorbis_comment_query(vc, "LOOPSTART", 0);
+		// Workaround conversion of string constant to char warning because
+		// of tremor using a different signature.
+#if defined(HAVE_TREMOR)
+		using char_type = char*;
+#else
+		using char_type = const char*;
+#endif
+
+		const char* str = vorbis_comment_query(vc, (char_type)"LOOPSTART", 0);
 		if (str) {
 			auto total = ov_pcm_total(ovf, -1) ;
 			loop.start = std::min<int64_t>(atoi(str), total);
 			if (loop.start >= 0) {
 				loop.looping = true;
 				loop.end = total;
-				str = vorbis_comment_query(vc, "LOOPLENGTH", 0);
+				str = vorbis_comment_query(vc, (char_type)"LOOPLENGTH", 0);
 				if (str) {
 					int len = atoi(str);
 					if (len >= 0) {
 						loop.end = std::min<int64_t>(loop.start + len, total);
 					}
 				} else {
-					str = vorbis_comment_query(vc, "LOOPEND", 0);
+					str = vorbis_comment_query(vc, (char_type)"LOOPEND", 0);
 					if (str) {
 						int end = atoi(str);
 						if (end >= 0) {

From a2080c76babaeda95b9dda5f02f2b81e3f452015 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Mon, 2 Sep 2024 20:50:48 +0200
Subject: [PATCH 212/222] Switch: Fix build (Add missing return value)

---
 src/platform/switch/ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/switch/ui.cpp b/src/platform/switch/ui.cpp
index 1ef3f28bd..957dba60d 100644
--- a/src/platform/switch/ui.cpp
+++ b/src/platform/switch/ui.cpp
@@ -439,7 +439,7 @@ bool NxUi::ProcessEvents() {
 
 	// do not handle touch when not displaying buttons or no touch happened
 	if (is_docked || vcfg.touch_ui.IsLocked() || !vcfg.touch_ui.Get() || !hidGetTouchScreenStates(&touch, 1))
-		return;
+		return true;
 
 	for (int32_t i = 0; i < touch.count; ++i) {
 		if (touch.touches[i].x < 160) {

From 52ea48812d943c17bd01a72ba5d51efc340088b0 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Tue, 3 Sep 2024 18:15:33 +0200
Subject: [PATCH 213/222] The Sacred Tears: TRUE uses a modified map tree

Detect this and apply a shift of 1 to all bytes in the map tree to make it work.
---
 CMakeLists.txt          |   2 +
 Makefile.am             |   2 +
 src/filesystem_hook.cpp | 147 ++++++++++++++++++++++++++++++++++++++++
 src/filesystem_hook.h   |  60 ++++++++++++++++
 src/player.cpp          |   5 +-
 5 files changed, 215 insertions(+), 1 deletion(-)
 create mode 100644 src/filesystem_hook.cpp
 create mode 100644 src/filesystem_hook.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e31277e..ac8def072 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,6 +123,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/fileext_guesser.h
 	src/filesystem.cpp
 	src/filesystem.h
+	src/filesystem_hook.cpp
+	src/filesystem_hook.h
 	src/filesystem_lzh.cpp
 	src/filesystem_lzh.h
 	src/filesystem_native.cpp
diff --git a/Makefile.am b/Makefile.am
index 444e7c90f..942640420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/fileext_guesser.h \
 	src/filesystem.cpp \
 	src/filesystem.h \
+	src/filesystem_hook.cpp \
+	src/filesystem_hook.h \
 	src/filesystem_lzh.cpp \
 	src/filesystem_lzh.h \
 	src/filesystem_native.cpp \
diff --git a/src/filesystem_hook.cpp b/src/filesystem_hook.cpp
new file mode 100644
index 000000000..90dd5639c
--- /dev/null
+++ b/src/filesystem_hook.cpp
@@ -0,0 +1,147 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "filesystem_hook.h"
+#include "filesystem_stream.h"
+#include "options.h"
+
+#include <cassert>
+#include <cstdio>
+#include <streambuf>
+
+class CaesarStreamBuf : public std::streambuf {
+public:
+	CaesarStreamBuf(std::streambuf* parent_sb, int n) : parent_sb(parent_sb), n(n) {
+		setg(&buf, &buf + 1, &buf + 1);
+	}
+	CaesarStreamBuf(CaesarStreamBuf const& other) = delete;
+	CaesarStreamBuf const& operator=(CaesarStreamBuf const& other) = delete;
+	~CaesarStreamBuf() {
+		delete parent_sb;
+	}
+
+protected:
+	int_type underflow() override {
+		auto byte = parent_sb->sbumpc();
+
+		if (byte == traits_type::eof()) {
+			return byte;
+		}
+
+		buf = traits_type::to_char_type(byte);
+		buf -= n;
+
+		setg(&buf, &buf, &buf + 1);
+
+		return byte;
+	}
+
+	std::streambuf::pos_type seekoff(std::streambuf::off_type offset, std::ios_base::seekdir dir, std::ios_base::openmode) override {
+		return parent_sb->pubseekoff(offset, dir);
+	}
+
+	std::streambuf::pos_type seekpos(std::streambuf::pos_type pos, std::ios_base::openmode) override {
+		return parent_sb->pubseekpos(pos);
+	}
+
+private:
+	std::streambuf* parent_sb;
+
+	char buf;
+	int n;
+};
+
+
+HookFilesystem::HookFilesystem(FilesystemView parent_fs, Hook hook) : Filesystem("", parent_fs), active_hook(hook) {
+	// no-op
+}
+
+FilesystemView HookFilesystem::Detect(FilesystemView fs) {
+	auto lmt = fs.OpenInputStream(TREEMAP_NAME);
+	if (lmt) {
+		std::array<char, 11> buf;
+
+		lmt.ReadIntoObj(buf);
+
+		if (!memcmp(buf.data(), "\xbMdgNbqUsff", 11)) {
+			auto hook_fs = std::make_shared<HookFilesystem>(fs, Hook::SacredTears);
+			return hook_fs->Subtree("");
+		}
+	}
+
+	return fs;
+}
+
+bool HookFilesystem::IsFile(StringView path) const {
+	return GetParent().IsFile(path);
+}
+
+bool HookFilesystem::IsDirectory(StringView path, bool follow_symlinks) const {
+	return GetParent().IsDirectory(path, follow_symlinks);
+}
+
+bool HookFilesystem::Exists(StringView path) const {
+	return GetParent().Exists(path);
+}
+
+int64_t HookFilesystem::GetFilesize(StringView path) const {
+	return GetParent().GetFilesize(path);
+}
+
+bool HookFilesystem::MakeDirectory(StringView dir, bool follow_symlinks) const {
+	return GetParent().MakeDirectory(dir, follow_symlinks);
+}
+
+bool HookFilesystem::IsFeatureSupported(Feature f) const {
+	return GetParent().IsFeatureSupported(f);
+}
+
+std::streambuf* HookFilesystem::CreateInputStreambuffer(StringView path, std::ios_base::openmode mode) const {
+	auto parent_sb = GetParent().CreateInputStreambuffer(path, mode);
+
+	if (active_hook == Hook::SacredTears) {
+		if (path == TREEMAP_NAME) {
+			return new CaesarStreamBuf(parent_sb, 1);
+		}
+	}
+
+	return parent_sb;
+}
+
+std::streambuf* HookFilesystem::CreateOutputStreambuffer(StringView path, std::ios_base::openmode mode) const {
+	return GetParent().CreateOutputStreambuffer(path, mode);
+}
+
+bool HookFilesystem::GetDirectoryContent(StringView path, std::vector<DirectoryTree::Entry>& tree) const {
+	auto dir_tree = GetParent().ListDirectory(path);
+
+	if (!dir_tree) {
+		return false;
+	}
+
+	for (auto& item: *dir_tree) {
+		tree.push_back(item.second);
+	}
+
+	return true;
+}
+
+std::string HookFilesystem::Describe() const {
+	assert(active_hook == Hook::SacredTears);
+
+	return fmt::format("[Hook] ({})", "Sacred Tears");
+}
diff --git a/src/filesystem_hook.h b/src/filesystem_hook.h
new file mode 100644
index 000000000..260116ae2
--- /dev/null
+++ b/src/filesystem_hook.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EP_FILESYSTEM_HOOK_H
+#define EP_FILESYSTEM_HOOK_H
+
+#include "filesystem.h"
+
+/**
+ * A virtual filesystem that applies modifications to game files
+ */
+class HookFilesystem : public Filesystem {
+public:
+	enum class Hook {
+		// The Sacred Tears: TRUE
+		// Shifts the offset of all bytes in the LMT back by one
+		SacredTears
+	};
+
+	explicit HookFilesystem(FilesystemView parent_fs, Hook hook);
+
+	static FilesystemView Detect(FilesystemView fs);
+
+	/**
+	 * Implementation of abstract methods
+	 */
+	/** @{ */
+	bool IsFile(StringView path) const override;
+	bool IsDirectory(StringView path, bool follow_symlinks) const override;
+	bool Exists(StringView path) const override;
+	int64_t GetFilesize(StringView path) const override;
+	bool MakeDirectory(StringView dir, bool follow_symlinks) const override;
+	bool IsFeatureSupported(Feature f) const override;
+	std::string Describe() const override;
+	/** @} */
+protected:
+	/** @{ */
+	bool GetDirectoryContent(StringView path, std::vector<DirectoryTree::Entry>& entries) const override;
+	std::streambuf* CreateInputStreambuffer(StringView path, std::ios_base::openmode mode) const override;
+	std::streambuf* CreateOutputStreambuffer(StringView path, std::ios_base::openmode mode) const override;
+	/** @} */
+
+	Hook active_hook;
+};
+
+#endif
diff --git a/src/player.cpp b/src/player.cpp
index 7645c3f16..95a5753ed 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -24,7 +24,6 @@
 #include <iomanip>
 #include <fstream>
 #include <memory>
-#include <thread>
 
 #ifdef _WIN32
 #  include "platform/windows/utils.h"
@@ -42,6 +41,7 @@
 #include "filefinder.h"
 #include "filefinder_rtp.h"
 #include "fileext_guesser.h"
+#include "filesystem_hook.h"
 #include "game_actors.h"
 #include "game_battle.h"
 #include "game_map.h"
@@ -692,6 +692,9 @@ void Player::CreateGameObjects() {
 	}
 	escape_char = Utils::DecodeUTF32(Player::escape_symbol).front();
 
+	// Special handling for games with altered files
+	FileFinder::SetGameFilesystem(HookFilesystem::Detect(FileFinder::Game()));
+
 	// Check for translation-related directories and load language names.
 	translation.InitTranslations();
 

From d8848dbf7347cf21c47098719364eb0b7c2a6ee4 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 9 Oct 2024 21:27:30 +0200
Subject: [PATCH 214/222] Add transparency to the SpriteEffect key, matching
 the behaviour of the normal sprite cache.

Fixes a black screen when entering the bedroom in Yume 2kki's Nocturnal Grove (Regression)

Fix #3274
---
 src/cache.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cache.cpp b/src/cache.cpp
index afc411270..4d54b1eb7 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -82,7 +82,7 @@ namespace {
 	std::unordered_map<tile_key_type, std::weak_ptr<Bitmap>> cache_tiles;
 
 	// rect, flip_x, flip_y, tone, blend
-	using effect_key_type = std::tuple<std::string, Rect, bool, bool, Tone, Color>;
+	using effect_key_type = std::tuple<std::string, bool, Rect, bool, bool, Tone, Color>;
 	std::map<effect_key_type, std::weak_ptr<Bitmap>> cache_effects;
 
 	std::string system_name;
@@ -465,6 +465,7 @@ BitmapRef Cache::Tile(StringView filename, int tile_id) {
 BitmapRef Cache::SpriteEffect(const BitmapRef& src_bitmap, const Rect& rect, bool flip_x, bool flip_y, const Tone& tone, const Color& blend) {
 	const effect_key_type key {
 		src_bitmap->GetId(),
+		src_bitmap->GetTransparent(),
 		rect,
 		flip_x,
 		flip_y,
@@ -472,6 +473,8 @@ BitmapRef Cache::SpriteEffect(const BitmapRef& src_bitmap, const Rect& rect, boo
 		blend
 	};
 
+	assert(!src_bitmap->GetId().empty());
+
 	const auto it = cache_effects.find(key);
 
 	if (it == cache_effects.end() || it->second.expired()) {

From df205a75d2d00f70bcd6cee3e7a5d89bf73f583e Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 9 Oct 2024 21:28:51 +0200
Subject: [PATCH 215/222] ManiacGetSaveInfo: Set transparency and apply correct
 defaults

Fix #3272
---
 src/game_interpreter.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 0f4312d8f..dd21bdde9 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -4061,19 +4061,15 @@ bool Game_Interpreter::CommandManiacGetSaveInfo(lcf::rpg::EventCommand const& co
 			continue;
 		}
 
-		// When the picture exists: Data is reused and effects finish immediately
-		// When not: Default data is used
-		// New features (spritesheets etc.) are always set due to how the patch works
-		// We are incompatible here and only set name and spritesheet and reuse stuff like the layer
+		// An existing picture is overwritten
+		// Default data is used with the exceptions listed below
 		Game_Pictures::ShowParams params;
-		auto& pic = Main_Data::game_pictures->GetPicture(pic_id);
-		if (pic.Exists()) {
-			params = pic.GetShowParams();
-		} else {
-			params.top_trans = 100;
+		params.use_transparent_color = true;
+		params.top_trans = 100; // Full transparent by default
 			params.map_layer = 7;
 			params.battle_layer = 7;
-		}
+
+		// Spritesheet configured to match the FaceSet layout
 		params.name = FileFinder::MakePath("..\\FaceSet", face_names[i]);
 		params.spritesheet_cols = 4;
 		params.spritesheet_rows = 4;

From f4739461fc174c232114b88a681fc800c764aa2d Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 9 Oct 2024 21:31:17 +0200
Subject: [PATCH 216/222] ManiacControlGlobalSave: Fix command not working the
 first time when using Copy From/To without calling Open.

Bug was that the function returned when the lgs file was missing.

Emscripten: Update the filesystem state

Fix #3270
---
 src/game_interpreter.cpp | 37 +++++++++++++++++++++++++------------
 src/main_data.cpp        |  4 ++++
 src/main_data.h          |  1 +
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index dd21bdde9..98b9edef5 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -25,6 +25,7 @@
 #include <string>
 #include <cassert>
 #include "game_interpreter.h"
+#include "async_handler.h"
 #include "audio.h"
 #include "dynrpg.h"
 #include "filefinder.h"
@@ -4066,8 +4067,8 @@ bool Game_Interpreter::CommandManiacGetSaveInfo(lcf::rpg::EventCommand const& co
 		Game_Pictures::ShowParams params;
 		params.use_transparent_color = true;
 		params.top_trans = 100; // Full transparent by default
-			params.map_layer = 7;
-			params.battle_layer = 7;
+		params.map_layer = 7;
+		params.battle_layer = 7;
 
 		// Spritesheet configured to match the FaceSet layout
 		params.name = FileFinder::MakePath("..\\FaceSet", face_names[i]);
@@ -4521,14 +4522,13 @@ bool Game_Interpreter::CommandManiacControlGlobalSave(lcf::rpg::EventCommand con
 
 	int operation = com.parameters[0];
 
-	static bool was_loaded = false; // FIXME
+	auto load_global_save = [&]() {
+		Main_Data::global_save_opened = true;
 
-	if (operation == 0 || (!was_loaded && (operation == 4 || operation == 5))) {
-		was_loaded = true;
 		// Load
 		auto lgs = FileFinder::Save().OpenFile("Save.lgs");
 		if (!lgs) {
-			return true;
+			return;
 		}
 
 		lcf::LcfReader reader(lgs);
@@ -4536,7 +4536,7 @@ bool Game_Interpreter::CommandManiacControlGlobalSave(lcf::rpg::EventCommand con
 		reader.ReadString(header, reader.ReadInt());
 		if (header.length() != 13 || header != "LcfGlobalSave") {
 			Output::Debug("This is not a valid global save.");
-			return true;
+			return;
 		}
 
 		lcf::LcfReader::Chunk chunk;
@@ -4561,15 +4561,18 @@ bool Game_Interpreter::CommandManiacControlGlobalSave(lcf::rpg::EventCommand con
 					reader.Skip(chunk, "CommandManiacControlGlobalSave");
 			}
 		}
-	}
-
+	};
 
-	if (operation == 0 || operation == 1) {
-		// Open / Close (no-op)
+	if (operation == 0) {
+		// Open
+		load_global_save();
+	} else if (operation == 1) {
+		// Close
+		Main_Data::global_save_opened = false;
 	} else if (operation == 2 || operation == 3) {
 		// 2: Save (write to file)
 		// 3: Save and Close
-		if (!was_loaded) {
+		if (!Main_Data::global_save_opened) {
 			return true;
 		}
 
@@ -4594,7 +4597,17 @@ bool Game_Interpreter::CommandManiacControlGlobalSave(lcf::rpg::EventCommand con
 		writer.WriteInt(2);
 		writer.WriteInt(Main_Data::game_variables_global->GetSize() * sizeof(int32_t));
 		writer.Write(Main_Data::game_variables_global->GetData());
+
+		AsyncHandler::SaveFilesystem();
+
+		if (operation == 3) {
+			Main_Data::global_save_opened = false;
+		}
 	} else if (operation == 4 || operation == 5) {
+		if (!Main_Data::global_save_opened) {
+			load_global_save();
+		}
+
 		int type = com.parameters[2];
 		int game_state_idx = ValueOrVariableBitfield(com.parameters[1], 0, com.parameters[3]);
 		int global_save_idx = ValueOrVariableBitfield(com.parameters[1], 1, com.parameters[4]);
diff --git a/src/main_data.cpp b/src/main_data.cpp
index 86d4a8cc3..cb170499d 100644
--- a/src/main_data.cpp
+++ b/src/main_data.cpp
@@ -71,6 +71,7 @@ namespace Main_Data {
 	std::unique_ptr<Game_Targets> game_targets;
 	std::unique_ptr<Game_Quit> game_quit;
 	std::unique_ptr<Game_Ineluki> game_ineluki;
+	bool global_save_opened = false;
 	std::unique_ptr<Game_Switches> game_switches_global;
 	std::unique_ptr<Game_Variables> game_variables_global;
 
@@ -125,6 +126,9 @@ void Main_Data::Cleanup() {
 	game_quit.reset();
 	game_system.reset();
 	game_ineluki.reset();
+	global_save_opened = false;
+	game_switches_global.reset();
+	game_variables_global.reset();
 }
 
 const std::string& Main_Data::GetDefaultProjectPath() {
diff --git a/src/main_data.h b/src/main_data.h
index e2d199eb9..ced8e4228 100644
--- a/src/main_data.h
+++ b/src/main_data.h
@@ -58,6 +58,7 @@ namespace Main_Data {
 	extern std::unique_ptr<Game_Targets> game_targets;
 	extern std::unique_ptr<Game_Quit> game_quit;
 	extern std::unique_ptr<Game_Ineluki> game_ineluki;
+	extern bool global_save_opened;
 	extern std::unique_ptr<Game_Switches> game_switches_global; // Used by Global Save command
 	extern std::unique_ptr<Game_Variables> game_variables_global;
 

From 60c998f1688c42390c2238c1e3e5e36ae90eb1d7 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 9 Oct 2024 21:32:24 +0200
Subject: [PATCH 217/222] Load: Fix Async loading of the map file when command
 ManiacLoad is used

Fix #3271
---
 src/player.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/player.cpp b/src/player.cpp
index 1cb57fe30..f78ba74e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1161,7 +1161,6 @@ void Player::LoadSavegame(const std::string& save_name, int save_id) {
 	if (!load_on_map) {
 		Scene::PopUntil(Scene::Title);
 	}
-	Game_Map::Dispose();
 
 	Main_Data::game_switches->SetLowerLimit(lcf::Data::switches.size());
 	Main_Data::game_switches->SetData(std::move(save->system.switches));
@@ -1180,17 +1179,26 @@ void Player::LoadSavegame(const std::string& save_name, int save_id) {
 	int map_id = Main_Data::game_player->GetMapId();
 
 	FileRequestAsync* map = Game_Map::RequestMap(map_id);
-	save_request_id = map->Bind([save=std::move(*save)](auto* request) { OnMapSaveFileReady(request, std::move(save)); });
+	save_request_id = map->Bind(
+		[save=std::move(*save), load_on_map, save_id](auto* request) {
+			Game_Map::Dispose();
+
+			OnMapSaveFileReady(request, std::move(save));
+
+			if (load_on_map) {
+				// Increment frame counter for consistency with a normal savegame load
+				IncFrame();
+				static_cast<Scene_Map*>(Scene::instance.get())->StartFromSave(save_id);
+			}
+		}
+	);
 
 	Main_Data::game_system->ReloadSystemGraphic();
 
 	map->Start();
+	// load_on_map is handled in the async callback
 	if (!load_on_map) {
 		Scene::Push(std::make_shared<Scene_Map>(save_id));
-	} else {
-		// Increment frame counter for consistency with a normal savegame load
-		IncFrame();
-		static_cast<Scene_Map*>(Scene::instance.get())->StartFromSave(save_id);
 	}
 }
 

From 981ac0f92ffbbaf48fc04d25f4878769897f97d4 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Wed, 9 Oct 2024 21:46:02 +0200
Subject: [PATCH 218/222] ZIP: Improve encoding detection by only feeding the
 filename to ICU

Before the string contained full paths, breaking the detection logic because most paths are ASCII
---
 src/filesystem_zip.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/filesystem_zip.cpp b/src/filesystem_zip.cpp
index eee40b0e3..8fab26ec1 100644
--- a/src/filesystem_zip.cpp
+++ b/src/filesystem_zip.cpp
@@ -83,8 +83,8 @@ ZipFilesystem::ZipFilesystem(std::string base_path, FilesystemView parent_fs, St
 		int items = 0;
 		while (ReadCentralDirectoryEntry(zip_is, filepath, entry, is_utf8)) {
 			// Only consider Non-ASCII & Non-UTF8 for encoding detection
-			// Skip directories, files already contain the paths
-			if (is_utf8 || filepath.back() == '/' || Utils::StringIsAscii(filepath)) {
+			// Directories are skipped as most of them are usually ASCII and do not help with the detection
+			if (is_utf8 || filepath.back() == '/' || Utils::StringIsAscii(std::get<1>(FileFinder::GetPathAndFilename(filepath)))) {
 				continue;
 			}
 			// Codepath will be only entered by Windows "compressed folder" ZIPs (uses local encoding) and

From cad75aafce4b202f07bb9933785f226942696bc6 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 5 Sep 2024 15:10:49 +0200
Subject: [PATCH 219/222] DestroyMapEvent: Remove the event from the cache

---
 src/game_map.cpp | 48 +++++++++++++++++++++++++++++++++++++-----------
 src/game_map.h   | 22 +++++++++++++---------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index ae9ecd4cc..f37bde987 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -380,6 +380,22 @@ void Game_Map::AddEventToCache(const lcf::rpg::Event& ev) {
 	}
 }
 
+void Game_Map::RemoveEventFromCache(const lcf::rpg::Event& ev) {
+	using Op = Caching::ObservedVarOps;
+
+	for (const auto& pg : ev.pages) {
+		if (pg.condition.flags.switch_a) {
+			map_cache->RemoveEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_a_id, ev);
+		}
+		if (pg.condition.flags.switch_b) {
+			map_cache->RemoveEventAsRefreshTarget<Op::SwitchSet>(pg.condition.switch_b_id, ev);
+		}
+		if (pg.condition.flags.variable) {
+			map_cache->RemoveEventAsRefreshTarget<Op::VarSet>(pg.condition.variable_id, ev);
+		}
+	}
+}
+
 void Game_Map::Caching::MapCache::Clear() {
 	for (int i = 0; i < static_cast<int>(ObservedVarOps_END); i++) {
 		refresh_targets_by_varid[i].clear();
@@ -458,17 +474,7 @@ bool Game_Map::DestroyMapEvent(const int event_id, bool update_references) {
 	}
 
 	// Remove event from cache
-	//	for (auto& pg : event->pages) {
-	//		if (pg.condition.flags.switch_a) {
-	//			events_cache_by_switch[pg.condition.switch_a_id].RemoveEvent(*event);
-	//		}
-	//		if (pg.condition.flags.switch_b) {
-	//			events_cache_by_switch[pg.condition.switch_b_id].RemoveEvent(*event);
-	//		}
-	//		if (pg.condition.flags.variable) {
-	//			events_cache_by_variable[pg.condition.variable_id].RemoveEvent(*event);
-	//		}
-	//	}
+	RemoveEventFromCache(*event);
 
 	// Remove event from events vector
 	for (auto it = events.begin(); it != events.end(); ++it) {
@@ -1894,6 +1900,26 @@ FileRequestAsync* Game_Map::RequestMap(int map_id) {
 	return request;
 }
 
+// MapEventCache
+//////////////////
+void Game_Map::Caching::MapEventCache::AddEvent(const lcf::rpg::Event& ev) {
+	auto id = ev.ID;
+
+	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
+		event_ids.emplace_back(id);
+	}
+}
+
+void Game_Map::Caching::MapEventCache::RemoveEvent(const lcf::rpg::Event& ev) {
+	auto id = ev.ID;
+
+	auto it = std::find(event_ids.begin(), event_ids.end(), id);
+
+	if (it != event_ids.end()) {
+		event_ids.erase(it);
+	}
+}
+
 // Parallax
 /////////////
 
diff --git a/src/game_map.h b/src/game_map.h
index 15eba930f..2f64de6a1 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -23,6 +23,7 @@
 #include <initializer_list>
 #include <vector>
 #include <string>
+#include <unordered_map>
 #include <unordered_set>
 #include "async_op.h"
 #include "system.h"
@@ -102,6 +103,7 @@ namespace Game_Map {
 	void CreateMapEvents();
 	void UpdateUnderlyingEventReferences();
 	void AddEventToCache(const lcf::rpg::Event& ev);
+	void RemoveEventFromCache(const lcf::rpg::Event& ev);
 	const lcf::rpg::Event* FindEventById(const std::vector<lcf::rpg::Event>& events, int event_id);
 	int GetNextAvailableEventId();
 
@@ -691,6 +693,7 @@ namespace Game_Map {
 		class MapEventCache {
 		public:
 			void AddEvent(const lcf::rpg::Event& ev);
+			void RemoveEvent(const lcf::rpg::Event& ev);
 
 		private:
 			std::vector<int> event_ids;
@@ -710,6 +713,9 @@ namespace Game_Map {
 			template <ObservedVarOps Op>
 			void AddEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev);
 
+			template <ObservedVarOps Op>
+			void RemoveEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev);
+
 			template <ObservedVarOps Op>
 			bool GetNeedRefresh(int var_id);
 
@@ -724,7 +730,6 @@ namespace Game_Map {
 	void SetNeedRefreshForSwitchChange(std::initializer_list<int> switch_ids);
 	void SetNeedRefreshForVarChange(std::initializer_list<int> var_ids);
 
-
 	namespace Parallax {
 		struct Params {
 			std::string name;
@@ -807,7 +812,6 @@ namespace Game_Map {
 	}
 }
 
-
 inline AsyncOp MapUpdateAsyncContext::GetAsyncOp() const {
 	return async_op;
 }
@@ -876,20 +880,20 @@ inline bool MapUpdateAsyncContext::IsActive() const {
 	return GetAsyncOp().IsActive();
 }
 
-inline void Game_Map::Caching::MapEventCache::AddEvent(const lcf::rpg::Event& ev) {
-	auto id = ev.ID;
+template <Game_Map::Caching::ObservedVarOps Op>
+inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev) {
+	static_assert(static_cast<int>(Op) >= 0 && Op < ObservedVarOps_END);
 
-	if (std::find(event_ids.begin(), event_ids.end(), id) == event_ids.end()) {
-		event_ids.emplace_back(id);
-	}
+	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
+	events_cache[var_id].AddEvent(ev);
 }
 
 template <Game_Map::Caching::ObservedVarOps Op>
-inline void Game_Map::Caching::MapCache::AddEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev) {
+inline void Game_Map::Caching::MapCache::RemoveEventAsRefreshTarget(int var_id, const lcf::rpg::Event& ev) {
 	static_assert(static_cast<int>(Op) >= 0 && Op < ObservedVarOps_END);
 
 	auto& events_cache = refresh_targets_by_varid[static_cast<int>(Op)];
-	events_cache[var_id].AddEvent(ev);
+	events_cache[var_id].RemoveEvent(ev);
 }
 
 template <Game_Map::Caching::ObservedVarOps Op>

From 85b82b7bac4ab86c5e779341e371a094d6260940 Mon Sep 17 00:00:00 2001
From: Ghabry <gabriel+github@mastergk.de>
Date: Thu, 5 Sep 2024 15:20:00 +0200
Subject: [PATCH 220/222] Clone/DestroyMapEvent: Silence warning when deletion
 fails while cloning

Add documentation
---
 src/game_map.cpp | 10 ++++++----
 src/game_map.h   | 21 ++++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/game_map.cpp b/src/game_map.cpp
index f37bde987..5056405de 100644
--- a/src/game_map.cpp
+++ b/src/game_map.cpp
@@ -430,7 +430,7 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 
 	lcf::rpg::Event new_event = *source_event;
 	if (target_event_id > 0) {
-		DestroyMapEvent(target_event_id, false);
+		DestroyMapEvent(target_event_id, true);
 		new_event.ID = target_event_id;
 	} else {
 		new_event.ID = GetNextAvailableEventId();
@@ -465,11 +465,13 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 	return true;
 }
 
-bool Game_Map::DestroyMapEvent(const int event_id, bool update_references) {
+bool Game_Map::DestroyMapEvent(const int event_id, bool from_clone) {
 	const lcf::rpg::Event* event = FindEventById(map->events, event_id);
 
 	if (event == nullptr) {
-		Output::Warning("DestroyMapEvent: Event ID {} not found on current map", event_id);
+		if (!from_clone) {
+			Output::Warning("DestroyMapEvent: Event ID {} not found on current map", event_id);
+		}
 		return true;
 	}
 
@@ -492,7 +494,7 @@ bool Game_Map::DestroyMapEvent(const int event_id, bool update_references) {
 		}
 	}
 
-	if (update_references) {
+	if (!from_clone) {
 		UpdateUnderlyingEventReferences();
 
 		Scene_Map* scene = (Scene_Map*)Scene::Find(Scene::Map).get();
diff --git a/src/game_map.h b/src/game_map.h
index 2f64de6a1..9cea5c5ea 100644
--- a/src/game_map.h
+++ b/src/game_map.h
@@ -96,8 +96,27 @@ namespace Game_Map {
 	/** Disposes Game_Map. */
 	void Dispose();
 
+	/**
+	 * Clones a map event.
+	 *
+	 * @param src_map_id Source map where to clone the event from
+	 * @param src_event_id Source event ID to clone
+	 * @param target_x Where to place the new event (X coordinate)
+	 * @param target_y Where to place the new event (Y coordinate)
+	 * @param target_event_id New event ID. When <= 0 a free ID is selected. When the ID exists the event is overwritten.
+	 * @param target_name New name of the event. When empty the original name is used.
+	 * @return Whether the cloning was successful. It will fail when source map or the src/target event do not exist.
+	 */
 	bool CloneMapEvent(int src_map_id, int src_event_id, int target_x, int target_y, int target_event_id, StringView target_name);
-	bool DestroyMapEvent(const int event_id, bool update_references = true);
+
+	/**
+	 * Deletes a map event.
+	 *
+	 * @param event_id Event ID to delete
+	 * @param from_clone When true this function was invoked by CloneMapEvent. This silences warnings and skips refreshes.
+	 * @return Whether the event was deleted. This will fail when the event does not exist.
+	 */
+	bool DestroyMapEvent(const int event_id, bool from_clone = false);
 
 	void TranslateMapMessages(int mapId, lcf::rpg::Map& map);
 	void CreateMapEvents();

From 6655ec7eedc789afcfb586db35ba5968dcd461ef Mon Sep 17 00:00:00 2001
From: Viet Dinh <54ckb0y789@gmail.com>
Date: Thu, 10 Oct 2024 21:53:54 -0400
Subject: [PATCH 221/222] Reset UI on WebGL context loss

On Emscripten, the WebGL context may be loss for any reason, for example
when restoring the application from the background, the GPU force-
refreshed the application to reclaim memory, etc. In these cases, canvas
data is lost and this commit accommodates that situation by reinitiali-
zing the UI when the browser has restored the context.
---
 resources/emscripten/emscripten-pre.js | 6 ++++--
 src/platform/emscripten/interface.cpp  | 8 ++++++++
 src/platform/emscripten/interface.h    | 1 +
 src/platform/emscripten/main.cpp       | 7 ++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/emscripten/emscripten-pre.js b/resources/emscripten/emscripten-pre.js
index 40bac40dd..c720cd758 100644
--- a/resources/emscripten/emscripten-pre.js
+++ b/resources/emscripten/emscripten-pre.js
@@ -15,13 +15,15 @@ Module = { ...Module,
   canvas: (() => {
     const canvas = document.getElementById('canvas');
 
-    // As a default initial behavior, pop up an alert when webgl context is lost
     // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
     canvas.addEventListener('webglcontextlost', event => {
-      alert('WebGL context lost. You will need to reload the page.');
       event.preventDefault();
     }, false);
 
+    canvas.addEventListener('webglcontextrestored', () => {
+      Module.api.resetCanvas();
+    });
+
     return canvas;
   })(),
 
diff --git a/src/platform/emscripten/interface.cpp b/src/platform/emscripten/interface.cpp
index a57e9c9ff..ccbd7b42a 100644
--- a/src/platform/emscripten/interface.cpp
+++ b/src/platform/emscripten/interface.cpp
@@ -24,6 +24,7 @@
 
 #include "system.h"
 #include "async_handler.h"
+#include "baseui.h"
 #include "filefinder.h"
 #include "filesystem_stream.h"
 #include "player.h"
@@ -159,6 +160,12 @@ bool Emscripten_Interface_Private::UploadFontStep2(std::string filename, int buf
 	return true;
 }
 
+bool Emscripten_Interface::ResetCanvas() {
+	DisplayUi.reset();
+	DisplayUi = BaseUi::CreateUi(Player::screen_width, Player::screen_height, Player::ParseCommandLine());
+	return DisplayUi != nullptr;
+}
+
 // Binding code
 EMSCRIPTEN_BINDINGS(player_interface) {
 	emscripten::class_<Emscripten_Interface>("api")
@@ -173,6 +180,7 @@ EMSCRIPTEN_BINDINGS(player_interface) {
 #endif
 		.class_function("refreshScene", &Emscripten_Interface::RefreshScene)
 		.class_function("takeScreenshot", &Emscripten_Interface::TakeScreenshot)
+		.class_function("resetCanvas", &Emscripten_Interface::ResetCanvas)
 	;
 
 	emscripten::class_<Emscripten_Interface_Private>("api_private")
diff --git a/src/platform/emscripten/interface.h b/src/platform/emscripten/interface.h
index 795587cc8..ae8fb360f 100644
--- a/src/platform/emscripten/interface.h
+++ b/src/platform/emscripten/interface.h
@@ -29,6 +29,7 @@ class Emscripten_Interface {
     static void RefreshScene();
 	static void TakeScreenshot();
 	static void Reset();
+	static bool ResetCanvas();
 };
 
 class Emscripten_Interface_Private {
diff --git a/src/platform/emscripten/main.cpp b/src/platform/emscripten/main.cpp
index b20b8f80f..dc88edaa5 100644
--- a/src/platform/emscripten/main.cpp
+++ b/src/platform/emscripten/main.cpp
@@ -68,9 +68,14 @@ void main_loop() {
 		Player::MainLoop();
 		if (!DisplayUi.get()) {
 			// Yield on shutdown to ensure async operations (e.g. IDBFS saving) can finish
-			counter = -5;
+			counter = -10;
 		}
 	} else if (counter == -1) {
+		if (DisplayUi.get()) {
+			// we previously lost the UI and restored it, so continue doing stuff.
+			counter = 6;
+			return;
+		}
 		emscripten_cancel_main_loop();
 	}
 }

From 97b51ac2cac3a3d73198beaee32c41677f6ac959 Mon Sep 17 00:00:00 2001
From: Viet Dinh <54ckb0y789@gmail.com>
Date: Sun, 27 Oct 2024 00:55:07 -0400
Subject: [PATCH 222/222] Fix compile errors from merge

---
 src/game_playerother.h     |  6 +++---
 src/multiplayer/messages.h |  5 +++--
 src/multiplayer/packet.h   | 30 ++++++++++++++++--------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/game_playerother.h b/src/game_playerother.h
index 450f773d9..be431e1c9 100644
--- a/src/game_playerother.h
+++ b/src/game_playerother.h
@@ -29,8 +29,8 @@ class Game_PlayerOther : public Game_PlayerBase {
 
 		int GetOpacity() const override;
 
-		Drawable::Z_t GetScreenZ(bool apply_shift = false) const override {
-			return Game_Character::GetScreenZ(apply_shift) | (0xFFFEu << 16u) + id;
+		Drawable::Z_t GetScreenZ(int x_offset, int y_offset) const override {
+			return Game_Character::GetScreenZ(x_offset, y_offset) | (0xFFFEu << 16u) + id;
 		}
 
 		void UpdateNextMovementAction() override {
@@ -79,4 +79,4 @@ inline int Game_PlayerOther::GetOpacity() const {
 	return std::floor(opacity);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/multiplayer/messages.h b/src/multiplayer/messages.h
index ccf13515e..b0e6b3d8c 100644
--- a/src/multiplayer/messages.h
+++ b/src/multiplayer/messages.h
@@ -207,7 +207,8 @@ namespace S2C {
 		static void BuildParams(Game_Pictures::Params& p, const PL& v) {
 			p.position_x = Decode<int>(v.at(2));
 			p.position_y = Decode<int>(v.at(3));
-			p.magnify = Decode<int>(v.at(8));
+			p.magnify_width = Decode<int>(v.at(8));
+			p.magnify_height = Decode<int>(v.at(8));
 			p.top_trans = Decode<int>(v.at(9));
 			p.bottom_trans = Decode<int>(v.at(10));
 			p.red = Decode<int>(v.at(11));
@@ -498,7 +499,7 @@ namespace C2S {
 		void Append(std::string& s) const {
 			AppendPartial(s, pic_id, p.position_x, p.position_y,
 					map_x, map_y, pan_x, pan_y,
-					p.magnify, p.top_trans, p.bottom_trans,
+					p.magnify_width, p.top_trans, p.bottom_trans,
 					p.red, p.green, p.blue, p.saturation,
 					p.effect_mode, p.effect_power);
 		}
diff --git a/src/multiplayer/packet.h b/src/multiplayer/packet.h
index ac06637b4..70b794ff7 100644
--- a/src/multiplayer/packet.h
+++ b/src/multiplayer/packet.h
@@ -57,30 +57,32 @@ class C2SPacket : public Packet {
 	std::string m_name;
 };
 
-class S2CPacket : public Packet {
-public:
-	virtual ~S2CPacket() = default;
-
+namespace S2CPacket__detail {
 	template<typename T>
-	static T Decode(std::string_view s);
+	T Decode(std::string_view s);
 
 	template<>
-	int Decode(std::string_view s) {
+	inline int Decode<int>(std::string_view s) {
 		int r;
 		auto e = std::from_chars(s.data(), s.data() + s.size(), r);
-		//if (e.ec != std::errc())
-		//	std::terminate();
 		return r;
 	}
 
 	template<>
-	bool Decode(std::string_view s) {
-		if (s == "1")
-			return true;
-		//if (s == "0")
-			return false;
-		//std::terminate();
+	inline bool Decode<bool>(std::string_view s) {
+		return s == "1";
 	}
+}
+
+class S2CPacket : public Packet {
+public:
+	virtual ~S2CPacket() = default;
+
+	template<typename T>
+	static T Decode(std::string_view s) {
+		return S2CPacket__detail::Decode<T>(s);
+	}
+
 };
 
 }