Leahnaya/PokemonGB_Online_Trades
1
0
Fork 0
mirror of https://github.com/Lorenzooone/PokemonGB_Online_Trades.git synced 2026-04-27 00:42:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix waiting for data in-menu and fix gen-1 issue with moves

Browse Source
This commit is contained in:
Lorenzo Carletti 2022-04-23 20:49:31 +02:00
parent 2cffee468a
commit 820e657850
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
utilities/gsc_trading.py
View File

@ -346,6 +346,8 @@ class GSCTrading:
sleep_timer = 0.01
enter_room_states = [[0x01, 0xFE, 0x61, 0xD1, 0xFE], [{0xFE}, {0x61}, {0xD1}, {0xFE}, {0xFE}]]
start_trading_states = [[0x75, 0x75, 0x76], [{0x75}, {0}, {0xFD}]]
success_values = {0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x7F}
possible_indexes = {0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x7F}
max_consecutive_no_data = 0x100
next_section = 0xFD
no_input = 0xFE
@ -570,11 +572,27 @@ class GSCTrading:
if(target == self.stop_trade and next == target):
target = 0
def wait_for_input(self, next):
def wait_for_choice(self, next):
"""
Waits for an useful value.
"""
while(next == self.no_input or next == self.no_data):
while(next not in self.possible_indexes):
next = self.swap_byte(self.no_input)
return next
def wait_for_accept_decline(self, next):
"""
Waits for an useful value.
"""
while((next != self.accept_trade) and (next != self.decline_trade)):
next = self.swap_byte(self.no_input)
return next
def wait_for_success(self, next):
"""
Waits for success.
"""
while(next not in self.success_values):
next = self.swap_byte(self.no_input)
return next
@ -675,7 +693,7 @@ class GSCTrading:
while not trade_completed:
# Get the choice
next = self.no_input
sent_mon = self.wait_for_input(next)
sent_mon = self.wait_for_choice(next)
if not close:
if autoclose_on_stop and self.is_choice_stop(sent_mon):
@ -703,7 +721,7 @@ class GSCTrading:
# Get whether the trade was declined or not
next = self.wait_for_no_data(next, received_choice)
next = self.wait_for_no_input(next)
accepted = self.wait_for_input(next)
accepted = self.wait_for_accept_decline(next)
# Check validity of trade
valid_trade = received_valid
@ -741,7 +759,7 @@ class GSCTrading:
self.check_reset_trade(to_server)
# Conclude the trade successfully
next = self.wait_for_input(next)
next = self.wait_for_success(next)
# Send it to the other player
self.verbose_print(GSCTradingStrings.success_send_str)

4
utilities/rby_trading.py
View File

@ -51,7 +51,7 @@ class RBYTradingClient(GSCTradingClient):
for i in range(4):
updating_mon.set_move(i, data[i+1], max_pp=False)
updating_mon.set_pp(i, data[i+5])
if data[i] != updating_mon.get_species():
if data[0] != updating_mon.get_species():
self.trader.other_pokemon.evolution_procedure(self.trader.other_pokemon.get_last_mon_index(), data[i])
return val
@ -77,6 +77,8 @@ class RBYTrading(GSCTrading):
enter_room_states = [[0x01, 0x60, 0xD0, 0xD4], [{0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6F}, {0xD0, 0xD1, 0xD2, 0xD3, 0xD4}, {0xFE}, {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6F}]]
start_trading_states = [[0x60, 0x60], [{0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6F}, {0xFD}]]
special_sections_len = [0xA, 0x1A2, 0xC5]
success_values = {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6F}
possible_indexes = {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6F}
next_section = 0xFD
no_input = 0xFE
drop_bytes_checks = [[0xA, 0x19F, 0xC5], [next_section, next_section, no_input]]