diff --git a/source/dbg/debug_mode.cpp b/source/dbg/debug_mode.cpp index 0ccaf30..82e79a0 100644 --- a/source/dbg/debug_mode.cpp +++ b/source/dbg/debug_mode.cpp @@ -4,7 +4,7 @@ debug_options g_debug_options = { .print_link_data = (false && DEBUG_MODE), .instant_text_speed = (false && DEBUG_MODE), - .ignore_game_pak = (true && DEBUG_MODE), + .ignore_game_pak = (false && DEBUG_MODE), .ignore_game_pak_sprites = (false && DEBUG_MODE), .ignore_link_cable = (false && DEBUG_MODE), .ignore_mg_e4_flags = (true && DEBUG_MODE), diff --git a/source/main.cpp b/source/main.cpp index 38a85a1..36ac658 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -110,8 +110,8 @@ void game_load_error(void) text_data_table general_text(general_text_table_buffer); general_text.decompress(get_compressed_text_table(GENERAL_INDEX)); - ptgb_write_textbox(general_text.get_text_entry(GENERAL_cart_load_error), true, true, - GENERAL_INDEX, GENERAL_cart_load_error, true); + ptgb_write_textbox(general_text.get_text_entry(GENERAL_cart_load_error), true, false, + GENERAL_INDEX, GENERAL_cart_load_error, false); } key_poll(); @@ -120,6 +120,9 @@ void game_load_error(void) global_next_frame(); } while (!key_hit(KEY_A) && !key_hit(KEY_SELECT)); + tte_erase_rect(0, 0, H_MAX, V_MAX); + erase_textbox_tiles(); + if (key_hit(KEY_SELECT)) { // We also want to give the option in this screen to upload the multiboot rom to another GBA. diff --git a/source/multiboot_upload.cpp b/source/multiboot_upload.cpp index 3031731..ef68e4c 100644 --- a/source/multiboot_upload.cpp +++ b/source/multiboot_upload.cpp @@ -7,12 +7,6 @@ #include "translated_text.h" #include "text_data_table.h" -static void multiboot_show_textbox() -{ - tte_erase_rect(0, 0, H_MAX, V_MAX); - //create_textbox(4, 1, 152, 100, true); -} - void multiboot_upload_screen() { u8 general_text_table_buffer[2048]; @@ -21,8 +15,9 @@ void multiboot_upload_screen() general_text.decompress(get_compressed_text_table(GENERAL_INDEX)); - multiboot_show_textbox(); - ptgb_write_simple(general_text.get_text_entry(GENERAL_send_multiboot_instructions), true); + // multiboot_show_textbox(); + ptgb_write_textbox(general_text.get_text_entry(GENERAL_send_multiboot_instructions), true, + false, GENERAL_INDEX, GENERAL_send_multiboot_instructions, false); // wait for key press do @@ -37,8 +32,9 @@ void multiboot_upload_screen() } // start upload - multiboot_show_textbox(); - ptgb_write_simple(general_text.get_text_entry(GENERAL_send_multiboot_wait), true); + // multiboot_show_textbox(); + ptgb_write_textbox(general_text.get_text_entry(GENERAL_send_multiboot_wait), true, + false, GENERAL_INDEX, GENERAL_send_multiboot_wait, false); global_next_frame(); const u32 romSize = 256 * 1024; // EWRAM = 256 KB @@ -52,14 +48,16 @@ void multiboot_upload_screen() // (when this returns true, the transfer will be canceled) }); // show result - multiboot_show_textbox(); + // multiboot_show_textbox(); if (multibootResult == LinkCableMultiboot::Result::SUCCESS) { - ptgb_write_simple(general_text.get_text_entry(GENERAL_send_multiboot_success), true); + ptgb_write_textbox(general_text.get_text_entry(GENERAL_send_multiboot_success), true, + false, GENERAL_INDEX, GENERAL_send_multiboot_success, false); } else { - ptgb_write_simple(general_text.get_text_entry(GENERAL_send_multiboot_failure), true); + ptgb_write_textbox(general_text.get_text_entry(GENERAL_send_multiboot_failure), true, + false, GENERAL_INDEX, GENERAL_send_multiboot_failure, false); } // wait for keypress again. diff --git a/tools/text_helper/text.xlsx b/tools/text_helper/text.xlsx index cb41809..57e4e34 100644 Binary files a/tools/text_helper/text.xlsx and b/tools/text_helper/text.xlsx differ