Leahnaya/Poke_Transporter_GB
1
0
Fork 0
mirror of https://github.com/GearsProgress/Poke_Transporter_GB.git synced 2026-03-21 17:34:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modifying text_helper to not have static text sections

Browse Source
This commit is contained in:
The Gears of Progress 2026-01-11 15:02:16 -05:00
parent adc48f2bd6
commit 1055094ab9
10 changed files with 272 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/box_menu.cpp
View File

@ -36,7 +36,7 @@ int Box_Menu::box_main(PokeBox* box)
obj_unhide(box_select, 0);
int index = 0;
PKMN_NAMES.decompress(get_compressed_pkmn_names_table());
PKMN_NAMES.decompress(get_compressed_PKMN_NAMES_table());
while (true)
{

6
source/gameboy_colour.cpp
View File

@ -169,7 +169,7 @@ void setup(const u16 *debug_charset)
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(GENERAL_connecting), true);
}
}
@ -228,7 +228,7 @@ byte handleIncomingByte(byte in, byte *box_data_storage, byte *curr_payload, GB_
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(curr_gb_rom->version != YELLOW_ID ? GENERAL_link_success : GENERAL_link_success_yellow), true);
}
@ -280,7 +280,7 @@ byte handleIncomingByte(byte in, byte *box_data_storage, byte *curr_payload, GB_
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(GENERAL_transferring), true);
}

2
source/global_frame_controller.cpp
View File

@ -27,7 +27,7 @@ static void __attribute__((noinline)) show_pulled_cart_error()
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(GENERAL_pulled_cart_error), true);
}

10
source/main.cpp
View File

