From 4782dcd3cbbe918bed2063a9cd5af50410906f31 Mon Sep 17 00:00:00 2001 From: Lorenzooone Date: Thu, 16 Mar 2023 08:59:10 +0100 Subject: [PATCH] Prevent issues with speed. Will improve it significantly later on --- emulator_trading.py | 10 +++++----- usb_trading.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emulator_trading.py b/emulator_trading.py index 8e16a34..20d57ac 100644 --- a/emulator_trading.py +++ b/emulator_trading.py @@ -66,16 +66,16 @@ def transfer_func(p, menu): if menu.gen == 2: if menu.japanese: - trade_c = GSCTradingJP(p.sendByte, p.receiveByte, p.connection, menu, kill_function, True) + trade_c = GSCTradingJP(p.sendByte, p.receiveByte, p.connection, menu, kill_function, False) else: - trade_c = GSCTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, True) + trade_c = GSCTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, False) elif menu.gen == 3: - trade_c = RSESPTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, True) + trade_c = RSESPTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, False) elif menu.gen == 1: if menu.japanese: - trade_c = RBYTradingJP(p.sendByte, p.receiveByte, p.connection, menu, kill_function, True) + trade_c = RBYTradingJP(p.sendByte, p.receiveByte, p.connection, menu, kill_function, False) else: - trade_c = RBYTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, True) + trade_c = RBYTrading(p.sendByte, p.receiveByte, p.connection, menu, kill_function, False) if menu.gen != 3: if menu.trade_type == GSCTradingStrings.two_player_trade_str: diff --git a/usb_trading.py b/usb_trading.py index 6caf6f7..303e9c1 100644 --- a/usb_trading.py +++ b/usb_trading.py @@ -37,7 +37,7 @@ def transfer_func(sender, receiver, list_sender, raw_receiver): if menu.gen == 3: config_base = multiboot.get_configure_list(1000, 4) else: - config_base = multiboot.get_configure_list(20000, 1) + config_base = multiboot.get_configure_list(1000, 1) multiboot.read_all(raw_receiver) list_sender(config_base, chunk_size=len(config_base)) @@ -47,7 +47,7 @@ def transfer_func(sender, receiver, list_sender, raw_receiver): print("Non-reconfigurable firmware found!\nIt's best if you update to the one available at:\nhttps://github.com/Lorenzooone/gb-link-firmware-reconfigurable/releases") pre_sleep = False - if ret == 1: + if(ret == 1) and (menu.gen == 3): pre_sleep = True if menu.multiboot: