dAcOTowerHandD101_c probably equivalent

config/SOUE01/rels/d_a_obj_tower_hand_D101NP/symbols.txt

@@ -102,47 +102,48 @@ isSameName__34sFStateID_c<19dAcOTowerHandD101_c>CFPCc = .text:0x00002FA0; // typ
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
 __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
-lbl_510_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float
-lbl_510_rodata_8 = .rodata:0x00000008; // type:object size:0x20 data:4byte
-lbl_510_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:4byte
-lbl_510_rodata_2C = .rodata:0x0000002C; // type:object size:0x64 data:4byte
-lbl_510_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
-lbl_510_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
-lbl_510_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float
-lbl_510_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float
-lbl_510_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float
-lbl_510_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float
-lbl_510_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float
-lbl_510_rodata_AC = .rodata:0x000000AC; // type:object size:0x10 data:float
-lbl_510_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float
-lbl_510_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float
-lbl_510_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float
-lbl_510_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float
-lbl_510_rodata_CC = .rodata:0x000000CC; // type:object size:0x30 data:float
+lbl_510_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float
+lbl_510_rodata_8 = .rodata:0x00000008; // type:object size:0x20 scope:local data:4byte
+lbl_510_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:4byte
+lbl_510_rodata_2C = .rodata:0x0000002C; // type:object size:0x64 scope:local data:4byte
+lbl_510_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_AC = .rodata:0x000000AC; // type:object size:0x10 scope:local data:float
+lbl_510_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
+lbl_510_rodata_CC = .rodata:0x000000CC; // type:object size:0x30 scope:local data:float
 g_profile_OBJ_TOWER_HAND_D101 = .data:0x00000000; // type:object size:0x10 data:4byte
-lbl_510_data_10 = .data:0x00000010; // type:object size:0x10
-lbl_510_data_20 = .data:0x00000020; // type:object size:0x10
-lbl_510_data_30 = .data:0x00000030; // type:object size:0x10
-lbl_510_data_40 = .data:0x00000040; // type:object size:0x10
-lbl_510_data_50 = .data:0x00000050; // type:object size:0x14
-lbl_510_data_64 = .data:0x00000064; // type:object size:0x14
-lbl_510_data_78 = .data:0x00000078; // type:object size:0x14
-lbl_510_data_8C = .data:0x0000008C; // type:object size:0xC
-lbl_510_data_98 = .data:0x00000098; // type:object size:0xC
-lbl_510_data_A4 = .data:0x000000A4; // type:object size:0x24
-lbl_510_data_C8 = .data:0x000000C8; // type:object size:0x4 data:4byte
-lbl_510_data_CC = .data:0x000000CC; // type:object size:0x4 data:4byte
-lbl_510_data_D0 = .data:0x000000D0; // type:object size:0x80
-lbl_510_data_150 = .data:0x00000150; // type:object size:0x30
-lbl_510_data_180 = .data:0x00000180; // type:object size:0x30
-lbl_510_data_1B0 = .data:0x000001B0; // type:object size:0x18
-lbl_510_data_1C8 = .data:0x000001C8; // type:object size:0x190
-lbl_510_data_358 = .data:0x00000358; // type:object size:0x34
+lbl_510_data_10 = .data:0x00000010; // type:object size:0x10 scope:local
+lbl_510_data_20 = .data:0x00000020; // type:object size:0x10 scope:local
+lbl_510_data_30 = .data:0x00000030; // type:object size:0x10 scope:local
+lbl_510_data_40 = .data:0x00000040; // type:object size:0x10 scope:local
+lbl_510_data_50 = .data:0x00000050; // type:object size:0x14 scope:local
+lbl_510_data_64 = .data:0x00000064; // type:object size:0x14 scope:local
+lbl_510_data_78 = .data:0x00000078; // type:object size:0x14 scope:local
+lbl_510_data_8C = .data:0x0000008C; // type:object size:0xC scope:local
+lbl_510_data_98 = .data:0x00000098; // type:object size:0xC scope:local
+lbl_510_data_A4 = .data:0x000000A4; // type:object size:0x24 scope:local
+@LOCAL@getFlags__Fv@FLAGS_1 = .data:0x000000C8; // type:object size:0x4 data:4byte
+@LOCAL@getFlags__Fv@FLAGS_2@0 = .data:0x000000CC; // type:object size:0x4 data:4byte
+__vt__19dAcOTowerHandD101_c = .data:0x000000D0; // type:object size:0x80
+__vt__58sFStateMgr_c<19dAcOTowerHandD101_c,20sStateMethodUsr_FI_c> = .data:0x00000150; // type:object size:0x30
+__vt__88sStateMgr_c<19dAcOTowerHandD101_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000180; // type:object size:0x30
+__vt__35sFStateFct_c<19dAcOTowerHandD101_c> = .data:0x000001B0; // type:object size:0x14
+__vt__32sFState_c<19dAcOTowerHandD101_c> = .data:0x000001C8; // type:object size:0x18
+__vt__34sFStateID_c<19dAcOTowerHandD101_c> = .data:0x00000358; // type:object size:0x34
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_510_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte
-lbl_510_bss_20 = .bss:0x00000020; // type:object size:0xC data:float
-lbl_510_bss_2C = .bss:0x0000002C; // type:object size:0x3C data:float
-lbl_510_bss_68 = .bss:0x00000068; // type:object size:0x40 data:4byte
-lbl_510_bss_A8 = .bss:0x000000A8; // type:object size:0x40 data:4byte
-lbl_510_bss_E8 = .bss:0x000000E8; // type:object size:0x40 data:4byte
-lbl_510_bss_128 = .bss:0x00000128; // type:object size:0x70 data:4byte
+lbl_510_bss_8 = .bss:0x00000008; // type:object size:0x18 scope:local data:4byte
+lbl_510_bss_20 = .bss:0x00000020; // type:object size:0xC scope:local data:float
+lbl_510_bss_2C = .bss:0x0000002C; // type:object size:0x3C scope:local data:float
+StateID_RemainOpen__19dAcOTowerHandD101_c = .bss:0x00000068; // type:object size:0x30 data:4byte
+StateID_Close__19dAcOTowerHandD101_c = .bss:0x000000A8; // type:object size:0x30 data:4byte
+StateID_RemainClosed__19dAcOTowerHandD101_c = .bss:0x000000E8; // type:object size:0x30 data:4byte
+StateID_Open__19dAcOTowerHandD101_c = .bss:0x00000128; // type:object size:0x30 data:4byte
+StateID_Hold__19dAcOTowerHandD101_c = .bss:0x00000168; // type:object size:0x30 data:4byte