@ -147,7 +147,7 @@ void game_load_error(void)
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(GENERAL_cart_load_error), true);
}
@ -189,7 +189,7 @@ void first_load_message(void)
u8 general_text_table_buffer[2048];
text_data_table general_text(general_text_table_buffer);
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
ptgb_write(general_text.get_text_entry(GENERAL_intro_first), true);
}
@ -206,7 +206,7 @@ int credits()
text_data_table credits_text_table(text_decompression_buffer);
int curr_credits_num = 0;
credits_text_table.decompress(get_compressed_credits_table());
credits_text_table.decompress(get_compressed_CREDITS_table());
bool update = true;
global_next_frame();
@ -329,7 +329,7 @@ int main_menu_loop()
int return_values[NUM_MENU_OPTIONS] = {BTN_TRANSFER, BTN_POKEDEX, BTN_CREDITS};
u16 test = 0;
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
while (true)
{
@ -429,7 +429,7 @@ static void __attribute__((noinline)) show_intro()
text_data_table general_text(general_text_table_buffer);
const u8 *text_entry;
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
text_entry = general_text.get_text_entry(GENERAL_press_start);
press_start_text_length = get_string_length(text_entry);

2
source/multiboot_upload.cpp
View File

@ -19,7 +19,7 @@ void multiboot_upload_screen()
text_data_table general_text(general_text_table_buffer);
LinkCableMultiboot linkCableMultiboot;
general_text.decompress(get_compressed_general_table());
general_text.decompress(get_compressed_GENERAL_table());
multiboot_show_textbox();
ptgb_write(general_text.get_text_entry(GENERAL_send_multiboot_instructions), true);

2
source/mystery_gift_builder.cpp
View File

@ -378,7 +378,7 @@ void mystery_gift_script::build_script(PokeBox *box)
// this decompresses the ZX0 compressed text table into the buffer inside of the decompressed_store union
// thereby reusing the stack (=IWRAM) memory used earlier for the PokemonTables instance we used above
decompressed_text_table.decompress(get_compressed_rsefrlg_table());
decompressed_text_table.decompress(get_compressed_RSEFRLG_table());
switch (curr_GBA_rom.gamecode)
{
case RUBY_ID:

4
source/pokedex.cpp
View File

@ -41,7 +41,7 @@ static void load_text_entry_into_buffer(text_data_table& data_table, u8 *output_
static void load_general_table_text_entries(u8 *decompression_buffer, u8 *kanto_buffer, u8 *johto_buffer)
{
text_data_table data_table(decompression_buffer);
data_table.decompress(get_compressed_general_table());
data_table.decompress(get_compressed_GENERAL_table());
load_text_entry_into_buffer(data_table, kanto_buffer, GENERAL_kanto_name);
load_text_entry_into_buffer(data_table, johto_buffer, GENERAL_johto_name);
@ -105,7 +105,7 @@ int pokedex_loop()
load_general_table_text_entries(decompression_buffer, kanto_name, johto_name);
text_data_table PKMN_NAMES(decompression_buffer);
PKMN_NAMES.decompress(get_compressed_pkmn_names_table());
PKMN_NAMES.decompress(get_compressed_PKMN_NAMES_table());
pokedex_init();
pokedex_show();

410
source/script_array.cpp
View File

@ -26,75 +26,75 @@ Box_Menu box_viewer;
// Check that the conditions are set for the transfer
// T_SCRIPT_START
// COND_TUTORIAL_COMPLETE
// DIA_OPEN
// PTGB_DIA_OPEN
// CMD_SET_TUTOR_TRUE
// COND_BEAT_E4
// DIA_E4
// PTGB_DIA_E4
// COND_MG_ENABLED
// COND_IS_FRLGE
// DIA_MG_FRLGE
// DIA_MG_RS
// PTGB_DIA_MG_FRLGE
// PTGB_DIA_MG_RS
// COND_MG_OTHER_EVENT
// COND_PKMN_TO_COLLECT
// DIA_MG_OTHER_EVENT
// DIA_PKMN_TO_COLLECT
// PTGB_DIA_MG_OTHER_EVENT
// PTGB_DIA_PKMN_TO_COLLECT
//
// Ask the user what game and language they're using
// DIA_WHAT_GAME_TRANS
// PTGB_DIA_WHAT_GAME_TRANS
// CMD_GAME_MENU
// DIA_WHAT_LANG_TRANS
// PTGB_DIA_WHAT_LANG_TRANS
// CMD_LANG_MENU
// DIA_ASK_QUEST
// PTGB_DIA_ASK_QUEST
// CMD_SLIDE_PROF_LEFT
// CMD_SLIDE_PROF_RIGHT
// COND_GB_ROM_EXISTS
// DIA_NO_GB_ROM
// DIA_MENU_BACK
// PTGB_DIA_NO_GB_ROM
// PTGB_DIA_MENU_BACK
//
// Initiate the transfer and check for errors
// DIA_LETS_START
// DIA_START
// PTGB_DIA_LETS_START
// PTGB_DIA_START
// CMD_START_LINK
// COND_ERROR_TIMEOUT_ONE
// DIA_ERROR_TIME_ONE
// PTGB_DIA_ERROR_TIME_ONE
// COND_ERROR_TIMEOUT_TWO
// DIA_ERROR_TIME_TWO
// PTGB_DIA_ERROR_TIME_TWO
// COND_ERROR_COM_ENDED
// DIA_ERROR_COM_ENDED
// PTGB_DIA_ERROR_COM_ENDED
// COND_ERROR_COLOSSEUM
// DIA_ERROR_COLOSSEUM
// PTGB_DIA_ERROR_COLOSSEUM
// COND_ERROR_DISCONNECT
// DIA_ERROR_DISCONNECT
// PTGB_DIA_ERROR_DISCONNECT
//
// Pause the transfer and show the user their box data
// CMD_IS_A_VALID_PKMN
// DIA_NO_VALID_PKMN
// PTGB_DIA_NO_VALID_PKMN
// COND_SOME_INVALID_PKMN
// DIA_SOME_INVALID_PKMN
// PTGB_DIA_SOME_INVALID_PKMN
// COND_CHECK_MYTHIC
// DIA_MYTHIC_CONVERT
// PTGB_DIA_MYTHIC_CONVERT
// CMD_MYTHIC_MENU
// COND_CHECK_MISSINGNO
// DIA_IS_MISSINGNO
// DIA_IN_BOX
// PTGB_DIA_IS_MISSINGNO
// PTGB_DIA_IN_BOX
// CMD_BOX_MENU
// DIA_CANCEL
// PTGB_DIA_CANCEL
// CMD_IMPORT_POKEMON
// CMD_CONTINUE_LINK
// CMD_CANCEL_LINK
// CMD_END_MISSINGNO
//
// Complete the transfer and give messages based on the transfered Pokemon
// DIA_TRANS_GOOD
// PTGB_DIA_TRANS_GOOD
// COND_NEW_POKEMON
// DIA_NEW_DEX
// DIA_NO_NEW_DEX
// PTGB_DIA_NEW_DEX
// PTGB_DIA_NO_NEW_DEX
// COND_IS_HOENN_RS
// COND_IS_HOENN_E
// DIA_SEND_FRIEND_HOENN_RS
// DIA_SEND_FRIEND_HOENN_E
// DIA_SEND_FRIEND_KANTO
// DIA_THANK
// PTGB_DIA_SEND_FRIEND_HOENN_RS
// PTGB_DIA_SEND_FRIEND_HOENN_E
// PTGB_DIA_SEND_FRIEND_KANTO
// PTGB_DIA_THANK
//
// Hide the dialogue and professor
// CMD_END_SCRIPT
@ -104,184 +104,184 @@ Box_Menu box_viewer;
// So if adding a new dia, command or condition, make sure to add it in the right position/index.
// defining it this way does not generate an expensive function. It's all stored as read-only data in EWRAM.
const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// DIA_OPEN
// PTGB_DIA_OPEN
{
.text_entry_index = DIA_OPEN,
.text_entry_index = PTGB_DIA_OPEN,
.next_if_true = CMD_SET_TUTOR_TRUE
},
// DIA_E4
// PTGB_DIA_E4
{
.text_entry_index = DIA_E4,
.text_entry_index = PTGB_DIA_E4,
.next_if_true = CMD_END_SCRIPT
},
// DIA_MG_FRLGE
// PTGB_DIA_MG_FRLGE
{
.text_entry_index = DIA_MG_FRLGE,
.text_entry_index = PTGB_DIA_MG_FRLGE,
.next_if_true = CMD_END_SCRIPT
},
// DIA_MG_RS
// PTGB_DIA_MG_RS
{
.text_entry_index = DIA_MG_RS,
.text_entry_index = PTGB_DIA_MG_RS,
.next_if_true = CMD_END_SCRIPT
},
// DIA_LETS_START
// PTGB_DIA_LETS_START
{
.text_entry_index = DIA_LETS_START,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_LETS_START,
.next_if_true = PTGB_DIA_START
},
// DIA_START
// PTGB_DIA_START
{
.text_entry_index = DIA_START,
.text_entry_index = PTGB_DIA_START,
.next_if_true = CMD_START_LINK
},
// DIA_TRANS_GOOD
// PTGB_DIA_TRANS_GOOD
{
.text_entry_index = DIA_TRANS_GOOD,
.text_entry_index = PTGB_DIA_TRANS_GOOD,
.next_if_true = COND_NEW_POKEMON
},
// DIA_NEW_DEX
// PTGB_DIA_NEW_DEX
{
.text_entry_index = DIA_NEW_DEX,
.text_entry_index = PTGB_DIA_NEW_DEX,
.next_if_true = COND_IS_HOENN_RS
},
// DIA_NO_NEW_DEX
// PTGB_DIA_NO_NEW_DEX
{
.text_entry_index = DIA_NO_NEW_DEX,
.text_entry_index = PTGB_DIA_NO_NEW_DEX,
.next_if_true = COND_IS_HOENN_RS
},
// DIA_SEND_FRIEND_KANTO
// PTGB_DIA_SEND_FRIEND_KANTO
{
.text_entry_index = DIA_SEND_FRIEND_KANTO,
.next_if_true = DIA_THANK
.text_entry_index = PTGB_DIA_SEND_FRIEND_KANTO,
.next_if_true = PTGB_DIA_THANK
},
// DIA_SEND_FRIEND_HOENN_RS
// PTGB_DIA_SEND_FRIEND_HOENN_RS
{
.text_entry_index = DIA_SEND_FRIEND_HOENN_RS,
.next_if_true = DIA_THANK
.text_entry_index = PTGB_DIA_SEND_FRIEND_HOENN_RS,
.next_if_true = PTGB_DIA_THANK
},
// DIA_SEND_FRIEND_HOENN_E
// PTGB_DIA_SEND_FRIEND_HOENN_E
{
.text_entry_index = DIA_SEND_FRIEND_HOENN_E,
.next_if_true = DIA_THANK
.text_entry_index = PTGB_DIA_SEND_FRIEND_HOENN_E,
.next_if_true = PTGB_DIA_THANK
},
// DIA_THANK
// PTGB_DIA_THANK
{
.text_entry_index = DIA_THANK,
.text_entry_index = PTGB_DIA_THANK,
.next_if_true = CMD_END_SCRIPT
},
// DIA_GET_MON (unused)
// PTGB_DIA_GET_MON (unused)
{
.text_entry_index = DIA_GET_MON,
.text_entry_index = PTGB_DIA_GET_MON,
.next_if_true = CMD_END_SCRIPT
},
// DIA_MG_OTHER_EVENT
// PTGB_DIA_MG_OTHER_EVENT
{
.text_entry_index = DIA_MG_OTHER_EVENT,
.next_if_true = DIA_ASK_QUEST
.text_entry_index = PTGB_DIA_MG_OTHER_EVENT,
.next_if_true = PTGB_DIA_ASK_QUEST
},
// DIA_PKMN_TO_COLLECT
// PTGB_DIA_PKMN_TO_COLLECT
{
.text_entry_index = DIA_PKMN_TO_COLLECT,
.text_entry_index = PTGB_DIA_PKMN_TO_COLLECT,
.next_if_true = CMD_END_SCRIPT
},
// DIA_NO_VALID_PKMN
// PTGB_DIA_NO_VALID_PKMN
{
.text_entry_index = DIA_NO_VALID_PKMN,
.text_entry_index = PTGB_DIA_NO_VALID_PKMN,
.next_if_true = CMD_CANCEL_LINK
},
// DIA_ASK_QUEST
// PTGB_DIA_ASK_QUEST
{
.text_entry_index = DIA_ASK_QUEST,
.text_entry_index = PTGB_DIA_ASK_QUEST,
.next_if_true = CMD_SLIDE_PROF_LEFT
},
// DIA_WHAT_GAME_TRANS
// PTGB_DIA_WHAT_GAME_TRANS
{
.text_entry_index = DIA_WHAT_GAME_TRANS,
.text_entry_index = PTGB_DIA_WHAT_GAME_TRANS,
.next_if_true = CMD_GAME_MENU
},
// DIA_WHAT_LANG_TRANS
// PTGB_DIA_WHAT_LANG_TRANS
{
.text_entry_index = DIA_WHAT_LANG_TRANS,
.text_entry_index = PTGB_DIA_WHAT_LANG_TRANS,
.next_if_true = CMD_LANG_MENU
},
// DIA_NO_GB_ROM
// PTGB_DIA_NO_GB_ROM
{
.text_entry_index = DIA_NO_GB_ROM,
.next_if_true = DIA_WHAT_LANG_TRANS
.text_entry_index = PTGB_DIA_NO_GB_ROM,
.next_if_true = PTGB_DIA_WHAT_LANG_TRANS
},
// DIA_IN_BOX
// PTGB_DIA_IN_BOX
{
.text_entry_index = DIA_IN_BOX,
.text_entry_index = PTGB_DIA_IN_BOX,
.next_if_true = CMD_BOX_MENU
},
// DIA_MYTHIC_CONVERT
// PTGB_DIA_MYTHIC_CONVERT
{
.text_entry_index = DIA_MYTHIC_CONVERT,
.text_entry_index = PTGB_DIA_MYTHIC_CONVERT,
.next_if_true = CMD_MYTHIC_MENU
},
// DIA_CANCEL
// PTGB_DIA_CANCEL
{
.text_entry_index = DIA_CANCEL,
.text_entry_index = PTGB_DIA_CANCEL,
.next_if_true = CMD_CANCEL_LINK
},
// DIA_SOME_INVALID_PKMN
// PTGB_DIA_SOME_INVALID_PKMN
{
.text_entry_index = DIA_SOME_INVALID_PKMN,
.text_entry_index = PTGB_DIA_SOME_INVALID_PKMN,
.next_if_true = COND_CHECK_MYTHIC
},
// DIA_MENU_BACK
// PTGB_DIA_MENU_BACK
{
.text_entry_index = DIA_MENU_BACK,
.text_entry_index = PTGB_DIA_MENU_BACK,
.next_if_true = CMD_END_SCRIPT
},
// DIA_IS_MISSINGNO
// PTGB_DIA_IS_MISSINGNO
{
.text_entry_index = DIA_IS_MISSINGNO,
.next_if_true = DIA_IN_BOX
.text_entry_index = PTGB_DIA_IS_MISSINGNO,
.next_if_true = PTGB_DIA_IN_BOX
},
// DIA_ERROR_COLOSSEUM
// PTGB_DIA_ERROR_COLOSSEUM
{
.text_entry_index = DIA_ERROR_COLOSSEUM,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_ERROR_COLOSSEUM,
.next_if_true = PTGB_DIA_START
},
// DIA_ERROR_COM_ENDED
// PTGB_DIA_ERROR_COM_ENDED
{
.text_entry_index = DIA_ERROR_COM_ENDED,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_ERROR_COM_ENDED,
.next_if_true = PTGB_DIA_START
},
// DIA_ERROR_DISCONNECT
// PTGB_DIA_ERROR_DISCONNECT
{
.text_entry_index = DIA_ERROR_DISCONNECT,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_ERROR_DISCONNECT,
.next_if_true = PTGB_DIA_START
},
// DIA_ERROR_TIME_ONE
// PTGB_DIA_ERROR_TIME_ONE
{
.text_entry_index = DIA_ERROR_TIME_ONE,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_ERROR_TIME_ONE,
.next_if_true = PTGB_DIA_START
},
// DIA_ERROR_TIME_TWO
// PTGB_DIA_ERROR_TIME_TWO
{
.text_entry_index = DIA_ERROR_TIME_TWO,
.next_if_true = DIA_START
.text_entry_index = PTGB_DIA_ERROR_TIME_TWO,
.next_if_true = PTGB_DIA_START
},
// DIA_WHAT_LANG_EVENT
// PTGB_DIA_WHAT_LANG_EVENT
{
.text_entry_index = DIA_WHAT_LANG_EVENT,
.text_entry_index = PTGB_DIA_WHAT_LANG_EVENT,
.next_if_true = CMD_LANG_MENU
},
// DIA_WHAT_GAME_EVENT
// PTGB_DIA_WHAT_GAME_EVENT
{
.text_entry_index = DIA_WHAT_GAME_EVENT,
.text_entry_index = PTGB_DIA_WHAT_GAME_EVENT,
.next_if_true = CMD_GAME_MENU
},
// DIA_K_DEX_NOT_FULL
// PTGB_DIA_K_DEX_NOT_FULL
{
.text_entry_index = DIA_K_DEX_NOT_FULL,
.text_entry_index = PTGB_DIA_K_DEX_NOT_FULL,
.next_if_true = CMD_END_SCRIPT
},
// DIA_J_DEX_NOT_FULL
// PTGB_DIA_J_DEX_NOT_FULL
{
.text_entry_index = DIA_J_DEX_NOT_FULL,
.text_entry_index = PTGB_DIA_J_DEX_NOT_FULL,
.next_if_true = CMD_END_SCRIPT
},
// T_SCRIPT_START
@ -292,7 +292,7 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// E_SCRIPT_START
{
.conditional_index = CMD_SHOW_PROF,
.next_if_true = DIA_ASK_QUEST
.next_if_true = PTGB_DIA_ASK_QUEST
},
// CMD_START_LINK
{
@ -330,23 +330,23 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
{
.conditional_index = CMD_GAME_MENU,
.next_if_true = COND_GB_ROM_EXISTS,
.next_if_false = DIA_WHAT_LANG_TRANS
.next_if_false = PTGB_DIA_WHAT_LANG_TRANS
},
// CMD_LANG_MENU
{
.conditional_index = CMD_LANG_MENU,
.next_if_true = DIA_WHAT_GAME_TRANS,
.next_if_false = DIA_CANCEL
.next_if_true = PTGB_DIA_WHAT_GAME_TRANS,
.next_if_false = PTGB_DIA_CANCEL
},
// CMD_SLIDE_PROF_LEFT
{
.conditional_index = CMD_SLIDE_PROF_LEFT,
.next_if_true = DIA_WHAT_LANG_TRANS
.next_if_true = PTGB_DIA_WHAT_LANG_TRANS
},
// CMD_SLIDE_PROF_RIGHT
{
.conditional_index = CMD_SLIDE_PROF_RIGHT,
.next_if_true = DIA_LETS_START
.next_if_true = PTGB_DIA_LETS_START
},
// CMD_CONTINUE_LINK
{
@ -357,7 +357,7 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
{
.conditional_index = CMD_BOX_MENU,
.next_if_true = CMD_IMPORT_POKEMON,
.next_if_false = DIA_CANCEL
.next_if_false = PTGB_DIA_CANCEL
},
// CMD_MYTHIC_MENU
{
@ -368,7 +368,7 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
{
.conditional_index = CMD_IS_A_VALID_PKMN,
.next_if_true = COND_SOME_INVALID_PKMN,
.next_if_false = DIA_NO_VALID_PKMN
.next_if_false = PTGB_DIA_NO_VALID_PKMN
},
// CMD_CANCEL_LINK
{
@ -378,43 +378,43 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// CMD_END_MISSINGNO
{
.conditional_index = CMD_END_MISSINGNO,
.next_if_true = DIA_TRANS_GOOD
.next_if_true = PTGB_DIA_TRANS_GOOD
},
// COND_ERROR_TIMEOUT_ONE
{
.conditional_index = COND_ERROR_TIMEOUT_ONE,
.next_if_true = COND_ERROR_TIMEOUT_TWO,
.next_if_false = DIA_ERROR_TIME_ONE
.next_if_false = PTGB_DIA_ERROR_TIME_ONE
},
// COND_ERROR_DISCONNECT
{
.conditional_index = COND_ERROR_DISCONNECT,
.next_if_true = CMD_IS_A_VALID_PKMN,
.next_if_false = DIA_ERROR_DISCONNECT
.next_if_false = PTGB_DIA_ERROR_DISCONNECT
},
// COND_ERROR_COM_ENDED
{
.conditional_index = COND_ERROR_COM_ENDED,
.next_if_true = COND_ERROR_COLOSSEUM,
.next_if_false = DIA_ERROR_COM_ENDED
.next_if_false = PTGB_DIA_ERROR_COM_ENDED
},
// COND_ERROR_TIMEOUT_TWO
{
.conditional_index = COND_ERROR_TIMEOUT_TWO,
.next_if_true = COND_ERROR_COM_ENDED,
.next_if_false = DIA_ERROR_TIME_TWO
.next_if_false = PTGB_DIA_ERROR_TIME_TWO
},
// COND_ERROR_COLOSSEUM
{
.conditional_index = COND_ERROR_COLOSSEUM,
.next_if_true = COND_ERROR_DISCONNECT,
.next_if_false = DIA_ERROR_COLOSSEUM
.next_if_false = PTGB_DIA_ERROR_COLOSSEUM
},
// COND_BEAT_E4
{
.conditional_index = COND_BEAT_E4,
.next_if_true = COND_MG_ENABLED,
.next_if_false = DIA_E4
.next_if_false = PTGB_DIA_E4
},
// COND_MG_ENABLED
{
@ -426,48 +426,48 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
{
.conditional_index = COND_TUTORIAL_COMPLETE,
.next_if_true = COND_BEAT_E4,
.next_if_false = DIA_OPEN
.next_if_false = PTGB_DIA_OPEN
},
// COND_NEW_POKEMON
{
.conditional_index = COND_NEW_POKEMON,
.next_if_true = DIA_NEW_DEX,
.next_if_false = DIA_NO_NEW_DEX
.next_if_true = PTGB_DIA_NEW_DEX,
.next_if_false = PTGB_DIA_NO_NEW_DEX
},
// COND_IS_HOENN_RS
{
.conditional_index = COND_IS_HOENN_RS,
.next_if_true = DIA_SEND_FRIEND_HOENN_RS,
.next_if_true = PTGB_DIA_SEND_FRIEND_HOENN_RS,
.next_if_false = COND_IS_HOENN_E
},
// COND_IS_FRLGE
{
.conditional_index = COND_IS_FRLGE,
.next_if_true = DIA_MG_FRLGE,
.next_if_false = DIA_MG_RS
.next_if_true = PTGB_DIA_MG_FRLGE,
.next_if_false = PTGB_DIA_MG_RS
},
// COND_MG_OTHER_EVENT
{
.conditional_index = COND_MG_OTHER_EVENT,
.next_if_true = DIA_MG_OTHER_EVENT,
.next_if_true = PTGB_DIA_MG_OTHER_EVENT,
.next_if_false = COND_PKMN_TO_COLLECT
},
// COND_PKMN_TO_COLLECT
{
.conditional_index = COND_PKMN_TO_COLLECT,
.next_if_true = DIA_PKMN_TO_COLLECT,
.next_if_false = DIA_ASK_QUEST
.next_if_true = PTGB_DIA_PKMN_TO_COLLECT,
.next_if_false = PTGB_DIA_ASK_QUEST
},
// COND_GB_ROM_EXISTS
{
.conditional_index = COND_GB_ROM_EXISTS,
.next_if_true = CMD_SLIDE_PROF_RIGHT,
.next_if_false = DIA_NO_GB_ROM
.next_if_false = PTGB_DIA_NO_GB_ROM
},
// COND_CHECK_MYTHIC
{
.conditional_index = COND_CHECK_MYTHIC,
.next_if_true = DIA_MYTHIC_CONVERT,
.next_if_true = PTGB_DIA_MYTHIC_CONVERT,
.next_if_false = COND_CHECK_MISSINGNO
},
// COND_CHECK_DEX
@ -479,26 +479,26 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// COND_CHECK_KANTO
{
.conditional_index = COND_CHECK_KANTO,
.next_if_true = DIA_K_DEX_NOT_FULL,
.next_if_false = DIA_J_DEX_NOT_FULL
.next_if_true = PTGB_DIA_K_DEX_NOT_FULL,
.next_if_false = PTGB_DIA_J_DEX_NOT_FULL
},
// COND_SOME_INVALID_PKMN
{
.conditional_index = COND_SOME_INVALID_PKMN,
.next_if_true = DIA_SOME_INVALID_PKMN,
.next_if_true = PTGB_DIA_SOME_INVALID_PKMN,
.next_if_false = COND_CHECK_MYTHIC
},
// COND_IS_HOENN_E
{
.conditional_index = COND_IS_HOENN_E,
.next_if_true = DIA_SEND_FRIEND_HOENN_E,
.next_if_false = DIA_SEND_FRIEND_KANTO
.next_if_true = PTGB_DIA_SEND_FRIEND_HOENN_E,
.next_if_false = PTGB_DIA_SEND_FRIEND_KANTO
},
// COND_CHECK_MISSINGNO
{
.conditional_index = COND_CHECK_MISSINGNO,
.next_if_true = DIA_IS_MISSINGNO,
.next_if_false = DIA_IN_BOX
.next_if_true = PTGB_DIA_IS_MISSINGNO,
.next_if_false = PTGB_DIA_IN_BOX
}
};
@ -506,24 +506,24 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// -------- EVENTS SCRIPT --------
// Start the dialogue and show the menu
// E_SCRIPT_START
// DIA_ASK_QUEST
// PTGB_DIA_ASK_QUEST
//
// Ask the user what game and language they're using
// DIA_WHAT_GAME_EVENT
// PTGB_DIA_WHAT_GAME_EVENT
// CMD_GAME_MENU
// DIA_WHAT_LANG_EVENT
// PTGB_DIA_WHAT_LANG_EVENT
// CMD_LANG_MENU
// DIA_ASK_QUEST
// PTGB_DIA_ASK_QUEST
// CMD_SLIDE_PROF_LEFT
// CMD_SLIDE_PROF_RIGHT
// COND_GB_ROM_EXISTS
// DIA_NO_GB_ROM
// PTGB_DIA_NO_GB_ROM
//
// Check the player's dex
// COND_CHECK_DEX
// COND_CHECK_KANTO
// DIA_K_DEX_NOT_FULL
// DIA_J_DEX_NOT_FULL
// PTGB_DIA_K_DEX_NOT_FULL
// PTGB_DIA_J_DEX_NOT_FULL
//
// Hide the dialogue and professor
// CMD_END_SCRIPT
@ -535,71 +535,71 @@ const script_obj_params transfer_script_params[SCRIPT_SIZE] = {
// defining it this way does not generate an expensive function. It's all stored as read-only data in EWRAM.
// Although frankly given the small amount of defined entries, we ARE wasting a lot of space with this one. (probably around 500 bytes)
const script_obj_params event_script_params[SCRIPT_SIZE] = {
{}, // DIA_OPEN
{}, // DIA_E4
{}, // DIA_MG_FRLGE
{}, // DIA_MG_RS
{}, // DIA_LETS_START
{}, // DIA_START
{}, // DIA_TRANS_GOOD
{}, // DIA_NEW_DEX
{}, // DIA_NO_NEW_DEX
{}, // DIA_SEND_FRIEND_KANTO
{}, // DIA_SEND_FRIEND_HOENN_RS
{}, // DIA_SEND_FRIEND_HOENN_E
{}, // DIA_THANK
{}, // DIA_GET_MON
{}, // DIA_MG_OTHER_EVENT
{}, // DIA_PKMN_TO_COLLECT
{}, // DIA_NO_VALID_PKMN
// DIA_ASK_QUEST
{}, // PTGB_DIA_OPEN
{}, // PTGB_DIA_E4
{}, // PTGB_DIA_MG_FRLGE
{}, // PTGB_DIA_MG_RS
{}, // PTGB_DIA_LETS_START
{}, // PTGB_DIA_START
{}, // PTGB_DIA_TRANS_GOOD
{}, // PTGB_DIA_NEW_DEX
{}, // PTGB_DIA_NO_NEW_DEX
{}, // PTGB_DIA_SEND_FRIEND_KANTO
{}, // PTGB_DIA_SEND_FRIEND_HOENN_RS
{}, // PTGB_DIA_SEND_FRIEND_HOENN_E
{}, // PTGB_DIA_THANK
{}, // PTGB_DIA_GET_MON
{}, // PTGB_DIA_MG_OTHER_EVENT
{}, // PTGB_DIA_PKMN_TO_COLLECT
{}, // PTGB_DIA_NO_VALID_PKMN
// PTGB_DIA_ASK_QUEST
{
.text_entry_index = DIA_ASK_QUEST,
.text_entry_index = PTGB_DIA_ASK_QUEST,
.next_if_true = CMD_SLIDE_PROF_LEFT
},
{}, // DIA_WHAT_GAME_TRANS
{}, // DIA_WHAT_LANG_TRANS
// DIA_NO_GB_ROM
{}, // PTGB_DIA_WHAT_GAME_TRANS
{}, // PTGB_DIA_WHAT_LANG_TRANS
// PTGB_DIA_NO_GB_ROM
{
.text_entry_index = DIA_NO_GB_ROM,
.next_if_true = DIA_WHAT_LANG_EVENT
.text_entry_index = PTGB_DIA_NO_GB_ROM,
.next_if_true = PTGB_DIA_WHAT_LANG_EVENT
},
{}, // DIA_IN_BOX
{}, // DIA_MYTHIC_CONVERT
{}, // DIA_CANCEL
{}, // DIA_SOME_INVALID_PKMN
{}, // DIA_MENU_BACK
{}, // DIA_IS_MISSINGNO
{}, // DIA_ERROR_COLOSSEUM
{}, // DIA_ERROR_COM_ENDED
{}, // DIA_ERROR_DISCONNECT
{}, // DIA_ERROR_TIME_ONE
{}, // DIA_ERROR_TIME_TWO
// DIA_WHAT_LANG_EVENT
{}, // PTGB_DIA_IN_BOX
{}, // PTGB_DIA_MYTHIC_CONVERT
{}, // PTGB_DIA_CANCEL
{}, // PTGB_DIA_SOME_INVALID_PKMN
{}, // PTGB_DIA_MENU_BACK
{}, // PTGB_DIA_IS_MISSINGNO
{}, // PTGB_DIA_ERROR_COLOSSEUM
{}, // PTGB_DIA_ERROR_COM_ENDED
{}, // PTGB_DIA_ERROR_DISCONNECT
{}, // PTGB_DIA_ERROR_TIME_ONE
{}, // PTGB_DIA_ERROR_TIME_TWO
// PTGB_DIA_WHAT_LANG_EVENT
{
.text_entry_index = DIA_WHAT_LANG_EVENT,
.text_entry_index = PTGB_DIA_WHAT_LANG_EVENT,
.next_if_true = CMD_LANG_MENU
},
// DIA_WHAT_GAME_EVENT
// PTGB_DIA_WHAT_GAME_EVENT
{
.text_entry_index = DIA_WHAT_GAME_EVENT,
.text_entry_index = PTGB_DIA_WHAT_GAME_EVENT,
.next_if_true = CMD_GAME_MENU
},
// DIA_K_DEX_NOT_FULL
// PTGB_DIA_K_DEX_NOT_FULL
{
.text_entry_index = DIA_K_DEX_NOT_FULL,
.text_entry_index = PTGB_DIA_K_DEX_NOT_FULL,
.next_if_true = CMD_END_SCRIPT
},
// DIA_J_DEX_NOT_FULL
// PTGB_DIA_J_DEX_NOT_FULL
{
.text_entry_index = DIA_J_DEX_NOT_FULL,
.text_entry_index = PTGB_DIA_J_DEX_NOT_FULL,
.next_if_true = CMD_END_SCRIPT
},
{}, // T_SCRIPT_START
// E_SCRIPT_START
{
.conditional_index = CMD_SHOW_PROF,
.next_if_true = DIA_ASK_QUEST
.next_if_true = PTGB_DIA_ASK_QUEST
},
{}, // CMD_START_LINK
{}, // CMD_IMPORT_POKEMON
@ -620,17 +620,17 @@ const script_obj_params event_script_params[SCRIPT_SIZE] = {
{
.conditional_index = CMD_GAME_MENU,
.next_if_true = COND_GB_ROM_EXISTS,
.next_if_false = DIA_WHAT_LANG_EVENT
.next_if_false = PTGB_DIA_WHAT_LANG_EVENT
},
// CMD_LANG_MENU
{
.conditional_index = CMD_LANG_MENU,
.next_if_true = DIA_WHAT_GAME_EVENT
.next_if_true = PTGB_DIA_WHAT_GAME_EVENT
},
// CMD_SLIDE_PROF_LEFT
{
.conditional_index = CMD_SLIDE_PROF_LEFT,
.next_if_true = DIA_WHAT_LANG_EVENT
.next_if_true = PTGB_DIA_WHAT_LANG_EVENT
},
// CMD_SLIDE_PROF_RIGHT
{
@ -660,7 +660,7 @@ const script_obj_params event_script_params[SCRIPT_SIZE] = {
{
.conditional_index = COND_GB_ROM_EXISTS,
.next_if_true = CMD_SLIDE_PROF_RIGHT,
.next_if_false = DIA_NO_GB_ROM
.next_if_false = PTGB_DIA_NO_GB_ROM
},
{}, // COND_CHECK_MYTHIC
// COND_CHECK_DEX
@ -672,8 +672,8 @@ const script_obj_params event_script_params[SCRIPT_SIZE] = {
// COND_CHECK_KANTO
{
.conditional_index = COND_CHECK_KANTO,
.next_if_true = DIA_K_DEX_NOT_FULL,
.next_if_false = DIA_J_DEX_NOT_FULL
.next_if_true = PTGB_DIA_K_DEX_NOT_FULL,
.next_if_false = PTGB_DIA_J_DEX_NOT_FULL
},
{}, // COND_SOME_INVALID_PKMN
{}, // COND_IS_HOENN_E

2
source/select_menu.cpp
View File

@ -106,7 +106,7 @@ void Select_Menu::show_menu()
{
u8 decompression_buffer[2048];
text_data_table text_data(decompression_buffer);
text_data.decompress(get_compressed_general_table());
text_data.decompress(get_compressed_GENERAL_table());
add_menu_box(menu_options.size(), startTileX, startTileY);
for (unsigned int i = 0; i < menu_options.size(); i++)

150
text_helper/main.py
View File

@ -313,18 +313,6 @@ dir = os.curdir + "/text_helper"
mainDict = {}
for lang in Languages:
mainDict[lang.name] = {
"PTGB": {},
"RSEFRLG": {},
"GB": {},
"GENERAL": {},
"CREDITS": {},
"PKMN_NAMES": {},
"Warnings" : {},
"Errors": {},
}
def convert_item(ogDict):
line = ogDict["bytes"]
numLines = ogDict["numLines"]
@ -445,13 +433,29 @@ def write_enum_to_header_file(hFile, prefix, dictionary):
for key, line in dictionary.items():
hFile.write(f"#define {prefix}{key} {num}\n")
num += 1
hFile.write(f"\n#define {prefix}_LENGTH {num}\n")
hFile.write("\n")
return num
print("Starting parse:")
currSheet = pd.read_excel(dir + "/text.xlsx", sheet_name="Translations")
textSections = []
for row in currSheet.iterrows():
currRow = row[1]["Text Section"]
if (currRow not in textSections):
textSections.append(currRow)
for lang in Languages:
mainDict[lang.name] = {}
for section in textSections:
mainDict[lang.name][section] = {}
mainDict[lang.name]["Warnings"] = {}
mainDict[lang.name]["Errors"] = {}
for row in currSheet.iterrows():
#print(row)
for lang in Languages:
@ -467,116 +471,66 @@ for row in currSheet.iterrows():
"includeBoxBreaks": currRow.iloc[5],
}
print("\tGenerating header file")
# generate the header file
with open (os.curdir + '/include/translated_text.h', 'w') as hFile:
hFile.write("#ifndef DIALOGUE_H\n#define DIALOGUE_H\n\n#include <tonc.h>\n\n")
hFile.write("// THIS FILE HAS BEEN GENERATED BY text_helper/main.py !\n\n#ifndef TRANSLATED_TEXT_H\n#define TRANSLATED_TEXT_H\n\n#include <tonc.h>\n\n")
# PTGB
num = write_enum_to_header_file(hFile, "", mainDict[lang.name]["PTGB"])
hFile.write(f"\n#define DIA_SIZE {num}\n#define DIA_END DIA_SIZE\n\n")
# RSEFRLG
write_enum_to_header_file(hFile, "RSEFRLG_", mainDict[lang.name]["RSEFRLG"])
for section in textSections:
num = write_enum_to_header_file(hFile, section + "_", mainDict[lang.name][section])
if(section == "PTGB"):
hFile.write(f"\n#define DIA_END {num}\n")
# GENERAL
write_enum_to_header_file(hFile, "GENERAL_", mainDict[lang.name]["GENERAL"])
hFile.write("/** Returns the LZ10 compressed " + section + " text table.*/\n")
hFile.write("const u8* get_compressed_" + section + "_table();\n\n")
# CREDITS
write_enum_to_header_file(hFile, "CREDITS_", mainDict[lang.name]["CREDITS"])
# PKMN_NAMES
write_enum_to_header_file(hFile, "PKMN_NAMES_", mainDict[lang.name]["PKMN_NAMES"])
hFile.write("/** Returns the LZ10 compressed PTGB text table.*/\n")
hFile.write("const u8* get_compressed_PTGB_table();\n\n")
hFile.write("/** Returns the LZ10 compressed RSEFRLG text table.*/\n")
hFile.write("const u8* get_compressed_rsefrlg_table();\n\n")
hFile.write("/** Returns the LZ10 compressed GENERAL text table.*/\n")
hFile.write("const u8* get_compressed_general_table();\n\n")
hFile.write("/** Returns the LZ10 compressed CREDITS text table.*/\n")
hFile.write("const u8* get_compressed_credits_table();\n\n")
hFile.write("/** Returns the LZ10 compressed PKMN_NAMES text table.*/\n")
hFile.write("const u8* get_compressed_pkmn_names_table();\n\n")
hFile.write("")
hFile.write("\n#endif")
hFile.close()
print("\tGenerating text tables")
# now generate the text tables
for lang in Languages:
# PTGB
table_file = os.curdir + '/to_compress/PTGB_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name]["PTGB"])
# RSEFRLG
table_file = os.curdir + '/to_compress/RSEFRLG_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name]["RSEFRLG"])
# GENERAL
table_file = os.curdir + '/to_compress/GENERAL_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name]["GENERAL"])
# CREDITS
table_file = os.curdir + '/to_compress/CREDITS_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name]["CREDITS"])
# PKMN_NAMES
table_file = os.curdir + '/to_compress/PKMN_NAMES_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name]["PKMN_NAMES"])
for section in textSections:
table_file = os.curdir + '/to_compress/' + section + '_' + lang.name.lower() + '.bin'
write_text_bin_file(table_file, mainDict[lang.name][section])
print("\tGenerating cpp file")
# now generate the cpp file.
with open(os.curdir + '/source/translated_text.cpp', 'w') as cppFile:
cppFile.write("#include \"translated_text.h\"\n#include \"debug_mode.h\"\n")
cppFile.write("// THIS FILE HAS BEEN GENERATED BY text_helper/main.py !\n#include \"translated_text.h\"\n#include \"debug_mode.h\"\n")
# generate includes for each language
for lang in Languages:
for cat in mainDict[lang.name]:
if cat in {"PTGB", "RSEFRLG", "GENERAL", "CREDITS", "PKMN_NAMES"}:
cppFile.write("#include \"" + cat.upper() + "_" + lang.name.lower() + "_lz10_bin.h\"\n")
for section in textSections:
cppFile.write("#include \"" + section.upper() + "_" + lang.name.lower() + "_lz10_bin.h\"\n")
for lang in Languages:
cppFile.write(f"\n#if PTGB_BUILD_LANGUAGE == {lang.value + 1}\n")
# PTGB
cppFile.write("const u8* get_compressed_PTGB_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn PTGB_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
# RSEFRLG
cppFile.write("const u8* get_compressed_rsefrlg_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn RSEFRLG_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
# GENERAL
cppFile.write("const u8* get_compressed_general_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn GENERAL_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
# CREDITS
cppFile.write("const u8* get_compressed_credits_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn CREDITS_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
# PKMN_NAMES
cppFile.write("const u8* get_compressed_pkmn_names_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn PKMN_NAMES_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
for section in textSections:
cppFile.write("const u8* get_compressed_" + section + "_table()\n")
cppFile.write("{\n")
cppFile.write("\treturn " + section + "_" + lang.name.lower() + "_lz10_bin;\n")
cppFile.write("}\n\n")
cppFile.write(f"#endif\n\n\n")
print("\tOutputting json file")
for lang in Languages:
for cat in mainDict[lang.name]:
if cat in {"PTGB", "RSEFRLG", "GENERAL", "CREDITS", "PKMN_NAMES"}:
for item in mainDict[lang.name][cat]:
string = mainDict[lang.name][cat][item]["bytes"].split(" ")
outText = ""
if lang == Languages.Japanese:
arr = jpnCharArray
else:
arr = engCharArray
for byte in string:
byte = engCharArray[int(byte, 16)]
outText += chr(byte)
mainDict[lang.name][cat][item]["text"] = outText
for section in textSections:
for item in mainDict[lang.name][section]:
string = mainDict[lang.name][section][item]["bytes"].split(" ")
outText = ""
if lang == Languages.Japanese:
arr = jpnCharArray
else:
arr = engCharArray
for byte in string:
byte = engCharArray[int(byte, 16)]
outText += chr(byte)
mainDict[lang.name][section][item]["text"] = outText
with open(dir + '/output.json', 'w') as jsonFile:
jsonFile.write(json.dumps(mainDict))