Fix symbol errors

config/SOUE01/rels/d_a_obj_diviner_crystalNP/symbols.txt

@@ -4,11 +4,11 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
 dAcODivinerCrystal_c_classInit__Fv = .text:0x000000F0; // type:function size:0x1A8
-fn_592_2A0 = .text:0x000002A0; // type:function size:0x58
-__dt__33sFState_c<20dAcODivinerCrystal_c>Fv = .text:0x00000300; // type:function size:0x58
-__dt__36sFStateFct_c<20dAcODivinerCrystal_c>Fv = .text:0x00000360; // type:function size:0x6C
-__dt__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003D0; // type:function size:0xA0
-__dt__59sFStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000470; // type:function size:0xA4
+__dt__15dShadowCircle_cFv = .text:0x000002A0; // type:function size:0x58
+__dt__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000300; // type:function size:0x58
+__dt__31sFStateFct_c<15dAcSalbageObj_c>Fv = .text:0x00000360; // type:function size:0x6C
+__dt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003D0; // type:function size:0xA0
+__dt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000470; // type:function size:0xA4
 fn_592_520 = .text:0x00000520; // type:function size:0x40
 fn_592_560 = .text:0x00000560; // type:function size:0x168
 fn_592_6D0 = .text:0x000006D0; // type:function size:0x2C4
@@ -18,7 +18,7 @@ fn_592_A30 = .text:0x00000A30; // type:function size:0x5C
 fn_592_A90 = .text:0x00000A90; // type:function size:0x8C
 fn_592_B20 = .text:0x00000B20; // type:function size:0x50
 fn_592_B70 = .text:0x00000B70; // type:function size:0xB4
-getStateID__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C30; // type:function size:0x10
+getStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C30; // type:function size:0x10
 fn_592_C40 = .text:0x00000C40; // type:function size:0xB4
 fn_592_D00 = .text:0x00000D00; // type:function size:0x58
 fn_592_D60 = .text:0x00000D60; // type:function size:0x98
@@ -40,25 +40,25 @@ fn_592_10A0 = .text:0x000010A0; // type:function size:0xC
 fn_592_10B0 = .text:0x000010B0; // type:function size:0xC
 fn_592_10C0 = .text:0x000010C0; // type:function size:0xC
 __dt__20dAcODivinerCrystal_cFv = .text:0x000010D0; // type:function size:0x138
-executeState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001210; // type:function size:0x10
-changeState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00001220; // type:function size:0x10
-getOldStateID__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001230; // type:function size:0x10
-build__36sFStateFct_c<20dAcODivinerCrystal_c>FRC12sStateIDIf_c = .text:0x00001240; // type:function size:0x60
-dispose__36sFStateFct_c<20dAcODivinerCrystal_c>FRP10sStateIf_c = .text:0x000012A0; // type:function size:0xC
-initialize__33sFState_c<20dAcODivinerCrystal_c>Fv = .text:0x000012B0; // type:function size:0x1C
-execute__33sFState_c<20dAcODivinerCrystal_c>Fv = .text:0x000012D0; // type:function size:0x1C
-finalize__33sFState_c<20dAcODivinerCrystal_c>Fv = .text:0x000012F0; // type:function size:0x1C
-initializeState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001310; // type:function size:0x10
-finalizeState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001320; // type:function size:0x10
-refreshState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001330; // type:function size:0x10
-getState__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001340; // type:function size:0x10
-getNewStateID__89sStateMgr_c<20dAcODivinerCrystal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001350; // type:function size:0x10
+executeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001210; // type:function size:0x10
+changeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00001220; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001230; // type:function size:0x10
+build__31sFStateFct_c<15dAcSalbageObj_c>FRC12sStateIDIf_c = .text:0x00001240; // type:function size:0x60
+dispose__31sFStateFct_c<15dAcSalbageObj_c>FRP10sStateIf_c = .text:0x000012A0; // type:function size:0xC
+initialize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000012B0; // type:function size:0x1C
+execute__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000012D0; // type:function size:0x1C
+finalize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000012F0; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001310; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001320; // type:function size:0x10
+refreshState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001330; // type:function size:0x10
+getState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001340; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001350; // type:function size:0x10
 __sinit_\d_a_obj_diviner_crystal_cpp = .text:0x00001360; // type:function size:0x1DC scope:local
 __dt__35sFStateID_c<20dAcODivinerCrystal_c>Fv = .text:0x00001540; // type:function size:0x58
-fn_592_15A0 = .text:0x000015A0; // type:function size:0x5C
-fn_592_1600 = .text:0x00001600; // type:function size:0xC
-fn_592_1610 = .text:0x00001610; // type:function size:0xDC
-fn_592_16F0 = .text:0x000016F0; // type:function size:0xE0
+__dt__42sFStateVirtualID_c<20dAcODivinerCrystal_c>Fv = .text:0x000015A0; // type:function size:0x5C
+baseID_DemoThrow<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x00001600; // type:function size:0xC
+number__42sFStateVirtualID_c<20dAcODivinerCrystal_c>CFv = .text:0x00001610; // type:function size:0xDC
+superID__42sFStateVirtualID_c<20dAcODivinerCrystal_c>CFv = .text:0x000016F0; // type:function size:0xE0
 isSameName__35sFStateID_c<20dAcODivinerCrystal_c>CFPCc = .text:0x000017D0; // type:function size:0x88
 initializeState__35sFStateID_c<20dAcODivinerCrystal_c>CFR20dAcODivinerCrystal_c = .text:0x00001860; // type:function size:0x30
 executeState__35sFStateID_c<20dAcODivinerCrystal_c>CFR20dAcODivinerCrystal_c = .text:0x00001890; // type:function size:0x30
@@ -84,14 +84,14 @@ g_profile_OBJ_DIVINER_CRYSTAL = .data:0x00000000; // type:object size:0x40 data:
 lbl_592_data_40 = .data:0x00000040; // type:object size:0x14
 lbl_592_data_54 = .data:0x00000054; // type:object size:0x14
 lbl_592_data_68 = .data:0x00000068; // type:object size:0x48
