Misc obj linkage (#2773)

1 files changed, 30 insertions, 30 deletions

diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp
index 35bf65b0a2..4fb9f50264 100644
--- a/src/d/actor/d_a_obj_master_sword.cpp
+++ b/src/d/actor/d_a_obj_master_sword.cpp
@@ -93,36 +93,6 @@ actionFunc daObjMasterSword_c::ActionTable[] = {
     &daObjMasterSword_c::initWait, &daObjMasterSword_c::executeWait,
 };
 
-/* 80C90DB8-80C90F6C 000338 01B4+00 1/1 0/0 0/0 .text            create__18daObjMasterSword_cFv */
-int daObjMasterSword_c::create() {
-    fopAcM_ct(this, daObjMasterSword_c);
-
-    if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()])) {
-        return cPhs_ERROR_e;
-    }
-
-    int phase = dComIfG_resLoad(&mPhase, l_arcName);
-    if (phase == cPhs_COMPLEATE_e) {
-        if (!fopAcM_entrySolidHeap(this, daObjMasterSword_c::createHeapCallBack, 0x1830)) {
-            return cPhs_ERROR_e;
-        }
-
-        create_init();
-    }
-
-    return phase;
-}
-
-void daObjMasterSword_c::callInit() {
-    (this->**mActionFunc)();
-}
-
-void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
-    mMode = i_mode;
-    mActionFunc = &ActionTable[2 * mMode];
-    callInit();
-}
-
 void daObjMasterSword_c::initCollision() {
     static dCcD_SrcCyl ccCylSrc = {
         {
@@ -143,6 +113,16 @@ void daObjMasterSword_c::initCollision() {
     mCyl.SetStts(&mCcStts);
 }
 
+void daObjMasterSword_c::callInit() {
+    (this->**mActionFunc)();
+}
+
+void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
+    mMode = i_mode;
+    mActionFunc = &ActionTable[2 * mMode];
+    callInit();
+}
+
 /* 80C90F6C-80C9120C 0004EC 02A0+00 1/1 0/0 0/0 .text            create_init__18daObjMasterSword_cFv */
 void daObjMasterSword_c::create_init() {
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
@@ -170,6 +150,26 @@ void daObjMasterSword_c::create_init() {
     setAction(MODE_0_e);
 }
 
+/* 80C90DB8-80C90F6C 000338 01B4+00 1/1 0/0 0/0 .text            create__18daObjMasterSword_cFv */
+int daObjMasterSword_c::create() {
+    fopAcM_ct(this, daObjMasterSword_c);
+
+    if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()])) {
+        return cPhs_ERROR_e;
+    }
+
+    int phase = dComIfG_resLoad(&mPhase, l_arcName);
+    if (phase == cPhs_COMPLEATE_e) {
+        if (!fopAcM_entrySolidHeap(this, daObjMasterSword_c::createHeapCallBack, 0x1830)) {
+            return cPhs_ERROR_e;
+        }
+
+        create_init();
+    }
+
+    return phase;
+}
+
 /* 80C91420-80C91448 0009A0 0028+00 1/0 0/0 0/0 .text            daObjMasterSword_Delete__FP18daObjMasterSword_c */
 static int daObjMasterSword_Delete(daObjMasterSword_c* i_this) {
     i_this->~daObjMasterSword_c();