Merge pull request #497 from PSI-Rockin/poketto_monsutaa

[CRO] Fix faulty data relocations
wheremyfoodat · Apr 22, 2024 · 000dc09 · 000dc09
2 parents 1af7664 + b797c92
commit 000dc09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,4 @@ fb.bat
 *.smdh
 
 config.toml
+CMakeSettings.json
diff --git a/src/core/services/ldr_ro.cpp b/src/core/services/ldr_ro.cpp
@@ -437,7 +437,7 @@ class CRO {
 			const u32 segmentID = mem.read32(segmentTable.offset + 12 * segment + SegmentTable::ID);
 			switch (segmentID) {
 				case SegmentTable::SegmentID::DATA:
-					*oldDataVaddr = segmentOffset + dataVaddr; oldDataSegmentOffset = segmentOffset; segmentOffset = dataVaddr; break;
+					*oldDataVaddr = segmentOffset + croPointer; oldDataSegmentOffset = segmentOffset; segmentOffset = dataVaddr; break;
 				case SegmentTable::SegmentID::BSS: segmentOffset = bssVaddr; break;
 				case SegmentTable::SegmentID::TEXT:
 				case SegmentTable::SegmentID::RODATA:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,3 +65,4 @@ fb.bat
		*.smdh

		config.toml
		CMakeSettings.json