chartransdraw matched

DarkRTA · Jun 12, 2024 · 0161022 · 0161022
1 parent f9b4f95
commit 0161022
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/config/SZBE69_B8/objects.json b/config/SZBE69_B8/objects.json
@@ -219,7 +219,7 @@
             "system/char/CharSleeve.cpp": "NonMatching",
             "system/char/CharTaskMgr.cpp": "Matching",
             "system/char/CharTransCopy.cpp": "Matching",
-            "system/char/CharTransDraw.cpp": "NonMatching",
+            "system/char/CharTransDraw.cpp": "Matching",
             "system/char/CharUpperTwist.cpp": "NonMatching",
             "system/char/CharWeightable.cpp": "NonMatching",
             "system/char/CharWeightSetter.cpp": "NonMatching",

diff --git a/config/SZBE69_B8/symbols.txt b/config/SZBE69_B8/symbols.txt
@@ -29272,16 +29272,16 @@ PropSync<9Character>__FR33ObjPtrList<9Character,9ObjectDir>R8DataNodeP9DataArray
 SetType__13CharTransDrawF6Symbol = .text:0x807198D0; // type:function size:0x1B8 scope:global align:16
 Replace__33ObjPtrList<9Character,9ObjectDir>FPQ23Hmx6ObjectPQ23Hmx6Object = .text:0x80719A90; // type:function size:0x20C scope:global align:16
 RefOwner__33ObjPtrList<9Character,9ObjectDir>Fv = .text:0x80719CA0; // type:function size:0x8 scope:global align:16
-@48@28@Load__13CharTransDrawFR9BinStream = .text:0x80719CB0; // type:function size:0x14 scope:local align:16
-@48@28@Copy__13CharTransDrawFPCQ23Hmx6ObjectQ33Hmx6Object8CopyType = .text:0x80719CD0; // type:function size:0x14 scope:local align:16
-@48@28@Save__13CharTransDrawFR9BinStream = .text:0x80719CF0; // type:function size:0x14 scope:local align:16
-@48@28@__dt__13CharTransDrawFv = .text:0x80719D10; // type:function size:0x14 scope:local align:16
-@48@28@SyncProperty__13CharTransDrawFR8DataNodeP9DataArrayi6PropOp = .text:0x80719D30; // type:function size:0x14 scope:local align:16
-@48@28@Handle__13CharTransDrawFP9DataArrayb = .text:0x80719D50; // type:function size:0x14 scope:local align:16
-@48@28@SetType__13CharTransDrawF6Symbol = .text:0x80719D70; // type:function size:0x14 scope:local align:16
-@48@28@ClassName__13CharTransDrawCFv = .text:0x80719D90; // type:function size:0x14 scope:local align:16
+@48@28@Load__13CharTransDrawFR9BinStream = .text:0x80719CB0; // type:function size:0x14 scope:weak align:16
+@48@28@Copy__13CharTransDrawFPCQ23Hmx6ObjectQ33Hmx6Object8CopyType = .text:0x80719CD0; // type:function size:0x14 scope:weak align:16
+@48@28@Save__13CharTransDrawFR9BinStream = .text:0x80719CF0; // type:function size:0x14 scope:weak align:16
+@48@28@__dt__13CharTransDrawFv = .text:0x80719D10; // type:function size:0x14 scope:weak align:16
+@48@28@SyncProperty__13CharTransDrawFR8DataNodeP9DataArrayi6PropOp = .text:0x80719D30; // type:function size:0x14 scope:weak align:16
+@48@28@Handle__13CharTransDrawFP9DataArrayb = .text:0x80719D50; // type:function size:0x14 scope:weak align:16
+@48@28@SetType__13CharTransDrawF6Symbol = .text:0x80719D70; // type:function size:0x14 scope:weak align:16
+@48@28@ClassName__13CharTransDrawCFv = .text:0x80719D90; // type:function size:0x14 scope:weak align:16
 @80@8@Highlight__11RndDrawableFv = .text:0x80719DB0; // type:function size:0x14 scope:weak align:16
-@80@8@__dt__13CharTransDrawFv = .text:0x80719DD0; // type:function size:0x14 scope:local align:16
+@80@8@__dt__13CharTransDrawFv = .text:0x80719DD0; // type:function size:0x14 scope:weak align:16
 .text.22053 = .text:0x80719DE4; // type:label scope:local align:1
 __ct__13CharacterTestFP9Character = .text:0x80719DF0; // type:function size:0x1C0 scope:global align:16
 __dt__34ObjPtr<13CharClipGroup,9ObjectDir>Fv = .text:0x80719FB0; // type:function size:0x74 scope:global align:16

diff --git a/src/system/char/CharTransDraw.cpp b/src/system/char/CharTransDraw.cpp
@@ -57,4 +57,8 @@ END_HANDLERS
 BEGIN_PROPSYNCS(CharTransDraw)
     SYNC_PROP(chars, mChars)
     SYNC_SUPERCLASS(RndDrawable)
-END_PROPSYNCS
+END_PROPSYNCS
+
+DECOMP_FORCEFUNC(CharTransDraw, CharTransDraw, SetType)
+DECOMP_FORCEFUNC_TEMPL(CharTransDraw, ObjPtrList, Replace(0, 0), Character, ObjectDir)
+DECOMP_FORCEFUNC_TEMPL(CharTransDraw, ObjPtrList, RefOwner(), Character, ObjectDir)