Batch 15: promote cmd_sem_init and seven overlay functions

config/us/rnc1.us.yaml

@@ -456,7 +456,7 @@ segments:
           - [0x21658, c, storage/cd/handle_cd_read_callback]
           - [0x216f8, textbin, text_gap_00120778_after_fun_001206d8_prefix_00120778]
           - [0x21708, c, sdk/callbacks/process_native_cd_read_completion]
-          - [0x217a8, c, assembly/sdk/library/cmd_sem_init]
+          - [0x217a8, c, sdk/library/cmd_sem_init]
           - [0x2183c, textbin, text_gap_00120828_post_sdk_worker]
           - [0x21840, c, sdk/library/cdvd_exit]
           - [0x218d4, textbin, text_gap_001208c0_post_sdk_worker_prefix_00120954]

src/assembly/sdk/dma/sce_gs_set_def_disp_env.c

@@ -28,8 +28,10 @@ void sceGsSetDefDispEnv(struct sceGsDispEnv *output, s16 pixel_storage_format, s
     s32 kernel_horizontal, kernel_vertical, kernel_width, kernel_height;
     s32 mode, scale;
     s64 scaled_horizontal;
+    u64 display_width;
     u16 interlace;
     u64 value;
+    u64 display_vertical;
 
     state = GetCoreDataTable();
     if (!((u32)(state->wMode - 2) < 2) && checkModelVersion() != 0) {
@@ -56,54 +58,52 @@ void sceGsSetDefDispEnv(struct sceGsDispEnv *output, s16 pixel_storage_format, s
 
     if ((s16)mode == 2) {
         if ((s16)interlace == 1) {
-            scale = width + 0x9ff;
-            scale /= width;
-            scaled_horizontal = horizontal_offset * scale;
-            value = ((u64)((vertical_offset + kernel_vertical + 0x32) & 0xfff) << 12) |
-                    ((u64)((s64)(width * scale) - 1) << 32) |
-                    ((u64)(((s64)scaled_horizontal + ((s64)kernel_horizontal + 0x27c)) & 0xfff)) |
-                    ((u64)(s64)(scale - 1) << 23);
-            if (state->nSFrame_mode == 0) {
-                scale = height - 1;
-            } else {
+            scale = (width + 0x9ff) / width;
+            display_vertical = (u64)((vertical_offset + kernel_vertical + 0x32) & 0xfff) << 12;
+            display_width = (u64)(s64)(scale * width - 1) << 32;
+            scaled_horizontal = (s64)kernel_horizontal + 0x27c;
+            scaled_horizontal = (scaled_horizontal + horizontal_offset * scale) & 0xfff;
+            value = (u64)(s64)(scale - 1) << 23;
+            if (state->nSFrame_mode != 0) {
                 scale = height * 2 - 1;
+            } else {
+                scale = height - 1;
             }
-            value |= (u64)(s64)scale << 44;
+            value = ((display_width | value) | ((u64)scaled_horizontal | ((u64)(s64)scale << 44))) | display_vertical;
         } else {
             scale = width + 0x9ff;
             scale /= width;
-            scaled_horizontal = horizontal_offset * scale;
-            value = ((u64)(s64)(height - 1) << 44) |
-                    ((u64)(s64)(scale - 1) << 23) |
+            scaled_horizontal = scale * horizontal_offset;
+            value = ((u64)(s64)(scale - 1) << 23) |
+                    ((u64)((s64)(scale * width) - 1) << 32) |
                     ((u64)(((s64)scaled_horizontal + (s64)(((u32)kernel_horizontal + 0x27cU) & 0xfffU)) & 0xfff)) |
-                    ((u64)((s64)(width * scale) - 1) << 32) |
-                    ((u64)((vertical_offset + kernel_vertical + 0x19) & 0xfff) << 12);
+                    ((u64)((vertical_offset + kernel_vertical + 0x19) & 0xfff) << 12) |
+                    ((u64)(s64)(height - 1) << 44);
         }
         output->display = value;
     } else if ((s16)mode == 3) {
         if ((s16)interlace == 1) {
-            scale = width + 0x9ff;
-            scale /= width;
-            scaled_horizontal = horizontal_offset * scale;
-            value = ((u64)((vertical_offset + kernel_vertical + 0x48) & 0xfff) << 12) |
-                    ((u64)((s64)(width * scale) - 1) << 32) |
-                    ((u64)(((s64)scaled_horizontal + ((s64)kernel_horizontal + 0x290)) & 0xfff)) |
-                    ((u64)(s64)(scale - 1) << 23);
+            scale = (width + 0x9ff) / width;
+            display_vertical = (u64)((vertical_offset + kernel_vertical + 0x48) & 0xfff) << 12;
+            display_width = (u64)(s64)(scale * width - 1) << 32;
+            scaled_horizontal = (s64)kernel_horizontal + 0x290;
+            scaled_horizontal = (scaled_horizontal + horizontal_offset * scale) & 0xfff;
+            value = (u64)(s64)(scale - 1) << 23;
             if (state->nSFrame_mode != 0) {
                 scale = height * 2 - 1;
             } else {
                 scale = height - 1;
             }
-            value |= (u64)(s64)scale << 44;
+            value = ((display_width | value) | ((u64)scaled_horizontal | ((u64)(s64)scale << 44))) | display_vertical;
         } else {
             scale = width + 0x9ff;
             scale /= width;
-            scaled_horizontal = horizontal_offset * scale;
-            value = ((u64)(s64)(height - 1) << 44) |
-                    ((u64)(s64)(scale - 1) << 23) |
+            scaled_horizontal = scale * horizontal_offset;
+            value = ((u64)(s64)(scale - 1) << 23) |
+                    ((u64)((s64)(scale * width) - 1) << 32) |
                     ((u64)(((s64)scaled_horizontal + (s64)(((u32)kernel_horizontal + 0x290U) & 0xfffU)) & 0xfff)) |
-                    ((u64)((s64)(width * scale) - 1) << 32) |
-                    ((u64)((vertical_offset + kernel_vertical + 0x24) & 0xfff) << 12);
+                    ((u64)((vertical_offset + kernel_vertical + 0x24) & 0xfff) << 12) |
+                    ((u64)(s64)(height - 1) << 44);
         }
         output->display = value;
     } else if ((s16)mode == 0x50) {

src/assembly/sdk/rpc/sce_sif_init_cmd.c

@@ -50,7 +50,6 @@ extern void _sceSifCmdIntrHdlr();
 /* Initializes the fixed command state once, then submits a warm or cold SIF
  * handshake. The cold path polls register 4 until bit 0x20000 is set. */
 void sceSifInitCmd(void) {
-    s32 ipval;
     struct M2c_var_3_42 *var_3_42;
     struct M2c_var_3_42 *handlers;
     s32 *var_2_61;
@@ -59,8 +58,7 @@ void sceSifInitCmd(void) {
     s32 poll_value;
     s32 temp_5_29;
     s32 temp_6_30;
-    s32 var_16_46;
-    s32 var_16_59;
+    s32 ipval;
 
     DIntr();
     if (*(s32 *)D_0012FC04 == 0) {
@@ -70,40 +68,39 @@ void sceSifInitCmd(void) {
     return;
 block_3:
     *(s32 *)D_0012FC04 = 1;
-    ipval = 0x20;
     temp_6_30 = (s32)D_00154D80 | 0x20000000;
     temp_5_29 = (s32)D_00154E00 | 0x20000000;
-    D_00154E58.unk0 = (u8 *)temp_6_30;
-    D_00154E58.unk4 = (u8 *)temp_5_29;
-    D_00154E58.unk1C = D_00154F80;
     handlers = D_00154E80;
-    var_3_42 = handlers;
-    D_00154E58.unk8 = 0;
-
-    var_16_46 = 0x1F;
-    D_00154E58.unkC = D_00154E80;
+    D_00154E58.unk1C = D_00154F80;
+    D_00154E58.unk10 = 0x20;
     D_00154E58.unk14 = 0;
+    D_00154E58.unk0 = (u8 *)temp_6_30;
+    D_00154E58.unk4 = (u8 *)temp_5_29;
     D_00154E58.unk18 = 0;
-    D_00154E58.unk10 = ipval;
+    D_00154E58.unk8 = 0;
+    D_00154E58.unkC = handlers;
+    ipval = 0x1F;
+    var_3_42 = handlers;
     do {
         var_3_42->unk0 = 0;
-        var_16_46 -= 1;
+        ipval -= 1;
         var_3_42->unk4 = 0;
         var_3_42 += 1;
-    } while (var_16_46 >= 0);
-    var_16_59 = 0x1F;
+    } while (ipval >= 0);
+    ipval = 0x1F;
     var_2_61 = D_00154F80 + 0x1F;
 loop_6:
     *var_2_61 = 0;
-    var_16_59 -= 1;
+    ipval -= 1;
     var_2_61 -= 1;
-    if (var_16_59 >= 0) {
+    if (ipval >= 0) {
         goto loop_6;
     }
-    handlers[0].unk0 = FUN_0011a448;
-    handlers[1].unk0 = FUN_0011a428;
-    handlers[0].unk4 = &D_00154E58;
-    handlers[1].unk4 = &D_00154E58;
+    D_00154E80[0].unk0 = FUN_0011a448;
+    D_00154E80[1].unk0 = FUN_0011a428;
+    D_00154E80[0].unk4 = &D_00154E58;
+    D_00154E80[1].unk4 = &D_00154E58;
+    ipval = 0x20;
     EnableInterrupts();
     FlushCache(0);
     {

src/assembly/textbin/audio/music/music_transition.c

@@ -9,14 +9,15 @@ INCLUDE_ASM("config/us/expected/asm/assembly/textbin/audio/music/music_transitio
 #include "rnc/audio/music/music_stream_state.h"
 #include "rnc/storage/disc_table.h"
 extern void music_transition_start_callback() __asm__("FUN_00216a80");
-extern void snd_play_vag_stream_by_loc_ex_cb(s32, s32, s32, s32, s16, s32, s32, s32, s32,
+extern s32 snd_play_vag_stream_by_loc_ex_cb(s32, s32, s32, s32, s16, s32, s32, s32, s32,
                                              void (*)(), u64) __asm__("func_0012EC08");
 s32 music_transition(s32 target_track, s32 transition_track, s32 flags,
                      s32 volume) __asm__("FUN_00215e00");
 s32 music_transition(s32 target_track, s32 transition_track, s32 flags, s32 volume) {
     volatile s32 *location_entry;
     s64 stream_location;
     u64 callback_context;
+    s16 stream_volume;
     void (*callback)();
     u8 *track_table;
     s32 track_table_offset;
@@ -34,19 +35,20 @@ s32 music_transition(s32 target_track, s32 transition_track, s32 flags, s32 volu
         return 0;
     }
     *(u32 *)&music_stream_state.transition.handle = 0xFFFFFFFF;
-    sample_rate = 48000;
     poll_interval = 10;
+    sample_rate = 48000;
     music_stream_state.transition.poll_interval = poll_interval;
     music_stream_state.transition.remaining_time = sample_rate;
     music_stream_state.transition.track = target_track;
     music_stream_state.transition.state = 1;
     music_stream_state.transition.volume = volume;
     music_stream_state.transition.crossfade_enabled = 1;
     music_stream_state.transition.flags = flags;
+    stream_volume = volume;
     stream_location = *location_entry;
     callback_context = (u32)&music_stream_state.transition.handle;
     callback = music_transition_start_callback;
-    snd_play_vag_stream_by_loc_ex_cb(stream_location, 0, 0, 0, volume, 0, 1, 0, 0x20, callback,
+    snd_play_vag_stream_by_loc_ex_cb(stream_location, 0, 0, 0, stream_volume, 0, 1, 0, 0x20, callback,
                                      callback_context);
     return 1;
 }

src/assembly/textbin/fun_0021a328.c

@@ -67,7 +67,6 @@ int render_configured_text_label(struct MenuScreen *label) {
     int remaining_frames;
     int visible_height;
     int text_extent;
-    struct MenuScreen *page;
     struct MenuGridCell *entry;
     u8 *availability_table;
     int item_id;
@@ -102,32 +101,33 @@ int render_configured_text_label(struct MenuScreen *label) {
         label->data.label.cached_value = 0;
         label->data.label.value_variant = 0;
     } else if (selector_flags & 0x80) {
-        page = menu_system.current->focus;
+        struct MenuScreen *page = menu_system.current->focus;
         value_index = page->data.list.selected;
         if (selector_flags & 0x8000) {
             value_variant = pal_mode != 0;
         }
     } else if (selector_flags & 0x100) {
-        page = menu_system.current->focus;
+        struct MenuScreen *page = menu_system.current->focus;
         value_index = page->data.grid.selected_cell;
         entry = &page->data.grid.cells[value_index];
-        item_id = entry->id;
+        flags = entry->id;
         availability_table = entry->kind == 0 ? item_available : alternate_item_available;
-        if (availability_table[item_id] != 0) {
+        flags = availability_table[flags];
+        if (flags != 0) {
             value_index = page->data.grid.selected_cell;
         } else {
             value_index = -1;
         }
     } else if (selector_flags & 0x1000) {
-        page = menu_system.current->focus;
+        struct MenuScreen *page = menu_system.current->focus;
         value_index = page->data.list.selected;
         {
             short sid = page->data.list.items[value_index].text;
             label->data.label.text_id = 0xFFFF;
             find_help_entry(sid, 1, (u16 *)&label->data.label.text_id);
         }
     } else {
-        page = menu_system.current->focus;
+        struct MenuScreen *page = menu_system.current->focus;
         item_id = page->data.grid.cells[page->data.grid.selected_cell].id;
         value_variant = item_text_variant[item_id] != 0;
         value_index = item_id;
@@ -182,7 +182,7 @@ int render_configured_text_label(struct MenuScreen *label) {
         text = unavailable_label_text;
     }
     if (label->data.label.flags & 0x200) {
-        item_id = *((int *)label->data.label.text_id +
+        int item_id = *((int *)label->data.label.text_id +
                     value_index * label->data.label.text_stride / sizeof(int));
         if (item_id != 0x4ED2 && item_id != 0x4ED9 && item_id != 0x4EDD) {
             sprintf(formatted_text, label_format, get_help_message_text(0x4ECC), text);
@@ -192,8 +192,8 @@ int render_configured_text_label(struct MenuScreen *label) {
 
     render_flags = label->data.label.flags;
     draw_flags = render_flags;
+    x = 4;
     y = 4;
-    text_style = 8;
     if ((draw_flags & 0x4004) == 0x4004 && label->data.label.text_id == 0x523E) {
         draw_flags |= 1;
         y = 12;
@@ -205,7 +205,7 @@ int render_configured_text_label(struct MenuScreen *label) {
     if (text == 0) {
         text = fallback_label_text;
     }
-    x = 4;
+    text_style = 8;
     if (draw_flags & 1) {
         text_style = 9;
         x = label->width / 2;
@@ -237,12 +237,12 @@ int render_configured_text_label(struct MenuScreen *label) {
         c.flags |= 4;
         font_print_window(&c, color, text, -1, texture_tex0, font);
         window->flags = c.flags ^ 4;
-        flags = label->data.label.flags;
+        draw_flags = label->data.label.flags;
         text_extent = c.rendered_height + 4;
         visible_height = c.bottom - c.top;
-        if (!(flags & 0x2000) && text_extent >= visible_height) {
-            if (!(flags & 0x400)) {
-                label->data.label.flags = flags | 0x400;
+        if (!(draw_flags & 0x2000) && text_extent >= visible_height) {
+            if (!(draw_flags & 0x400)) {
+                label->data.label.flags = draw_flags | 0x400;
                 label->data.label.scroll_offset = -(label->height * 8);
             }
         } else if (label->data.label.flags & 0x400) {

src/assembly/textbin/fun_0022e420.c

@@ -73,11 +73,10 @@ void build_resident_indexed_texture_warp_meshes(void) {
         s32 page;
         for (page = 0; page < level_render_state.history_count - 1; page++) {
             history_index = (level_render_state.history_index - page + 0x1F) & 0x1F;
-            primary_next = get_primary_history_position((history_index + 1) & 0x1F);
-            secondary_next =
-                &level_render_state.secondary_history[(history_index + 1) & 0x1F];
-            primary_current = get_primary_history_position(history_index);
             secondary_current = &level_render_state.secondary_history[history_index];
+            primary_current = get_primary_history_position(history_index);
+            secondary_next = &level_render_state.secondary_history[(history_index + 1) & 0x1F];
+            primary_next = get_primary_history_position((history_index + 1) & 0x1F);
             primary_after_next = get_primary_history_position((history_index + 2) & 0x1F);
             {
                 s32 strip;
@@ -88,10 +87,10 @@ void build_resident_indexed_texture_warp_meshes(void) {
                     subtract_vectors(&cross_strip_differences[1], primary_current, secondary_current);
                     subtract_vectors(&cross_strip_differences[2], secondary_next, primary_next);
                     subtract_vectors(&cross_strip_differences[3], primary_next, secondary_next);
-                    subtract_vectors(&edge_normals[1], primary_next + strip_offset,
-                                     primary_current + strip_offset);
-                    subtract_vectors(&edge_normals[3], primary_after_next + strip_offset,
-                                     primary_next + strip_offset);
+                    subtract_vectors(&edge_normals[1], (Vec4 *)(strip_offset * sizeof(Vec4) + (u32)primary_next),
+                                     (Vec4 *)(strip_offset * sizeof(Vec4) + (u32)primary_current));
+                    subtract_vectors(&edge_normals[3], (Vec4 *)(strip_offset * sizeof(Vec4) + (u32)primary_after_next),
+                                     (Vec4 *)(strip_offset * sizeof(Vec4) + (u32)primary_next));
                     if (page == 0) {
                         qcopy(&edge_normals[3], &edge_normals[1]);
                     }
@@ -110,8 +109,8 @@ void build_resident_indexed_texture_warp_meshes(void) {
                                          progress *
                                              (&D_001604D0)[level_render_state.content_variant]);
                         add_vectors(&quad.positions[vertex], &quad.positions[vertex],
-                                    get_primary_history_position((history_index + history_step) & 0x1F) +
-                                        strip_offset);
+                                    (Vec4 *)(strip_offset * sizeof(Vec4) +
+                                        (u32)get_primary_history_position((history_index + history_step) & 0x1F)));
                     }
                     draw_geometry_quad(&quad, 0, 0);
                     for (side_vertex = 0; side_vertex < 4; side_vertex++) {
@@ -123,8 +122,8 @@ void build_resident_indexed_texture_warp_meshes(void) {
                                              (&D_001604D0)[level_render_state.content_variant]);
                         add_vectors(
                             &quad.positions[side_vertex], &quad.positions[side_vertex],
-                            get_primary_history_position((history_index + side_history_step) & 0x1F) +
-                                strip_offset);
+                            (Vec4 *)(strip_offset * sizeof(Vec4) +
+                                (u32)get_primary_history_position((history_index + side_history_step) & 0x1F)));
                     }
                     draw_geometry_quad(&quad, 0, 0);
                 }

src/assembly/textbin/fun_0022eaa8.c

@@ -165,7 +165,10 @@ extern s32 rand(void);
 void update_level_gameplay_frame(void) __asm__("FUN_0022eaa8");
 
 void update_level_gameplay_frame(void) {
-    Vector4 first_position;
+    union {
+        Vector4 position;
+        volatile s32 sound_bank;
+    } first_position;
     Vector4 second_position;
     Matrix4x4 first_transform;
     Matrix4x4 second_transform;
@@ -175,7 +178,7 @@ void update_level_gameplay_frame(void) {
     LevelRenderObject *object;
     LevelRenderObject *expired_object;
     s32 mode_advance;
-    volatile s32 sound_bank;
+    s32 sound_bank;
     RenderModel *model;
     RenderArchiveTable *archive_table;
     u8 *archive_data;
@@ -212,7 +215,9 @@ void update_level_gameplay_frame(void) {
     if (render_sequence.time == 1 && current_level_index != 0 &&
         (current_level_index != 1 || level_available[3] != 0)) {
         read_global_table_entry();
-        sound_bank = sound_bank_handle;
+        /* The bank scratch is dead before scale_vector overwrites the position. */
+        first_position.sound_bank = sound_bank_handle;
+        sound_bank = first_position.sound_bank;
         mode_advance = level_render_state.mode;
         snd_play_sound_vol_pan_pmpb(sound_bank, mode_advance, 0x400, 0, 0, 0, 0, D_0013E5C0);
         snd_reset_state_and_flush_commands();