EffectSs Sync (#1799)

* gEffectSsOverlayTable

* Sync with OoT docs

3 files changed, 22 insertions, 22 deletions

diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
index d54d91324..64cee0bf1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
@@ -174,21 +174,21 @@ void EffectSsBomb2_Update(PlayState* play, u32 index, EffectSs* this) {
 
     if ((this->life < 23) && (this->life > 13)) {
         divisor = this->life - 13;
-        this->rPrimColorR = func_800B096C(this->rPrimColorR, 255, divisor);
-        this->rPrimColorG = func_800B096C(this->rPrimColorG, 255, divisor);
-        this->rPrimColorB = func_800B096C(this->rPrimColorB, 150, divisor);
-        this->rPrimColorA = func_800B096C(this->rPrimColorA, 255, divisor);
-        this->rEnvColorR = func_800B096C(this->rEnvColorR, 150, divisor);
-        this->rEnvColorG = func_800B096C(this->rEnvColorG, 0, divisor);
-        this->rEnvColorB = func_800B096C(this->rEnvColorB, 0, divisor);
+        this->rPrimColorR = EffectSs_LerpInv(this->rPrimColorR, 255, divisor);
+        this->rPrimColorG = EffectSs_LerpInv(this->rPrimColorG, 255, divisor);
+        this->rPrimColorB = EffectSs_LerpInv(this->rPrimColorB, 150, divisor);
+        this->rPrimColorA = EffectSs_LerpInv(this->rPrimColorA, 255, divisor);
+        this->rEnvColorR = EffectSs_LerpInv(this->rEnvColorR, 150, divisor);
+        this->rEnvColorG = EffectSs_LerpInv(this->rEnvColorG, 0, divisor);
+        this->rEnvColorB = EffectSs_LerpInv(this->rEnvColorB, 0, divisor);
     } else if ((this->life < 14) && (this->life > -1)) {
         divisor = this->life + 1;
-        this->rPrimColorR = func_800B096C(this->rPrimColorR, 50, divisor);
-        this->rPrimColorG = func_800B096C(this->rPrimColorG, 50, divisor);
-        this->rPrimColorB = func_800B096C(this->rPrimColorB, 50, divisor);
-        this->rPrimColorA = func_800B096C(this->rPrimColorA, 150, divisor);
-        this->rEnvColorR = func_800B096C(this->rEnvColorR, 10, divisor);
-        this->rEnvColorG = func_800B096C(this->rEnvColorG, 10, divisor);
-        this->rEnvColorB = func_800B096C(this->rEnvColorB, 10, divisor);
+        this->rPrimColorR = EffectSs_LerpInv(this->rPrimColorR, 50, divisor);
+        this->rPrimColorG = EffectSs_LerpInv(this->rPrimColorG, 50, divisor);
+        this->rPrimColorB = EffectSs_LerpInv(this->rPrimColorB, 50, divisor);
+        this->rPrimColorA = EffectSs_LerpInv(this->rPrimColorA, 150, divisor);
+        this->rEnvColorR = EffectSs_LerpInv(this->rEnvColorR, 10, divisor);
+        this->rEnvColorG = EffectSs_LerpInv(this->rEnvColorG, 10, divisor);
+        this->rEnvColorB = EffectSs_LerpInv(this->rEnvColorB, 10, divisor);
     }
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c
index 174b86b16..7d8010385 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c
@@ -153,11 +153,11 @@ void EffectSsHitmark_Update(PlayState* play, u32 index, EffectSs* this) {
 
     if (this->rTexIndex != 0) {
         colorIndex = this->rType * 4 + 2;
-        this->rPrimColorR = func_800B096C(this->rPrimColorR, sColors[colorIndex].r, this->life + 1);
-        this->rPrimColorG = func_800B096C(this->rPrimColorG, sColors[colorIndex].g, this->life + 1);
-        this->rPrimColorB = func_800B096C(this->rPrimColorB, sColors[colorIndex].b, this->life + 1);
-        this->rEnvColorR = func_800B096C(this->rEnvColorR, sColors[colorIndex + 1].r, this->life + 1);
-        this->rEnvColorG = func_800B096C(this->rEnvColorG, sColors[colorIndex + 1].g, this->life + 1);
-        this->rEnvColorB = func_800B096C(this->rEnvColorB, sColors[colorIndex + 1].b, this->life + 1);
+        this->rPrimColorR = EffectSs_LerpInv(this->rPrimColorR, sColors[colorIndex].r, this->life + 1);
+        this->rPrimColorG = EffectSs_LerpInv(this->rPrimColorG, sColors[colorIndex].g, this->life + 1);
+        this->rPrimColorB = EffectSs_LerpInv(this->rPrimColorB, sColors[colorIndex].b, this->life + 1);
+        this->rEnvColorR = EffectSs_LerpInv(this->rEnvColorR, sColors[colorIndex + 1].r, this->life + 1);
+        this->rEnvColorG = EffectSs_LerpInv(this->rEnvColorG, sColors[colorIndex + 1].g, this->life + 1);
+        this->rEnvColorB = EffectSs_LerpInv(this->rEnvColorB, sColors[colorIndex + 1].b, this->life + 1);
     }
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
index 5b387712c..91ac0b80d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
@@ -73,14 +73,14 @@ u32 EffectSsLightning_Init(PlayState* play, u32 index, EffectSs* this, void* ini
 void EffectSsLightning_NewLightning(PlayState* play, Vec3f* pos, s32 yaw, EffectSs* this) {
     EffectSs newLightning;
 
-    EffectSS_Delete(&newLightning);
+    EffectSs_Delete(&newLightning);
     newLightning = *this;
     newLightning.pos = *pos;
     newLightning.rNumBolts--;
     newLightning.rYaw = yaw;
     newLightning.life = newLightning.rLifespan;
 
-    EffectSS_Copy(play, &newLightning);
+    EffectSs_Insert(play, &newLightning);
 }
 
 void EffectSsLightning_Draw(PlayState* play, u32 index, EffectSs* this) {