-lbl_592_data_B0 = .data:0x000000B0; // type:object size:0x100
-lbl_592_data_1B0 = .data:0x000001B0; // type:object size:0x30
-lbl_592_data_1E0 = .data:0x000001E0; // type:object size:0x30
-lbl_592_data_210 = .data:0x00000210; // type:object size:0x18
-lbl_592_data_228 = .data:0x00000228; // type:object size:0x44
-lbl_592_data_26C = .data:0x0000026C; // type:object size:0xA0
-lbl_592_data_30C = .data:0x0000030C; // type:object size:0x34
-lbl_592_data_340 = .data:0x00000340; // type:object size:0x34
+__vt__20dAcODivinerCrystal_c = .data:0x000000B0; // type:object size:0x100
+__vt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c> = .data:0x000001B0; // type:object size:0x30
+__vt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000001E0; // type:object size:0x30
+__vt__31sFStateFct_c<15dAcSalbageObj_c> = .data:0x00000210; // type:object size:0x18
+__vt__28sFState_c<15dAcSalbageObj_c> = .data:0x00000228; // type:object size:0x44
+__vt__15dShadowCircle_c = .data:0x0000026C; // type:object size:0xA0
+__vt__42sFStateVirtualID_c<20dAcODivinerCrystal_c> = .data:0x0000030C; // type:object size:0x34
+__vt__35sFStateID_c<20dAcODivinerCrystal_c> = .data:0x00000340; // type:object size:0x34
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 lbl_592_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte
 lbl_592_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte

config/SOUE01/rels/d_a_obj_pot_salNP/symbols.txt

@@ -4,11 +4,11 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
 dAcOpotSal_c_classInit__Fv = .text:0x000000F0; // type:function size:0x14C
-fn_100_240 = .text:0x00000240; // type:function size:0x58
-__dt__25sFState_c<12dAcOpotSal_c>Fv = .text:0x000002A0; // type:function size:0x58
-__dt__28sFStateFct_c<12dAcOpotSal_c>Fv = .text:0x00000300; // type:function size:0x6C
-__dt__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000370; // type:function size:0xA0
-__dt__51sFStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000410; // type:function size:0xA4
+__dt__15dShadowCircle_cFv = .text:0x00000240; // type:function size:0x58
+__dt__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000002A0; // type:function size:0x58
+__dt__31sFStateFct_c<15dAcSalbageObj_c>Fv = .text:0x00000300; // type:function size:0x6C
+__dt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000370; // type:function size:0xA0
+__dt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000410; // type:function size:0xA4
 fn_100_4C0 = .text:0x000004C0; // type:function size:0x40
 AcOPotSal__initModels = .text:0x00000500; // type:function size:0xF4
 AcOPotSal__init = .text:0x00000600; // type:function size:0x130
@@ -36,27 +36,27 @@ fn_100_B50 = .text:0x00000B50; // type:function size:0xC
 fn_100_B60 = .text:0x00000B60; // type:function size:0xC
 fn_100_B70 = .text:0x00000B70; // type:function size:0xC
 __dt__12dAcOpotSal_cFv = .text:0x00000B80; // type:function size:0x120
-executeState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000CA0; // type:function size:0x10
-changeState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000CB0; // type:function size:0x10
-getStateID__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CC0; // type:function size:0x10
-getOldStateID__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CD0; // type:function size:0x10
-build__28sFStateFct_c<12dAcOpotSal_c>FRC12sStateIDIf_c = .text:0x00000CE0; // type:function size:0x60
-dispose__28sFStateFct_c<12dAcOpotSal_c>FRP10sStateIf_c = .text:0x00000D40; // type:function size:0xC
-initialize__25sFState_c<12dAcOpotSal_c>Fv = .text:0x00000D50; // type:function size:0x1C
-execute__25sFState_c<12dAcOpotSal_c>Fv = .text:0x00000D70; // type:function size:0x1C
-finalize__25sFState_c<12dAcOpotSal_c>Fv = .text:0x00000D90; // type:function size:0x1C
-initializeState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DB0; // type:function size:0x10
-finalizeState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DC0; // type:function size:0x10
-refreshState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DD0; // type:function size:0x10
-getState__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000DE0; // type:function size:0x10
-getNewStateID__81sStateMgr_c<12dAcOpotSal_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000DF0; // type:function size:0x10
+executeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000CA0; // type:function size:0x10
+changeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000CB0; // type:function size:0x10
+getStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CC0; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CD0; // type:function size:0x10
+build__31sFStateFct_c<15dAcSalbageObj_c>FRC12sStateIDIf_c = .text:0x00000CE0; // type:function size:0x60
+dispose__31sFStateFct_c<15dAcSalbageObj_c>FRP10sStateIf_c = .text:0x00000D40; // type:function size:0xC
+initialize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000D50; // type:function size:0x1C
+execute__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000D70; // type:function size:0x1C
+finalize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000D90; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DB0; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DC0; // type:function size:0x10
+refreshState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000DD0; // type:function size:0x10
+getState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000DE0; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000DF0; // type:function size:0x10
 __sinit_\d_a_obj_pot_sal_cpp = .text:0x00000E00; // type:function size:0x1E0 scope:local
 __dt__27sFStateID_c<12dAcOpotSal_c>Fv = .text:0x00000FE0; // type:function size:0x58
-fn_100_1040 = .text:0x00001040; // type:function size:0x5C
-fn_100_10A0 = .text:0x000010A0; // type:function size:0xC
-fn_100_10B0 = .text:0x000010B0; // type:function size:0xC
-fn_100_10C0 = .text:0x000010C0; // type:function size:0xDC
-fn_100_11A0 = .text:0x000011A0; // type:function size:0xE0
+__dt__34sFStateVirtualID_c<12dAcOpotSal_c>Fv = .text:0x00001040; // type:function size:0x5C
+baseID_After<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x000010A0; // type:function size:0xC
+baseID_DemoThrow<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x000010B0; // type:function size:0xC
+number__34sFStateVirtualID_c<12dAcOpotSal_c>CFv = .text:0x000010C0; // type:function size:0xDC
+superID__34sFStateVirtualID_c<12dAcOpotSal_c>CFv = .text:0x000011A0; // type:function size:0xE0
 isSameName__27sFStateID_c<12dAcOpotSal_c>CFPCc = .text:0x00001280; // type:function size:0x88
 initializeState__27sFStateID_c<12dAcOpotSal_c>CFR12dAcOpotSal_c = .text:0x00001310; // type:function size:0x30
 executeState__27sFStateID_c<12dAcOpotSal_c>CFR12dAcOpotSal_c = .text:0x00001340; // type:function size:0x30
@@ -75,13 +75,13 @@ lbl_100_rodata_30 = .rodata:0x00000030; // type:object size:0x4 align:4 data:flo
 lbl_100_rodata_34 = .rodata:0x00000034; // type:object size:0x4 align:4 data:float
 g_profile_OBJ_POT_SAL = .data:0x00000000; // type:object size:0x40 data:4byte
 lbl_100_data_40 = .data:0x00000040; // type:object size:0x20
