diff --git a/Makefile b/Makefile index 04d6c58..29aed8a 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ LIBS := -lmm -ltonc -lgba # include and lib. # the LIBGBA path should remain in this list if you want to use maxmod #--------------------------------------------------------------------------------- -LIBDIRS := $(LIBGBA) $(LIBTONC) $(LIBGBA) +LIBDIRS := $(LIBGBA) $(LIBTONC) #--------------------------------------------------------------------------------- # no real need to edit anything past this point unless you need to add additional diff --git a/include/debug_mode.h b/include/debug_mode.h index 8acc609..4b3a622 100644 --- a/include/debug_mode.h +++ b/include/debug_mode.h @@ -1,5 +1,3 @@ -//Created by Lorenzooone https://github.com/Lorenzooone/Pokemon-Gen3-to-Gen-X - #ifndef DEBUG_MODE_H #define DEBUG_MODE_H diff --git a/source/main.cpp b/source/main.cpp index ad59362..a7a9bdf 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -31,22 +31,18 @@ #include "save.h" /* -TODO: -- Center buttons? -- Credits (List all programs, people, and code- plus TPCI) - -Post Beta: +Post Beta TODO: - Better custom sprites (Progress, Fennel, Title) - Add a % or x/250 for the Dream Dex - Determine if transfered Shiny Pokemon are square/star sparkles -- Music and Sound Effects +- Music and sound effects - Simplify the sprite initalization -- Smoother Transitions +- Smoother transitions - Minigame - Wii Channel -- Ditto Gift (Ignore Mew/Celebi?) +- Ditto gift (ignore Mew/Celebi?) - MissingNo/Enigma Berry -- Text Translations +- Text translations - Add support for other languages -------- */ @@ -266,19 +262,21 @@ int main(void) int old_lang_btn_num = -1; set_arrow_point(curr_lang_btn_num); -#define CREDITS_ARRAY_SIZE 13 +#define CREDITS_ARRAY_SIZE 15 int curr_credits_num = 0; std::string credits_array[CREDITS_ARRAY_SIZE] = { - "Developed by:\n\n\nThe Gears\nof Progress\n\nusing libTONC from\ndevkitPro", + "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", "Programs used:\n\n\n-HexManiacAdvance\n-PKHeX\n-WC3Tool\n-Usenti\n", - "Open Source Code and\nLibraries:\n\n-libtonc-examples\n-libsavgba\n-gba-link-connection\n-awesome-gbadev\n-arduino-poke-gen2", + "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", "ROM data obtained\nfrom decompilations created by the PRET team", "Pok@mon data\nobtained from:\n\n-Bulbapedia\n-Serebii\n-PokeAPI.com", "Discord community\nassistance:\n\n-Hex Maniac Advance\n Development\n-gbadev\n-pret", "Sprite work:\n\n\n-lite_thespark", "Writing assistance:\n\n\n-Mad", + "An immense thanks to\nLorenzooone for\ntheir assistance in\nreading/writing save\ndata. Without them,\nthis project would\nnot have been\npossible.", "Special thanks:\n\n\nEnn, Roku, Luca,\nArctic, and everyone\nwho has listened to me talk about this\nfor months", "All Pok@mon names,\nsprites, and names\nof related resources\nare copyright\nNintendo,\nCreatures Inc.,\nand GAME FREAK Inc.", "This project is not endorsed or\nsupported by\nGameFreak/Nintendo.\n\nPlease support the\noriginal developers.", diff --git a/source/main_menu.cpp b/source/main_menu.cpp index ae23c68..b534123 100644 --- a/source/main_menu.cpp +++ b/source/main_menu.cpp @@ -3,11 +3,13 @@ #include "button_handler.h" #include "save_data_manager.h" +#define MAX_X_CORD 72 //128 + int menu_slot = 1; int old_menu_slot = 0; int menu_mode = BTN_MAIN_MENU; int ani_mode = 0; -int menu_x_cord = 128; +int menu_x_cord = MAX_X_CORD; int lang_btn_slot; int old_lang_btn_slot; @@ -19,7 +21,7 @@ void main_menu_btn_init(Button nButton, int index) if (nButton.isWide) { wide_button_array[index] = nButton; - wide_button_array[index].set_location(128, 7 + (38 * (index - 1))); + wide_button_array[index].set_location(MAX_X_CORD, 7 + (38 * (index - 1))); wide_button_array[index].show(); } else @@ -54,7 +56,7 @@ int main_menu_loop() { wide_button_array[i].set_location(menu_x_cord, 7 + (38 * (i - 1))); } - if (menu_x_cord <= 128) + if (menu_x_cord <= MAX_X_CORD) { ani_mode = BTN_MAIN_MENU; } diff --git a/source/save_data_manager.cpp b/source/save_data_manager.cpp index 12bd254..db976d4 100644 --- a/source/save_data_manager.cpp +++ b/source/save_data_manager.cpp @@ -74,7 +74,6 @@ void set_def_lang(int nLang) void set_tutorial_flag(bool value) { save_data_array[TUTORIAL_FLAG] = value; - write_custom_save_data(); } bool get_tutorial_flag() diff --git a/source/script_array.cpp b/source/script_array.cpp index 884e416..7e88d6d 100644 --- a/source/script_array.cpp +++ b/source/script_array.cpp @@ -61,15 +61,15 @@ void populate_script() // Initiate the transfer and check for errors script[COND_ERROR_TIMEOUT_ONE] = script_obj(COND_ERROR_TIMEOUT_ONE, COND_ERROR_TIMEOUT_TWO, DIA_ERROR_TIME_ONE); - script[DIA_ERROR_TIME_ONE] = script_obj(dialogue[DIA_ERROR_TIME_ONE], DIA_LETS_START); + script[DIA_ERROR_TIME_ONE] = script_obj(dialogue[DIA_ERROR_TIME_ONE], DIA_START); script[COND_ERROR_TIMEOUT_TWO] = script_obj(COND_ERROR_TIMEOUT_TWO, COND_ERROR_COM_ENDED, DIA_ERROR_TIME_TWO); - script[DIA_ERROR_TIME_TWO] = script_obj(dialogue[DIA_ERROR_TIME_TWO], DIA_LETS_START); + script[DIA_ERROR_TIME_TWO] = script_obj(dialogue[DIA_ERROR_TIME_TWO], DIA_START); script[COND_ERROR_COM_ENDED] = script_obj(COND_ERROR_COM_ENDED, COND_ERROR_COLOSSEUM, DIA_ERROR_COM_ENDED); - script[DIA_ERROR_COM_ENDED] = script_obj(dialogue[DIA_ERROR_COM_ENDED], DIA_LETS_START); + script[DIA_ERROR_COM_ENDED] = script_obj(dialogue[DIA_ERROR_COM_ENDED], DIA_START); script[COND_ERROR_COLOSSEUM] = script_obj(COND_ERROR_COLOSSEUM, COND_ERROR_DISCONNECT, DIA_ERROR_COLOSSEUM); - script[DIA_ERROR_COLOSSEUM] = script_obj(dialogue[DIA_ERROR_COLOSSEUM], DIA_LETS_START); + script[DIA_ERROR_COLOSSEUM] = script_obj(dialogue[DIA_ERROR_COLOSSEUM], DIA_START); script[COND_ERROR_DISCONNECT] = script_obj(COND_ERROR_DISCONNECT, CMD_IMPORT_POKEMON, DIA_ERROR_DISCONNECT); - script[DIA_ERROR_DISCONNECT] = script_obj(dialogue[DIA_ERROR_DISCONNECT], DIA_LETS_START); + script[DIA_ERROR_DISCONNECT] = script_obj(dialogue[DIA_ERROR_DISCONNECT], DIA_START); // Complete the transfer and give messages based on the transfered Pokemon script[CMD_IMPORT_POKEMON] = script_obj(CMD_IMPORT_POKEMON, DIA_TRANS_GOOD, DIA_NO_VALID_PKMN);