PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match SGameFileSlot::InitializeFromGameState (and a few others)

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-11 20:09:26 +03:00
parent fb0c6815ac
commit 9bd9f9c32f
No known key found for this signature in database
GPG Key ID: E224F951761145F8
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/MetroidPrime/CMemoryCardDriver.s
View File

@ -483,7 +483,7 @@ ExportPersistentOptions__17CMemoryCardDriverFv:
/* 8024C808 00249768 4B F8 91 61 */ bl __ct__14CSystemOptionsFR12CInputStream /* 8024C808 00249768 4B F8 91 61 */ bl __ct__14CSystemOptionsFR12CInputStream
/* 8024C80C 0024976C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8024C80C 0024976C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13)
/* 8024C810 00249770 38 81 00 B8 */ addi r4, r1, 0xb8 /* 8024C810 00249770 38 81 00 B8 */ addi r4, r1, 0xb8
/* 8024C814 00249774 4B F8 74 F5 */ bl ExportPersistentOptions__10CGameStateFRC14CSystemOptions /* 8024C814 00249774 4B F8 74 F5 */ bl ExportPersistentOptions__10CGameStateFR14CSystemOptions
/* 8024C818 00249778 7F E4 FB 78 */ mr r4, r31 /* 8024C818 00249778 7F E4 FB 78 */ mr r4, r31
/* 8024C81C 0024977C 38 61 00 2C */ addi r3, r1, 0x2c /* 8024C81C 0024977C 38 61 00 2C */ addi r3, r1, 0x2c
/* 8024C820 00249780 38 A0 00 AE */ li r5, 0xae /* 8024C820 00249780 38 A0 00 AE */ li r5, 0xae

4
asm/MetroidPrime/Player/CGameState.s
View File

@ -415,8 +415,8 @@ lbl_801D3CE0:
/* 801D3D00 001D0C60 38 21 00 30 */ addi r1, r1, 0x30 /* 801D3D00 001D0C60 38 21 00 30 */ addi r1, r1, 0x30
/* 801D3D04 001D0C64 4E 80 00 20 */ blr /* 801D3D04 001D0C64 4E 80 00 20 */ blr
.global ExportPersistentOptions__10CGameStateFRC14CSystemOptions .global ExportPersistentOptions__10CGameStateFR14CSystemOptions
ExportPersistentOptions__10CGameStateFRC14CSystemOptions: ExportPersistentOptions__10CGameStateFR14CSystemOptions:
/* 801D3D08 001D0C68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D3D08 001D0C68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801D3D0C 001D0C6C 7C 08 02 A6 */ mflr r0 /* 801D3D0C 001D0C6C 7C 08 02 A6 */ mflr r0
/* 801D3D10 001D0C70 90 01 00 14 */ stw r0, 0x14(r1) /* 801D3D10 001D0C70 90 01 00 14 */ stw r0, 0x14(r1)

6
include/Kyoto/Streams/CMemoryStreamOut.hpp
View File

@ -12,6 +12,12 @@ public:
CMemoryStreamOut(void* buffer, size_t len, EOwnerShip ownerShip = kOS_NotOwned, int blockLen = 4096); CMemoryStreamOut(void* buffer, size_t len, EOwnerShip ownerShip = kOS_NotOwned, int blockLen = 4096);
virtual ~CMemoryStreamOut(); virtual ~CMemoryStreamOut();
private:
u8* x7c_ptr;
u32 x80_len;
u32 x84_position;
bool x88_owned;
}; };
#endif // _CMEMORYSTREAMOUT #endif // _CMEMORYSTREAMOUT

2
include/MetroidPrime/Player/CGameState.hpp
View File

@ -53,7 +53,7 @@ public:
float x1c_scanPercent; float x1c_scanPercent;
bool x20_hardMode; bool x20_hardMode;
}; };
static GameFileStateInfo LoadGameFileState(const uchar* data); static GameFileStateInfo LoadGameFileState(const void* data);
private: private:
rstl::reserved_vector< bool, 128 > x0_; rstl::reserved_vector< bool, 128 > x0_;

8
src/MetroidPrime/CMemoryCardDriver.cpp
View File

@ -784,7 +784,13 @@ void SGameFileSlot::DoPut(CMemoryStreamOut& w) const {
w.Put(x0_saveBuffer.data(), x0_saveBuffer.capacity()); w.Put(x0_saveBuffer.data(), x0_saveBuffer.capacity());
} }
void SGameFileSlot::InitializeFromGameState() {} void SGameFileSlot::InitializeFromGameState() {
{
CMemoryStreamOut w(x0_saveBuffer.data(), x0_saveBuffer.capacity());
gpGameState->PutTo(w);
}
x944_fileInfo = CGameState::LoadGameFileState(x0_saveBuffer.data());
}
void SGameFileSlot::LoadGameState(int) {} void SGameFileSlot::LoadGameState(int) {}