* matched both

* use overlay reloc macro

* fix fake looking match

* PR fixes and change other overlay loading functions

* rename

* formatter

* fix build

* re format
This commit is contained in:
louist103
2022-08-04 00:47:01 -04:00
committed by GitHub
parent 8f7f3d24c7
commit fb445b7d4b
3 changed files with 77 additions and 8 deletions
+3 -2
View File
@@ -188,8 +188,9 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initData) {
Load2_LoadOverlay(entry->vromStart, entry->vromEnd, entry->vramStart, entry->vramEnd, entry->loadedRamAddr);
}
initInfo = (uintptr_t)(
(entry->initInfo != NULL) ? (void*)(-OVERLAY_RELOCATION_OFFSET(entry) + (uintptr_t)entry->initInfo) : NULL);
initInfo = (uintptr_t)((entry->initInfo != NULL)
? (void*)((uintptr_t)entry->initInfo - (intptr_t)OVERLAY_RELOCATION_OFFSET(entry))
: NULL);
}
if (initInfo->init != NULL) {