decomp: clarify function, field and state names (batch 37)

include/rnc/hero/hero_state.h

@@ -135,6 +135,10 @@ enum HeroStateId {
     HERO_STATE_DYING_ZERO_HEALTH = 0x82
 };
 
+enum HeroAnimationEntryMode {
+    HERO_ANIMATION_ENTRY_OVERRIDE_GUARDS = 0x2
+};
+
 enum HeroVehicleMode {
     HERO_VEHICLE_MODE_ON_FOOT = 0x0,
     HERO_VEHICLE_MODE_CLANK = 0x1,

include/rnc/mobys/moby_state.h

@@ -0,0 +1,9 @@
+#ifndef LOMBYTE_RNC_MOBYS_MOBY_STATE_H
+#define LOMBYTE_RNC_MOBYS_MOBY_STATE_H
+
+enum MobyRemovalState {
+    MOBY_STATE_ALTERNATE_REMOVAL_MARKER = 0xFD,
+    MOBY_STATE_REMOVAL_MARKER = 0xFE
+};
+
+#endif /* LOMBYTE_RNC_MOBYS_MOBY_STATE_H */

include/rnc/overlay/shared/game/queue_planet_unlock_message.h

@@ -5,6 +5,6 @@
 
 void queue_planet_unlock_message(s32) __asm__("FUN_L00_00262d38");
 
-void FUN_L00_00262cf0(void *, void *);
+void fast_add_rotations_cf_spherical_offset(void *, void *) __asm__("FUN_L00_00262cf0");
 
 #endif /* LOMBYTE_RNC_OVERLAY_SHARED_GAME_QUEUE_PLANET_UNLOCK_MESSAGE_H */

include/rnc/overlay/shared/mobys/test_path_segment_strict_crossing.h

@@ -7,7 +7,7 @@ void update_joint_animation(void *m, unsigned char *p, int c, float fa, float fb
 void initialize_moby_transform_history(int   source_moby,
                                        char *history_state) __asm__("FUN_L00_00262500");
 
-int  FUN_L00_00261b48(int, void *, void *, void *);
+int  path_8808(int, void *, void *, void *) __asm__("FUN_L00_00261b48");
 void path_sample_at_distance(int, float *, float *, void *, float, float) __asm__("FUN_L00_00262360");
 
 #endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_TEST_PATH_SEGMENT_STRICT_CROSSING_H */

src/audio/voices/is_voice_active.c

@@ -6,7 +6,7 @@ struct VoiceState {
     u8  pad_0[0x74];
     u8  unk74;
     u8  pad_75[0x9];
-    s16 unk7E;
+    s16 resolved_sound_id;
 };
 
 s32 is_voice_active(s32 voice_index, s32 sound_id) __asm__("FUN_001eb740");
@@ -16,7 +16,7 @@ s32 is_voice_active(s32 voice_index, s32 sound_id) {
 
     if (voice_index >= 0) {
         voice = (struct VoiceState *)(voice_index * 0x70 + ((u8 *)&voice_pool));
-        if (voice->unk7E == sound_id + D_0015F5B4) {
+        if (voice->resolved_sound_id == sound_id + D_0015F5B4) {
             if ((u32)(voice->unk74 - 1) < 2) {
                 return 1;
             }

src/camera/apply_camera_shake.c

@@ -26,7 +26,7 @@ void apply_camera_shake(struct CameraShake *shake, s32 axis_index) {
     f32 total_frames_float;
     f32 remaining_frame_ratio;
     f32 oscillation_cosine;
-    f32 val;
+    f32 applied_shake_offset;
     s32 remaining_frames;
 
     if (cur_cam[0] != 0 && cur_cam[0]->unk86 == 6) {
@@ -44,12 +44,13 @@ void apply_camera_shake(struct CameraShake *shake, s32 axis_index) {
             remaining_frame_ratio = remaining_frames_float / total_frames_float;
             oscillation_cosine =
                 fast_cos(fast_normalize_angle(2.0f * convert_integer_to_float(shake->unk8)));
-            val = shake->unk0 * oscillation_cosine * remaining_frame_ratio * remaining_frame_ratio;
-            shake->unk4 = val;
+            applied_shake_offset =
+                shake->unk0 * oscillation_cosine * remaining_frame_ratio * remaining_frame_ratio;
+            shake->unk4 = applied_shake_offset;
             if (axis_index == 0) {
-                fast_vec_normalize(shake_offset, D_001872B0, val);
+                fast_vec_normalize(shake_offset, D_001872B0, applied_shake_offset);
             } else {
-                fast_vec_normalize(shake_offset, camera_rows, val);
+                fast_vec_normalize(shake_offset, camera_rows, applied_shake_offset);
             }
             fast_vec_add(camera_position, camera_position, shake_offset);
         } else {

src/camera/camera_activation_check_priority.c

@@ -101,8 +101,9 @@ int camera_activation_check_priority(struct UpdateCam *candidate, struct UpdateC
             return 1;
         }
         {
-            CamRec20 *rec = &D_0015EF90[candidate->descriptor_index];
-            int       secondary_descriptor_index = *(int *)((char *)rec->unk1C + 0x24);
+            CamRec20 *candidate_descriptor_entry = &D_0015EF90[candidate->descriptor_index];
+            int       secondary_descriptor_index =
+                *(int *)((char *)candidate_descriptor_entry->unk1C + 0x24);
 
             if (secondary_descriptor_index < 0 ||
                 (hero_state->rail_spline == D_0015EF40[secondary_descriptor_index].unk10 &&

src/camera/restore_camera_vectors.c

@@ -6,8 +6,11 @@
 void restore_camera_vectors(void) __asm__("FUN_001ec868");
 
 void restore_camera_vectors(void) {
+    enum {
+        CAMERA_TRANSITION_ALTERNATE_DISABLED = 0
+    };
     struct CameraTransition *transition = &cam_trans_state;
-    if (transition->kind != 0) {
+    if (transition->kind != CAMERA_TRANSITION_ALTERNATE_DISABLED) {
         qcopy(transition->blend.position, transition->orbit.saved_position);
         qcopy(transition->blend.rotation, transition->orbit.saved_rotation);
     }

src/camera/start_camera_blend.c

@@ -21,18 +21,22 @@ void start_camera_blend(struct UpdateCam *source) {
         CAMERA_TRANSITION_KIND_BLEND = 0,
         CAMERA_TRANSITION_PHASE_SEED_FROM_SOURCE = 1
     };
+    enum {
+        CAMERA_TRANSITION_KIND_ORBIT_ACTIVE_CAMERA = 1,
+        CAMERA_TRANSITION_KIND_ORBIT_SHARED_TARGET = 2
+    };
     struct CameraTransition *transition = &cam_trans_state;
     char                     orbit_reference_direction[16];
     char                     orbit_yaw_side_direction[16];
     char                     orbit_axis[16];
-    unsigned char            sub;
+    unsigned char            requested_transition_kind;
 
     if (transition->mode == CAMERA_TRANSITION_PHASE_SEED_FROM_SOURCE) {
-        sub = transition->requested_kind;
-        if (sub == 0) {
+        requested_transition_kind = transition->requested_kind;
+        if (requested_transition_kind == CAMERA_TRANSITION_KIND_BLEND) {
             qcopy(transition->blend.position, &source->pos);
             extract_matrix_rotation_quaternion(transition->blend.rotation, source);
-        } else if (sub == 2) {
+        } else if (requested_transition_kind == CAMERA_TRANSITION_KIND_ORBIT_SHARED_TARGET) {
             qcopy(transition->orbit.saved_position, &source->pos);
             extract_matrix_rotation_quaternion(transition->orbit.saved_rotation, source);
             capture_camera_orientation();
@@ -55,14 +59,14 @@ void start_camera_blend(struct UpdateCam *source) {
             qcopy(transition->orbit.saved_rotation, transition->orbit.rotation);
         }
     } else {
-        sub = transition->requested_kind;
-        if (sub == 2) {
+        requested_transition_kind = transition->requested_kind;
+        if (requested_transition_kind == CAMERA_TRANSITION_KIND_ORBIT_SHARED_TARGET) {
             save_camera_vectors();
             capture_camera_orientation();
-        } else if (sub == 1) {
+        } else if (requested_transition_kind == CAMERA_TRANSITION_KIND_ORBIT_ACTIVE_CAMERA) {
             save_camera_vectors();
             qcopy(transition->orbit.rotation, transition->orbit.saved_rotation);
-        } else if (sub == 0) {
+        } else if (requested_transition_kind == CAMERA_TRANSITION_KIND_BLEND) {
             restore_camera_vectors();
         }
     }

src/game/missions/collect_mission_ids.c

@@ -16,6 +16,9 @@ int collect_mission_ids(int *out,
                         int  use_selected_ids) __asm__("FUN_0020bc00");
 
 int collect_mission_ids(int *mission_ids, int *mask, int *nums, int use_selected_ids) {
+    enum {
+        MISSION_STATUS_ALL_CONDITIONS_MET = 2
+    };
     MissionNode *mission_node_cursor = mission_id_collection_node_source[0];
     int          count = 0;
     int          all = 1;
@@ -40,11 +43,12 @@ int collect_mission_ids(int *mission_ids, int *mask, int *nums, int use_selected
         if (!(f & 2) && t != 0 && !((f & 1) && t == 2)) {
             mission_ids[count] = mission_node_cursor->id;
             if (use_selected_ids != 0) {
-                mission_ids[count] = (mission_node_cursor->status == 2)
-                                         ? 0x523E
-                                         : mission_node_cursor->ids[mission_node_cursor->sel];
+                mission_ids[count] =
+                    (mission_node_cursor->status == MISSION_STATUS_ALL_CONDITIONS_MET)
+                        ? 0x523E
+                        : mission_node_cursor->ids[mission_node_cursor->sel];
             }
-            if (mask != 0 && mission_node_cursor->status == 2) {
+            if (mask != 0 && mission_node_cursor->status == MISSION_STATUS_ALL_CONDITIONS_MET) {
                 *mask |= 1 << count;
             }
             if (nums != 0) {

src/input/init_pads.c

@@ -9,22 +9,26 @@ typedef struct {
     u8  reserve[4];
 } scePad2SocketParam;
 
-scePad2SocketParam D_001CD760 = {0};
+scePad2SocketParam controller_socket_params __asm__("D_001CD760") = {0};
 
 extern s32 scePad2Init(s32);
 extern s32 scePad2CreateSocket(scePad2SocketParam *, void *);
 void       init_pads(void) __asm__("FUN_00217048");
 
 void init_pads(void) {
+    enum {
+        CONTROLLER_PROFILE_INITIAL_STATE = 0,
+        CONTROLLER_DEVICE_INITIAL_STATE = 0
+    };
     sceDbcInit();
     scePad2Init(0);
-    D_001CD760.port = 2;
-    D_001CD760.slot = 0;
-    controller_state.socket = scePad2CreateSocket(&D_001CD760, &controller_state);
-    D_001CD760.port = 2;
-    D_001CD760.slot = 1;
-    controller_state.profile_state = 0;
-    controller_state.device_state = 0;
+    controller_socket_params.port = 2;
+    controller_socket_params.slot = 0;
+    controller_state.socket = scePad2CreateSocket(&controller_socket_params, &controller_state);
+    controller_socket_params.port = 2;
+    controller_socket_params.slot = 1;
+    controller_state.profile_state = CONTROLLER_PROFILE_INITIAL_STATE;
+    controller_state.device_state = CONTROLLER_DEVICE_INITIAL_STATE;
 }
 
 extern __typeof__(init_pads) func_00217048 __attribute__((alias("FUN_00217048")));

src/input/poll_pad_device_state.c

@@ -41,9 +41,9 @@ void poll_pad_device_state(struct PadState *pad_state) {
                 for (i = 0; i < byte_count; i++) {
                     pad_state->button_profile[i] = pad_response_buffer[i];
                 }
-                pad_state->profile_state = 1;
+                pad_state->profile_state = PAD_INPUT_POLLING;
             } else {
-                pad_state->profile_state = 2;
+                pad_state->profile_state = PAD_BUTTON_PROFILE_TOO_LARGE;
                 byte_count = 0;
             }
             for (i = byte_count; i < 4; i++) {
@@ -73,7 +73,7 @@ void poll_pad_device_state(struct PadState *pad_state) {
         }
     } else {
         clear_pad_input(pad_state);
-        pad_state->profile_state = 0;
+        pad_state->profile_state = PAD_PROFILE_INITIALIZATION;
     }
     pad_state->unk188 = 0;
     pad_state->unk189 = 0;

src/mobys/attach_manipulator.c

@@ -6,7 +6,7 @@ typedef struct MobyAttachOwner {
     u8           pad0[0x24];
     void        *unk24;
     u8           pad28[0x3C];
-    Manipulator *unk64;
+    Manipulator *manipulator_head;
 } MobyAttachOwner;
 
 struct Manipulator {
@@ -43,8 +43,8 @@ void attach_manipulator(MobyAttachOwner *source_moby, s32 slot_index, Manipulato
             u8 record_byte_offset = *slot_record;
             manip->unk4 = (void *)((slot_record[record_byte_offset + 4] << 6) + 0x70000000);
         }
-        manip->unk8 = source_moby->unk64;
-        source_moby->unk64 = manip;
+        manip->unk8 = source_moby->manipulator_head;
+        source_moby->manipulator_head = manip;
     }
 }
 

src/mobys/init_moby_instance.c

@@ -65,9 +65,9 @@ typedef struct {
     unsigned char  unkA3; /* 0xA3 */
     unsigned char  unkA4; /* 0xA4 */
     char           padA5;
-    short          unkA6; /* 0xA6 */
-    int            unkA8; /* 0xA8 */
-    int            unkAC; /* 0xAC */
+    short          original_class_id; /* 0xA6 */
+    int            unkA8;             /* 0xA8 */
+    int            unkAC;             /* 0xAC */
     char           padB0[0xD];
     unsigned char  unkBD; /* 0xBD */
     char           padBE[0x42];
@@ -102,7 +102,7 @@ void init_moby_instance(void *moby_mem, int oClass) {
     moby_instance->unk21 = 0xFF;
     moby_instance->unk71 = 0xFF;
     moby_instance->unk72 = 0xFF;
-    moby_instance->unkA6 = oClass;
+    moby_instance->original_class_id = oClass;
     moby_instance->unk38 = 0x40404000000000L;
     moby_instance->unk36 = 0x7F80;
     resident_pool_slot_index = ((char *)moby_instance - (char *)resident_object_pool) >> 8;

src/mobys/prune_moby_references.c

@@ -5,7 +5,7 @@ struct MobyRecord {
     u8 pad_0[0x20];
     u8 unk20;
     u8 pad_21[0x31];
-    u8 unk52;
+    u8 primary_binding_selector;
 };
 
 void prune_moby_references(void) __asm__("FUN_0020cc60");
@@ -21,7 +21,7 @@ void prune_moby_references(void) {
     do {
         moby = *slot;
         remaining -= 1;
-        if ((moby != NULL) && ((moby->unk20 & 0x80) || (moby->unk52 != mask))) {
+        if ((moby != NULL) && ((moby->unk20 & 0x80) || (moby->primary_binding_selector != mask))) {
             *slot = NULL;
         }
         slot += 1;

src/mobys/update_moby_voice.c

@@ -5,12 +5,12 @@
 struct MobyVoiceFlags {
     u8 pad_0[0x7C];
     u8 unk7C;
-    u8 unk7D;
+    u8 current_voice_slot_index;
 };
 
 struct MobyVoiceEntry {
     u8  pad_0[0x7E];
-    s16 unk7E;
+    s16 voice_entry_index;
     u8  pad_80[0x8];
     s32 unk88;
 };
@@ -23,17 +23,17 @@ void update_moby_voice(struct MobyVoiceFlags *moby) {
     s32                    voice_slot_index;
     struct MobyVoiceEntry *voice_slot;
 
-    if (moby->unk7D != 0xFF) {
-        voice_slot_index = moby->unk7D;
+    if (moby->current_voice_slot_index != 0xFF) {
+        voice_slot_index = moby->current_voice_slot_index;
         voice_slot = (struct MobyVoiceEntry *)(voice_slot_index * 0x70 + ((u8 *)&voice_pool));
         if (voice_slot->unk88 != (s32)moby) {
-            moby->unk7D = 0xFF;
-        } else if (voice_slot->unk7E != moby->unk7C) {
+            moby->current_voice_slot_index = 0xFF;
+        } else if (voice_slot->voice_entry_index != moby->unk7C) {
             release_voice_slot(voice_slot_index);
-            moby->unk7D = 0xFF;
+            moby->current_voice_slot_index = 0xFF;
         }
     } else if (moby->unk7C != 0xFF) {
-        moby->unk7D = allocate_voice_for_target_entry(moby->unk7C, 4, moby);
+        moby->current_voice_slot_index = allocate_voice_for_target_entry(moby->unk7C, 4, moby);
     }
 }
 

src/movies/decoder/buffers/read_buf_delete.c

@@ -2,7 +2,7 @@
 
 void read_buf_delete(struct ReadBuf *buf) __asm__("func_0023B958");
 
-void read_buf_delete(struct ReadBuf *buf) {
+void read_buf_delete(struct ReadBuf *stream_read_buffer) {
 }
 
 /* Recovered original symbol name. */

src/overlays/l00/mobys/clank_cutscene_trigger.c

@@ -146,7 +146,7 @@ typedef struct {
     s16         count;
     u8          pad46[0x132];
     VeldinMoby *mobys[1];
-    VeldinMoby *unk17C;
+    VeldinMoby *particle_pair_source_moby;
     u8          pad180[4];
     VeldinMoby *unk184;
     VeldinMoby *unk188;
@@ -226,7 +226,7 @@ void apply_level_specific_cutscene_moby_effects(void) {
         add_draw_callback((s32)FUN_L00_002935b8, (s32)D_L00_0016C860.unk188);
     }
     if (current_level_index == 14 && D_L00_0016C860.state == 0) {
-        particle_source_moby = D_L00_0016C860.unk17C;
+        particle_source_moby = D_L00_0016C860.particle_pair_source_moby;
         if (particle_source_moby != 0 && (u32)(D_L00_0016C860.timer - 0x1C) < 6) {
             emit_moby_particle_pairs(particle_source_moby);
             add_draw_callback((s32)glow_quads_draw, (s32)particle_source_moby);

src/overlays/l00/mobys/cutscene_effects.c

@@ -28,7 +28,7 @@ typedef struct {
     s32 unk4;
     u8  pad8[2];
     u8  unkA;
-    u8  unkB;
+    u8  initial_duration_frames;
 } FlockTail;
 
 typedef struct {
@@ -114,7 +114,7 @@ void phase_effect_controller_update(FlockMoby *moby) {
                         part->unkA = scale_game_frames_s32(60);
                         tail->unk4 = 2;
                         tail->unkA = color >> 24;
-                        tail->unkB = part->unkA;
+                        tail->initial_duration_frames = part->unkA;
                     }
                 }
             }