-AcOPotSal__vtable = .data:0x00000060; // type:object size:0x100
-lbl_100_data_160 = .data:0x00000160; // type:object size:0x30
-lbl_100_data_190 = .data:0x00000190; // type:object size:0x30
-lbl_100_data_1C0 = .data:0x000001C0; // type:object size:0x18
-lbl_100_data_1D8 = .data:0x000001D8; // type:object size:0x44
-lbl_100_data_21C = .data:0x0000021C; // type:object size:0x90
-lbl_100_data_2AC = .data:0x000002AC; // type:object size:0x68
+__vt__12dAcOpotSal_c = .data:0x00000060; // type:object size:0x100
+__vt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c> = .data:0x00000160; // type:object size:0x30
+__vt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000190; // type:object size:0x30
+__vt__31sFStateFct_c<15dAcSalbageObj_c> = .data:0x000001C0; // type:object size:0x18
+__vt__28sFState_c<15dAcSalbageObj_c> = .data:0x000001D8; // type:object size:0x44
+__vt__15dShadowCircle_c = .data:0x0000021C; // type:object size:0x90
+__vt__34sFStateVirtualID_c<12dAcOpotSal_c> = .data:0x000002AC; // type:object size:0x68
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 lbl_100_bss_8 = .bss:0x00000008; // type:object size:0x4C data:4byte
 lbl_100_bss_54 = .bss:0x00000054; // type:object size:0x34 data:4byte

config/SOUE01/rels/d_a_obj_properaNP/symbols.txt

@@ -5,10 +5,10 @@ __register_global_object = .text:0x00000070; // type:function size:0x1C scope:gl
 __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
 dAcObjPropera_c_classInit__Fv = .text:0x000000F0; // type:function size:0x148
 fn_575_240 = .text:0x00000240; // type:function size:0x58
-__dt__28sFState_c<15dAcObjPropera_c>Fv = .text:0x000002A0; // type:function size:0x58
-__dt__31sFStateFct_c<15dAcObjPropera_c>Fv = .text:0x00000300; // type:function size:0x6C
-__dt__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000370; // type:function size:0xA0
-__dt__54sFStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000410; // type:function size:0xA4
+__dt__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000002A0; // type:function size:0x58
+__dt__31sFStateFct_c<15dAcSalbageObj_c>Fv = .text:0x00000300; // type:function size:0x6C
+__dt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000370; // type:function size:0xA0
+__dt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000410; // type:function size:0xA4
 fn_575_4C0 = .text:0x000004C0; // type:function size:0x40
 fn_575_500 = .text:0x00000500; // type:function size:0x9C
 fn_575_5A0 = .text:0x000005A0; // type:function size:0x98
@@ -20,7 +20,7 @@ fn_575_7F0 = .text:0x000007F0; // type:function size:0x4
 fn_575_800 = .text:0x00000800; // type:function size:0xC
 fn_575_810 = .text:0x00000810; // type:function size:0xC
 fn_575_820 = .text:0x00000820; // type:function size:0xB4
-getStateID__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000008E0; // type:function size:0x10
+getStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000008E0; // type:function size:0x10
 fn_575_8F0 = .text:0x000008F0; // type:function size:0x50
 fn_575_940 = .text:0x00000940; // type:function size:0x8
 fn_575_950 = .text:0x00000950; // type:function size:0x8
@@ -31,25 +31,25 @@ fn_575_990 = .text:0x00000990; // type:function size:0xC
 fn_575_9A0 = .text:0x000009A0; // type:function size:0xC
 fn_575_9B0 = .text:0x000009B0; // type:function size:0xC
 __dt__15dAcObjPropera_cFv = .text:0x000009C0; // type:function size:0x120
-executeState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000AE0; // type:function size:0x10
-changeState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000AF0; // type:function size:0x10
-getOldStateID__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B00; // type:function size:0x10
-build__31sFStateFct_c<15dAcObjPropera_c>FRC12sStateIDIf_c = .text:0x00000B10; // type:function size:0x60
-dispose__31sFStateFct_c<15dAcObjPropera_c>FRP10sStateIf_c = .text:0x00000B70; // type:function size:0xC
-initialize__28sFState_c<15dAcObjPropera_c>Fv = .text:0x00000B80; // type:function size:0x1C
-execute__28sFState_c<15dAcObjPropera_c>Fv = .text:0x00000BA0; // type:function size:0x1C
-finalize__28sFState_c<15dAcObjPropera_c>Fv = .text:0x00000BC0; // type:function size:0x1C
-initializeState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000BE0; // type:function size:0x10
-finalizeState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000BF0; // type:function size:0x10
-refreshState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000C00; // type:function size:0x10
-getState__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C10; // type:function size:0x10
-getNewStateID__84sStateMgr_c<15dAcObjPropera_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C20; // type:function size:0x10
+executeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000AE0; // type:function size:0x10
+changeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000AF0; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B00; // type:function size:0x10
+build__31sFStateFct_c<15dAcSalbageObj_c>FRC12sStateIDIf_c = .text:0x00000B10; // type:function size:0x60
+dispose__31sFStateFct_c<15dAcSalbageObj_c>FRP10sStateIf_c = .text:0x00000B70; // type:function size:0xC
+initialize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000B80; // type:function size:0x1C
+execute__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000BA0; // type:function size:0x1C
+finalize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000BC0; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000BE0; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000BF0; // type:function size:0x10
+refreshState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000C00; // type:function size:0x10
+getState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C10; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C20; // type:function size:0x10
 __sinit_\d_a_obj_propera_cpp = .text:0x00000C30; // type:function size:0x124 scope:local
 __dt__30sFStateID_c<15dAcObjPropera_c>Fv = .text:0x00000D60; // type:function size:0x58
