* 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
+4 -4
View File
@@ -3153,10 +3153,10 @@ ActorInit* Actor_LoadOverlay(ActorContext* actorCtx, s16 index) {
overlayEntry->numLoaded = 0;
}
actorInit =
(uintptr_t)((overlayEntry->initInfo != NULL)
? (void*)(-OVERLAY_RELOCATION_OFFSET(overlayEntry) + (uintptr_t)overlayEntry->initInfo)
: NULL);
actorInit = (uintptr_t)(
(overlayEntry->initInfo != NULL)
? (void*)((uintptr_t)overlayEntry->initInfo - (intptr_t)OVERLAY_RELOCATION_OFFSET(overlayEntry))
: NULL);
}
return actorInit;