summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandom06457 <28494085+Random06457@users.noreply.github.com>2023-11-19 20:46:01 +0100
committerRandom06457 <28494085+Random06457@users.noreply.github.com>2023-11-19 20:46:01 +0100
commit0f35296cb63de8a6f83e0fe3f10ecfff6f8ea8b1 (patch)
treed860a6a5b7f921c3ba654ff8c63e3f5c6954be23
parent83382e52a7c1842c16b1c3eb02755f0d10a46385 (diff)
fix Camera_GetQuakeOffset
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c2
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c2
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c2
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c2
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c4
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c2
-rw-r--r--mm/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
index 13042cdcc..71453acd6 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
@@ -73,7 +73,7 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) {
Vtx* vtxPtr;
Vec3f quakeOffset;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
OPEN_DISPS(play->state.gfxCtx);
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/mm/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
index 13c7748a5..6340b90ae 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
@@ -67,7 +67,7 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) {
Vtx* vtxPtr;
Vec3f quakeOffset;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
vtxPtr = sEponaSongFrustumVtx;
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/mm/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
index 9f3fd9821..de1a63f59 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
@@ -68,7 +68,7 @@ void OceffWipe3_Draw(Actor* thisx, PlayState* play) {
Vtx* vtxPtr;
Vec3f quakeOffset;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
vtxPtr = sSariaSongFrustumVtx;
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
index 219fdff21..33ceaae39 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
@@ -67,7 +67,7 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) {
Vtx* vtxPtr;
Vec3f quakeOffset;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
if (this->counter < 16) {
z = Math_SinS(this->counter * 0x400) * 1220.0f;
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/mm/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c
index ece41aaf2..16609edc5 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c
@@ -92,7 +92,7 @@ void OceffWipe5_Draw(Actor* thisx, PlayState* play) {
colorIndex = 0;
}
- Camera_GetQuakeOffset(&quakeOffset, activeCam);
+ quakeOffset = Camera_GetQuakeOffset(activeCam);
if (this->counter < 32) {
z = Math_SinS(this->counter << 9) * phi_fv1;
@@ -105,7 +105,7 @@ void OceffWipe5_Draw(Actor* thisx, PlayState* play) {
} else {
alpha = 255;
}
-
+
for (i = 1; i < ResourceMgr_GetArraySizeByName(gOceff5Vtx); i += 2) {
gOceff5VtxData[i].v.cn[3] = alpha;
}
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/mm/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
index cf0737fea..c3e2e4655 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
@@ -69,7 +69,7 @@ void OceffWipe6_Draw(Actor* thisx, PlayState* play) {
s32 pad2;
activeCamEye = GET_ACTIVE_CAM(play)->eye;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
if (this->counter < 32) {
counter = this->counter;
diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/mm/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c
index df503f537..072aca957 100644
--- a/mm/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c
+++ b/mm/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c
@@ -72,7 +72,7 @@ void OceffWipe7_Draw(Actor* thisx, PlayState* play) {
Vec3f quakeOffset;
s32 pad2;
- Camera_GetQuakeOffset(&quakeOffset, GET_ACTIVE_CAM(play));
+ quakeOffset = Camera_GetQuakeOffset(GET_ACTIVE_CAM(play));
if (this->counter < 32) {
z = Math_SinS(this->counter * 0x200) * 1220.0f;