-fn_575_DC0 = .text:0x00000DC0; // type:function size:0x5C
-fn_575_E20 = .text:0x00000E20; // type:function size:0xC
-fn_575_E30 = .text:0x00000E30; // type:function size:0xDC
-fn_575_F10 = .text:0x00000F10; // type:function size:0xE0
+__dt__37sFStateVirtualID_c<15dAcObjPropera_c>Fv = .text:0x00000DC0; // type:function size:0x5C
+baseID_DemoThrow<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x00000E20; // type:function size:0xC
+number__37sFStateVirtualID_c<15dAcObjPropera_c>CFv = .text:0x00000E30; // type:function size:0xDC
+superID__37sFStateVirtualID_c<15dAcObjPropera_c>CFv = .text:0x00000F10; // type:function size:0xE0
 isSameName__30sFStateID_c<15dAcObjPropera_c>CFPCc = .text:0x00000FF0; // type:function size:0x88
 initializeState__30sFStateID_c<15dAcObjPropera_c>CFR15dAcObjPropera_c = .text:0x00001080; // type:function size:0x30
 executeState__30sFStateID_c<15dAcObjPropera_c>CFR15dAcObjPropera_c = .text:0x000010B0; // type:function size:0x30
@@ -75,13 +75,13 @@ lbl_575_data_20 = .data:0x00000020; // type:object size:0x4 data:4byte
 lbl_575_data_24 = .data:0x00000024; // type:object size:0x18
 lbl_575_data_3C = .data:0x0000003C; // type:object size:0x18
 lbl_575_data_54 = .data:0x00000054; // type:object size:0x24
-lbl_575_data_78 = .data:0x00000078; // type:object size:0x100
-lbl_575_data_178 = .data:0x00000178; // type:object size:0x30
-lbl_575_data_1A8 = .data:0x000001A8; // type:object size:0x30
-lbl_575_data_1D8 = .data:0x000001D8; // type:object size:0x18
-lbl_575_data_1F0 = .data:0x000001F0; // type:object size:0x44
-lbl_575_data_234 = .data:0x00000234; // type:object size:0x54
-lbl_575_data_288 = .data:0x00000288; // type:object size:0x68
+__vt__15dAcObjPropera_c = .data:0x00000078; // type:object size:0x100
+__vt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c> = .data:0x00000178; // type:object size:0x30
+__vt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000001A8; // type:object size:0x30
+__vt__31sFStateFct_c<15dAcSalbageObj_c> = .data:0x000001D8; // type:object size:0x18
+__vt__28sFState_c<15dAcSalbageObj_c> = .data:0x000001F0; // type:object size:0x44
+__vt__15dShadowCircle_c = .data:0x00000234; // type:object size:0x54
+__vt__37sFStateVirtualID_c<15dAcObjPropera_c> = .data:0x00000288; // type:object size:0x68
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 lbl_575_bss_8 = .bss:0x00000008; // type:object size:0xC
 lbl_575_bss_14 = .bss:0x00000014; // type:object size:0x34 data:4byte

config/SOUE01/rels/d_a_obj_rouletteNP/symbols.txt

@@ -4,11 +4,11 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
 dAcObjRoulette_c_classInit__Fv = .text:0x000000F0; // type:function size:0x170
-fn_576_260 = .text:0x00000260; // type:function size:0x58
-__dt__29sFState_c<16dAcObjRoulette_c>Fv = .text:0x000002C0; // type:function size:0x58
-__dt__32sFStateFct_c<16dAcObjRoulette_c>Fv = .text:0x00000320; // type:function size:0x6C
-__dt__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000390; // type:function size:0xA0
-__dt__55sFStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000430; // type:function size:0xA4
+__dt__15dShadowCircle_cFv = .text:0x00000260; // type:function size:0x58
+__dt__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000002C0; // type:function size:0x58
+__dt__31sFStateFct_c<15dAcSalbageObj_c>Fv = .text:0x00000320; // type:function size:0x6C
+__dt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000390; // type:function size:0xA0
+__dt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000430; // type:function size:0xA4
 fn_576_4E0 = .text:0x000004E0; // type:function size:0x40
 AcObjRoulette__initModels = .text:0x00000520; // type:function size:0x13C
 AcObjRoulette__init = .text:0x00000660; // type:function size:0x128
@@ -25,7 +25,7 @@ fn_576_B40 = .text:0x00000B40; // type:function size:0xC
 fn_576_B50 = .text:0x00000B50; // type:function size:0xC
 fn_576_B60 = .text:0x00000B60; // type:function size:0x8
 fn_576_B70 = .text:0x00000B70; // type:function size:0xB4
-getStateID__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C30; // type:function size:0x10
+getStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C30; // type:function size:0x10
 fn_576_C40 = .text:0x00000C40; // type:function size:0x50
 fn_576_C90 = .text:0x00000C90; // type:function size:0x8
 fn_576_CA0 = .text:0x00000CA0; // type:function size:0xC
@@ -35,26 +35,26 @@ fn_576_CD0 = .text:0x00000CD0; // type:function size:0xC
 fn_576_CE0 = .text:0x00000CE0; // type:function size:0xC
 fn_576_CF0 = .text:0x00000CF0; // type:function size:0xC
 __dt__16dAcObjRoulette_cFv = .text:0x00000D00; // type:function size:0x120
-executeState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000E20; // type:function size:0x10
-changeState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000E30; // type:function size:0x10
-getOldStateID__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000E40; // type:function size:0x10
-build__32sFStateFct_c<16dAcObjRoulette_c>FRC12sStateIDIf_c = .text:0x00000E50; // type:function size:0x60
-dispose__32sFStateFct_c<16dAcObjRoulette_c>FRP10sStateIf_c = .text:0x00000EB0; // type:function size:0xC
-initialize__29sFState_c<16dAcObjRoulette_c>Fv = .text:0x00000EC0; // type:function size:0x1C
-execute__29sFState_c<16dAcObjRoulette_c>Fv = .text:0x00000EE0; // type:function size:0x1C
-finalize__29sFState_c<16dAcObjRoulette_c>Fv = .text:0x00000F00; // type:function size:0x1C
-initializeState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F20; // type:function size:0x10
-finalizeState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F30; // type:function size:0x10
-refreshState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F40; // type:function size:0x10
-getState__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F50; // type:function size:0x10
-getNewStateID__85sStateMgr_c<16dAcObjRoulette_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F60; // type:function size:0x10
+executeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000E20; // type:function size:0x10
+changeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000E30; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000E40; // type:function size:0x10
+build__31sFStateFct_c<15dAcSalbageObj_c>FRC12sStateIDIf_c = .text:0x00000E50; // type:function size:0x60
+dispose__31sFStateFct_c<15dAcSalbageObj_c>FRP10sStateIf_c = .text:0x00000EB0; // type:function size:0xC
+initialize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000EC0; // type:function size:0x1C
+execute__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000EE0; // type:function size:0x1C
+finalize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000F00; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F20; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F30; // type:function size:0x10
+refreshState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000F40; // type:function size:0x10
+getState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F50; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F60; // type:function size:0x10
 __sinit_\d_a_obj_roulette_cpp = .text:0x00000F70; // type:function size:0x1E0 scope:local
 __dt__31sFStateID_c<16dAcObjRoulette_c>Fv = .text:0x00001150; // type:function size:0x58
