Pokémon R/B: Migrate support into Bizhawk Client #2466
Conversation
Bad commit organization a consequence of working with two different branches and not keeping the commits separated
…perations On 2.9, it would detect LuaJIT and flood the console with deprecation warnings
… address Gambatte frame sync issue
Also splits out BizHawk communication functions to their own file for use outside this client
# Conflicts: # inno_setup.iss # worlds/_bizhawk/__init__.py # worlds/_bizhawk/client.py # worlds/_bizhawk/context.py
There was a problem hiding this comment.
Lots of single quoted strings that should be double quoted.
If this is a supported way to dynamically add or remove commands
ctx.command_processor.commands["bank"] = cmd_bankthen there's probably a reasonable interface that could be added to BizHawkClient where you define your commands on a classvar and the main loop will add and remove your commands when it detects ROM changes.
As it is though, I don't think CommonClient is built in a way that expects dynamically added commands, so it'd be better to start from there and work down. I think this method is fine for now, since it will only be present if you switch games after playing R/B and try to use it, and it checks you and tells you what you did wrong.
worlds/pokemon_rb/client.py
Outdated
| original_money = original_money[0] | ||
| original_money = [int(byte) for byte in original_money] | ||
| money = [int(hex(byte).split("x")[1]) for byte in original_money] | ||
| money = (money[0] * 10000) + (money[1] * 100) + money[2] |
There was a problem hiding this comment.
This looks really weird. I'll believe that it's a silly representation that GF used either to store large numbers or to "encrypt" the number, but int(hex(byte).split("x")[1] looks especially hacky. A quick comment explaining what's going on would be warranted imo.
There was a problem hiding this comment.
It's binary-coded decimal, where 0x99 means 99.
There was a problem hiding this comment.
Seems complicated. Can't you just do money = int(original_money[0].hex())?
There was a problem hiding this comment.
Seems complicated. Can't you just do
money = int(original_money[0].hex())?
int(original_money.hex()) works. I was not aware .hex() on a bytes object would do this.
|
Only just noticed this was a draft 😅. Didn't mean to be over-eager. The discord feed didn't show draft at all, so I just clicked it and looked around. |
Draft just means I don't want it merged yet, not that I don't want help. |
ThePhar
added
the
is: refactor/cleanup
| if location.ram_address is not None: | ||
| if type(location.ram_address) == list: | ||
| location_map[type(location.ram_address).__name__][(location.ram_address[0].flag, location.ram_address[1].flag)] = location.address | ||
| location_bytes_bits[location.address] = [{'byte': location.ram_address[0].byte, 'bit': location.ram_address[0].bit}, |
There was a problem hiding this comment.
Still a bunch of single-quoted strings here and there that should be double-quoted
|
Note that InnoSetup will not delete old files, like the old .exe or the old .lua unless instructed to do so. I did not see any such instructions. I'd strongly recommend that this is added as users are likely to just try to use the old files if they exist. |
- Removes the Pokémon Client, adding support for Red and Blue to the Bizhawk Client. - Adds `/bank` commands that mirror SDV's, allowing transferring money into and out of the EnergyLink storage. - Adds a fix to the base patch so that the progressive card key counter will not increment beyond 10, which would lead to receiving glitch items. This value is checked against and verified that it is not > 10 as part of crash detection by the client, to prevent erroneous location checks when the game crashes, so this is relevant to the new client (although shouldn't happen unless you're using !getitem, or putting progressive card keys as item link replacement items)
What is this fixing or adding?
/bankcommands that mirror SDV's, allowing transferring money into and out of the EnergyLink storage.How was this tested?
By testing it. A client has also been made available in #pkmn-red-blue for further testing by others.