Name unk IScnObjCallback funcs

zeldaret · Sep 28, 2024 · 90f9ae8 · 90f9ae8
1 parent 9942297
commit 90f9ae8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt
@@ -27,8 +27,8 @@ executeState_Disappear__18dAcOappearBridge_cFv = .text:0x00000B20; // type:funct
 finalizeState_Disappear__18dAcOappearBridge_cFv = .text:0x00000C20; // type:function size:0x4
 __dt__18dAcOappearBridge_cFv = .text:0x00000C30; // type:function size:0xFC
 getStateID__87sStateMgr_c<18dAcOappearBridge_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000D30; // type:function size:0x10
-ExecCallback_CALC_0x1C__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D40; // type:function size:0x4
-ExecCallback_CALC_0x18__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D50; // type:function size:0x4
+ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D40; // type:function size:0x4
+ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D50; // type:function size:0x4
 ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D60; // type:function size:0x4
 ExecCallback_CALC_WORLD__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D70; // type:function size:0x4
 ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D80; // type:function size:0x4

diff --git a/include/d/a/obj/d_a_obj_appear_bridge.h b/include/d/a/obj/d_a_obj_appear_bridge.h
@@ -37,9 +37,9 @@ class dAcOappearBridge_c : public dAcObjBase_c {
     ActorEventRelated mActorEvent;
 
     // TODO the weak IScnObjCallback functions are in the wrong order.
-    // The vtable order is            dtor, World, Mat, View, 0x18, 0x1C
-    // and the emitted order is       dtor, 0x1C, 0x18, View, Mat, World
-    // but the order in the binary is dtor, 0x1C, 0x18, Mat, World, View
+    // The vtable order is            dtor, World,   Mat,  View,   Opa,   Xlu
+    // and the emitted order is       dtor,   Xlu,   Opa,  View,   Mat, World
+    // but the order in the binary is dtor,   Xlu,   Opa,  Mat,  World,  View
     dScnCallback_c mSceneCallback;
     /* 0x650 */ mVec3_c mSoundPosition;
     /* 0x65C */ f32 field_0x65C;

diff --git a/include/nw4r/g3d/g3d_scnobj.h b/include/nw4r/g3d/g3d_scnobj.h
@@ -144,9 +144,8 @@ struct IScnObjCallback {
     virtual void ExecCallback_CALC_WORLD(ScnObj::Timing, ScnObj *, u32, void *) {} // at 0xC
     virtual void ExecCallback_CALC_MAT(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x10
     virtual void ExecCallback_CALC_VIEW(ScnObj::Timing, ScnObj *, u32, void *) {}  // at 0x14
-    // SS: We apparently have two more members
-    virtual void ExecCallback_CALC_0x18(ScnObj::Timing, ScnObj *, u32, void *) {} // at 0x18
-    virtual void ExecCallback_CALC_0x1C(ScnObj::Timing, ScnObj *, u32, void *) {} // at 0x1C
+    virtual void ExecCallback_DRAW_OPA(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x18
+    virtual void ExecCallback_DRAW_XLU(ScnObj::Timing, ScnObj *, u32, void *) {}   // at 0x1C
 };
 
 // Is there a better way of resolving this dependency?