summaryrefslogtreecommitdiff
path: root/src/code/z_lib.c
diff options
context:
space:
mode:
authorrozlette <uberpanzermensch@gmail.com>2019-12-14 23:38:35 -0600
committerrozlette <uberpanzermensch@gmail.com>2019-12-14 23:38:35 -0600
commit9bc4990814d2e953df294bc57f7bca1918bd3bac (patch)
tree9f0ea9c0964956d25056bda289b13fa8c00f1128 /src/code/z_lib.c
parentd6f9c091cc3bec8425e9bcf93ce39f1d9b733c94 (diff)
Update to latest from ghidra project
Diffstat (limited to 'src/code/z_lib.c')
-rw-r--r--src/code/z_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 34c971601..e9eb805eb 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -581,7 +581,7 @@ void Lib_ScaleMax_s(s16* a0, s16 a1, s16 a2, s16 a3) {
*a0 += v0;
}
-UNK_RET Lib_CopyColor(Color* a0, Color* a1) {
+UNK_RET Lib_CopyColor(ColorRGBA8* a0, ColorRGBA8* a1) {
a0->red = a1->red;
a0->green = a1->green;
a0->blue = a1->blue;
@@ -589,7 +589,7 @@ UNK_RET Lib_CopyColor(Color* a0, Color* a1) {
}
UNK_RET func_801000A4(u16 a0) {
- func_8019F0C8(a0);
+ play_sound(a0);
}
UNK_RET func_801000CC(u16 a0) {
@@ -649,16 +649,16 @@ f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2) {
void Lib_Nop801004FC(void) {}
-u32 Lib_PtrSegToPhys(u32 a0) {
- return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
+u32 Lib_PtrSegToVirt(u32 a0) {
+ return(gRspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
}
-u32 Lib_PtrSegToPhysNull(u32 a0) {
+u32 Lib_PtrSegToVirtNull(u32 a0) {
if ((a0 >> 28) == 0) {
return a0;
}
- return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
+ return(gRspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
}
u32 Lib_PtrSegToK0(u32 a0) {