[FFMQ] Fix all checks sending on hard reset + stronger read validation check #4242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
waiting-on: peer-review
Co-authored-by: Exempt-Medic <[email protected]>
Exempt-Medic
added
the
is: bug/fix
Co-authored-by: Exempt-Medic <[email protected]>
|
I want to merge this but I'm not 100% sure how to validate that this |
The rando adds a function called at boot up that write 1 state byte (0 outside gameplay loop, 1 inside gameplay loop), then 5 bytes for "FFMQR" |
beauxq
reviewed
Nov 25, 2024
| @@ -47,6 +47,17 @@ def get_flag(data, flag): | |||
| bit = int(0x80 / (2 ** (flag % 8))) | |||
| return (data[byte] & bit) > 0 | |||
|
|
|||
| def validate_read_state(data1, data2): | |||
| validation_array = bytes([0x01, 0x46, 0x46, 0x4D, 0x51, 0x52]) | |||
There was a problem hiding this comment.
Suggested change
| validation_array = bytes([0x01, 0x46, 0x46, 0x4D, 0x51, 0x52]) | |
| validation_array = b"\x01FFMQR" |
another way this could be written (not saying one should be preferred over the other)
There was a problem hiding this comment.
>>> a = bytes([0x01, 0x46, 0x46, 0x4D, 0x51, 0x52])
>>> b = b"\x01FFMQR"
>>> a == b
TrueThere was a problem hiding this comment.
good to know, i'll keep that in mind for next time
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
SNIClient's task will die sometime (like on hard resets) and FFMQ's client will pass the validation check when it's not supposed to on some emulator. This fix the issue by checking None type and adding a stronger validation check.
How was this tested?
Test was done on a known seed that would reliably trigger the behaviour on hard reset.