Some Solar Docs

sonicdcer · Jan 12, 2025 · 66c3a4b · 66c3a4b
1 parent 7805784
commit 66c3a4b
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 131 deletions.
diff --git a/include/functions.h b/include/functions.h
@@ -277,7 +277,7 @@ void Effect_Effect357_Draw(Effect* );
 void Effect_Effect383_Update(Effect* );
 void Effect_Effect383_Draw(Effect* );
 void Effect_Effect383_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
-void Effect_SetupTimedSfxAtPos(Effect* , Vec3f* pos, u32 sfxId);
+void Effect_TimedSfxAtPos_Setup(Effect* , Vec3f* pos, u32 sfxId);
 void Effect_SpawnTimedSfxAtPos(Vec3f* pos, s32 sfxId);
 void Effect_TimedSfx_Update(Effect*);
 bool func_effect_8007A774(Player*, Effect*, f32);

diff --git a/include/i3.h b/include/i3.h
@@ -73,8 +73,8 @@ void Zoness_ZoBarrier_Draw(Actor* this);
 void Zoness_LevelStart(Player* player);
 void Zoness_LevelComplete(Player* player);
 
-void Solar_8019E8B8(f32, f32, f32, f32);
-void Solar_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
+void Solar_Effect392_Spawn1(f32, f32, f32, f32);
+void Solar_Effect392_Spawn2(f32, f32, f32, f32, f32, f32, f32, s32);
 void Solar_SoWave_Update(SoWave*);
 void Solar_SoRock_Update(Actor*);
 void Solar_SoRock_Draw(Actor*);

diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c
@@ -952,7 +952,7 @@ void Effect_Effect383_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
     Effect_Effect384_Spawn(xPos, yPos, zPos, 80.0f, 4);
 }
 
-void Effect_SetupTimedSfxAtPos(TimedSfx* this, Vec3f* pos, u32 sfxId) {
+void Effect_TimedSfxAtPos_Setup(TimedSfx* this, Vec3f* pos, u32 sfxId) {
     Effect_Initialize(this);
     this->obj.status = OBJ_ACTIVE;
     this->obj.id = OBJ_EFFECT_TIMED_SFX;
@@ -980,7 +980,7 @@ void Effect_SpawnTimedSfxAtPos(Vec3f* pos, s32 sfxId) {
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
         if (gEffects[i].obj.status == OBJ_FREE) {
-            Effect_SetupTimedSfxAtPos(&gEffects[i], pos, sfxId);
+            Effect_TimedSfxAtPos_Setup(&gEffects[i], pos, sfxId);
             break;
         }
     }

diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
@@ -3562,8 +3562,8 @@ void ActorEvent_Update(ActorEvent* this) {
                     this->animFrame = 0;
                 }
                 if ((gGameFrameCount % 3) == 0) {
-                    Solar_8019E9F4(this->obj.pos.x, this->obj.pos.y - 20, this->obj.pos.z - 180.0f, 0.0f,
-                                   RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2);
+                    Solar_Effect392_Spawn2(this->obj.pos.x, this->obj.pos.y - 20, this->obj.pos.z - 180.0f, 0.0f,
+                                           RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2);
                 }
             } else if (this->animFrame >= Animation_GetFrameCount(&aFirebirdAnim)) {
                 this->animFrame = 0;

diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
@@ -6821,9 +6821,9 @@ void Play_UpdateLevel(void) {
             Audio_SetHeatAlarmParams(shields, heightParam);
 
             if (((gGameFrameCount % 8) == 0) && (gPlayer[0].state != PLAYERSTATE_LEVEL_COMPLETE)) {
-                Solar_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), -80.0f,
-                               gPlayer[0].trueZpos + (RAND_FLOAT(2000.0f) + -6000.0f),
-                               RAND_FLOAT(10.0f) + 20.0f); // check
+                Solar_Effect392_Spawn1(RAND_FLOAT_CENTERED(6000.0f), -80.0f,
+                                       gPlayer[0].trueZpos + (RAND_FLOAT(2000.0f) + -6000.0f),
+                                       RAND_FLOAT(10.0f) + 20.0f); // check
             }
 
             HUD_Texture_Wave(D_SO_60229A4, D_SO_6010198);