Identify/fix some mcard inlines #177
Merged
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
Yanis002
approved these changes
Sep 18, 2024
| @@ -287,12 +257,12 @@ static bool mcardReplaceFileBlock(MemCard* pMCard, s32 index) { | |||
|
|
|||
| simulatorPrepareMessage(S_M_CARD_SV09); | |||
|
|
|||
| if (!UnkInlinemCardReplaceFileBlock2(pMCard, index << 13)) { | |||
| if (!mcardWriteAnywhereNoTime(pMCard, index << 13, 0x2000, pMCard->writeBuffer)) { | |||
There was a problem hiding this comment.
Suggested change
| if (!mcardWriteAnywhereNoTime(pMCard, index << 13, 0x2000, pMCard->writeBuffer)) { | |
| if (!mcardWriteAnywhereNoTime(pMCard, index << 13, CARD_SYSTEM_BLOCK_SIZE, pMCard->writeBuffer)) { |
|
|
||
| memcpy(buffer, pMCard->writeBuffer, 0x2000); | ||
|
|
||
| if (!UnkInlinemCardReplaceFileBlock(pMCard)) { | ||
| if (!mcardReadAnywhereNoTime(pMCard, 0x4000, 0x2000, pMCard->writeBuffer)) { |
There was a problem hiding this comment.
Suggested change
| if (!mcardReadAnywhereNoTime(pMCard, 0x4000, 0x2000, pMCard->writeBuffer)) { | |
| if (!mcardReadAnywhereNoTime(pMCard, 0x4000, CARD_SYSTEM_BLOCK_SIZE, pMCard->writeBuffer)) { |
maybe that 0x4000 is CARD_SYSTEM_BLOCK_SIZE * 2? not sure if that makes sense though
| @@ -263,11 +233,11 @@ static bool mcardReplaceFileBlock(MemCard* pMCard, s32 index) { | |||
| s32 checksum1; | |||
| s32 checksum2; | |||
| char buffer[0x2000]; | |||
There was a problem hiding this comment.
Suggested change
| char buffer[0x2000]; | |
| char buffer[CARD_SYSTEM_BLOCK_SIZE]; |
Comment on lines
+199
to
204
| char buffer2[0x2000]; | ||
| s32 checksum; | ||
| s32 pad[2]; | ||
|
|
||
| memcpy(buffer2, pMCard->writeBuffer, 0x2000); | ||
| memcpy(pMCard->writeBuffer, buffer, 0x2000); |
There was a problem hiding this comment.
Suggested change
| char buffer2[0x2000]; | |
| s32 checksum; | |
| s32 pad[2]; | |
| memcpy(buffer2, pMCard->writeBuffer, 0x2000); | |
| memcpy(pMCard->writeBuffer, buffer, 0x2000); | |
| char buffer2[CARD_SYSTEM_BLOCK_SIZE]; | |
| s32 checksum; | |
| s32 pad[2]; | |
| memcpy(buffer2, pMCard->writeBuffer, CARD_SYSTEM_BLOCK_SIZE); | |
| memcpy(pMCard->writeBuffer, buffer, CARD_SYSTEM_BLOCK_SIZE); |
|
I definitely agree on |
|
I don't mind if it's done in this PR but do like you want about the name, |
|
Yeah sorry, I think I'd like to do a cleanup pass after the rest of mcard is decompiled, because it's a bit hard to tell how things are used right now |
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.
I started matching more mcard functions and I think these are correct now, although I'm not sure on
mcardFinishFilevsmcardFinishGame. Highlights:UnkInlinemCardReplaceFileBlock->mcardReadAnywhereNoTimeUnkInlinemCardReplaceFileBlock2,UnkInlinemCardVerifyChecksumFileHeader2->mcardWriteAnywhereNoTimeUnkInlinemCardVerifyChecksumFileHeader,mcardGameEraseInline->mcardReadyFileUnkINlinemCardVerifyChecksumFileHeader3,UnkINlinemCardVerifyChecksumFileHeader4->mcardFinishFilemcardGetFileTime: missingpMCard->saveToggle == truecheckmcardFileRelease: should callmcardGameRelease