diff --git a/include/debug_mode.h b/include/debug_mode.h index 22f1d1e..dc5255f 100644 --- a/include/debug_mode.h +++ b/include/debug_mode.h @@ -10,7 +10,7 @@ #define INSTANT_TEXT_SPEED (false && DEBUG_MODE) #define IGNORE_GAME_PAK (true && DEBUG_MODE) #define IGNORE_GAME_PAK_SPRITES (true && DEBUG_MODE) -#define IGNORE_LINK_CABLE (false && DEBUG_MODE) +#define IGNORE_LINK_CABLE (true && DEBUG_MODE) #define IGNORE_MG_E4_FLAGS (true && DEBUG_MODE) #define IGNORE_UNRECEIVED_PKMN (true && DEBUG_MODE) #define FORCE_TUTORIAL (false && DEBUG_MODE) diff --git a/loader/data/multiboot_rom.bin b/loader/data/multiboot_rom.bin index 0e1b555..42d54f3 100644 Binary files a/loader/data/multiboot_rom.bin and b/loader/data/multiboot_rom.bin differ diff --git a/source/box_menu.cpp b/source/box_menu.cpp index 30ffff6..ea25e6f 100644 --- a/source/box_menu.cpp +++ b/source/box_menu.cpp @@ -18,7 +18,6 @@ int Box_Menu::box_main(Pokemon_Party party_data) load_flex_background(BG_BOX, 2); REG_BG1VOFS = 0; REG_BG1HOFS = 0; - REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(3); load_temp_box_sprites(&party_data); Button cancel_button(button_cancel_left, button_cancel_right, 64); Button confirm_button(button_confirm_left, button_confirm_right, 64); diff --git a/source/script_array.cpp b/source/script_array.cpp index 5609251..ed9b8cd 100644 --- a/source/script_array.cpp +++ b/source/script_array.cpp @@ -180,6 +180,7 @@ bool run_conditional(int index) // Here is most of the logic that drives what lines show up where. It's probably not the best way to code it, but it works int game; int lang; + bool ret; switch (index) { @@ -341,7 +342,10 @@ bool run_conditional(int index) return true; case CMD_BOX_MENU: - return (box_viewer.box_main(party_data) == CONFIRM_BUTTON); + hide_text_box(); + ret = (box_viewer.box_main(party_data) == CONFIRM_BUTTON); + show_text_box(); + return ret; case CMD_MYTHIC_MENU: party_data.set_mythic_stabilization(yes_no_menu.button_main());