Leahnaya/Pokemon-Gen3-to-Gen-X
1
0
Fork 0
mirror of https://github.com/Lorenzooone/Pokemon-Gen3-to-Gen-X.git synced 2026-04-26 08:37:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add auto-retry on bad start

Browse Source
This commit is contained in:
Lorenzo Carletti 2023-03-10 14:20:38 +01:00
parent bd6e09b2cc
commit 75b2c807b9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/communicator.h
View File

@ -53,7 +53,7 @@
#define WANTS_TO_CANCEL -1
#define TRADE_CANCELLED -2
#define NO_INFO_LIMIT (60*5)
#define NO_INFO_LIMIT (FPS*10)
enum START_TRADE_STATE {START_TRADE_UNK, START_TRADE_ENT, START_TRADE_STA, START_TRADE_END, START_TRADE_WAI, START_TRADE_PAR, START_TRADE_SYN, START_TRADE_DON, START_TRADE_NO_UPDATE};
enum TRADING_STATE {NO_INFO, HAVE_OFFER, RECEIVED_OFFER, HAVE_ACCEPT, HAVE_ACCEPT_BASE, HAVE_ACCEPT_FINAL, RECEIVED_ACCEPT, HAVE_SUCCESS, HAVE_SUCCESS_SPECIES_OUT, HAVE_SUCCESS_LOW_PID_OUT, HAVE_SUCCESS_HIGH_PID_OUT, HAVE_SUCCESS_SPECIES_IN, HAVE_SUCCESS_LOW_PID_IN, HAVE_SUCCESS_HIGH_PID_IN, HAVE_SUCCESS_COMPLETED, RECEIVED_SUCCESS, FAILED_SUCCESS};

13
source/main.c
View File

@ -791,6 +791,7 @@ int main(void)
u32 curr_move = 0;
u8 success = 0;
u8 other_mon = 0;
u8 failed_entered_menu = 0;
u8 curr_page = 0;
const u8* party_selected_mons[2] = {&curr_mon, &other_mon};
@ -824,6 +825,7 @@ int main(void)
prepare_flush();
wait_frames(WAITING_TIME_BEFORE_RESPONSE);
trade_menu_init(game_data, &game_data_priv, target, region, master, curr_gen, own_menu, &cursor_y_pos, &cursor_x_pos);
failed_entered_menu = curr_state == WAITING_DATA;
}
else
print_start_trade();
@ -833,8 +835,15 @@ int main(void)
case RECEIVED_OFFER:
keys = 0;
result = get_received_trade_offer();
if(result == TRADE_CANCELLED)
conclude_trade(&game_data[0], &game_data_priv, target, region, master, &cursor_y_pos);
if(result == TRADE_CANCELLED) {
if(failed_entered_menu) {
stop_transfer(master);
wait_frames(WAITING_TIME_BEFORE_RESPONSE);
start_trade_init(&game_data[0], &game_data_priv, target, region, master, curr_gen, &cursor_y_pos);
}
else
conclude_trade(&game_data[0], &game_data_priv, target, region, master, &cursor_y_pos);
}
else if(result == WANTS_TO_CANCEL) {
rejected_print_screen(1);
wait_frames(WAITING_TIME_REJECTED);