diff --git a/Pokemon_Mirror_mb-0.png b/Pokemon_Mirror_mb-0.png new file mode 100644 index 0000000..8cf3d41 Binary files /dev/null and b/Pokemon_Mirror_mb-0.png differ 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();