-fn_576_11B0 = .text:0x000011B0; // type:function size:0x5C
-fn_576_1210 = .text:0x00001210; // type:function size:0xC
-fn_576_1220 = .text:0x00001220; // type:function size:0xC
-fn_576_1230 = .text:0x00001230; // type:function size:0xDC
-fn_576_1310 = .text:0x00001310; // type:function size:0xE0
+__dt__38sFStateVirtualID_c<16dAcObjRoulette_c>Fv = .text:0x000011B0; // type:function size:0x5C
+baseID_Wait<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x00001210; // type:function size:0xC
+baseID_DemoThrow<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x00001220; // type:function size:0xC
+number__38sFStateVirtualID_c<16dAcObjRoulette_c>CFv = .text:0x00001230; // type:function size:0xDC
+superID__38sFStateVirtualID_c<16dAcObjRoulette_c>CFv = .text:0x00001310; // type:function size:0xE0
 isSameName__31sFStateID_c<16dAcObjRoulette_c>CFPCc = .text:0x000013F0; // type:function size:0x88
 initializeState__31sFStateID_c<16dAcObjRoulette_c>CFR16dAcObjRoulette_c = .text:0x00001480; // type:function size:0x30
 executeState__31sFStateID_c<16dAcObjRoulette_c>CFR16dAcObjRoulette_c = .text:0x000014B0; // type:function size:0x30
@@ -79,12 +79,12 @@ g_profile_OBJ_ROULETTE = .data:0x00000000; // type:object size:0x10 data:4byte
 lbl_576_data_10 = .data:0x00000010; // type:object size:0x10
 lbl_576_data_20 = .data:0x00000020; // type:object size:0x28
 lbl_576_data_48 = .data:0x00000048; // type:object size:0x20
-AcObjRoulette__vtable = .data:0x00000068; // type:object size:0x100
-lbl_576_data_168 = .data:0x00000168; // type:object size:0x30
-lbl_576_data_198 = .data:0x00000198; // type:object size:0x30
-lbl_576_data_1C8 = .data:0x000001C8; // type:object size:0x18
-lbl_576_data_1E0 = .data:0x000001E0; // type:object size:0x44
-lbl_576_data_224 = .data:0x00000224; // type:object size:0x98
-lbl_576_data_2BC = .data:0x000002BC; // type:object size:0x68
+__vt__16dAcObjRoulette_c = .data:0x00000068; // type:object size:0x100
+__vt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c> = .data:0x00000168; // type:object size:0x30
+__vt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000198; // type:object size:0x30
+__vt__31sFStateFct_c<15dAcSalbageObj_c> = .data:0x000001C8; // type:object size:0x18
+__vt__28sFState_c<15dAcSalbageObj_c> = .data:0x000001E0; // type:object size:0x44
+__vt__15dShadowCircle_c = .data:0x00000224; // type:object size:0x98
+__vt__38sFStateVirtualID_c<16dAcObjRoulette_c> = .data:0x000002BC; // type:object size:0x68
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 lbl_576_bss_8 = .bss:0x00000008; // type:object size:0x80 data:4byte

config/SOUE01/rels/d_a_obj_water_jarNP/symbols.txt

@@ -4,11 +4,11 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
 dAcOWaterJar_c_classInit__Fv = .text:0x000000F0; // type:function size:0x188
-fn_601_280 = .text:0x00000280; // type:function size:0x58
-__dt__27sFState_c<14dAcOWaterJar_c>Fv = .text:0x000002E0; // type:function size:0x58
-__dt__30sFStateFct_c<14dAcOWaterJar_c>Fv = .text:0x00000340; // type:function size:0x6C
-__dt__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003B0; // type:function size:0xA0
-__dt__53sFStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000450; // type:function size:0xA4
+__dt__15dShadowCircle_cFv = .text:0x00000280; // type:function size:0x58
+__dt__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x000002E0; // type:function size:0x58
+__dt__31sFStateFct_c<15dAcSalbageObj_c>Fv = .text:0x00000340; // type:function size:0x6C
+__dt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003B0; // type:function size:0xA0
+__dt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000450; // type:function size:0xA4
 fn_601_500 = .text:0x00000500; // type:function size:0x40
 AcOWaterJar__initModels = .text:0x00000540; // type:function size:0x160
 AcOWaterJar__init = .text:0x000006A0; // type:function size:0x190
@@ -21,7 +21,7 @@ fn_601_AE0 = .text:0x00000AE0; // type:function size:0x4
 fn_601_AF0 = .text:0x00000AF0; // type:function size:0x4
 AcOWaterJar__shouldHaveWaterInIt = .text:0x00000B00; // type:function size:0x60
 fn_601_B60 = .text:0x00000B60; // type:function size:0xA4
-getStateID__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C10; // type:function size:0x10
+getStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C10; // type:function size:0x10
 fn_601_C20 = .text:0x00000C20; // type:function size:0xC
 fn_601_C30 = .text:0x00000C30; // type:function size:0xC
 fn_601_C40 = .text:0x00000C40; // type:function size:0x4
@@ -36,25 +36,25 @@ fn_601_D70 = .text:0x00000D70; // type:function size:0xC
 fn_601_D80 = .text:0x00000D80; // type:function size:0xC
 fn_601_D90 = .text:0x00000D90; // type:function size:0xC
 __dt__14dAcOWaterJar_cFv = .text:0x00000DA0; // type:function size:0x150
