Leahnaya/Pokemon-Gen3-to-Gen-X
1
0
Fork 0
mirror of https://github.com/Lorenzooone/Pokemon-Gen3-to-Gen-X.git synced 2026-03-21 17:24:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue with Gen 1 Slaves getting stuck

Browse Source
This commit is contained in:
Lorenzooone 2023-04-23 02:23:06 +02:00
parent f31e60ea41
commit 2b16e6d360
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/communicator.c
View File

@ -15,6 +15,7 @@
#define MAX_WAIT_FOR_SYN 30
#define MIN_WAIT_FOR_SYN 3
#define MAX_NO_NEW_INFO 30
#define GEN1_CHOICE_LOCKOUT_INDEX 3
#define NUMBER_OF_ENTITIES 2
@ -421,10 +422,20 @@ IWRAM_CODE int check_if_continue(u8 data, const u8* sends, const u8* recvs, size
IWRAM_CODE int process_data_arrived_gen1(u8 data, u8 is_master) {
if(is_master)
is_master = 1;
int return_value = 0;
size_t buffer_counter_old = buffer_counter;
if(start_state != START_TRADE_DON) {
switch(start_state) {
case START_TRADE_ENT:
return check_if_continue(data, gen1_start_trade_enter_room[is_master], gen1_start_trade_enter_room_next[is_master], GEN1_ENTER_STATES_NUM, START_TRADE_WAI, START_TRADE_BYTE_GEN1 | 1, 1);
return_value = check_if_continue(data, gen1_start_trade_enter_room[is_master], gen1_start_trade_enter_room_next[is_master], GEN1_ENTER_STATES_NUM, START_TRADE_WAI, START_TRADE_BYTE_GEN1 | 1, 1);
// Fix this getting stuck for slaves not receiving the end message...
if((!is_master) && ((data == SYNCHRONIZE_BYTE) || ((buffer_counter == buffer_counter_old) && (buffer_counter >= GEN1_CHOICE_LOCKOUT_INDEX) && (data == START_TRADE_BYTE_GEN1)))) {
buffer_counter = 0;
last_filtered = 0;
set_start_state(START_TRADE_UNK);
return_value = SEND_NO_INFO;
}
return return_value;
case START_TRADE_STA:
return check_if_continue(data, gen1_start_trade_start_trade_procedure[is_master], gen1_start_trade_start_trade_procedure_next[is_master], GEN1_START_STATES_NUM, START_TRADE_SYN, SEND_NO_INFO, 1);
case START_TRADE_PAR:

2
source/config_settings.c
View File

@ -39,7 +39,7 @@ static u16 applied_ball;
static u8 egg_met_location;
static u8 first_set_egg_met_location;
const struct version_t version = { .main_version = 1, .sub_version = 1, .revision_version = 1, .revision_letter = CONSOLE_LETTER};
const struct version_t version = { .main_version = 1, .sub_version = 1, .revision_version = 2, .revision_letter = CONSOLE_LETTER};
const u8* egg_valid_met_locations[NUMBER_OF_GAMES+FIRST_VERSION_ID] = {valid_egg_locations_rs_bin, valid_egg_locations_rs_bin, valid_egg_locations_rs_bin, valid_egg_locations_e_bin, valid_egg_locations_frlg_bin, valid_egg_locations_frlg_bin};
void set_default_settings() {