diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-01-30 16:30:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 19:30:27 -0500 |
| commit | 77c9c97ff9c1ca822e8f72575cd6a02eabc1b716 (patch) | |
| tree | e8db8d33d973203f3f8b33203e5214eb4ca91441 /include | |
| parent | 2beff8cbf4ec619fd25d8c4fa2678bfd88a2e4c4 (diff) | |
Overlay_Relocate and Overlay_Load retail OK (#1662)
* Overlay_Relocate OK
* Overlay_Load
* format
* PR + better match for Overlay_Load
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/ultra64/libc.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index afe206318..fea1e252d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1717,8 +1717,8 @@ void RcpUtils_Reset(void); void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd); void MtxConv_F2L(Mtx* m1, MtxF* m2); void MtxConv_L2F(MtxF* m1, Mtx* m2); -void Overlay_Relocate(void* allocatedRamAddress, OverlayRelocationSection* ovlRelocs, void* vramStart); -s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr); +void Overlay_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart); +size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr); // ? func_800FC800(?); // ? func_800FC83C(?); // ? func_800FCAB4(?); diff --git a/include/ultra64/libc.h b/include/ultra64/libc.h index 31898a967..f297bfd0d 100644 --- a/include/ultra64/libc.h +++ b/include/ultra64/libc.h @@ -5,8 +5,8 @@ void osSyncPrintf(const char* fmt, ...); -void bzero(void* __s, size_t __n); -int bcmp(const void* __sl, const void* __s2, size_t __n); -void bcopy(const void* __src, void* __dest, size_t __n); +void bzero(void* __s, int __n); +int bcmp(const void* __sl, const void* __s2, int __n); +void bcopy(const void* __src, void* __dest, int __n); #endif |