config/SOUE01/symbols.txt

@@ -1121,7 +1121,7 @@ restorePosRotFromCopy__12dAcObjBase_cFv = .text:0x8002E5C0; // type:function siz
 create__12dAcObjBase_cFQ28fProfile14PROFILE_NAME_eUlUlP7mVec3_cP7mAng3_cP7mVec3_cUl = .text:0x8002E630; // type:function size:0x98
 create__12dAcObjBase_cFPcUlUlP7mVec3_cP7mAng3_cP7mVec3_cUlUsSc = .text:0x8002E6D0; // type:function size:0xA0
 ActorObjectBase__findObject = .text:0x8002E770; // type:function size:0x7C
-getNextActorInList = .text:0x8002E7F0; // type:function size:0x58
+getNextObject__12dAcObjBase_cFP9fLiMgBa_cP12dAcObjBase_c = .text:0x8002E7F0; // type:function size:0x58
 isLinkPointer = .text:0x8002E850; // type:function size:0x14
 ActorObjectBase__calcVelocity = .text:0x8002E870; // type:function size:0x68
 calcVelocity__12dAcObjBase_cFv = .text:0x8002E8E0; // type:function size:0xB8
@@ -2452,7 +2452,7 @@ isSpinAttackingVertically = .text:0x8005B850; // type:function size:0x20
 fn_8005B870 = .text:0x8005B870; // type:function size:0x28
 fn_8005B8A0 = .text:0x8005B8A0; // type:function size:0xC0
 ActorLink__setPosYRot = .text:0x8005B960; // type:function size:0x44
-fn_8005B9B0 = .text:0x8005B9B0; // type:function size:0x98
+setTransform__7dAcPy_cFRC6mMtx_ciii = .text:0x8005B9B0; // type:function size:0x98
 fn_8005BA50 = .text:0x8005BA50; // type:function size:0x30
 fn_8005BA80 = .text:0x8005BA80; // type:function size:0x8
 fn_8005BA90 = .text:0x8005BA90; // type:function size:0x8
