decomp: clarify parameter and local names (batch 19)

src/audio/banks/snd_bank_load_by_loc.c

@@ -16,7 +16,7 @@ extern s32 sceSifCallRpc(void *, s32, s32, void *, s32, void *, s32, void *, voi
 
 s32 snd_bank_load_by_loc(s32 location, s32 arg1) __asm__("FUN_0012df20");
 
-s32 snd_bank_load_by_loc(s32 location, s32 arg1) {
+s32 snd_bank_load_by_loc(s32 location, s32 byte_offset) {
     snd_cd_load_error = 0;
     if (snd_cd_callback_pending != 0) {
         printf("snd_BankLoadByLoc: Load already in progress!\n");
@@ -26,7 +26,7 @@ s32 snd_bank_load_by_loc(s32 location, s32 arg1) {
         printf("snd_BankLoadByLoc: CD BUSY!\n");
         return 0;
     }
-    snd_cd_bank_load_request[1] = arg1;
+    snd_cd_bank_load_request[1] = byte_offset;
     snd_cd_callback_arg = 0xFFFFFFFF;
     snd_cd_bank_load_request[0] = location;
     while (SceSifCheckStatRpc(D_0015EBE8) != 0) {

src/audio/banks/snd_unload_bank.c

@@ -3,9 +3,9 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_unload_bank(s32 arg0) __asm__("FUN_0012e1d8");
 
-void snd_unload_bank(s32 arg0) {
+void snd_unload_bank(s32 bank_handle) {
     u8 sp_slot[0x10];
-    *(s32 *)sp_slot = arg0;
+    *(s32 *)sp_slot = bank_handle;
     snd_send_iop_command_no_wait(6, 4, sp_slot, 0, 0);
 }
 

src/audio/decoder/audio_dec_create.c

@@ -7,7 +7,7 @@ extern s32 snd_init_movie_sound() __asm__("FUN_0012f068");
 extern void fast_mem_zero16() __asm__("func_001F9810");
 s32 audio_dec_create(struct AudioDec *dec, s32 buffer, s32 buffer_size, s32 arg3) __asm__("FUN_0023abd0");
 
-s32 audio_dec_create(struct AudioDec *dec, s32 buffer, s32 buffer_size, s32 arg3) {
+s32 audio_dec_create(struct AudioDec *dec, s32 buffer, s32 buffer_size, s32 globals_address) {
     s32 movie_handle;
     s32 three;
     s32 four;
@@ -26,7 +26,7 @@ s32 audio_dec_create(struct AudioDec *dec, s32 buffer, s32 buffer_size, s32 arg3
     dec->totalBytesSent = 0;
     dec->iopZero = 0;
     dec->spuPos = 0;
-    D_001612BC = (struct Globals_001612BC *)arg3;
+    D_001612BC = (struct Globals_001612BC *)globals_address;
     four = 0x400;
     dec->iopBuffSize = four;
     movie_handle = snd_init_movie_sound(0x400, 0x1000, 0x400, 0, 5, 3);

src/audio/decoder/audio_dec_delete.c

@@ -2,7 +2,7 @@
 extern s32 snd_close_movie_sound() __asm__("FUN_0012f0e0");
 s32 audio_dec_delete(s32 arg0) __asm__("FUN_0023ac90");
 
-s32 audio_dec_delete(s32 arg0) {
+s32 audio_dec_delete(s32 unused_arg) {
     snd_close_movie_sound();
     return 1;
 }

src/audio/decoder/send_adpcm.c

@@ -16,8 +16,8 @@ extern void send_to_spu(struct AudioDec *, unsigned char *, int, int) __asm__("f
    pointer (one load, as retail). */
 void send_adpcm(void *arg0) __asm__("FUN_0023afc0");
 
-void send_adpcm(void *arg0) {
-    struct AudioDec *ad = arg0;
+void send_adpcm(void *audio_decoder) {
+    struct AudioDec *ad = audio_decoder;
     int avail = 0;
     int i, j, n;
     unsigned char *src, *dst;

src/audio/decoder/send_to_spu.c

@@ -8,7 +8,7 @@ extern void snd_update_movie_adpcm(s32, s32) __asm__("FUN_0012f148");
 
 void send_to_spu(struct AudioDec *dec, s32 src, s32 size, s32 arg3) __asm__("FUN_0023af18");
 
-void send_to_spu(struct AudioDec *dec, s32 src, s32 size, s32 arg3) {
+void send_to_spu(struct AudioDec *dec, s32 src, s32 size, s32 staging_byte_offset) {
     u32 descriptor[4];
     s32 dma_id;
 
@@ -22,7 +22,7 @@ void send_to_spu(struct AudioDec *dec, s32 src, s32 size, s32 arg3) {
     } while (dma_id == 0);
     while (sceSifDmaStat(dma_id) >= 0) {
     }
-    snd_update_movie_adpcm(size, arg3);
+    snd_update_movie_adpcm(size, staging_byte_offset);
 }
 
 extern __typeof__(send_to_spu) func_0023AF18 __attribute__((alias("FUN_0023af18")));

src/audio/mixer/snd_set_playback_mode.c

@@ -3,8 +3,8 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_set_playback_mode(s32 arg0) __asm__("FUN_0012e240");
 
-void snd_set_playback_mode(s32 arg0) {
+void snd_set_playback_mode(s32 playback_mode) {
     u8 sp_slot[0x10];
-    *(s32 *)sp_slot = arg0;
+    *(s32 *)sp_slot = playback_mode;
     snd_send_iop_command_no_wait(11, 4, sp_slot, 0, 0);
 }

src/audio/music/music_pause.c

@@ -1,7 +1,7 @@
 #include "types.h"
 #include "rnc/audio/music/music_stream_state.h"
-void music_pause(s32 arg0) {
-    if (arg0 != 0) {
+void music_pause(s32 pause_secondary) {
+    if (pause_secondary != 0) {
         music_stream_state.secondary.fade_flags = -0x8000;
         music_stream_state.secondary.unkE = 0;
     }

src/audio/rpc/snd_reset_state_and_flush_commands.c

@@ -3,7 +3,7 @@ extern s32 snd_flush_sound_commands() __asm__("FUN_0012dc80");
 void snd_reset_state_and_flush_commands(s32 arg0) __asm__("FUN_0012eb00");
 
 extern s32 GlobalTableStatus __asm__("D_0015ECC4") __attribute__((sda));
-void snd_reset_state_and_flush_commands(s32 arg0) {
+void snd_reset_state_and_flush_commands(s32 unused_arg) {
     GlobalTableStatus = 0;
     snd_flush_sound_commands();
 }

src/audio/snd_get_doppler_pitch_mod.c

@@ -1,3 +1,3 @@
-int snd_get_doppler_pitch_mod(int arg0) {
-    return (arg0 * 0x5F4) / 0x2E5;
+int snd_get_doppler_pitch_mod(int projected_velocity) {
+    return (projected_velocity * 0x5F4) / 0x2E5;
 }

src/audio/streaming/clear_record_flag_by_key.c

@@ -7,11 +7,11 @@ struct KeyedFlagRecord {
 
 s32 clear_record_flag_by_key(s32 arg0) __asm__("FUN_00225e20");
 
-s32 clear_record_flag_by_key(s32 arg0) {
+s32 clear_record_flag_by_key(s32 record_key) {
     s32 i;
 
     for (i = 0; i < 5; i++) {
-        if (graphics_buffer_descriptors[i].address == arg0) {
+        if (graphics_buffer_descriptors[i].address == record_key) {
             graphics_buffer_descriptors[i].flags &= ~4;
             return 0;
         }

src/audio/streaming/finish_audio_stream_read.c

@@ -6,8 +6,8 @@
 extern s32 snd_stream_safe_cd_get_error() __asm__("func_0012EEF0");
 void finish_audio_stream_read(s32 arg0) __asm__("FUN_00216950");
 
-void finish_audio_stream_read(s32 arg0) {
-    if (arg0 == 1) {
+void finish_audio_stream_read(s32 callback_value) {
+    if (callback_value == 1) {
         music_stream_state.read_state = 0;
         if (snd_stream_safe_cd_get_error() != 0) {
             music_stream_state.read_state = 2;

src/audio/streaming/request_audio_stream_break.c

@@ -6,7 +6,7 @@
 extern s32 snd_stream_safe_cd_break() __asm__("func_0012EEA8");
 void request_audio_stream_break(s32 arg0) __asm__("FUN_002166e8");
 
-void request_audio_stream_break(s32 arg0) {
+void request_audio_stream_break(s32 unused_parameter) {
     if (music_stream_state.read_state != 0) {
         snd_stream_safe_cd_break();
         music_stream_state.break_requested = 1;

src/audio/streaming/select_next_stream_buffer.c

@@ -5,12 +5,12 @@ extern s32 get_stream_buffer_size() __asm__("func_00225D88");
 
 s32 select_next_stream_buffer(s32 arg0) __asm__("FUN_00225c18");
 
-s32 select_next_stream_buffer(s32 arg0) {
+s32 select_next_stream_buffer(s32 require_low_flag_bit) {
     s32 i;
     s32 f;
 
     for (i = 0; i < 5; i++) {
-        if (arg0 != 0) {
+        if (require_low_flag_bit != 0) {
             f = graphics_buffer_descriptors[i].flags ^ 1;
         } else {
             f = graphics_buffer_descriptors[i].flags;

src/audio/streaming/snd_continue_vag_stream.c

@@ -3,9 +3,9 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_continue_vag_stream(s32 arg0) __asm__("FUN_0012eca0");
 
-void snd_continue_vag_stream(s32 arg0) {
+void snd_continue_vag_stream(s32 sound_handle) {
     u8 sp_slot[0x10];
-    *(s32 *)(sp_slot + 0) = arg0;
+    *(s32 *)(sp_slot + 0) = sound_handle;
     snd_send_iop_command_no_wait(46, 4, sp_slot, 0, 0);
 }
 

src/audio/streaming/snd_pause_vag_stream.c

@@ -3,9 +3,9 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_pause_vag_stream(s32 arg0) __asm__("FUN_0012ec70");
 
-void snd_pause_vag_stream(s32 arg0) {
+void snd_pause_vag_stream(s32 sound_handle) {
     u8 sp_slot[0x10];
-    *(s32 *)(sp_slot + 0) = arg0;
+    *(s32 *)(sp_slot + 0) = sound_handle;
     snd_send_iop_command_no_wait(45, 4, sp_slot, 0, 0);
 }
 

src/audio/streaming/snd_play_vag_stream_by_loc_ex_cb.c

@@ -16,7 +16,7 @@ void snd_play_vag_stream_by_loc_ex_cb(s32 loc, s32 size, s32 vol_l, s32 vol_r, s
                                       u64 cb_data) __asm__("FUN_0012ec08");
 
 void snd_play_vag_stream_by_loc_ex_cb(s32 loc, s32 size, s32 vol_l, s32 vol_r, s32 pitch, s32 flags,
-                                      s32 voice, s32 channel, s32 a8, s32 id, u64 cb_data) {
+                                      s32 voice, s32 channel, s32 request_word_6, s32 id, u64 cb_data) {
     int new_var;
     s32 buf[7];
     new_var = (pitch << 16) | (vol_l & 0xFFFF);
@@ -29,7 +29,7 @@ void snd_play_vag_stream_by_loc_ex_cb(s32 loc, s32 size, s32 vol_l, s32 vol_r, s
     buf[3] = (flags << 16) | (vol_r & 0xFFFF);
     buf[4] = voice;
     buf[5] = channel;
-    buf[6] = a8;
+    buf[6] = request_word_6;
     snd_send_iop_command_no_wait(0x2C, 0x1C, buf, id, cb_data);
 }
 

src/audio/streaming/snd_stream_safe_cd_get_error.c

@@ -5,7 +5,7 @@
 extern s32 sceCdGetError();
 s32 snd_stream_safe_cd_get_error(s32 arg0) __asm__("FUN_0012eef0");
 
-s32 snd_stream_safe_cd_get_error(s32 arg0) {
+s32 snd_stream_safe_cd_get_error(s32 unused_arg) {
     if (snd_cd_stream_active == 0) {
         return sceCdGetError();
     }

src/audio/streaming/snd_stream_safe_check_cd_idle.c

@@ -2,9 +2,9 @@
 extern s32 snd_send_iop_command_and_wait() __asm__("func_0012E548");
 void snd_stream_safe_check_cd_idle(s32 arg0) __asm__("FUN_0012ed30");
 
-void snd_stream_safe_check_cd_idle(s32 arg0) {
+void snd_stream_safe_check_cd_idle(s32 payload_word) {
     u8 sp_slot[0x10];
-    *(s32 *)sp_slot = arg0;
+    *(s32 *)sp_slot = payload_word;
     snd_send_iop_command_and_wait(0x36, 4, sp_slot);
 }
 

src/audio/streaming/update_audio_stream_until_idle.c

@@ -9,8 +9,8 @@ extern s32 music_update() __asm__("func_00216290");
 extern s32 sceGsSyncV();
 s16 update_audio_stream_until_idle(s32 arg0) __asm__("FUN_002168a8");
 
-s16 update_audio_stream_until_idle(s32 arg0) {
-    if (arg0 != 0) {
+s16 update_audio_stream_until_idle(s32 wait_for_completion) {
+    if (wait_for_completion != 0) {
         if (music_stream_state.read_state != 0) {
             do {
                 sceGsSyncV(0);

src/audio/voices/snd_continue_all_sounds_in_group.c

@@ -3,9 +3,9 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_continue_all_sounds_in_group(s32 arg0) __asm__("FUN_0012e418");
 
-void snd_continue_all_sounds_in_group(s32 arg0) {
+void snd_continue_all_sounds_in_group(s32 payload_word) {
     u8 sp_slot[0x10];
-    *(s32 *)(sp_slot + 0) = arg0;
+    *(s32 *)(sp_slot + 0) = payload_word;
     snd_send_iop_command_no_wait(23, 4, sp_slot, 0, 0);
 }
 

src/audio/voices/snd_pause_all_sounds_in_group.c

@@ -3,9 +3,9 @@ extern s32 snd_send_iop_command_no_wait(s32 cmd, s32 size, void *buf, s32 a,
                                         s32 b) __asm__("func_0012E6E0");
 void snd_pause_all_sounds_in_group(s32 arg0) __asm__("FUN_0012e3e8");
 
-void snd_pause_all_sounds_in_group(s32 arg0) {
+void snd_pause_all_sounds_in_group(s32 payload_word) {
     u8 sp_slot[0x10];
-    *(s32 *)(sp_slot + 0) = arg0;
+    *(s32 *)(sp_slot + 0) = payload_word;
     snd_send_iop_command_no_wait(22, 4, sp_slot, 0, 0);
 }
 

src/audio/voices/snd_play_sound_vol_pan_pmpb.c

@@ -3,15 +3,15 @@ extern s32 snd_send_iop_command_no_wait() __asm__("func_0012E6E0");
 void snd_play_sound_vol_pan_pmpb(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6,
                                  s32 a7) __asm__("FUN_0012e308");
 
-void snd_play_sound_vol_pan_pmpb(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 callback_address, s32 callback_context_address) {
+void snd_play_sound_vol_pan_pmpb(s32 request_word_0, s32 request_word_1, s32 request_word_2, s32 request_word_3, s32 request_word_4, s32 request_word_5, s32 callback_address, s32 callback_context_address) {
     s32 buf[6];
 
-    buf[0] = a0;
-    buf[1] = a1;
-    buf[2] = a2;
-    buf[3] = a3;
-    buf[4] = a4;
-    buf[5] = a5;
+    buf[0] = request_word_0;
+    buf[1] = request_word_1;
+    buf[2] = request_word_2;
+    buf[3] = request_word_3;
+    buf[4] = request_word_4;
+    buf[5] = request_word_5;
     snd_send_iop_command_no_wait(0x11, 0x18, buf, callback_address, callback_context_address);
 }
 

src/audio/voices/snd_set_sound_params_cb.c

@@ -3,7 +3,7 @@ extern s32 snd_send_iop_command_no_wait() __asm__("func_0012E6E0");
 void snd_set_sound_params_cb(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6,
                              s32 a7) __asm__("FUN_0012e4c0");
 
-void snd_set_sound_params_cb(s32 request_word_0, s32 request_word_1, s32 request_word_2, s32 request_word_3, s32 request_word_4, s32 request_word_5, s32 a6, s32 a7) {
+void snd_set_sound_params_cb(s32 request_word_0, s32 request_word_1, s32 request_word_2, s32 request_word_3, s32 request_word_4, s32 request_word_5, s32 callback_address, s32 callback_context_address) {
     s32 buf[6];
 
     buf[0] = request_word_0;
@@ -12,7 +12,7 @@ void snd_set_sound_params_cb(s32 request_word_0, s32 request_word_1, s32 request
     buf[3] = request_word_3;
     buf[4] = request_word_4;
     buf[5] = request_word_5;
-    snd_send_iop_command_no_wait(0x21, 0x18, buf, a6, a7);
+    snd_send_iop_command_no_wait(0x21, 0x18, buf, callback_address, callback_context_address);
 }
 
 extern __typeof__(snd_set_sound_params_cb) func_0012E4C0 __attribute__((alias("FUN_0012e4c0")));

src/audio/voices/snd_stop_sound.c

@@ -2,10 +2,10 @@
 extern s32 snd_send_iop_command_no_wait() __asm__("func_0012E6E0");
 void snd_stop_sound(s32 arg0) __asm__("FUN_0012e368");
 
-void snd_stop_sound(s32 arg0) {
+void snd_stop_sound(s32 sound_handle) {
     s32 buf[4];
 
-    buf[0] = arg0;
+    buf[0] = sound_handle;
     snd_send_iop_command_no_wait(0x15, 4, buf, 0, 0);
 }
 

src/gameplay/entities/build_moby_bone_transform.c

@@ -8,13 +8,13 @@ extern void multiply_matrix(s32, void *, s32) __asm__("FUN_001fa378");
 extern void FUN_00210850(struct Moby *, s32, s32 *, s32);
 void build_moby_bone_transform(struct Moby *arg0, s32 arg1, s32 arg2) __asm__("FUN_0020cca8");
 
-void build_moby_bone_transform(struct Moby *moby, s32 arg1, s32 output_transform) {
+void build_moby_bone_transform(struct Moby *moby, s32 bone_index, s32 output_transform) {
     u8 sp_slot[0x40];
     s32 sp40;
     f32 scale;
     s32 temp_16_22;
 
-    sp40 = arg1;
+    sp40 = bone_index;
     scale = (*(f32 *)((u8 *)moby + 0x2C)) * 0.0009765625f;
     FUN_00210850(moby, 1, &sp40, output_transform);
     temp_16_22 = output_transform + 0x30;

src/gameplay/entities/draw_moby_list.c

@@ -9,11 +9,11 @@ extern s32 vu1_add_g_sregister() __asm__("func_00233980");
 
 void draw_moby_list(s32 arg0, s32 arg1) __asm__("FUN_0020d330");
 
-void draw_moby_list(s32 arg0, s32 arg1) {
+void draw_moby_list(s32 source_address, s32 arg1) {
     vu1_add_g_sregister(0x47, (long)0x5360B);
     flush_cache(0);
     restore_moby_class_dists();
-    moby_anim_head = moby_proc(arg0, moby_anim_head, arg1, 0);
+    moby_anim_head = moby_proc(source_address, moby_anim_head, arg1, 0);
     stash_moby_class_dists();
     moby_anim_head -= 0x10;
 }

src/gameplay/missions/collect_mission_ids.c

@@ -12,7 +12,7 @@ extern MissionNode *D_001A2C20[];
 
 int collect_mission_ids(int *out, int *mask, int *nums, int arg3) __asm__("FUN_0020bc00");
 
-int collect_mission_ids(int *out, int *mask, int *nums, int arg3) {
+int collect_mission_ids(int *out, int *mask, int *nums, int use_selected_ids) {
     MissionNode *p = D_001A2C20[0];
     int count = 0;
     int all = 1;
@@ -36,7 +36,7 @@ int collect_mission_ids(int *out, int *mask, int *nums, int arg3) {
         }
         if (!(f & 2) && t != 0 && !((f & 1) && t == 2)) {
             out[count] = p->id;
-            if (arg3 != 0) {
+            if (use_selected_ids != 0) {
                 out[count] = (p->status == 2) ? 0x523E : p->ids[p->sel];
             }
             if (mask != 0 && p->status == 2) {

src/gameplay/missions/fun_0020be68.c

@@ -1,7 +1,7 @@
 /* Ported from rac1-decomp (src/game/missionfunc.c, func_0020CCB8). */
 #include "rnc/gameplay/state/item_state.h"
-int FUN_0020be68(int arg0) {
-    return item_available[arg0] != 0;
+int FUN_0020be68(int item_index) {
+    return item_available[item_index] != 0;
 }
 
 extern __typeof__(FUN_0020be68) func_0020BE68 __attribute__((alias("FUN_0020be68")));

src/gameplay/state/transition_default_draw.c

@@ -51,7 +51,7 @@ extern s32 draw_ties_1() __asm__("func_002358C8");
 extern s32 light_ties() __asm__("func_00237370");
 void transition_default_draw(s32 *arg0) __asm__("FUN_001eb410");
 
-void transition_default_draw(s32 *arg0) {
+void transition_default_draw(s32 *unused_parameter) {
     s32 n;
 
     if (D_0016045C == 0 || D_0016045C->unk4 != 0) {