mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 01:10:33 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup unnecessary &'s on function/array pointers (#1031)

Browse source
This commit is contained in:
Roman971 2021-11-28 11:47:55 +01:00 • committed by GitHub
parent 6efb590699
commit d241bfb7ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 106 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
View file

@ -24,7 +24,7 @@ u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
//! @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro.
// In the base game this works out because both addresses are segment 4, but it may break if
// the addresses were changed to refer to different segments
this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &gEffBubble1Tex : &gEffBubble2Tex);
this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? gEffBubble1Tex : gEffBubble2Tex);
this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x;
this->pos.y = (((Rand_ZeroOne() - 0.5f) * initParams->yPosRandScale) + initParams->yPosOffset) + initParams->pos.y;
this->pos.z = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.z;

2
src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
View file

@ -37,7 +37,7 @@ u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v
//! @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro.
// In the base game this works out because both addresses are segment 4, but it may break if
// the addresses were changed to refer to different segments
this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &gEffBubble1Tex : &gEffBubble2Tex);
this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? gEffBubble1Tex : gEffBubble2Tex);
this->pos = initParams->pos;
this->velocity = initParams->velocity;
this->accel = initParams->accel;

4
src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
View file

@ -36,9 +36,9 @@ u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
this->accel = initParams->accel;
if (KREG(2) != 0) {
this->gfx = SEGMENTED_TO_VIRTUAL(&gEffBubble2Tex);
this->gfx = SEGMENTED_TO_VIRTUAL(gEffBubble2Tex);
} else {
this->gfx = SEGMENTED_TO_VIRTUAL(&gEffBubble1Tex);
this->gfx = SEGMENTED_TO_VIRTUAL(gEffBubble1Tex);
}
this->life = ((s16)((Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10;