From 1a5d9aba687916836806a11577bf118504fdc166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 11 Apr 2021 00:49:56 +0200 Subject: [PATCH] Fix matching issue in _ZN4ksys3res9ASSetting10BoneParams5parseERKNS0_13ASParamParser9ParseArgsE --- data/uking_functions.csv | 2 +- src/KingSystem/Resource/resResourceASSetting.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index b4e611d0..16680dec 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -96592,7 +96592,7 @@ 0x00000071012f1868,sub_71012F1868,756, 0x00000071012f1b5c,sub_71012F1B5C,756, 0x00000071012f1e50,sub_71012F1E50,168, -0x00000071012f1ef8,sub_71012F1EF8,896,_ZN4ksys3res9ASSetting10BoneParams5parseERKNS0_13ASParamParser9ParseArgsE! +0x00000071012f1ef8,sub_71012F1EF8,896,_ZN4ksys3res9ASSetting10BoneParams5parseERKNS0_13ASParamParser9ParseArgsE 0x00000071012f2278,sub_71012F2278,300,_ZNK4ksys3res9ASSetting10BoneParams13getBoneWeightERKN4sead14SafeStringBaseIcEE 0x00000071012f23a4,sub_71012F23A4,132, 0x00000071012f2428,sub_71012F2428,508, diff --git a/src/KingSystem/Resource/resResourceASSetting.cpp b/src/KingSystem/Resource/resResourceASSetting.cpp index b465900a..2fe40a2a 100644 --- a/src/KingSystem/Resource/resResourceASSetting.cpp +++ b/src/KingSystem/Resource/resResourceASSetting.cpp @@ -73,7 +73,6 @@ ASSetting::BoneParams::~BoneParams() { mBuffer.freeBuffer(); } -// NON_MATCHING: parameter object iteration(???) bool ASSetting::BoneParams::parse(const ASParamParser::ParseArgs& args) { const auto num_objects = args.res_list.getResParameterObjNum(); if (num_objects == 0) @@ -82,12 +81,12 @@ bool ASSetting::BoneParams::parse(const ASParamParser::ParseArgs& args) { if (!mBuffer.tryAllocBuffer(num_objects, args.heap)) return false; - sead::FixedSafeString<32> obj_name{"BoneParam"}; - const auto obj_name_base_len = obj_name.calcLength(); - auto it = mBuffer.begin(); const auto end = mBuffer.end(); + sead::FixedSafeString<32> obj_name{"BoneParam"}; + const auto obj_name_base_len = obj_name.calcLength(); + auto res_it = args.res_list.objBegin(); const auto res_end = args.res_list.objEnd();