mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-04 18:58:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

More work on z_scene_proc.c 31/36 matching, 3 non-matching, 2 not attempted

Browse Source
This commit is contained in:
rozlette
2019-12-29 21:34:58 -06:00
parent fe8a5a216e
commit 8d8df1848e
13 changed files with 612 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_lib.c
+12 -12
View File
@@ -649,30 +649,30 @@ f32 Lib_PushAwayVec3f(Vector3f* start, Vector3f* pusher, f32 distanceToApproach)
void Lib_Nop801004FC(void) {}
u32 Lib_PtrSegToVirt(u32 ptr) {
return(gRspSegmentPhysAddrs[(ptr << 4) >> 28] + (ptr & 0xFFFFFF)) + 0x80000000;
u32 Lib_PtrSegToVirt(void* ptr) {
return(gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000;
}
u32 Lib_PtrSegToVirtNull(u32 ptr) {
if ((ptr >> 28) == 0) {
return ptr;
u32 Lib_PtrSegToVirtNull(void* ptr) {
if (((u32)ptr >> 28) == 0) {
return (u32)ptr;
}
return(gRspSegmentPhysAddrs[(ptr << 4) >> 28] + (ptr & 0xFFFFFF)) + 0x80000000;
return(gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000;
}
u32 Lib_PtrSegToK0(u32 ptr) {
if (ptr == 0) {
u32 Lib_PtrSegToK0(void* ptr) {
if (ptr == NULL) {
return 0;
} else {
return ptr + 0x80000000;
return (u32)ptr + 0x80000000;
}
}
u32 Lib_PtrSegToK0Null(u32 ptr) {
if (ptr == 0) {
u32 Lib_PtrSegToK0Null(void* ptr) {
if (ptr == NULL) {
return 0;
} else {
return ptr + 0x80000000;
return (u32)ptr + 0x80000000;
}
}