-executeState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000EF0; // type:function size:0x10
-changeState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000F00; // type:function size:0x10
-getOldStateID__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F10; // type:function size:0x10
-build__30sFStateFct_c<14dAcOWaterJar_c>FRC12sStateIDIf_c = .text:0x00000F20; // type:function size:0x60
-dispose__30sFStateFct_c<14dAcOWaterJar_c>FRP10sStateIf_c = .text:0x00000F80; // type:function size:0xC
-initialize__27sFState_c<14dAcOWaterJar_c>Fv = .text:0x00000F90; // type:function size:0x1C
-execute__27sFState_c<14dAcOWaterJar_c>Fv = .text:0x00000FB0; // type:function size:0x1C
-finalize__27sFState_c<14dAcOWaterJar_c>Fv = .text:0x00000FD0; // type:function size:0x1C
-initializeState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000FF0; // type:function size:0x10
-finalizeState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001000; // type:function size:0x10
-refreshState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001010; // type:function size:0x10
-getState__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001020; // type:function size:0x10
-getNewStateID__83sStateMgr_c<14dAcOWaterJar_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001030; // type:function size:0x10
+executeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000EF0; // type:function size:0x10
+changeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000F00; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000F10; // type:function size:0x10
+build__31sFStateFct_c<15dAcSalbageObj_c>FRC12sStateIDIf_c = .text:0x00000F20; // type:function size:0x60
+dispose__31sFStateFct_c<15dAcSalbageObj_c>FRP10sStateIf_c = .text:0x00000F80; // type:function size:0xC
+initialize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000F90; // type:function size:0x1C
+execute__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000FB0; // type:function size:0x1C
+finalize__28sFState_c<15dAcSalbageObj_c>Fv = .text:0x00000FD0; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000FF0; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001000; // type:function size:0x10
+refreshState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001010; // type:function size:0x10
+getState__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001020; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001030; // type:function size:0x10
 __sinit_\d_a_obj_water_jar_cpp = .text:0x00001040; // type:function size:0x124 scope:local
 __dt__29sFStateID_c<14dAcOWaterJar_c>Fv = .text:0x00001170; // type:function size:0x58
-fn_601_11D0 = .text:0x000011D0; // type:function size:0x5C
-fn_601_1230 = .text:0x00001230; // type:function size:0xC
-fn_601_1240 = .text:0x00001240; // type:function size:0xDC
-fn_601_1320 = .text:0x00001320; // type:function size:0xE0
+__dt__36sFStateVirtualID_c<14dAcOWaterJar_c>Fv = .text:0x000011D0; // type:function size:0x5C
+baseID_DemoThrow<15dAcSalbageObj_c>__Fv_RC12sStateIDIf_c = .text:0x00001230; // type:function size:0xC
+number__36sFStateVirtualID_c<14dAcOWaterJar_c>CFv = .text:0x00001240; // type:function size:0xDC
+superID__36sFStateVirtualID_c<14dAcOWaterJar_c>CFv = .text:0x00001320; // type:function size:0xE0
 isSameName__29sFStateID_c<14dAcOWaterJar_c>CFPCc = .text:0x00001400; // type:function size:0x88
 initializeState__29sFStateID_c<14dAcOWaterJar_c>CFR14dAcOWaterJar_c = .text:0x00001490; // type:function size:0x30
 executeState__29sFStateID_c<14dAcOWaterJar_c>CFR14dAcOWaterJar_c = .text:0x000014C0; // type:function size:0x30
@@ -78,12 +78,12 @@ lbl_601_data_10 = .data:0x00000010; // type:object size:0x70
 lbl_601_data_80 = .data:0x00000080; // type:object size:0x1C data:string
 lbl_601_data_9C = .data:0x0000009C; // type:object size:0x4 data:4byte
 lbl_601_data_A0 = .data:0x000000A0; // type:object size:0x8 data:4byte
-AcOWaterJar__vtable = .data:0x000000A8; // type:object size:0x100
-lbl_601_data_1A8 = .data:0x000001A8; // type:object size:0x30
-lbl_601_data_1D8 = .data:0x000001D8; // type:object size:0x30
-lbl_601_data_208 = .data:0x00000208; // type:object size:0x18
-lbl_601_data_220 = .data:0x00000220; // type:object size:0x44
-lbl_601_data_264 = .data:0x00000264; // type:object size:0x54
+__vt__14dAcOWaterJar_c = .data:0x000000A8; // type:object size:0x100
+__vt__54sFStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c> = .data:0x000001A8; // type:object size:0x30
+__vt__84sStateMgr_c<15dAcSalbageObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000001D8; // type:object size:0x30
+__vt__31sFStateFct_c<15dAcSalbageObj_c> = .data:0x00000208; // type:object size:0x18
+__vt__28sFState_c<15dAcSalbageObj_c> = .data:0x00000220; // type:object size:0x44
+__vt__15dShadowCircle_c = .data:0x00000264; // type:object size:0x54
 lbl_601_data_2B8 = .data:0x000002B8; // type:object size:0x68
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 lbl_601_bss_8 = .bss:0x00000008; // type:object size:0xC

include/d/a/d_a_salbage_obj.h

@@ -1,6 +1,7 @@
 #ifndef D_A_SALBAGE_OBJ_H
 #define D_A_SALBAGE_OBJ_H
 
+#include "common.h"
 #include "d/a/obj/d_a_obj_base.h"
 #include "d/col/bg/d_bg_s_acch.h"
 #include "d/col/cc/d_cc_d.h"
@@ -14,9 +15,17 @@
 
 class dAcSalbageObj_c;
 
+enum SalvageObj_e {
+    SALVAGE_OBJ_PROPERA = 0,
+    SALVAGE_OBJ_ROULETTE = 1,
+    SALVAGE_OBJ_DIVINER_CRYSTAL = 2,
+    SALVAGE_OBJ_WATER_JAR = 5,
+    SALVAGE_OBJ_POT = 6,
+};
+
 class SalbageRelated {
 public:
-    SalbageRelated(dAcSalbageObj_c *obj) : mpObj(obj), mSalvageObjId(6) {}
+    SalbageRelated(dAcSalbageObj_c *obj, s32 id) : mpObj(obj), mCarried(false), mHidden(false), mSalvageObjId(id) {}
 
     /* vt 0x08 */ virtual ~SalbageRelated() {}
     /* vt 0x0C */ virtual void setCarried() {
@@ -68,7 +77,14 @@ class dAcSalbageObj_c : public dAcObjBase_c {
     };
 
 public:
-    dAcSalbageObj_c() : mStateMgr(*this), mSalbageRelated(this), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {}
+    dAcSalbageObj_c(m3d::smdl_c *mdl, s32 salvageObjId)
+        : field_0x330(0),
+          mpMdl(mdl),
+          mStateMgr(*this),
+          mSalbageRelated(this, salvageObjId),
+          mDowsingTarget(this, DowsingTarget::SLOT_NONE),
+          mIsDemoState(false),
+          mpNextStateId(nullptr) {}
     virtual ~dAcSalbageObj_c() {}
 
     virtual int preExecute() override;
@@ -82,6 +98,14 @@ public:
         return false;
     }
 
+    /* vt 0x84-0x8C */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Wait);
+    /* vt 0x90-0x98 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Carried);
+    /* vt 0x9C-0xA4 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Demo);
+    /* vt 0xA8-0xB0 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, DemoThrow);
+    /* vt 0xB4-0xBC */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Fly);
+    /* vt 0xC0-0xC8 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, After);
+    STATE_FUNC_DECLARE(dAcSalbageObj_c, Kill);
+
 protected:
     bool shouldBeActiveDowsingTarget() const;
     void initSalbageObj();
@@ -97,14 +121,6 @@ protected:
     void updateBgAcchCir();
     void updateMdl();
 
-    /* vt 0x84-0x8C */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Wait);
-    /* vt 0x90-0x98 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Carried);
-    /* vt 0x9C-0xA4 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Demo);
-    /* vt 0xA8-0xB0 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, DemoThrow);
-    /* vt 0xB4-0xBC */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Fly);
-    /* vt 0xC0-0xC8 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, After);
-    STATE_FUNC_DECLARE(dAcSalbageObj_c, Kill);
-
     /* vt 0xCC */ virtual mMtx_c calcWorldMtx();
     /* vt 0xD0 */ virtual void vt_0xD0() {}
 
