diff --git a/include/debug_mode.h b/include/debug_mode.h index 20a90fa..eedf682 100644 --- a/include/debug_mode.h +++ b/include/debug_mode.h @@ -12,12 +12,12 @@ #define IGNORE_GAME_PAK_SPRITES (false && DEBUG_MODE) #define IGNORE_LINK_CABLE (false && DEBUG_MODE) #define IGNORE_MG_E4_FLAGS (true && DEBUG_MODE) -#define IGNORE_UNRECEIVED_PKMN (true && DEBUG_MODE) +#define IGNORE_UNRECEIVED_PKMN (false && DEBUG_MODE) #define FORCE_TUTORIAL (false && DEBUG_MODE) #define DONT_REMOVE_PKMN (false && DEBUG_MODE) #define DONT_HIDE_INVALID_PKMN (false && DEBUG_MODE) #define IGNORE_DEX_COMPLETION (false && DEBUG_MODE) -#define FORCE_ALL_CAUGHT (false && DEBUG_MODE) +#define FORCE_ALL_CAUGHT (true && DEBUG_MODE) #define WRITE_CABLE_DATA_TO_SAVE (false && DEBUG_MODE) #define SHOW_DATA_PACKETS (false && DEBUG_MODE) #define DISPLAY_CONTROL_CHAR (false && DEBUG_MODE) diff --git a/include/rom_data.h b/include/rom_data.h index 98611a7..24c8bd2 100644 --- a/include/rom_data.h +++ b/include/rom_data.h @@ -25,7 +25,7 @@ class rom_data { public: rom_data(); - bool load_rom(); + bool load_rom(bool debug); bool is_hoenn(); bool is_ruby_sapphire(); void print_rom_info(); diff --git a/source/main.cpp b/source/main.cpp index 5f08e1d..70bc1fe 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -448,7 +448,7 @@ static void __attribute__((noinline)) show_intro() REG_BG1CNT = REG_BG1CNT | BG_PRIO(3); key_poll(); // Reset the keys - curr_GBA_rom.load_rom(); + curr_GBA_rom.load_rom(false); obj_set_pos(ptgb_logo_l, 56, 12); obj_set_pos(ptgb_logo_r, 56 + 64, 12); @@ -494,12 +494,20 @@ int main(void) REG_BLDALPHA = BLDA_BUILD(0b10000, 0); // Reset fade // Check if the game has been loaded correctly. - while (!curr_GBA_rom.load_rom()) + bool debug = false; + while (!curr_GBA_rom.load_rom(debug)) { - obj_hide_multi(ptgb_logo_l, 2); - global_next_frame(); - game_load_error(); - // initalization_script(); + if (IGNORE_GAME_PAK) + { + debug = true; + } + else + { + obj_hide_multi(ptgb_logo_l, 2); + global_next_frame(); + game_load_error(); + // initalization_script(); + } } // Initalize memory and save data after loading the game diff --git a/source/rom_data.cpp b/source/rom_data.cpp index ceceb81..8788373 100644 --- a/source/rom_data.cpp +++ b/source/rom_data.cpp @@ -16,14 +16,14 @@ extern rom_data curr_GBA_rom; rom_data::rom_data() {} -bool rom_data::load_rom() +bool rom_data::load_rom(bool debug) { u8 rom_list_buffer[2048]; u32 rom_list_size; const u8 *compressed_rom_list; const u8 *cur; - if (IGNORE_GAME_PAK) + if (debug) { gamecode = DEBUG_GAME; version = DEBUG_VERS;