izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix several ocarina effects (#108)

Browse Source
This commit is contained in:
Rozelette
2024-05-22 09:04:59 -05:00
committed by Garrett Cox
parent 6164a75d67
commit 21e27a512b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
+3 -1
View File
@@ -197,7 +197,9 @@ void OceffStorm_Draw2(Actor* thisx, PlayState* play) {
void OceffStorm_Draw(Actor* thisx, PlayState* play) {
u32 scroll = play->state.frames & 0xFFF;
OceffStorm* this = (OceffStorm*)thisx;
Vtx* vtxPtr = sSongOfStormsCylinderVtx;
// #region 2S2H [Port] Originally this was just a pointer to the vertices, now it's the OTR path so we need to grab it's actual address
Vtx* vtxPtr = ResourceMgr_LoadVtxByName(sSongOfStormsCylinderVtx);
// #endregion
OPEN_DISPS(play->state.gfxCtx);
mm/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
+3 -1
View File
@@ -94,7 +94,9 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) {
}
for (i = 0; i < 20; i++) {
vtxPtr = sSongOfTimeFrustumVtx;
// #region 2S2H [Port] Originally this was just a pointer to the vertices, now it's the OTR path so we need to grab it's actual address
vtxPtr = ResourceMgr_LoadVtxByName(sSongOfTimeFrustumVtx);
// #endregion
vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[(sAlphaIndices[i] & 0xF0) >> 4];
vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sAlphaIndices[i] & 0xF];
}