@@ -142,7 +158,7 @@ protected:
         return 50.0f;
     }
 
-    /* 0x330 */ u8 _0x330[0x334 - 0x330];
+    /* 0x330 */ UNKWORD field_0x330;
 
     /* 0x334 */ m3d::smdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShadow;

include/d/a/obj/d_a_obj_diviner_crystal.h

@@ -1,17 +1,27 @@
 #ifndef D_A_OBJ_DIVINER_CRYSTAL_H
 #define D_A_OBJ_DIVINER_CRYSTAL_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_anmmatclr.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "m/m3d/m_smdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
-class dAcODivinerCrystal_c : public dAcObjBase_c {
+class dAcODivinerCrystal_c : public dAcSalbageObj_c {
 public:
-    dAcODivinerCrystal_c() : mStateMgr(*this, sStateID::null) {}
+    dAcODivinerCrystal_c() : dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_DIVINER_CRYSTAL) {}
     virtual ~dAcODivinerCrystal_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcODivinerCrystal_c, dAcSalbageObj_c, DemoThrow);
+    STATE_FUNC_DECLARE(dAcODivinerCrystal_c, Stay);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcODivinerCrystal_c);
+    /* 0x970 */ nw4r::g3d::ResFile mResMaybe;
+    /* 0x974 */ m3d::smdl_c mMdl1;
+    /* 0x990 */ m3d::smdl_c mMdl2;
+    /* 0x9AC */ m3d::anmTexSrt_c mAnmTexSrt;
+    /* 0x9D8 */ m3d::anmMatClr_c mAnmMatClr;
 };
 
 #endif

include/d/a/obj/d_a_obj_pot_sal.h

@@ -2,17 +2,20 @@
 #define D_A_OBJ_POT_SAL_H
 
 #include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_smdl.h"
 #include "s/s_State.hpp"
 
 class dAcOpotSal_c : public dAcSalbageObj_c {
 public:
-    dAcOpotSal_c() {}
+    dAcOpotSal_c() : dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_POT) {}
     virtual ~dAcOpotSal_c() {}
 
     STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, DemoThrow);
     STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, After);
 
 private:
+    /* 0x970 */ m3d::smdl_c mMdl1;
+    /* 0x98C */ m3d::smdl_c mMdl2;
 };
 
 #endif

include/d/a/obj/d_a_obj_propera.h

@@ -1,17 +1,20 @@
 #ifndef D_A_OBJ_PROPERA_H
 #define D_A_OBJ_PROPERA_H
 
-#include "d/a/obj/d_a_obj_base.h"
-#include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
+#include "d/a/d_a_salbage_obj.h"
+#include "d/col/bg/d_bg_w.h"
+#include "m/m3d/m_smdl.h"
 
-class dAcObjPropera_c : public dAcObjBase_c {
+class dAcObjPropera_c : public dAcSalbageObj_c {
 public:
-    dAcObjPropera_c() : mStateMgr(*this, sStateID::null) {}
+    dAcObjPropera_c() : dAcSalbageObj_c(&mMdl, SALVAGE_OBJ_PROPERA) {}
     virtual ~dAcObjPropera_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjPropera_c, dAcSalbageObj_c, DemoThrow);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcObjPropera_c);
+    /* 0x970 */ m3d::smdl_c mMdl;
+    /* 0x98C */ dBgW mBgW;
 };
 
 #endif

include/d/a/obj/d_a_obj_roulette.h

@@ -1,17 +1,22 @@
 #ifndef D_A_OBJ_ROULETTE_H
 #define D_A_OBJ_ROULETTE_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "m/m3d/m_mdl.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
-class dAcObjRoulette_c : public dAcObjBase_c {
+class dAcObjRoulette_c : public dAcSalbageObj_c {
 public:
-    dAcObjRoulette_c() : mStateMgr(*this, sStateID::null) {}
+    dAcObjRoulette_c() : dAcSalbageObj_c(&mMdl, SALVAGE_OBJ_ROULETTE) {}
     virtual ~dAcObjRoulette_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjRoulette_c, dAcSalbageObj_c, DemoThrow);
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjRoulette_c, dAcSalbageObj_c, Wait);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcObjRoulette_c);
+    /* 0x970 */ m3d::mdl_c mMdl;
+    /* 0x994 */ m3d::anmTexSrt_c mAnm;
 };
 
 #endif

include/d/a/obj/d_a_obj_water_jar.h

@@ -1,17 +1,32 @@
 #ifndef D_A_OBJ_WATER_JAR_H
 #define D_A_OBJ_WATER_JAR_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "common.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "d/col/cc/d_cc_d.h"
+#include "m/m3d/m_anmchr.h"
+#include "m/m3d/m_smdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
+#include "toBeSorted/actor_event.h"
+#include "toBeSorted/d_emitter.h"
 
-class dAcOWaterJar_c : public dAcObjBase_c {
+class dAcOWaterJar_c : public dAcSalbageObj_c {
 public:
-    dAcOWaterJar_c() : mStateMgr(*this, sStateID::null) {}
+    dAcOWaterJar_c() : mEvent(*this, nullptr), dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_WATER_JAR) {}
     virtual ~dAcOWaterJar_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOWaterJar_c, dAcSalbageObj_c, DemoThrow);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOWaterJar_c);
