document: Blubber actor from TTC

src/core2/ba/carriedobj.c

@@ -56,7 +56,7 @@ void bacarriedobj_spawn(enum actor_e actor_id){
 void func_8028DEEC(enum actor_e actor_id, Actor *actor){
     f32 sp1C[3];
 
-    nodeprop_getPosition(func_80304C38(actor_id, actor), sp1C);
+    nodeprop_getPosition(nodeprop_findByActorIdAndActorPosition(actor_id, actor), sp1C);
     set_throw_target_position(sp1C);
 }
 

src/core2/ch/mole.c

@@ -349,7 +349,7 @@ void chmole_update(Actor *this){
     if(!this->initialized){
         // Checks if player is within radius of a specific actor exists within the same cube
         // If actor exists and player is within radius, force trigger conversation
-        node_prop = func_80304C38(0x372, this);
+        node_prop = nodeprop_findByActorIdAndActorPosition(0x372, this);
         if(node_prop == NULL){
             this->unk38_0 = FALSE;
         }
@@ -363,7 +363,7 @@ void chmole_update(Actor *this){
         this->marker->collidable = FALSE;
         this->initialized = TRUE;
         if(this->unkF4_8 == 0x12){
-            node_prop = func_80304C38(0x349, this);
+            node_prop = nodeprop_findByActorIdAndActorPosition(0x349, this);
             if(node_prop == NULL){
                 this->velocity[0] = this->position[0];
                 this->velocity[1] = this->position[1];

src/core2/code_47BD0.c

@@ -142,7 +142,7 @@ void func_802CEEA4(Actor *this, Struct_core2_47BD0_0 *arg1) {
 }
 
 
-void func_802CEF54(Actor *this, f32 arg1[3], f32 arg2){
+void func_802CEF54(Actor *this, f32 arg1[3], f32 distance){
     f32 sp34[3];
     s32 phi_v1;
     s32 phi_v0;
@@ -153,7 +153,7 @@ void func_802CEF54(Actor *this, f32 arg1[3], f32 arg2){
 
     phi_v1 = (this->state == 5) ? 200 : 50;
     phi_v0 = (this->state == 5) ? 200 : 100;
-    func_802CEDE4(sp34, this->unk1C, arg2, &this->actor_specific_1_f, (f32) phi_v1, (f32) phi_v0);
+    func_802CEDE4(sp34, this->unk1C, distance, &this->actor_specific_1_f, (f32) phi_v1, (f32) phi_v0);
     this->unk1C[0] = this->unk1C[0] + arg1[0];
     this->unk1C[1] = this->unk1C[1] + arg1[1];
     this->unk1C[2] = this->unk1C[2] + arg1[2];

src/core2/code_599E0.c

@@ -2,13 +2,13 @@
 #include "functions.h"
 #include "variables.h"
 
-s32 func_802E0970(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, bool arg5, f32 arg6[3]) {
+s32 func_802E0970(enum sfx_e sfxId, f32 arg1, f32 arg2, f32 arg3, s32 sampleRate, bool arg5, f32 position[3]) {
     f32 temp_f0;
     f32 phi_f2;
 
     phi_f2 = (arg5) ? arg1 : arg2;
 
     temp_f0 = arg3 * 0.5;
-    func_8030E878(arg0, randf2(phi_f2 - temp_f0, phi_f2 + temp_f0), arg4, arg6, 1000.0f, 2300.0f);
+    func_8030E878(sfxId, randf2(phi_f2 - temp_f0, phi_f2 + temp_f0), sampleRate, position, 1000.0f, 2300.0f);
     return NOT(arg5);
 }

src/core2/code_7AF80.c

@@ -995,7 +995,7 @@ NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 position[3])
     return NULL;
 }
 
-NodeProp *func_80304C38(enum actor_e actor_id, Actor *actor){
+NodeProp *nodeprop_findByActorIdAndActorPosition(enum actor_e actor_id, Actor *actor){
     s32 tmp_position[3];
     s32 *position;
 

src/core2/code_85800.c

@@ -39,7 +39,7 @@ typedef struct {
     u8 unk40;
     u8 unk41;
     u8 busy;
-    u8 unk43_7:3;
+    u8 unk43_7:3; // value is set to 1, 2 or 3
     u8 unk43_4:3;
     u8 unk43_1:2;
 }SfxSource;
@@ -420,11 +420,11 @@ void func_8030D644(void){
     }
 }
 
-void func_8030D6C4(enum sfx_e uid, f32 arg1, s32 arg2, s32 arg3, s32 arg4){
+void func_8030D6C4(enum sfx_e uid, f32 arg1, s32 sampleRate, s32 arg3, s32 arg4){
     u8 indx = sfxsource_createSfxsourceAndReturnIndex();
     if(indx){
         sfxsource_setSfxId(indx, uid);
-        sfxsource_setSampleRate(indx, arg2);
+        sfxsource_setSampleRate(indx, sampleRate);
         sfxsource_playSfxAtVolume(indx, arg1);
         func_8030DCCC(indx, arg3);
         func_8030DD14(indx, 1);
@@ -850,8 +850,8 @@ void func_8030E4E4(enum sfx_e uid){
     func_8030D6C4(uid, 1.0f, 22000, 0, 0);
 }
 
-void sfxsource_play(enum sfx_e uid, s32 sample_rate){
-    func_8030D6C4(uid, 1.0f, sample_rate, 0, 2);
+void sfxsource_play(enum sfx_e uid, s32 sampleRate){
+    func_8030D6C4(uid, 1.0f, sampleRate, 0, 2);
 }
 
 void func_8030E540(enum sfx_e uid){

src/core2/code_9E370.c

@@ -1932,7 +1932,7 @@ void func_8032A82C(Actor *arg0, s32 arg1) {
     Actorlocal_Core2_9E370 *sp1C;
 
     sp1C = &arg0->local;
-    sp24 = func_80304C38(arg1, arg0);
+    sp24 = nodeprop_findByActorIdAndActorPosition(arg1, arg0);
     if (sp24 != NULL) {
         sp1C->unkC = func_80304DA8(sp24);
         nodeprop_getPosition(sp24, sp1C->unk0);