diff --git a/include/debug_mode.h b/include/debug_mode.h index bcb1e2a..da9763a 100644 --- a/include/debug_mode.h +++ b/include/debug_mode.h @@ -2,12 +2,12 @@ #define DEBUG_MODE_H #define DEBUG_MODE false -#define IGNORE_GAME_PAK true -#define IGNORE_LINK_CABLE true -#define IGNORE_MG_E4_FLAGS true -#define IGNORE_UNRECEIVED_PKMN true +#define IGNORE_GAME_PAK false +#define IGNORE_LINK_CABLE false +#define IGNORE_MG_E4_FLAGS false +#define IGNORE_UNRECEIVED_PKMN false #define FORCE_TUTORIAL false -#define DONT_REMOVE_PKMN true +#define DONT_REMOVE_PKMN false #define SHOW_INVALID_PKMN false #define IGNORE_DEX_COMPLETION false diff --git a/include/gb_rom_values/eng_gb_rom_values.h b/include/gb_rom_values/eng_gb_rom_values.h index 1524f71..6b5801e 100644 --- a/include/gb_rom_values/eng_gb_rom_values.h +++ b/include/gb_rom_values/eng_gb_rom_values.h @@ -64,7 +64,7 @@ const struct GB_ROM ENG_RED = { }; const struct GB_ROM ENG_BLUE = { .language = ENG_ID, - .version = RED_ID, + .version = BLUE_ID, .generation = 1, .method = METHOD_NEWLINE, .payload_size = 637, diff --git a/source/box_menu.cpp b/source/box_menu.cpp index ac256bc..231d01c 100644 --- a/source/box_menu.cpp +++ b/source/box_menu.cpp @@ -118,6 +118,9 @@ int Box_Menu::box_main(Pokemon_Party party_data) for (int i = 0; i < 10; i++) { nickname[i] = gen_3_Intern_char_array[curr_pkmn.nickname[i]]; + if (curr_pkmn.nickname[i] == 0xFF){ + i = 10; + } } tte_set_pos(40, 72); tte_write(nickname); diff --git a/source/global_frame_controller.cpp b/source/global_frame_controller.cpp index 767f894..4d06a05 100644 --- a/source/global_frame_controller.cpp +++ b/source/global_frame_controller.cpp @@ -22,7 +22,6 @@ void global_next_frame() // tte_write(std::to_string(get_rand_u32()).c_str()); background_frame(global_frame_count); determine_fennel_blink(); - update_y_offset(); oam_copy(oam_mem, obj_buffer, num_sprites); VBlankIntrWait(); // mmFrame(); //Music diff --git a/source/main.cpp b/source/main.cpp index c7dd992..544ec59 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -405,6 +405,8 @@ int main(void) } // Initalize memory and save data after loading the game + set_textbox_small(); + REG_BG2CNT = REG_BG2CNT | BG_PRIO(3); init_bank(); initalize_memory_locations(); load_custom_save_data(); diff --git a/source/pokemon_party.cpp b/source/pokemon_party.cpp index 8d7d927..6622b8d 100644 --- a/source/pokemon_party.cpp +++ b/source/pokemon_party.cpp @@ -135,7 +135,7 @@ byte gen2_debug_box_data[0x44E] = { 0x80, 0x94, 0x92, 0x93, 0x88, 0x8D, 0x50, 0x50, 0x00, 0x00, 0x00, 0x80, 0x94, 0x92, 0x93, 0x88, 0x8D, 0x50, 0x50, 0x00, 0x00, 0x00, // Nicknames - 0x92, 0x87, 0x94, 0x82, 0x8A, 0x8B, 0x84, 0x50, 0x50, 0x50, 0x50, + 0x92, 0x87, 0x94, 0x82, 0x8A, 0x8B, 0x84, 0x50, 0x80, 0x81, 0x82, 0x92, 0x82, 0x98, 0x93, 0x87, 0x84, 0x91, 0x50, 0x50, 0x50, 0x50, 0x82, 0x80, 0x8C, 0x84, 0x8B, 0x8E, 0x93, 0x50, 0x50, 0x50, 0x50, 0x93, 0x88, 0x8C, 0x8D, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, diff --git a/source/select_menu.cpp b/source/select_menu.cpp index d6e70ae..eb59376 100644 --- a/source/select_menu.cpp +++ b/source/select_menu.cpp @@ -21,10 +21,36 @@ int Select_Menu::select_menu_main() key_poll(); // Reset the buttons bool update = true; - + bool first = true; while (true) { + update = true; + if (key_hit(KEY_DOWN)) + { + curr_selection = ((curr_selection + 1) % menu_options.size()); + } + else if (key_hit(KEY_UP)) + { + curr_selection = ((curr_selection + (menu_options.size() - 1)) % menu_options.size()); + } + else if (key_hit(KEY_A)) + { + hide_menu(); + return return_values[curr_selection]; + } + else if (cancel_enabled && key_hit(KEY_B)) + { + hide_menu(); + return -1; + } + else if (!first) + { + update = false; + } + update_y_offset(); obj_set_pos(point_arrow, 19 * 8, (2 + curr_selection) * 8); + global_next_frame(); + if (update) { if (return_values[curr_selection] == -1) @@ -56,32 +82,6 @@ int Select_Menu::select_menu_main() } } } - - update = true; - if (key_hit(KEY_DOWN)) - { - curr_selection = ((curr_selection + 1) % menu_options.size()); - } - else if (key_hit(KEY_UP)) - { - curr_selection = ((curr_selection + (menu_options.size() - 1)) % menu_options.size()); - } - else if (key_hit(KEY_A)) - { - hide_menu(); - return return_values[curr_selection]; - } - else if (cancel_enabled && key_hit(KEY_B)) - { - hide_menu(); - return -1; - } - else - { - update = false; - } - - global_next_frame(); } return 0; }