+    /* 0x970 */ ActorEventRelated mEvent;
+    /* 0x9C0 */ nw4r::g3d::ResFile mResMaybe;
+    /* 0x9C4 */ m3d::smdl_c mMdl1;
+    /* 0x9E0 */ m3d::smdl_c mMdl2;
+    /* 0x9FC */ m3d::anmChr_c mAnm;
+    /* 0xA34 */ EffectsStruct mEffect;
+    /* 0xA68 */ u8 _0xA68[0xA6C - 0xA68];
+    /* 0xA6C */ dCcD_Cyl mCcCyl;
 };
 
 #endif

src/REL/d/a/obj/d_a_obj_diviner_crystal.cpp

@@ -1,3 +1,14 @@
 #include "d/a/obj/d_a_obj_diviner_crystal.h"
 
 SPECIAL_ACTOR_PROFILE(OBJ_DIVINER_CRYSTAL, dAcODivinerCrystal_c, fProfile::OBJ_DIVINER_CRYSTAL, 0x157, 0, 3);
+
+STATE_VIRTUAL_DEFINE(dAcODivinerCrystal_c, DemoThrow);
+STATE_DEFINE(dAcODivinerCrystal_c, Stay);
+
+void dAcODivinerCrystal_c::initializeState_DemoThrow() {}
+void dAcODivinerCrystal_c::executeState_DemoThrow() {}
+void dAcODivinerCrystal_c::finalizeState_DemoThrow() {}
+
+void dAcODivinerCrystal_c::initializeState_Stay() {}
+void dAcODivinerCrystal_c::executeState_Stay() {}
+void dAcODivinerCrystal_c::finalizeState_Stay() {}

src/REL/d/a/obj/d_a_obj_pot_sal.cpp

@@ -1,3 +1,14 @@
 #include "d/a/obj/d_a_obj_pot_sal.h"
 
 SPECIAL_ACTOR_PROFILE(OBJ_POT_SAL, dAcOpotSal_c, fProfile::OBJ_POT_SAL, 0x86, 0, 2);
+
+STATE_VIRTUAL_DEFINE(dAcOpotSal_c, DemoThrow);
+STATE_VIRTUAL_DEFINE(dAcOpotSal_c, After);
+
+void dAcOpotSal_c::initializeState_DemoThrow() {}
+void dAcOpotSal_c::executeState_DemoThrow() {}
+void dAcOpotSal_c::finalizeState_DemoThrow() {}
+
+void dAcOpotSal_c::initializeState_After() {}
+void dAcOpotSal_c::executeState_After() {}
+void dAcOpotSal_c::finalizeState_After() {}

src/REL/d/a/obj/d_a_obj_propera.cpp

@@ -1,3 +1,9 @@
 #include "d/a/obj/d_a_obj_propera.h"
 
 SPECIAL_ACTOR_PROFILE(OBJ_PROPERA, dAcObjPropera_c, fProfile::OBJ_PROPERA, 0x96, 0, 386);
+
+STATE_VIRTUAL_DEFINE(dAcObjPropera_c, DemoThrow);
+
+void dAcObjPropera_c::initializeState_DemoThrow() {}
+void dAcObjPropera_c::executeState_DemoThrow() {}
+void dAcObjPropera_c::finalizeState_DemoThrow() {}

src/REL/d/a/obj/d_a_obj_roulette.cpp

@@ -1,3 +1,14 @@
 #include "d/a/obj/d_a_obj_roulette.h"
 
 SPECIAL_ACTOR_PROFILE(OBJ_ROULETTE, dAcObjRoulette_c, fProfile::OBJ_ROULETTE, 0x97, 0, 384);
+
+STATE_VIRTUAL_DEFINE(dAcObjRoulette_c, DemoThrow);
+STATE_VIRTUAL_DEFINE(dAcObjRoulette_c, Wait);
+
+void dAcObjRoulette_c::initializeState_DemoThrow() {}
+void dAcObjRoulette_c::executeState_DemoThrow() {}
+void dAcObjRoulette_c::finalizeState_DemoThrow() {}
+
+void dAcObjRoulette_c::initializeState_Wait() {}
+void dAcObjRoulette_c::executeState_Wait() {}
+void dAcObjRoulette_c::finalizeState_Wait() {}

src/REL/d/a/obj/d_a_obj_water_jar.cpp

@@ -1,3 +1,9 @@
 #include "d/a/obj/d_a_obj_water_jar.h"
 
 SPECIAL_ACTOR_PROFILE(OBJ_WATER_JAR, dAcOWaterJar_c, fProfile::OBJ_WATER_JAR, 0x1AE, 0, 3);
+
+STATE_VIRTUAL_DEFINE(dAcOWaterJar_c, DemoThrow);
+
+void dAcOWaterJar_c::initializeState_DemoThrow() {}
+void dAcOWaterJar_c::executeState_DemoThrow() {}
+void dAcOWaterJar_c::finalizeState_DemoThrow() {}

src/d/a/d_a_salbage_obj.cpp

@@ -68,7 +68,7 @@ int dAcSalbageObj_c::preExecute() {
     int result = dAcObjBase_c::preExecute() == NOT_READY ? NOT_READY : SUCCEEDED;
     if (dSalvageMgr_c::sInstance->checkDeliveredStoryflag(mSalbageRelated.getSalvageObjId())) {
         s32 id = mSalbageRelated.getSalvageObjId();
-        if (id != 2 && id != 6) {
+        if (id != SALVAGE_OBJ_DIVINER_CRYSTAL && id != SALVAGE_OBJ_POT) {
             if (!EventManager::isInEvent()) {
                 deleteRequest();
             }
@@ -204,9 +204,9 @@ void dAcSalbageObj_c::doInteraction(s32 arg) {
 
 void dAcSalbageObj_c::addAttentionTargetIfNeeded() {
     switch (mSalbageRelated.getSalvageObjId()) {
-        case 5:
-        case 6:  return;
-        default: addAttentionTarget(); break;
+        case SALVAGE_OBJ_WATER_JAR:
+        case SALVAGE_OBJ_POT:       return;
+        default:                    addAttentionTarget(); break;
     }
 }
 
@@ -243,7 +243,7 @@ bool dAcSalbageObj_c::shouldBeActiveDowsingTarget() const {
     if (dSalvageMgr_c::sInstance->hasDowsingForSalvageObj(this) == false) {
         return false;
     } else {
-        return mSalbageRelated.getSalvageObjId() != 6;
+        return mSalbageRelated.getSalvageObjId() != SALVAGE_OBJ_POT;
     }
 }