Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Identify remasters based on UMD_DATA hash #8314

Merged
merged 5 commits into from
Dec 29, 2015

Conversation

unknownbrackets
Copy link
Collaborator

I don't actually have any remasters, so this has not been tested with an actual remaster. But it ought to work.

Fixes #8268.

-[Unknown]

@daniel229
Copy link
Collaborator

blackscreen Eiyuu Densetsu Sora no Kiseki FC Kai HD Edition

25:17:106 root         I[KERNEL]: HLE\sceKernelThread.cpp:1943 276=sceKernelCreateThread(user_main, 08804228, 00000020, 327680, 80000000, 00000000)
25:17:106 root         I[KERNEL]: HLE\sceKernelThread.cpp:2014 0=sceKernelStartThread(276, 33, 09fffed0)
25:17:106 root         I[KERNEL]: HLE\sceKernelThread.cpp:2053 __KernelReturnFromThread: 0
25:17:106 user_main    E[HLE]: Util\BlockAllocator.cpp:61 Clearly bogus size: 024a3000 - failing allocation
25:17:106 user_main    E[KERNEL]: HLE\sceKernelMemory.cpp:1020 sceKernelAllocPartitionMemory(partition = 2, UserSbrk, type= 3, size= 38416384, addr= 00001000): allocation failed
25:17:107 user_main    E[HLE]: Util\BlockAllocator.cpp:61 Clearly bogus size: 024a3000 - failing allocation
25:17:107 user_main    E[KERNEL]: HLE\sceKernelMemory.cpp:1020 sceKernelAllocPartitionMemory(partition = 2, UserSbrk, type= 3, size= 38416384, addr= 00001000): allocation failed
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: //----------------------------------------------//
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: 
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: //                                              //
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: 
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: // YamanekoCoreSystem Init                      //
25:17:107 user_main    I[IO]: HLE\sceIo.cpp:937 stdout: 
25:17:107 user_main    E[HLE]: Util\BlockAllocator.cpp:61 Clearly bogus size: 024a3000 - failing allocation
25:17:107 user_main    E[KERNEL]: HLE\sceKernelMemory.cpp:1020 sceKernelAllocPartitionMemory(partition = 2, UserSbrk, type= 3, size= 38416384, addr= 00001000): allocation failed
25:17:107 user_main    W[MM]: MemmapFunctions.cpp:130 WriteToHardware: Invalid address 00000000
25:17:107 user_main    W[MM]: MemmapFunctions.cpp:130 WriteToHardware: Invalid address 00000004
25:17:107 user_main    W[MM]: MemmapFunctions.cpp:130 WriteToHardware: Invalid address 00000008

@daniel229
Copy link
Collaborator

@unknownbrackets
Copy link
Collaborator Author

It did not detect that as a remaster. Does your UMD_DATA.BIN contain ULJM-05170|55C069C631B22685|0001|G (it can have other things as well, as long as it has that)?

If so, I must've done something wrong. In that case, can you try just "55C069C631B22685" for the value in HDRemaster.cpp or something?

-[Unknown]

@daniel229
Copy link
Collaborator

It has that
01

@daniel229
Copy link
Collaborator

"55C069C631B22685" instead of "ULJM-05170|55C069C631B22685|0001|G" is still blackscreen

@daniel229
Copy link
Collaborator

It seems broke by unknownbrackets@d273dee ,it can load to title before taht change.

@MIuIddy
Copy link

MIuIddy commented Dec 27, 2015

There is a small error in line 125 of Core/PSPLoaders.cpp.

if (entry.umdDataValue && umdData.find(entry.umdDataValue) != umdData.npos) {

should be

if (entry.umdDataValue && umdData.find(entry.umdDataValue) == umdData.npos) {

otherwise the original game gets detected as remaster and the remaster gets detected as the original.

@daniel229
Copy link
Collaborator

@MIuIddy the game going to the title now,still hangs on new game or after loading save.

@unknownbrackets
Copy link
Collaborator Author

@daniel229 did you put the exdata files inside memstick/exdata/ULJM05170/?

Thanks for the typo fix.

-[Unknown]

@daniel229
Copy link
Collaborator

Is it like this?Still not help.
01

@MIuIddy
Copy link

MIuIddy commented Dec 28, 2015

What is the filename extension of the files in the folders?
If it's .EDAT, you need to decrypt the files.
If it's .DAT, you need to remove the extension, for example "c_stchr0.itp.DAT" becomes "c_stchr0.itp".
If the files in etc end with .itp and the files in map3 end with .map everything should work fine.

Also there should be one of this lines in the logfile:

HLE\sceIo.cpp:521 I[IO]: Did not find exdata/ULJM05170/ under memstick for exdata0:/
HLE\sceIo.cpp:519 I[IO]: Mounted exdata/ULJM05170/ under memstick for exdata0:/

@daniel229
Copy link
Collaborator

Thanks,decrypting files now,it seems need an hour.

@unknownbrackets
Copy link
Collaborator Author

Hmm. Maybe PSP/exdata/ is better, if people want this on Android devices. Opinions?

-[Unknown]

@daniel229
Copy link
Collaborator

Are MUSIC,PICTURE,VIDEO,PAUTH,PAUTH also in PSP folder for Android?

@unknownbrackets
Copy link
Collaborator Author

No, they aren't.

-[Unknown]

@daniel229
Copy link
Collaborator

Looks good,but the saving dialog is broken.

01

broken
02

before
03

@unknownbrackets
Copy link
Collaborator Author

Oh, right. That's probably the case in all remasters. I've just pushed something to this branch which may fix that.

-[Unknown]

@daniel229
Copy link
Collaborator

fixed.

@daniel229
Copy link
Collaborator

Someone play the FC HD ver on PPSSPP one year ago,MP4 also play fine.
https://www.youtube.com/watch?v=0eB3bJURSmo

Using memstick/exdata/GAMEID/.
This allows us to initialize the memory AFTER determining the proper size,
in the case of remasters.  It also avoids going through load twice.
@unknownbrackets
Copy link
Collaborator Author

@hrydgard I think this is all good now, although the PPGe change is a bit less than beautiful. It seemed the simplest solution by far, though.

-[Unknown]

@hrydgard
Copy link
Owner

That should be alright, yeah.

hrydgard added a commit that referenced this pull request Dec 29, 2015
Identify remasters based on UMD_DATA hash
@hrydgard hrydgard merged commit 2909580 into hrydgard:master Dec 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants