Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-11 16:48:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Separated rob_cmn_mottbl_get_motion_id to it's own function

Browse Source
This commit is contained in:
korenkonder
2025-09-23 16:19:16 +03:00
parent 02fb84782f
commit 0f48fa1620
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/rob/rob.cpp
+16 -13
View File
@@ -2933,19 +2933,7 @@ uint32_t rob_chara::get_rob_cmn_mottbl_motion_id(int32_t id) {
return data.motion.motion_id;
else if (id >= 226 && id <= 235)
return pv_data.motion_face_ids[id - 226];
int32_t v2 = data.field_8.field_1A4;
if (rob_cmn_mottbl_data
&& chara_index >= 0 && chara_index < rob_cmn_mottbl_data->chara_count
&& id >= 0 && id < rob_cmn_mottbl_data->mottbl_indices_count) {
rob_cmn_mottbl_sub_header* v4 = (rob_cmn_mottbl_sub_header*)((uint8_t*)rob_cmn_mottbl_data
+ rob_cmn_mottbl_data->subheaders_offset);
if (v2 >= 0 && v2 < v4[chara_index].field_4)
return ((uint32_t*)((uint8_t*)rob_cmn_mottbl_data
+ *(uint32_t*)((uint8_t*)rob_cmn_mottbl_data
+ v2 * sizeof(uint32_t) + v4[chara_index].data_offset)))[id];
}
return -1;
return rob_cmn_mottbl_get_motion_id(chara_index, data.field_8.field_1A4, id);
}
float_t rob_chara::get_pos_scale(int32_t bone, vec3& pos) {
@@ -11739,6 +11727,21 @@ bool rob_chara_pv_data_array_check_chara_id(int32_t chara_id) {
return rob_chara_pv_data_array[chara_id].type != ROB_CHARA_TYPE_NONE;
}
// 0x1405376C0
uint32_t rob_cmn_mottbl_get_motion_id(chara_index chara_index, int32_t a2, int32_t id) {
if (rob_cmn_mottbl_data
&& chara_index >= 0 && chara_index < rob_cmn_mottbl_data->chara_count
&& id >= 0 && id < rob_cmn_mottbl_data->mottbl_indices_count) {
rob_cmn_mottbl_sub_header* v4 = (rob_cmn_mottbl_sub_header*)((uint8_t*)rob_cmn_mottbl_data
+ rob_cmn_mottbl_data->subheaders_offset);
if (a2 >= 0 && a2 < v4[chara_index].field_4)
return ((uint32_t*)((uint8_t*)rob_cmn_mottbl_data
+ *(uint32_t*)((uint8_t*)rob_cmn_mottbl_data
+ a2 * sizeof(uint32_t) + v4[chara_index].data_offset)))[id];
}
return -1;
}
void rob_sleeve_handler_data_get_sleeve_data(
::chara_index chara_index, int32_t cos, rob_sleeve_data& l, rob_sleeve_data& r) {
rob_sleeve_handler_data->get_sleeve_data(chara_index, cos, l, r);
src/CRE/rob/rob.hpp
+2
View File
@@ -3901,6 +3901,8 @@ extern bool rob_chara_check_for_ageageagain_module(chara_index chara_index, int3
extern bool rob_chara_pv_data_array_check_chara_id(int32_t chara_id);
extern uint32_t rob_cmn_mottbl_get_motion_id(chara_index chara_index, int32_t a2, int32_t id);
extern void rob_sleeve_handler_data_get_sleeve_data(
::chara_index chara_index, int32_t cos, rob_sleeve_data& l, rob_sleeve_data& r);
extern bool rob_sleeve_handler_data_load();