mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-09 11:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc Cleanup (#1585)

Browse Source 
* misc cleanup

* more fake matches

* revert for sym
This commit is contained in:
engineer124
2023-11-22 20:19:31 +11:00
committed by GitHub
parent 2aaa286cf8
commit f2c06ce441
45 changed files with 134 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
+3 -5
View File
@@ -59,10 +59,10 @@ u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initP
return 1;
}
void EffectSsGRipple_DrawRipple(PlayState* play, EffectSs* this, void* segment) {
GraphicsContext* gfxCtx = play->state.gfxCtx;
void EffectSsGRipple_DrawRipple(PlayState* play2, EffectSs* this, void* segment) {
PlayState* play = play2;
f32 radius;
s32 pad;
GraphicsContext* gfxCtx = play->state.gfxCtx;
MtxF mfTrans;
MtxF mfScale;
MtxF mfResult;
@@ -71,8 +71,6 @@ void EffectSsGRipple_DrawRipple(PlayState* play, EffectSs* this, void* segment)
OPEN_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 199);
if (play) {}
radius = this->rRadius * 0.0025f;
if ((this->rWaterBoxNum != -1) && (this->rWaterBoxNum < play->colCtx.colHeader->numWaterBoxes)) {
src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+3 -3
View File
@@ -80,7 +80,7 @@ void EffectSsIcePiece_Draw(PlayState* play, u32 index, EffectSs* this) {
void EffectSsIcePiece_Update(PlayState* play, u32 index, EffectSs* this) {
this->rPitch += this->rRotSpeed;
this->velocity.x = this->velocity.x * 0.85f;
this->velocity.y = this->velocity.y * 0.85f;
this->velocity.z = this->velocity.z * 0.85f;
this->velocity.x *= 0.85f;
this->velocity.y *= 0.85f;
this->velocity.z *= 0.85f;
}