@@ -13452,8 +13452,8 @@ AcItem__stateWaitTurnOffLeave = .text:0x80250630; // type:function size:0x4
 AcItem__stateWaitSacredDewGetEffectEnter = .text:0x80250640; // type:function size:0x64
 AcItem__stateWaitSacredDewGetEffectUpdate = .text:0x802506B0; // type:function size:0x80
 AcItem__stateWaitSacredDewGetEffectLeave = .text:0x80250730; // type:function size:0x4
-getItemFromBWheelItem = .text:0x80250740; // type:function size:0xEC
-fn_80250830 = .text:0x80250830; // type:function size:0x40
+getItemFromBWheelItem__9dAcItem_cFv = .text:0x80250740; // type:function size:0xEC
+setItemPosition__9dAcItem_cFRC7mVec3_c = .text:0x80250830; // type:function size:0x40
 fn_80250870 = .text:0x80250870; // type:function size:0x38
 isStateWait__9dAcItem_cFv = .text:0x802508B0; // type:function size:0x50
 AcItem__setCarriedAndTransitionToGetState = .text:0x80250900; // type:function size:0x50
@@ -40216,7 +40216,7 @@ lbl_805758B6 = .sbss:0x805758B6; // type:object size:0x1 data:byte
 lbl_805758B7 = .sbss:0x805758B7; // type:object size:0x1 data:byte
 lbl_805758B8 = .sbss:0x805758B8; // type:object size:0x4 data:float
 lbl_805758BC = .sbss:0x805758BC; // type:object size:0x4 data:float
-ITEM_ACTOR_LIST = .sbss:0x805758C0; // type:object size:0x8 data:4byte
+sItemList__9dAcItem_c = .sbss:0x805758C0; // type:object size:0x8 data:4byte
 lbl_805758C8 = .sbss:0x805758C8; // type:object size:0x8 data:4byte
 NUMBER_OF_ITEMS = .sbss:0x805758D0; // type:object size:0x4 data:4byte
 lbl_805758D4 = .sbss:0x805758D4; // type:object size:0x1 data:byte

include/d/a/d_a_base.h

@@ -59,7 +59,7 @@ class dAcRef_c : dAcRefBase_c {
     const T *get() const {
         return static_cast<const T *>(p_owner);
     }
-    bool isLinked() const {
+    BOOL isLinked() const {
         return get() != nullptr;
     }
 };

include/d/a/d_a_player.h

@@ -53,7 +53,7 @@ class dAcPy_c : public dAcObjBase_c {
 
     /* vt 0x080 */ virtual UNKWORD IfCurrentActionToActor(dAcBase_c *ac, UNKWORD);
     /* vt 0x084 */ virtual void vt_0x084(dAcBase_c *ac, UNKWORD);
-    /* vt 0x088 */ virtual void set0x439F();
+    /* vt 0x088 */ virtual void set0x439F(dAcBase_c *ac, UNKWORD);
     /* vt 0x08C */ virtual void set0x43DE();
     /* vt 0x090 */ virtual f32 vt_0x090();
     /* vt 0x094 */ virtual void relatedToUsingItem0x11();

include/d/a/obj/d_a_obj_base.h

@@ -171,8 +171,6 @@ class dAcObjBase_c : public dAcBase_c {
         char *name, u32 roomId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, u16 id,
         u8 viewclipId
     );
-
-    static fLiMgBa_c ITEM_ACTOR_LIST;
 };
 
 // Actors' createHeap functions often have patterns that can be matched with this macro

include/d/a/obj/d_a_obj_item.h

@@ -18,6 +18,8 @@ class dAcItem_c : public dAcObjBase_c {
     void setItemPosition(const mVec3_c &);
     void getItemFromBWheelItem();
     bool isStateWait();
+
+    static fLiMgBa_c sItemList;
 };
 
 #endif

include/d/a/obj/d_a_obj_tower_hand_D101.h

@@ -40,6 +40,9 @@ class dAcOTowerHandD101_c : public dAcObjBase_c {
     int getSceneFlag() const;
     u32 getEventId() const;
 
+    inline bool getItem(dAcItem_c *&outItem, bool &outIsWait);
+    inline bool getItem(dAcItem_c *&outItem);
+
     static bool isValidDirectionParam(int param);
     static bool getScale(int direction, mVec3_c &outScale);
     bool getNodeMtx(const char *nodeName, mMtx_c &outMtx) const;