From de3be068d7612cf3ff77c9c69d4a0885debec1a0 Mon Sep 17 00:00:00 2001
From: Remnants of Forgotten Disney <weber.austint@gmail.com>
Date: Mon, 4 Dec 2023 21:03:14 -0600
Subject: [PATCH] Final commit before release

---
 Pokemon_Mirror_mb-0.png | Bin 0 -> 1590 bytes
 include/debug_mode.h    |   2 ++
 source/main.cpp         |   2 +-
 source/script_array.cpp |   4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 Pokemon_Mirror_mb-0.png

diff --git a/Pokemon_Mirror_mb-0.png b/Pokemon_Mirror_mb-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cf3d414096ac6bc348e2e5def1473335ddfa64c
GIT binary patch
literal 1590
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

literal 0
HcmV?d00001

diff --git a/include/debug_mode.h b/include/debug_mode.h
index 4b3a622..2da2c02 100644
--- a/include/debug_mode.h
+++ b/include/debug_mode.h
@@ -4,6 +4,8 @@
 #define DEBUG_MODE false
 #define IGNORE_GAME_PAK false
 #define IGNORE_LINK_CABLE false
+#define IGNORE_MG_E4_FLAGS false
+
 #define DEBUG_GAME SAPPHIRE_ID
 #define DEBUG_VERS VERS_1_0
 #define DEBUG_LANG LANG_ENG
diff --git a/source/main.cpp b/source/main.cpp
index a7a9bdf..3cf18ea 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -267,7 +267,7 @@ int main(void)
 	std::string credits_array[CREDITS_ARRAY_SIZE] = {
 		"Developed by:\n\n\nThe Gears\nof Progress",
 		"Built using:\n\n\n-DevkitPro\n-LibTonc\n-LibGBA",
-		"Inspired by the\nworks of:\n\n-Goppier\n-Lorenzooone\n-im a blissey\n-RETIRE",
+		"Inspired by the\nworks of:\n\n-Goppier\n-Lorenzooone\n-im a blisy\n-RETIRE",
 		"Programs used:\n\n\n-HexManiacAdvance\n-PKHeX\n-WC3Tool\n-Usenti\n",
 		"Open Source Code and\nLibraries:\n\n-libtonc-examples\n-PokemonGen3toGenX\n-gba-link-connection\n-awesome-gbadev\n-arduino-poke-gen2",
 		"Research resources:\n\n-arm-docs\n-PokemonGen3toGenX\n\nFull links can be\nfound on this\nprogram's GitHub",
diff --git a/source/script_array.cpp b/source/script_array.cpp
index 7e88d6d..ebb2d68 100644
--- a/source/script_array.cpp
+++ b/source/script_array.cpp
@@ -116,10 +116,10 @@ bool run_conditional(int index)
         return party_data.get_last_error() != COND_ERROR_COLOSSEUM;
 
     case COND_BEAT_E4:
-        return read_flag(curr_rom.e4_flag);
+        return read_flag(curr_rom.e4_flag) || IGNORE_MG_E4_FLAGS;
 
     case COND_MG_ENABLED:
-        return read_flag(curr_rom.mg_flag);
+        return read_flag(curr_rom.mg_flag) || IGNORE_MG_E4_FLAGS;
 
     case COND_TUTORIAL_COMPLETE:
         return get_tutorial_flag();