diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f3841552..fb95509b 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -88710,8 +88710,8 @@ 0x0000007101166d94,nullsub_4612,4,_ZThn632_N4ksys3res9ActorLink9doCreate_EPhjPN4sead4HeapE 0x0000007101166d98,Bxml::parse,428,_ZN4ksys3res9ActorLink6parse_EPhmPN4sead4HeapE? 0x0000007101166f44,ResourceBxml::parse,28,_ZThn632_N4ksys3res9ActorLink6parse_EPhmPN4sead4HeapE -0x0000007101166f60,sub_7101166F60,124,_ZN4ksys3res9ActorLink3m5_Ev -0x0000007101166fdc,sub_7101166FDC,124,_ZThn632_N4ksys3res9ActorLink3m5_Ev +0x0000007101166f60,sub_7101166F60,124,_ZN4ksys3res9ActorLink9finalize_Ev +0x0000007101166fdc,sub_7101166FDC,124,_ZThn632_N4ksys3res9ActorLink9finalize_Ev 0x0000007101167058,Bxml::hasTagByName,164,_ZNK4ksys3res9ActorLink6hasTagEPKc? 0x00000071011670fc,Bxml::hasTag,108,_ZNK4ksys3res9ActorLink6hasTagENS_3act3TagE 0x0000007101167168,sub_7101167168,236,_ZN4ksys3res9ActorLinkD2Ev @@ -90762,13 +90762,13 @@ 0x0000007101201304,ResourceBase::setField30,8,_ZN4ksys3res8Resource10setContextEPNS0_7ContextE 0x000000710120130c,ResourceBase::callOnDestroy,12,_ZN4ksys3res8Resource9onDestroyEv 0x0000007101201318,ResourceBase::callParse,24,_ZN4ksys3res8Resource5parseEPNS0_7ContextEPN4sead4HeapE -0x0000007101201330,ResourceBase::callM5,32,_ZN4ksys3res8Resource2m5Ev +0x0000007101201330,ResourceBase::callM5,32,_ZN4ksys3res8Resource8finalizeEv 0x0000007101201350,ResourceBase::callM6AndClearField30,48,_ZN4ksys3res8Resource13finishParsingEv 0x0000007101201380,ResourceBase::callM7,12,_ZN4ksys3res8Resource2m7Ev 0x000000710120138c,ResourceBase::doCreate,4,_ZN4ksys3res8Resource9doCreate_EPhjPN4sead4HeapE 0x0000007101201390,ResourceBase::onDestroy,4,_ZN4ksys3res8Resource10onDestroy_Ev 0x0000007101201394,ResourceBase::parse,8,_ZN4ksys3res8Resource6parse_EPhmPN4sead4HeapE -0x000000710120139c,ResourceBase::nullsub1,4,_ZN4ksys3res8Resource3m5_Ev +0x000000710120139c,ResourceBase::nullsub1,4,_ZN4ksys3res8Resource9finalize_Ev 0x00000071012013a0,ResourceBase::afterParse,8,_ZN4ksys3res8Resource14finishParsing_Ev 0x00000071012013a8,ResourceBase::returnTrue4,8,_ZN4ksys3res8Resource3m7_Ev 0x00000071012013b0,ResourceBase::nullsub2,4,_ZN4ksys3res8Resource3m8_Ev diff --git a/src/KingSystem/Resource/resResource.cpp b/src/KingSystem/Resource/resResource.cpp index af16b188..713d4edd 100644 --- a/src/KingSystem/Resource/resResource.cpp +++ b/src/KingSystem/Resource/resResource.cpp @@ -20,8 +20,8 @@ void Resource::parse(Context*, sead::Heap* heap) { parse_(mRawData, mRawSize, heap); } -bool Resource::m5() { - m5_(); +bool Resource::finalize() { + finalize_(); return true; } diff --git a/src/KingSystem/Resource/resResource.h b/src/KingSystem/Resource/resResource.h index 2bd96642..e5df218c 100644 --- a/src/KingSystem/Resource/resResource.h +++ b/src/KingSystem/Resource/resResource.h @@ -30,7 +30,7 @@ public: void onDestroy(); void parse(Context*, sead::Heap* heap); - bool m5(); + bool finalize(); bool finishParsing(); bool m7(); @@ -39,7 +39,7 @@ public: protected: virtual void onDestroy_() {} virtual bool parse_(u8* data, size_t size, sead::Heap* heap); - virtual void m5_() {} + virtual void finalize_() {} virtual bool finishParsing_() { return true; } virtual bool m7_() { return true; } virtual void m8_() {} diff --git a/src/KingSystem/Resource/resResourceActorLink.cpp b/src/KingSystem/Resource/resResourceActorLink.cpp index 32c3ede5..9aebc366 100644 --- a/src/KingSystem/Resource/resResourceActorLink.cpp +++ b/src/KingSystem/Resource/resResourceActorLink.cpp @@ -80,7 +80,7 @@ bool ActorLink::parse_(u8* data, size_t, sead::Heap* heap) { return true; } -void ActorLink::m5_() { +void ActorLink::finalize_() { if (!mTags.isBufferReady()) return; diff --git a/src/KingSystem/Resource/resResourceActorLink.h b/src/KingSystem/Resource/resResourceActorLink.h index 0dc0d152..1257ebdf 100644 --- a/src/KingSystem/Resource/resResourceActorLink.h +++ b/src/KingSystem/Resource/resResourceActorLink.h @@ -60,7 +60,7 @@ public: private: bool parse_(u8* data, size_t size, sead::Heap* heap) override; - void m5_() override; + void finalize_() override; Users mUsers; agl::utl::Parameter mActorNameJpn;